From 2e598ac02627011426f88512978b75c98c94e88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= Date: Wed, 16 Oct 2024 11:18:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A1=A8=E5=A4=B4=E4=B8=BA=E4=B8=AD=E6=96=87?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pages/index.vue | 13 ++++++++----- pages/member.vue | 12 ++++++------ src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 1392ab1..71f5f59 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "author": "leizi97", "description": "A simple network initiator based on Easytier", - "version": "1.0.4", + "version": "1.0.5", "scripts": { "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "build": "nuxt generate --dotenv env/.env.prod" diff --git a/pages/index.vue b/pages/index.vue index 908d515..15e5a3f 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -505,9 +505,8 @@ data.memberVisible = true; memberDialog.onCloseRequested(() => { data.logVisible = false; - }) + }); const appWindow = getCurrentWindow(); - appWindow.emitTo("log", "logs", data.log); } else { data.memberVisible = false; memberDialog.destroy(); @@ -520,8 +519,10 @@ } }; + const handleShowLogDialog = async () => { try { + logsTimer && clearInterval(logsTimer); const appWindow = getCurrentWindow(); const appSize = await appWindow.innerSize(); const appPosition = await appWindow.outerPosition(); @@ -540,13 +541,15 @@ y: appPosition.y, url: "#/log" }); - if (!data.logVisible) { data.logVisible = true; infoDialog.onCloseRequested(() => { data.logVisible = false; - }) - appWindow.emitTo("log", "logs", data.log); + }); + + logsTimer = setInterval(() => { + appWindow.emitTo("log", "logs", data.log); + }, 3000); } else { data.logVisible = false; infoDialog.destroy(); diff --git a/pages/member.vue b/pages/member.vue index bb00b21..5957c7a 100644 --- a/pages/member.vue +++ b/pages/member.vue @@ -9,8 +9,8 @@ > @@ -23,7 +23,7 @@ member: [] }); - const showTableHeader = ["ipv4", "hostname", "cost", "lat_ms", "loss_rate", "nat_type", "version"]; + const showTableHeader = [["ipv4", "虚拟网IP"], ["hostname", "主机名"], ["lat_ms", "延迟"], ["loss_rate", "丢包率"], ["version", '版本']]; const headers = [ "ipv4", "hostname", @@ -161,9 +161,9 @@ onMounted(async () => { listenOutput(); - // timer = setInterval(() => { - // listenOutput(); - // }, 3000); + timer = setInterval(() => { + listenOutput(); + }, 1000 * 10); }); onBeforeUnmount(() => { diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 6d83d74..d436ac5 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1059,7 +1059,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "easytier-game" -version = "1.0.4" +version = "1.0.5" dependencies = [ "log", "reqwest", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 668ea15..3c10c9b 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "easytier-game" -version = "1.0.4" +version = "1.0.5" homepage = "https://github.com/EasyTier/EasyTier" repository = "https://github.com/EasyTier/EasytierGame" description = "A simple network initiator based on Easytier" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 0be37eb..4108fff 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "productName": "easytier-game", - "version": "1.0.4", + "version": "1.0.5", "identifier": "com.tauri.easytier-game", "build": { From 0467074eece0f3bd2e455c178a54a8f03326a74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= Date: Wed, 16 Oct 2024 16:33:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#Fix=20=E5=86=85=E7=BD=AEWinIPBroadcast?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BC=80=E5=90=AF=EF=BC=8C=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96=201.0.5?= =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index.vue | 65 +++++++- pages/member.vue | 27 +++- src-tauri/Cargo.lock | 150 ++++++++++++++++-- src-tauri/Cargo.toml | 1 + .../WinIPBroadcast-x86_64-pc-windows-msvc.exe | Bin 0 -> 107008 bytes src-tauri/capabilities/default.json | 67 +++++--- src-tauri/src/lib.rs | 55 ++++--- src-tauri/tauri.conf.json | 2 + 8 files changed, 298 insertions(+), 69 deletions(-) create mode 100644 src-tauri/WinIPBroadcast-x86_64-pc-windows-msvc.exe diff --git a/pages/index.vue b/pages/index.vue index 15e5a3f..a64bf52 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -232,15 +232,27 @@ > easytier发布页 -
+
- 找不到房间？安装WinIPBroadcast + WinIPBroadcast + + + +
@@ -249,7 +261,7 @@