diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 192b489..ee2f1c4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ on: image_tag: description: 'Tag for this image build' type: string - default: 'v2.2.1' + default: 'v2.2.2' required: true mark_latest: description: 'Mark this image as latest' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6c7d42..d842615 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: 'v2.2.1' + default: 'v2.2.2' required: true make_latest: description: 'Mark this release as latest' diff --git a/Cargo.lock b/Cargo.lock index 59ad928..135421e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1874,7 +1874,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "easytier" -version = "2.2.1" +version = "2.2.2" dependencies = [ "aes-gcm", "anyhow", @@ -1977,7 +1977,7 @@ dependencies = [ [[package]] name = "easytier-gui" -version = "2.2.1" +version = "2.2.2" dependencies = [ "anyhow", "chrono", @@ -2022,7 +2022,7 @@ dependencies = [ [[package]] name = "easytier-web" -version = "2.2.1" +version = "2.2.2" dependencies = [ "anyhow", "async-trait", diff --git a/easytier-gui/package.json b/easytier-gui/package.json index ec8a681..bff59ad 100644 --- a/easytier-gui/package.json +++ b/easytier-gui/package.json @@ -1,7 +1,7 @@ { "name": "easytier-gui", "type": "module", - "version": "2.2.1", + "version": "2.2.2", "private": true, "packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4", "scripts": { diff --git a/easytier-gui/src-tauri/Cargo.toml b/easytier-gui/src-tauri/Cargo.toml index 7ae2456..a0999d1 100644 --- a/easytier-gui/src-tauri/Cargo.toml +++ b/easytier-gui/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "easytier-gui" -version = "2.2.1" +version = "2.2.2" description = "EasyTier GUI" authors = ["you"] edition = "2021" diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 28f1aa1..dfbe3a9 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 85d0c88..ec6b407 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 28f1aa1..dfbe3a9 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 73e48db..aa521c3 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 13dd214..e47422e 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 73e48db..aa521c3 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 1d98044..332ee4b 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index a888b33..36b495d 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 1d98044..332ee4b 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 0818324..08230a5 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index a2a838e..bfa65bb 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 0818324..08230a5 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b18bceb..34fc58d 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 3f8a57f..86f247a 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index b18bceb..34fc58d 100644 Binary files a/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/easytier-gui/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/easytier-gui/src-tauri/icons/32x32.png b/easytier-gui/src-tauri/icons/32x32.png index 14e17ba..678b8cf 100644 Binary files a/easytier-gui/src-tauri/icons/32x32.png and b/easytier-gui/src-tauri/icons/32x32.png differ diff --git a/easytier-gui/src-tauri/icons/Square310x310Logo.png b/easytier-gui/src-tauri/icons/Square310x310Logo.png index be3cae0..dafb7c2 100644 Binary files a/easytier-gui/src-tauri/icons/Square310x310Logo.png and b/easytier-gui/src-tauri/icons/Square310x310Logo.png differ diff --git a/easytier-gui/src-tauri/icons/icon.icns b/easytier-gui/src-tauri/icons/icon.icns index bf303af..d576994 100644 Binary files a/easytier-gui/src-tauri/icons/icon.icns and b/easytier-gui/src-tauri/icons/icon.icns differ diff --git a/easytier-gui/src-tauri/icons/icon.ico b/easytier-gui/src-tauri/icons/icon.ico index aa1a113..9c3b594 100644 Binary files a/easytier-gui/src-tauri/icons/icon.ico and b/easytier-gui/src-tauri/icons/icon.ico differ diff --git a/easytier-gui/src-tauri/tauri.conf.json b/easytier-gui/src-tauri/tauri.conf.json index 749a13e..3cb510a 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": "2.2.1", + "version": "2.2.2", "identifier": "com.kkrainbow.easytier", "plugins": {}, "app": { diff --git a/easytier-web/Cargo.toml b/easytier-web/Cargo.toml index 7d38b58..69b3409 100644 --- a/easytier-web/Cargo.toml +++ b/easytier-web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "easytier-web" -version = "2.2.1" +version = "2.2.2" edition = "2021" description = "Config server for easytier. easytier-core gets config from this and web frontend use it as restful api server." diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml index 57eb655..67eecb8 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 = "2.2.1" +version = "2.2.2" edition = "2021" authors = ["kkrainbow"] keywords = ["vpn", "p2p", "network", "easytier"] diff --git a/easytier/src/connector/udp_hole_punch/sym_to_cone.rs b/easytier/src/connector/udp_hole_punch/sym_to_cone.rs index bc449e6..48c7321 100644 --- a/easytier/src/connector/udp_hole_punch/sym_to_cone.rs +++ b/easytier/src/connector/udp_hole_punch/sym_to_cone.rs @@ -580,13 +580,15 @@ pub mod tests { ) .await; + println!("start punching {:?}", p_a.list_routes().await); + wait_for_condition( || async { wait_route_appear_with_cost(p_a.clone(), p_c.my_peer_id(), Some(1)) .await .is_ok() }, - Duration::from_secs(5), + Duration::from_secs(10), ) .await; println!("{:?}", p_a.list_routes().await); diff --git a/easytier/src/tests/three_node.rs b/easytier/src/tests/three_node.rs index ea9041a..c52578a 100644 --- a/easytier/src/tests/three_node.rs +++ b/easytier/src/tests/three_node.rs @@ -520,12 +520,13 @@ pub async fn proxy_three_node_disconnect_test(#[values("tcp", "wg")] proto: &str })); wait_for_condition( || async { - insts[0] + insts[2] .get_peer_manager() - .list_routes() + .get_peer_map() + .list_peers_with_conn() .await .iter() - .find(|r| r.peer_id == inst4.peer_id()) + .find(|r| **r == inst4.peer_id()) .is_none() }, // 0 down, assume last packet is recv in -0.01 @@ -534,6 +535,21 @@ pub async fn proxy_three_node_disconnect_test(#[values("tcp", "wg")] proto: &str Duration::from_secs(11), ) .await; + + wait_for_condition( + || async { + insts[0] + .get_peer_manager() + .list_routes() + .await + .iter() + .find(|r| r.peer_id == inst4.peer_id()) + .is_none() + }, + Duration::from_secs(7), + ) + .await; + set_link_status("net_d", true); } });