bump version to v1.2.3 and update readme (#280)

.github/workflows/release.yml

@@ -21,7 +21,7 @@ on:
       version:
         description: 'Version for this release'
         type: string
-        default: 'v1.2.2'
+        default: 'v1.2.3'
         required: true
       make_latest:
         description: 'Mark this release as latest'

Cargo.lock

@@ -1597,7 +1597,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier"
-version = "1.2.2"
+version = "1.2.3"
 dependencies = [
  "aes-gcm",
  "anyhow",
@@ -1684,7 +1684,7 @@ dependencies = [
 
 [[package]]
 name = "easytier-gui"
-version = "1.2.2"
+version = "1.2.3"
 dependencies = [
  "anyhow",
  "chrono",

README.md

@@ -22,7 +22,7 @@ EasyTier is a simple, safe and decentralized VPN networking solution implemented
 - **Decentralized**: No need to rely on centralized services, nodes are equal and independent.
 - **Safe**: Use WireGuard protocol to encrypt data.
 - **High Performance**: Full-link zero-copy, with performance comparable to mainstream networking software.
-- **Cross-platform**: Supports MacOS/Linux/Windows, will support IOS and Android in the future. The executable file is statically linked, making deployment simple.
+- **Cross-platform**: Supports MacOS/Linux/Windows/Android, will support IOS in the future. The executable file is statically linked, making deployment simple.
 - **Networking without public IP**: Supports networking using shared public nodes, refer to [Configuration Guide](#Networking-without-public-IP)
 - **NAT traversal**: Supports UDP-based NAT traversal, able to establish stable connections even in complex network environments.
 - **Subnet Proxy (Point-to-Network)**: Nodes can expose accessible network segments as proxies to the VPN subnet, allowing other nodes to access these subnets through the node.
@@ -57,7 +57,7 @@ EasyTier is a simple, safe and decentralized VPN networking solution implemented
 5. **Install by script (For Linux Only)**
 
     ```sh
-    wget -O /tmp/easytier.sh "https://raw.githubusercontent.com/EasyTier/EasyTier/main/script/easytier.sh" && bash /tmp/easytier.sh install
+    wget -O /tmp/easytier.sh "https://raw.githubusercontent.com/EasyTier/EasyTier/main/script/install.sh" && bash /tmp/easytier.sh install
     ```
 
     You can also uninstall/update Easytier by the command "uninstall" or "update" of this script
@@ -132,6 +132,13 @@ nodea <-----> nodeb
 
     ![alt text](/assets/image-1.png)
 
+
+    ```sh
+    easytier-cli node
+    ```
+
+    ![alt text](assets/image-10.png)
+
 ---
 
 ### Multi-node Networking
@@ -282,7 +289,7 @@ You can use ``easytier-core --help`` to view all configuration items
 
 - [ ] Improve documentation and user guides.
 - [ ] Support features such as encryption, TCP hole punching, etc.
-- [ ] Support Android, IOS and other mobile platforms.
+- [ ] Support iOS.
 - [ ] Support Web configuration management.
 
 ## Community and Contribution

README_CN.md

@@ -22,7 +22,7 @@
 - **去中心化**：无需依赖中心化服务，节点平等且独立。
 - **安全**：支持利用 WireGuard 加密通信，也支持 AES-GCM 加密保护中转流量。
 - **高性能**：全链路零拷贝，性能与主流组网软件相当。
-- **跨平台**：支持 MacOS/Linux/Windows，未来将支持 IOS 和 Android。可执行文件静态链接，部署简单。
+- **跨平台**：支持 MacOS/Linux/Windows/Android，未来将支持 IOS。可执行文件静态链接，部署简单。
 - **无公网 IP 组网**：支持利用共享的公网节点组网，可参考 [配置指南](#无公网IP组网)
 - **NAT 穿透**：支持基于 UDP 的 NAT 穿透，即使在复杂的网络环境下也能建立稳定的连接。
 - **子网代理（点对网）**：节点可以将可访问的网段作为代理暴露给 VPN 子网，允许其他节点通过该节点访问这些子网。
@@ -57,7 +57,7 @@
 5. **使用一键脚本安装 (仅适用于 Linux)**
 
     ```sh
-    wget -O /tmp/easytier.sh "https://raw.githubusercontent.com/EasyTier/EasyTier/main/script/easytier.sh" && bash /tmp/easytier.sh install
+    wget -O /tmp/easytier.sh "https://raw.githubusercontent.com/EasyTier/EasyTier/main/script/install.sh" && bash /tmp/easytier.sh install
     ```
 
     使用本脚本安装的 Easytier 可以使用脚本的 uninstall/update 对其卸载/升级
@@ -132,6 +132,12 @@ nodea <-----> nodeb
 
     ![alt text](/assets/image-1.png)
 
+    ```sh
+    easytier-cli node
+    ```
+
+    ![alt text](assets/image-10.png)
+
 ---
 
 ### 多节点组网
@@ -286,7 +292,7 @@ connected_clients:
 
 - [ ] 完善文档和用户指南。
 - [ ] 支持 TCP 打洞等特性。
-- [ ] 支持 Android、IOS 等移动平台。
+- [ ] 支持 iOS。
 - [ ] 支持 Web 配置管理。
 
 ## 社区和贡献

easytier-gui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "easytier-gui",
   "type": "module",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "private": true,
   "scripts": {
     "dev": "vite",

easytier-gui/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-gui"
-version = "1.2.2"
+version = "1.2.3"
 description = "EasyTier GUI"
 authors = ["you"]
 edition = "2021"

easytier-gui/src-tauri/tauri.conf.json

@@ -17,7 +17,7 @@
     "createUpdaterArtifacts": false
   },
   "productName": "easytier-gui",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "identifier": "com.kkrainbow.easytier",
   "plugins": {},
   "app": {

easytier/Cargo.toml

@@ -3,7 +3,7 @@ name = "easytier"
 description = "A full meshed p2p VPN, connecting all your devices in one network with one command."
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasyTier"
-version = "1.2.2"
+version = "1.2.3"
 edition = "2021"
 authors = ["kkrainbow"]
 keywords = ["vpn", "p2p", "network", "easytier"]

script/install.sh

@@ -2,9 +2,6 @@
 
 # This script copy from alist , Thank for it!
 
-# INSTALL_PATH='/opt/easytier'
-VERSION='latest'
-
 SKIP_FOLDER_VERIFY=false
 SKIP_FOLDER_FIX=false
 
@@ -52,6 +49,12 @@ SHAN='\e[1;33;5m'
 RES='\e[0m'
 # clear
 
+# check if unzip is installed
+if ! command -v unzip >/dev/null 2>&1; then
+  echo -e "\r\n${RED_COLOR}Error: unzip is not installed${RES}\r\n"
+  exit 1
+fi
+
 echo -e "\r\n${RED_COLOR}----------------------NOTICE----------------------${RES}\r\n"
 echo " This is a temporary script to install EasyTier "
 echo " EasyTier requires a dedicated empty folder to install"
@@ -60,13 +63,6 @@ echo " Using EasyTier requires some basic skills "
 echo " You need to face the risks brought by using EasyTier at your own risk "
 echo -e "\r\n${RED_COLOR}-------------------------------------------------${RES}\r\n"
 
-read -p "Enter \"yes\" to accept our policy and continue: " -r agreement
-if [[ ! "$agreement" =~ ^[Yy]es$ ]]
-then
-    echo "You do not accept your policy, the script will exit ..."
-    exit 1
-fi
-
 # Get platform
 if command -v arch >/dev/null 2>&1; then
   platform=$(arch)
@@ -128,9 +124,6 @@ CHECK() {
 		exit 0
 	fi
   fi
-  if [ $check_port ]; then
-    kill -9 $check_port
-  fi
   if [ ! -d "$INSTALL_PATH/" ]; then
     mkdir -p $INSTALL_PATH
   else
@@ -183,7 +176,38 @@ INIT() {
   fi
 
   # Create default blank file config
-  touch $INSTALL_PATH/config/default.conf
+  cat >$INSTALL_PATH/config/default.conf <<EOF
+instance_name = "default"
+dhcp = true
+listeners = [
+    "tcp://0.0.0.0:11010",
+    "udp://0.0.0.0:11010",
+    "wg://0.0.0.0:11011",
+    "ws://0.0.0.0:11011/",
+    "wss://0.0.0.0:11012/",
+]
+exit_nodes = []
+peer = []
+rpc_portal = "127.0.0.1:15888"
+
+[network_identity]
+network_name = "default"
+network_secret = ""
+
+[flags]
+default_protocol = "udp"
+dev_name = ""
+enable_encryption = true
+enable_ipv6 = true
+mtu = 1380
+latency_first = false
+enable_exit_node = false
+no_tun = false
+use_smoltcp = false
+foreign_network_whitelist = "*"
+disable_p2p = false
+relay_all_peer_rpc = false
+EOF
 
   # Create systemd
   cat >/etc/systemd/system/easytier@.service <<EOF
@@ -225,6 +249,7 @@ SUCCESS() {
   clear
   echo " Install EasyTier successfully!"
   echo -e "\r\nDefault Port: ${GREEN_COLOR}11010(UDP+TCP)${RES}, Notice allowing in firewall!\r\n"
+  echo -e "Default Network Name: ${GREEN_COLOR}default${RES}, Please change it to your own network name!\r\n"
 
   echo -e "Now EasyTier supports multiple config files. You can create config files in the ${GREEN_COLOR}${INSTALL_PATH}/config/${RES} folder"
   echo -e "For more information, please check the documents in offical site"
@@ -290,11 +315,11 @@ fi
 
 echo $COMMEND
 
-if [ $COMMEND = "uninstall" ]; then
+if [ "$COMMEND" = "uninstall" ]; then
   UNINSTALL
-elif [ $COMMEND = "update" ]; then
+elif [ "$COMMEND" = "update" ]; then
   UPDATE
-elif [ $COMMEND = "install" ]; then
+elif [ "$COMMEND" = "install" ]; then
   CHECK
   INSTALL
   INIT