From 2b7ff0efc501978d8f59ad772e1c8285cbef4e5c Mon Sep 17 00:00:00 2001 From: "Sijie.Sun" Date: Sun, 25 Aug 2024 13:45:18 +0800 Subject: [PATCH] bump version to v1.2.3 and update readme (#280) --- .github/workflows/release.yml | 2 +- Cargo.lock | 4 +- README.md | 13 ++++-- README_CN.md | 12 +++-- assets/image-10.png | Bin 0 -> 16946 bytes easytier-gui/package.json | 2 +- easytier-gui/src-tauri/Cargo.toml | 2 +- easytier-gui/src-tauri/tauri.conf.json | 2 +- easytier/Cargo.toml | 2 +- script/{easytier.sh => install.sh} | 59 ++++++++++++++++++------- 10 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 assets/image-10.png rename script/{easytier.sh => install.sh} (89%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d3dfe3..9840a8b 100644 --- a/.github/workflows/release.yml +++ b/.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' diff --git a/Cargo.lock b/Cargo.lock index 835501b..64f3587 100644 --- a/Cargo.lock +++ b/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", diff --git a/README.md b/README.md index 4f6c5e7..70cdeff 100644 --- a/README.md +++ b/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 diff --git a/README_CN.md b/README_CN.md index 0fe2b90..7d1e4f6 100644 --- a/README_CN.md +++ b/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 配置管理。 ## 社区和贡献 diff --git a/assets/image-10.png b/assets/image-10.png new file mode 100644 index 0000000000000000000000000000000000000000..e421880c4ec6fcc0632f8396f17f664023f75411 GIT binary patch literal 16946 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 literal 0 HcmV?d00001 diff --git a/easytier-gui/package.json b/easytier-gui/package.json index 69937fa..8742e0c 100644 --- a/easytier-gui/package.json +++ b/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", diff --git a/easytier-gui/src-tauri/Cargo.toml b/easytier-gui/src-tauri/Cargo.toml index d7e8b26..5c9ded7 100644 --- a/easytier-gui/src-tauri/Cargo.toml +++ b/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" diff --git a/easytier-gui/src-tauri/tauri.conf.json b/easytier-gui/src-tauri/tauri.conf.json index d500402..a6a7ac7 100644 --- a/easytier-gui/src-tauri/tauri.conf.json +++ b/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": { diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml index 38ee820..10726c4 100644 --- a/easytier/Cargo.toml +++ b/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"] diff --git a/script/easytier.sh b/script/install.sh similarity index 89% rename from script/easytier.sh rename to script/install.sh index e1db0c5..5382310 100644 --- a/script/easytier.sh +++ b/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 </etc/systemd/system/easytier@.service <