From 5d11f39855aaff9acb63a0ae7a79083e3164ba85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= <leizi97@126.com>
Date: Mon, 2 Dec 2024 17:24:33 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=90=AF=E5=8A=A8=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96IP=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index.vue | 57 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 13 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index 6ad0269..548f481 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -10,7 +10,7 @@
 			class="full-label"
 		>
 			<template #label>
-				<div class="flex items-center flex-nowrap gap-[0_5px]">
+				<div class="flex flex-nowrap items-center gap-[0_5px]">
 					<div>服务器</div>
 					<span>-</span>
 					<ElTag
@@ -82,11 +82,11 @@
 					:label="item"
 					:value="item"
 				>
-					<div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]">
+					<div class="flex max-w-[calc(100vw-62px)] flex-nowrap items-center gap-[20px] overflow-hidden">
 						<ElTooltip :content="item">
 							<p class="truncate">{{ item }}</p>
 						</ElTooltip>
-						<div class="flex-shrink-0 ml-auto">
+						<div class="ml-auto flex-shrink-0">
 							<ElButton
 								@click.stop="handleDeleteServerUrl(item)"
 								round
@@ -98,7 +98,7 @@
 				</ElOption>
 			</ElSelect>
 		</ElFormItem>
-		<div class="flex flex-wrap gap-[0_10px] items-center">
+		<div class="flex flex-wrap items-center gap-[0_10px]">
 			<div class="flex-1">
 				<ElFormItem label="网络名">
 					<template #label>
@@ -157,7 +157,7 @@
 				label="局域网IP"
 			>
 				<template #label>
-					<div class="flex items-center h-[20px]">
+					<div class="flex h-[20px] items-center">
 						虚拟网IP
 						<ElTooltip content="对应命令行参数 --ipv4">
 							<ElIcon><QuestionFilled /></ElIcon>
@@ -181,7 +181,7 @@
 			</ElFormItem>
 		</div>
 	</ElForm>
-	<div class="flex items-start mt-auto">
+	<div class="mt-auto flex items-start">
 		<div>
 			<div>
 				<ElDropdown
@@ -209,13 +209,20 @@
 								分享联机相关配置
 							</ElDropdownItem>
 							<ElDropdownItem disabled>
-								<ElDivider class="!h-[2px] !m-0" />
+								<ElDivider class="!m-0 !h-[2px]" />
 							</ElDropdownItem>
 							<ElDropdownItem
 								:icon="SetUp"
 								command="create_server"
 							>
-								自建服务器<ElTag size="small" class="ml-[5px]" :type="listenObj.server_thread_id.value ? 'success' : 'info'">{{ listenObj.server_thread_id.value ? "运行中" : "未运行" }}</ElTag>
+								自建服务器
+								<ElTag
+									size="small"
+									class="ml-[5px]"
+									:type="listenObj.server_thread_id.value ? 'success' : 'info'"
+								>
+									{{ listenObj.server_thread_id.value ? "运行中" : "未运行" }}
+								</ElTag>
 							</ElDropdownItem>
 							<ElDropdownItem
 								:icon="Tools"
@@ -303,7 +310,7 @@
 					</ElButton>
 				</div>
 				<ElLink
-					class="!text-[9px] pb-[2px] ml-[8px] truncate"
+					class="ml-[8px] truncate pb-[2px] !text-[9px]"
 					type="info"
 					:underline="false"
 					@click="open('https://github.com/EasyTier/EasytierGame')"
@@ -336,7 +343,11 @@
 				刷新
 			</ElButton>
 			<ElTooltip content="打开内核缓存目录">
-				<ElButton :icon="Folder" size="small" @click="handleOpenCache"></ElButton>
+				<ElButton
+					:icon="Folder"
+					size="small"
+					@click="handleOpenCache"
+				></ElButton>
 			</ElTooltip>
 		</div>
 		<ElSelect
@@ -354,7 +365,7 @@
 				{{ release ? release[0] : "" }}
 			</ElOption>
 		</ElSelect>
-		<div class="pb-[5px] mt-[10px]">
+		<div class="mt-[10px] pb-[5px]">
 			<ElTooltip content="不使用出国软件也能告诉下载github Release包的地址，可自行搜索替换使用">
 				<ElText>github下载加速地址</ElText>
 			</ElTooltip>
@@ -456,6 +467,7 @@
 				v-model="mainStore.configPath"
 				no-data-text="目录没有配置文件"
 				placeholder="选择配置文件"
+				filterable
 			>
 				<ElOption
 					v-for="item in configStart.list"
@@ -482,7 +494,20 @@
 	import { invoke } from "@tauri-apps/api/core";
 	import { listen } from "@tauri-apps/api/event";
 	import { open, Command } from "@tauri-apps/plugin-shell";
-	import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools, MagicStick, SetUp, Folder } from "@element-plus/icons-vue";
+	import {
+		QuestionFilled,
+		Delete,
+		List,
+		UserFilled,
+		Setting,
+		Share,
+		RefreshRight,
+		Link,
+		Tools,
+		MagicStick,
+		SetUp,
+		Folder
+	} from "@element-plus/icons-vue";
 	import { reactive, onBeforeUnmount, onMounted, ref } from "vue";
 	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
 	import { initStartWinIpBroadcast } from "~/composables/netcard";
@@ -586,7 +611,7 @@
 		}
 		// console.error(configPath);
 		await Command.create("explorer", [configPath]).execute();
-	}
+	};
 
 	const handleDeleteServerUrl = (url: string) => {
 		const newBasePeers = [...mainStore.basePeers];
@@ -636,6 +661,12 @@
 					data.startLoading = false;
 					let ipv4 = /dhcp ip changed. old: None, new: Some\((\d+\.\d+\.\d+\.\d+).*\)/g.exec(event.payload as string)?.[1];
 					let devName = /tun device ready. dev: (.*)/g.exec(event.payload as string)?.[1];
+					if (mainStore.configStartEnable || mainStore.config.dhcp) {
+						let configIpv4 = /ipv4\s.*=\s.*[\'\"](\d+\.\d+\.\d+\.\d+).*[\'\"]/g.exec(event.payload as string)?.[1];
+						if (configIpv4) {
+							mainStore.config.ipv4 = configIpv4;
+						}
+					}
 					if (event.payload.includes("peer connection removed")) {
 						data.isSuccessGetIp = false;
 					}

From e8b82007c223c062b1e21e212c0522fa45af41d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= <leizi97@126.com>
Date: Tue, 3 Dec 2024 16:08:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E5=8E=9Fautostart=E5=BA=93-=E7=A7=BB=E9=99=A4autostart?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将开机自启检测使用plugins-cli进行判断
修复创建窗口后多次触发监听的情况
---
 composables/windows.ts              |  18 +++--
 pages/index.vue                     |  53 +++-----------
 src-tauri/Cargo.lock                | 110 ++++++++++++++++++++++++++++
 src-tauri/Cargo.toml                |   2 +
 src-tauri/capabilities/default.json |   4 +
 src-tauri/capabilities/desktop.json |  14 ++++
 src-tauri/src/lib.rs                |  28 ++++---
 src-tauri/tauri.conf.json           |  12 ++-
 8 files changed, 177 insertions(+), 64 deletions(-)
 create mode 100644 src-tauri/capabilities/desktop.json

diff --git a/composables/windows.ts b/composables/windows.ts
index df382f7..0b8d77c 100644
--- a/composables/windows.ts
+++ b/composables/windows.ts
@@ -2,17 +2,20 @@ import { type UnlistenFn } from "@tauri-apps/api/event";
 import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } from "@tauri-apps/api/window";
 import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
 import type { WebviewLabel, WebviewOptions } from "@tauri-apps/api/webview";
+
+const _listenersMaps: { [key: string]: [UnlistenFn | null, UnlistenFn | null] } = {};
+
 export default async (
 	label: WebviewLabel,
 	options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
 	afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
 	beforeCloseFunc?: () => void | null
 ) => {
-	let unListenlogClose: UnlistenFn | null = null;
-	let unlistenLogCreated: UnlistenFn | null = null;
+	const unlistenFnList: [UnlistenFn | null, UnlistenFn | null] = _listenersMaps[label] || [null, null];
+	let [unlistenLogCreated, unListenlogClose] = unlistenFnList;
 	let dialog = await WebviewWindow.getByLabel(label);
 	if (!dialog) {
-		let defaultOpts: {[key:string]: any, parent: Window | undefined} = {
+		let defaultOpts: { [key: string]: any; parent: Window | undefined } = {
 			parent: undefined,
 			closable: true,
 			resizable: true,
@@ -25,17 +28,16 @@ export default async (
 		const appWindow = getCurrentWindow();
 		if (appWindow) {
 			const appSize = await appWindow.outerSize();
-			// const monitor = await currentMonitor();
-			// console.error(monitor)
 			const factor = await appWindow.scaleFactor();
 			const appPosition = await appWindow.outerPosition();
-			// console.error((appPosition.x + appSize.width) / 1.25);
 			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
 			defaultOpts.parent = appWindow;
 			// console.error(logicalPosition);
 			defaultOpts.x = logicalPosition.x;
 			defaultOpts.y = logicalPosition.y;
 		}
+		unlistenLogCreated && (await (unlistenLogCreated as Function)());
+		unListenlogClose && (await unListenlogClose());
 		dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
 		unlistenLogCreated = await dialog.listen("tauri://webview-created", async () => {
 			if (dialog) {
@@ -43,10 +45,14 @@ export default async (
 				await dialog.show();
 			}
 		});
+		unlistenFnList[0] = unlistenLogCreated;
 		unListenlogClose = await dialog.onCloseRequested(async () => {
 			beforeCloseFunc && (await beforeCloseFunc());
 			unListenlogClose && (await unListenlogClose());
+			unlistenLogCreated && (await (unlistenLogCreated as Function)());
 		});
+		unlistenFnList[1] = unlistenLogCreated;
+		_listenersMaps[label] = unlistenFnList;
 	} else {
 		const visible = await dialog.isVisible();
 		if (visible) {
diff --git a/pages/index.vue b/pages/index.vue
index 548f481..0792f8b 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -510,13 +510,13 @@
 	} from "@element-plus/icons-vue";
 	import { reactive, onBeforeUnmount, onMounted, ref } from "vue";
 	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
+	import { getMatches } from '@tauri-apps/plugin-cli';
 	import { initStartWinIpBroadcast } from "~/composables/netcard";
 	import useMainStore from "@/stores/index";
 	import { ElMessage, ElMessageBox } from "element-plus";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
 	import etWindows from "@/composables/windows";
-	import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
 	import { readDir, exists, mkdir, BaseDirectory, readTextFile } from "@tauri-apps/plugin-fs";
 	import { updateConfigJson } from "~/composables/configJson";
@@ -844,42 +844,6 @@
 		// console.log(data.releaseList);
 	};
 
-	const handleAutoStart = async () => {
-		let is_enable = await tauriAutoStart.isEnabled();
-		if (!config.autoStart && !is_enable) {
-			try {
-				await tauriAutoStart.enable();
-			} catch (err) {
-				ElMessage.error(`开机自启失败`);
-			}
-		} else {
-			try {
-				await tauriAutoStart.disable();
-			} catch (err) {
-				// ElMessage.error(`取消自启失败`);
-			}
-		}
-		is_enable = await tauriAutoStart.isEnabled();
-		if (!is_enable) {
-			config.autoStart = false;
-		} else {
-			config.autoStart = true;
-		}
-	};
-
-	const initAutoStart = async () => {
-		try {
-			const is_enable = await tauriAutoStart.isEnabled();
-			if (!is_enable) {
-				config.autoStart = false;
-			} else {
-				config.autoStart = true;
-			}
-		} catch (err) {
-			config.autoStart = false;
-		}
-	};
-
 	const handleAutoStartByTask = async () => {
 		await invoke("spawn_autostart", { enabled: !config.autoStart });
 		const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
@@ -888,11 +852,6 @@
 
 	const compatibleInitAutoStart = async () => {
 		try {
-			const is_enable = await tauriAutoStart.isEnabled();
-			if (is_enable) {
-				await invoke("spawn_autostart", { enabled: true });
-				await tauriAutoStart.disable();
-			}
 			let is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
 			if (is_enable_by_task) {
 				// 每次打开Exe重新加载一次开机自启，因为可能路径变了
@@ -984,6 +943,15 @@
 		}
 	};
 
+	const mountedShow = async () => {
+		const args = await getMatches();
+		if(!args.args?.['task-auto-start']?.value) {
+			const appWindow = getCurrentWindow();
+			await appWindow.show();
+			await appWindow.setFocus();
+		}
+	}
+
 	let logsTimer: NodeJS.Timeout | null = null;
 	let serverLogsTimer: NodeJS.Timeout | null = null;
 
@@ -1000,6 +968,7 @@
 		await initConfigDir();
 		await initAutoStartServer();
 		await initConnectAfterStart();
+		mountedShow(); // 不需要await
 		closePrevent();
 	});
 
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index f7b2c35..e4d60af 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -95,6 +95,55 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.92"
@@ -692,6 +741,33 @@ dependencies = [
  "inout",
 ]
 
+[[package]]
+name = "clap"
+version = "4.5.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+
 [[package]]
 name = "clipboard-win"
 version = "5.4.0"
@@ -731,6 +807,12 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -1187,6 +1269,7 @@ dependencies = [
  "tauri",
  "tauri-build",
  "tauri-plugin-autostart",
+ "tauri-plugin-cli",
  "tauri-plugin-clipboard-manager",
  "tauri-plugin-fs",
  "tauri-plugin-log",
@@ -2165,6 +2248,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -4451,6 +4540,21 @@ dependencies = [
  "thiserror 1.0.64",
 ]
 
+[[package]]
+name = "tauri-plugin-cli"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bccd4692b56822a60874542c7655546c8e7aed3c2e2926166e1498e595bd2a2"
+dependencies = [
+ "clap",
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 1.0.64",
+]
+
 [[package]]
 name = "tauri-plugin-clipboard-manager"
 version = "2.0.2"
@@ -5087,6 +5191,12 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "uuid"
 version = "1.10.0"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 7409022..33db545 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -44,11 +44,13 @@ tokio = { version = "1.41.1", features = ["process"] }
 # prost = "0.13"
 # prost-types = "0.13"
 
+
 [dependencies.windows]
 version = "0.58.0"
 features = ["Win32_System_TaskScheduler"]
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
 tauri-plugin-autostart = "2.0.1"
+tauri-plugin-cli = "2"
 tauri-plugin-single-instance = "2.0.1"
 tauri-plugin-window-state = "2"
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index 59c9aca..18899c0 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -97,6 +97,10 @@
     "window-state:allow-save-window-state",
     "window-state:allow-restore-state",
 
+    
+    "cli:default",
+    "cli:allow-cli-matches",
+
     "log:default",
     "log:allow-log"
   ]
diff --git a/src-tauri/capabilities/desktop.json b/src-tauri/capabilities/desktop.json
new file mode 100644
index 0000000..a33e9fd
--- /dev/null
+++ b/src-tauri/capabilities/desktop.json
@@ -0,0 +1,14 @@
+{
+  "identifier": "desktop-capability",
+  "platforms": [
+    "macOS",
+    "windows",
+    "linux"
+  ],
+  "windows": [
+    "main"
+  ],
+  "permissions": [
+    "cli:default"
+  ]
+}
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 8a62158..afa0af4 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -138,13 +138,14 @@ async fn get_members_by_cli() -> String {
         .arg("peer")
         .arg("list")
         .creation_flags(0x08000000)
-        .output().await
+        .output()
+        .await
     {
         Ok(output) => {
             if output.status.success() {
                 let output_str = String::from_utf8_lossy(&output.stdout);
                 return output_str.trim().to_string();
-            }else {
+            } else {
                 let output_str = String::from_utf8_lossy(&output.stderr);
                 log::error!("{}", output_str.trim().to_string());
                 return "_EasytierGameCliFailedToConnect_".to_string();
@@ -153,7 +154,7 @@ async fn get_members_by_cli() -> String {
         Err(_e) => {
             log::error!("get member list error");
             return "".to_string();
-        },
+        }
     }
 }
 
@@ -482,7 +483,7 @@ fn autostart_is_enabled() -> bool {
     }
 }
 
-pub const AUTOSTART_ARG: &str = "--autostart";
+// pub const AUTOSTART_ARG: &str = "--autostart";
 pub const TASKAUTOSTART_ARG: &str = "--task-auto-start";
 fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error>> {
     if !enabled {
@@ -550,10 +551,11 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     // 获取命令行参数
-    let args: Vec<String> = std::env::args().collect();
+    let _args: Vec<String> = std::env::args().collect();
 
     let context = tauri::generate_context!();
     tauri::Builder::default()
+        .plugin(tauri_plugin_cli::init())
         .plugin(
             tauri_plugin_window_state::Builder::new()
                 .with_state_flags(tauri_plugin_window_state::StateFlags::SIZE)
@@ -561,10 +563,6 @@ pub fn run() {
         )
         .plugin(tauri_plugin_clipboard_manager::init())
         .plugin(tauri_plugin_fs::init())
-        .plugin(tauri_plugin_autostart::init(
-            MacosLauncher::LaunchAgent,
-            Some(vec![AUTOSTART_ARG]),
-        ))
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
             let _ = app
@@ -574,7 +572,7 @@ pub fn run() {
                 .expect("failed to set focus");
         }))
         .setup(move |app| {
-            let args = args.clone();
+            // let args = args.clone();
             // if cfg!(debug_assertions) {
             let log_path = get_tool_exe_path(String::from("\\easytier\\guiLogs"));
             app.handle().plugin(
@@ -611,11 +609,11 @@ pub fn run() {
                 .build(app)?;
 
             // 开机自启隐藏到托盘或者显示主窗口
-            if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
-                let main_window = app.get_webview_window("main").unwrap();
-                main_window.show().expect("failed to show window");
-                main_window.set_focus().expect("failed to set focus");
-            }
+            // if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
+            //     let main_window = app.get_webview_window("main").unwrap();
+            //     main_window.show().expect("failed to show window");
+            //     main_window.set_focus().expect("failed to set focus");
+            // }
 
             Ok(())
         })
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index d391cf9..af3a341 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -34,7 +34,17 @@
 			"csp": null
 		}
 	},
-	"plugins": {},
+	"plugins": {
+		"cli": {
+			"description": "easytier game CLI Plugin",
+			"args": [
+				{
+					"name": "task-auto-start",
+					"description": "easytier game autostart"
+				}
+			]
+		}
+	},
 	"bundle": {
 		"active": false,
 		"targets": "all",

From b94d5de463e7eb5e01a6e35d8c0b3c5686598782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= <leizi97@126.com>
Date: Tue, 3 Dec 2024 18:07:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

高级选项-增加默认协议配置
高级选项-增加自定义监听相关配置
修复创建子窗口多次触发监听的问题
config.json增加对自定义协议配置
优化高级选项文本说明
---
 composables/configJson.ts               |   3 +
 composables/server.ts                   |   3 +-
 composables/windows.ts                  |  26 +++++
 package.json                            |   3 +-
 pages/advance.vue                       | 125 +++++++++++++++++++++---
 pages/cidr.vue                          |  10 +-
 pages/index.vue                         |  65 +++++++-----
 pages/server.vue                        |   6 +-
 pages/tool.vue                          |   9 +-
 pnpm-lock.yaml                          |  10 --
 src-tauri/Cargo.lock                    |  68 ++-----------
 src-tauri/Cargo.toml                    |   3 +-
 src-tauri/capabilities/default.json     |   4 -
 src-tauri/capabilities/desktop.json     |  14 ---
 src-tauri/easytier/config_template.json |   2 +
 src-tauri/src/lib.rs                    |   1 -
 src-tauri/tauri.conf.json               |   4 +-
 stores/index.ts                         |  26 +++--
 utils/index.ts                          |   6 ++
 19 files changed, 230 insertions(+), 158 deletions(-)
 delete mode 100644 src-tauri/capabilities/desktop.json

diff --git a/composables/configJson.ts b/composables/configJson.ts
index a0ce63a..d9ee8e8 100644
--- a/composables/configJson.ts
+++ b/composables/configJson.ts
@@ -22,6 +22,9 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 			saveErrorLog,
 			logLevel,
 			serverUrl,
+			port,
+			enableCustomListener,
+			customListenerData,
 			...otherConfig
 		} = mainStore.config;
 		let writeServerUrl: Array<string> | string = serverUrl;
diff --git a/composables/server.ts b/composables/server.ts
index 6a282ed..11c53ff 100644
--- a/composables/server.ts
+++ b/composables/server.ts
@@ -14,9 +14,8 @@ export const getServerArgs = () => {
 		.split("\n")
 		.map(el => el.trim())
 		.filter(el => el)
-		.join(" ");
 	if (whiteList && mainStore.serverConfig.enableWhiteList) {
-		args.push("--relay-network-whitelist", whiteList);
+		args.push("--relay-network-whitelist", ...whiteList);
 	}
 	if (!whiteList && mainStore.serverConfig.enableWhiteList) {
 		args.push("--relay-network-whitelist");
diff --git a/composables/windows.ts b/composables/windows.ts
index 0b8d77c..a9034fc 100644
--- a/composables/windows.ts
+++ b/composables/windows.ts
@@ -2,6 +2,8 @@ import { type UnlistenFn } from "@tauri-apps/api/event";
 import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } from "@tauri-apps/api/window";
 import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
 import type { WebviewLabel, WebviewOptions } from "@tauri-apps/api/webview";
+import useMainStore from "@/stores/index";
+import { onBeforeUnmount } from "vue";
 
 const _listenersMaps: { [key: string]: [UnlistenFn | null, UnlistenFn | null] } = {};
 
@@ -61,3 +63,27 @@ export default async (
 		}
 	}
 };
+
+export const dataSubscribe = async (cb?: (...args: any) => any) => {
+	if (!cb) return;
+	const mainStore = useMainStore();
+	const currentWindow = getCurrentWindow();
+	let removeSubscribe = mainStore.$subscribe(async (...args) => {
+		const emitData = await cb(args);
+		await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
+	});
+	const unlisten = currentWindow.listen<any>("global-main-store", event => {
+		console.log('global-main-store')
+		console.log(event);
+		removeSubscribe && removeSubscribe();
+		mainStore.$patch({ ...event.payload.store }); // 更新全局状态
+		removeSubscribe = mainStore.$subscribe(async (...args) => {
+			const emitData = await cb(args);
+			await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
+		});
+	});
+	onBeforeUnmount(async () => {
+		unlisten && (await unlisten)();
+		removeSubscribe && removeSubscribe();
+	});
+};
diff --git a/package.json b/package.json
index 4c1862b..4319433 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.2.8",
+	"version": "1.2.9",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod",
@@ -16,7 +16,6 @@
 		"@pinia/nuxt": "0.8.0",
 		"@tauri-apps/api": "^2.1.1",
 		"@tauri-apps/cli": "^2.1.0",
-		"@tauri-apps/plugin-autostart": "~2",
 		"@tauri-apps/plugin-cli": "^2.0.0",
 		"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
 		"@tauri-apps/plugin-fs": "~2",
diff --git a/pages/advance.vue b/pages/advance.vue
index 03cb785..c870307 100644
--- a/pages/advance.vue
+++ b/pages/advance.vue
@@ -1,7 +1,29 @@
 <template>
 	<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
 		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
+		<div class="flex items-center gap-[15px] flex-nowrap">
+			<div class="flex items-center gap-[5px] flex-nowrap">
+				<ElCheckbox v-model="mainStore.config.enableCustonProtocol">自定义联机时使用的默认协议</ElCheckbox>
+				<ElTooltip content="如果没有支持该协议的节点地址，程序会自动处理，请放心使用">
+					<ElIcon><QuestionFilled /></ElIcon>
+				</ElTooltip>
+			</div>
+			<div class="w-[80px]">
+				<ElSelect
+					size="small"
+					v-model="mainStore.config.customProtocol"
+					placeholder="请选择协议"
+					class="ml-[5px]"
+				>
+					<ElOption
+						v-for="item in protocols"
+						:key="item"
+						:label="`${item}`"
+						:value="item"
+					></ElOption>
+				</ElSelect>
+			</div>
+		</div>
 		<div class="flex items-center gap-[15px] flex-nowrap">
 			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
 			<div class="w-[140px]">
@@ -36,7 +58,71 @@
 				打开config.json目录
 			</ElButton>
 		</div>
-
+		<ElDivider />
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox>
+			<ElTooltip content="无法联机时，可以尝试开启这个选项">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElText
+				class="flex-shrink-0"
+				size="small"
+			>
+				监听端口
+			</ElText>
+			<ElInput
+				:disabled="mainStore.config.disbleListenner || mainStore.config.enableCustomListener"
+				size="small"
+				:maxlength="10"
+				v-model="mainStore.config.port"
+				placeholder="请输入端口号"
+			/>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox
+				:disabled="mainStore.config.disbleListenner"
+				v-model="mainStore.config.enableCustomListener"
+			>
+				自定义监听地址
+			</ElCheckbox>
+			<ElButton
+				size="small"
+				:disabled="mainStore.config.disbleListenner"
+				@click="handleListenerDialog"
+			>
+				填写
+			</ElButton>
+			<ElDialog
+				width="95%"
+				top="10px"
+				append-to-body
+				:z-index="10"
+				class="!mb-0"
+				v-model="listenerDialogData.visible"
+				:close-on-press-escape="false"
+				title="自定义监听地址"
+			>
+				<ElInput
+					type="textarea"
+					:rows="8"
+					placeholder="请输入监听地址一行一个"
+					v-model="mainStore.config.customListenerData"
+				></ElInput>
+				<template #footer>
+					<div class="text-right">
+						<ElButton
+							size="default"
+							@click="handleFinishInputListener"
+							type="primary"
+						>
+							确定
+						</ElButton>
+					</div>
+				</template>
+			</ElDialog>
+		</div>
 		<ElDivider />
 		<div class="flex items-center gap-[10px]">
 			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
@@ -76,12 +162,12 @@
 
 		<ElDivider />
 		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为启用，必须与对等节点相同</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.multiThread">启用多线程运行</ElCheckbox></div>
 		<ElDivider />
 
 		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
 		<div>
 			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包，即使对等节点不在转发网络白名单内</ElCheckbox>
@@ -91,14 +177,29 @@
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
 	import { QuestionFilled } from "@element-plus/icons-vue";
-	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
 	import { Command } from "@tauri-apps/plugin-shell";
 	import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
 	import { ElMessage } from "element-plus";
+	import { reactive } from "vue";
+	import { dataSubscribe } from "@/composables/windows";
+	import { supportProtocols } from "~/utils";
+
+	const protocols = supportProtocols();
+	const listenerDialogData = reactive<{ [key: string]: any }>({
+		visible: false,
+		loading: false
+	});
+
+	const handleListenerDialog = () => {
+		listenerDialogData.visible = true;
+	};
+
+	const handleFinishInputListener = async () => {
+		listenerDialogData.visible = false;
+	};
 
 	const mainStore = useMainStore();
-	const appWindow = getCurrentWindow();
 	const data = ["trace", "debug", "info", "warn", "error", "off"];
 	const openLogDir = async () => {
 		const resourceDir = await getResourceDir();
@@ -122,11 +223,11 @@
 			ElMessage.error("config.json的目录不存在");
 		}
 	};
-	mainStore.$subscribe(async (...a) => {
-		// console.error("subscribe", a);
-		await appWindow.emitTo("main", "config", { config: { ...mainStore.config }, createConfigInEasytier: mainStore.createConfigInEasytier });
-		// if(mainStore.createConfigInEasytier) {
-		// 	updateConfigJson();
-		// }
+
+	dataSubscribe(async (...a) => {
+		return {
+			config: { ...mainStore.config },
+			createConfigInEasytier: mainStore.createConfigInEasytier
+		};
 	});
 </script>
diff --git a/pages/cidr.vue b/pages/cidr.vue
index 508c350..97e03db 100644
--- a/pages/cidr.vue
+++ b/pages/cidr.vue
@@ -10,16 +10,16 @@
 				v-model="mainStore.config.proxyNetworks"
 				type="textarea"
 				:rows="30"
-				resize="none"></ElInput>
+				resize="none"
+			></ElInput>
 		</div>
 	</div>
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
-    import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { dataSubscribe } from "@/composables/windows";
 	const mainStore = useMainStore();
-	const appWindow = getCurrentWindow();
-	mainStore.$subscribe((...a) => {
-		appWindow.emitTo("main", "config", { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } });
+	dataSubscribe(async (...a) => {
+		return { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } };
 	});
 </script>
diff --git a/pages/index.vue b/pages/index.vue
index 0792f8b..3f5957d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -83,9 +83,10 @@
 					:value="item"
 				>
 					<div class="flex max-w-[calc(100vw-62px)] flex-nowrap items-center gap-[20px] overflow-hidden">
-						<ElTooltip :content="item">
+						<ElTooltip v-if="item && item.length > 30" placement="top" :content="item || '-'">
 							<p class="truncate">{{ item }}</p>
 						</ElTooltip>
+						<p v-else class="truncate">{{ item }}</p>
 						<div class="ml-auto flex-shrink-0">
 							<ElButton
 								@click.stop="handleDeleteServerUrl(item)"
@@ -510,7 +511,7 @@
 	} from "@element-plus/icons-vue";
 	import { reactive, onBeforeUnmount, onMounted, ref } from "vue";
 	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
-	import { getMatches } from '@tauri-apps/plugin-cli';
+	import { getMatches } from "@tauri-apps/plugin-cli";
 	import { initStartWinIpBroadcast } from "~/composables/netcard";
 	import useMainStore from "@/stores/index";
 	import { ElMessage, ElMessageBox } from "element-plus";
@@ -522,7 +523,7 @@
 	import { updateConfigJson } from "~/composables/configJson";
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
 	import { sortedUniq, uniq } from "lodash-es";
-	import { bounce, addQQGroup } from "~/utils";
+	import { bounce, addQQGroup, supportProtocols } from "~/utils";
 	import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
 	import { getServerArgs } from "@/composables/server";
 
@@ -545,7 +546,7 @@
 	const mainStore = useMainStore();
 	const config = mainStore.config;
 	// console.error(config);
-	const protocols = ["tcp", "udp", "ws", "wss", "quic"];
+	const protocols = supportProtocols();
 	const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
 		logVisible: false,
 		cidrVisible: false,
@@ -734,13 +735,18 @@
 			this.unListenServerThreadId = unListen;
 		},
 		async listenConfigStart() {
+			const appWindow = getCurrentWindow();
 			const unListen = await listen("config", event => {
 				// console.error("config", event.payload);
 				const ipv4 = config.ipv4;
 				mainStore.$patch(event.payload as any);
 				config.ipv4 = ipv4;
+				appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
 			});
-			this.unListenConfigStart = unListen;
+			const unListen2 = mainStore.$subscribe(() => {
+				appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
+			})
+			this.unListenConfigStart = [unListen, unListen2];
 		},
 		async listenStartStopServer() {
 			const unListen = await listen<{ args: Array<string> }>("startStopServer", async event => {
@@ -945,12 +951,12 @@
 
 	const mountedShow = async () => {
 		const args = await getMatches();
-		if(!args.args?.['task-auto-start']?.value) {
+		if (!args.args?.["task-auto-start"]?.value) {
 			const appWindow = getCurrentWindow();
 			await appWindow.show();
 			await appWindow.setFocus();
 		}
-	}
+	};
 
 	let logsTimer: NodeJS.Timeout | null = null;
 	let serverLogsTimer: NodeJS.Timeout | null = null;
@@ -975,7 +981,8 @@
 	onBeforeUnmount(() => {
 		unListenAll();
 		listenObj.unListenReleaseList && listenObj.unListenReleaseList();
-		listenObj.unListenConfigStart && listenObj.unListenConfigStart();
+		listenObj.unListenConfigStart && listenObj.unListenConfigStart[0]();
+		listenObj.unListenConfigStart && listenObj.unListenConfigStart[1]();
 		listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
 		logsTimer && clearInterval(logsTimer);
 		serverLogsTimer && clearInterval(serverLogsTimer);
@@ -1030,6 +1037,12 @@
 			const formatUrl = config.serverUrl.replace(/\\/g, "/");
 			args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
 		}
+		if (config.enableCustonProtocol) {
+			const includes = config.protocol.includes(config.customProtocol);
+			if (includes) {
+				args.push("--default-protocol", config.customProtocol);
+			}
+		}
 		if (config.disbleP2p) {
 			args.push("--disable-p2p");
 		}
@@ -1039,6 +1052,19 @@
 		if (config.disbleListenner) {
 			args.push("--no-listener");
 		}
+		if (!config.disbleListenner && config.enableCustomListener && config.customListenerData) {
+			const customListener = config.customListenerData
+				.trim()
+				.split("\n")
+				.map(el => el.trim())
+				.filter(el => el);
+			if (customListener.length > 0) {
+				args.push("-l", ...customListener);
+			}
+		}
+		if (!config.disbleListenner && !config.enableCustomListener && config.port) {
+			args.push("-l", config.port);
+		}
 		if (mainStore.cidrEnable && config.proxyNetworks) {
 			// console.error(config.proxyNetworks);
 			const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
@@ -1182,22 +1208,6 @@
 		}
 		if (command === "create_server") {
 			await handleShowServerDialog();
-			// if (data.isStart) {
-			// 	const [error] = await ElConfirmDanger("切换会停止{action}，是否继续?", "提示", {
-			// 		action: "`联机/服务`",
-			// 		confirmButtonText: "继续",
-			// 		cancelButtonText: "取消"
-			// 	});
-			// 	if (!error) await reset();
-			// }
-			// mainStore.enableCreateServer = !mainStore.enableCreateServer;
-			// if (mainStore.config.relayAllPeerrpc && !mainStore.enableCreateServer) {
-			// 	const [error] = await ElConfirmPrimary("是否关闭RPC流量转发?", "提示", {
-			// 		confirmButtonText: "关闭",
-			// 		cancelButtonText: "取消"
-			// 	});
-			// 	if (!error) mainStore.config.relayAllPeerrpc = false;
-			// }
 		}
 	};
 
@@ -1285,7 +1295,7 @@
 				data.logVisible = true;
 				logsTimer && clearInterval(logsTimer);
 				logsTimer = setInterval(() => {
-					appWindow.emitTo("log", "logs", data.log);
+					appWindow.emitTo({ kind: "WebviewWindow", label: "log" }, "logs", data.log);
 				}, 650);
 			},
 			() => {
@@ -1368,7 +1378,10 @@
 				data.serverVisible = true;
 				serverLogsTimer && clearInterval(serverLogsTimer);
 				serverLogsTimer = setInterval(() => {
-					appWindow.emitTo("server", "server_logs", { log: data.serverLog, threadId: listenObj.server_thread_id.value });
+					appWindow.emitTo({ kind: "WebviewWindow", label: "server" }, "server_logs", {
+						log: data.serverLog,
+						threadId: listenObj.server_thread_id.value
+					});
 				}, 650);
 			},
 			() => {
diff --git a/pages/server.vue b/pages/server.vue
index c57c540..0a36999 100644
--- a/pages/server.vue
+++ b/pages/server.vue
@@ -85,6 +85,7 @@
 	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
 	import { getServerArgs } from "@/composables/server";
+	import { dataSubscribe } from "@/composables/windows";
 
     const appWindow = getCurrentWindow();
 	const mainStore = useMainStore();
@@ -122,7 +123,8 @@
 		await appWindow.emitTo("main", "startStopServer", { args });
 	};
 
-    mainStore.$subscribe(async (...a) => {
-		await appWindow.emitTo("main", "config", { serverConfig: { ...mainStore.serverConfig }});
+	dataSubscribe(async (...a) => {
+		return { serverConfig: { ...mainStore.serverConfig }};
 	});
+
 </script>
diff --git a/pages/tool.vue b/pages/tool.vue
index 12df71d..cffb0a5 100644
--- a/pages/tool.vue
+++ b/pages/tool.vue
@@ -181,8 +181,8 @@
 	import { onMounted, reactive } from "vue";
 	import useMainStore from "@/stores/index";
 	import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
-	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { isValidIP } from "~/utils";
+	import { dataSubscribe } from "~/composables/windows";
 
 	const mainStore = useMainStore();
 	const data = reactive({
@@ -328,10 +328,9 @@
 		}
 	};
 
-	const appWindow = getCurrentWindow();
-	mainStore.$subscribe((...a) => {
-		// console.error("subscribe", a);
-		appWindow.emitTo("main", "config", { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } });
+
+	dataSubscribe(async (...a) => {
+		return { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } };
 	});
 
 	onMounted(() => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5f8e40c..ebbbf1f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,9 +26,6 @@ importers:
       '@tauri-apps/cli':
         specifier: ^2.1.0
         version: 2.1.0
-      '@tauri-apps/plugin-autostart':
-        specifier: ~2
-        version: 2.0.0
       '@tauri-apps/plugin-cli':
         specifier: ^2.0.0
         version: 2.0.0
@@ -1147,9 +1144,6 @@ packages:
     engines: {node: '>= 10'}
     hasBin: true
 
-  '@tauri-apps/plugin-autostart@2.0.0':
-    resolution: {integrity: sha512-NEwOQWVasZ8RczXkMLNJokRDujneuMH/UFA5t84DLkbNZUmiD3G7HZWhgSd1YQ0BFU9h9w+h2B/py3y6bzWg4Q==}
-
   '@tauri-apps/plugin-cli@2.0.0':
     resolution: {integrity: sha512-glQmlL1IiCGEa1FHYa/PTPSeYhfu56omLRgHXWlJECDt6DbJyRuJWVgtkQfUxtqnVdYnnU+DGIGeiInoEqtjLw==}
 
@@ -4991,10 +4985,6 @@ snapshots:
       '@tauri-apps/cli-win32-ia32-msvc': 2.1.0
       '@tauri-apps/cli-win32-x64-msvc': 2.1.0
 
-  '@tauri-apps/plugin-autostart@2.0.0':
-    dependencies:
-      '@tauri-apps/api': 2.1.1
-
   '@tauri-apps/plugin-cli@2.0.0':
     dependencies:
       '@tauri-apps/api': 2.1.1
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index e4d60af..ec4f096 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -355,17 +355,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "auto-launch"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471"
-dependencies = [
- "dirs 4.0.0",
- "thiserror 1.0.64",
- "winreg 0.10.1",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -1139,33 +1128,13 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys 0.3.7",
-]
-
 [[package]]
 name = "dirs"
 version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys 0.4.1",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -1258,7 +1227,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.2.8"
+version = "1.2.9"
 dependencies = [
  "log",
  "planif",
@@ -1268,7 +1237,6 @@ dependencies = [
  "sysinfo",
  "tauri",
  "tauri-build",
- "tauri-plugin-autostart",
  "tauri-plugin-cli",
  "tauri-plugin-clipboard-manager",
  "tauri-plugin-fs",
@@ -1299,7 +1267,7 @@ dependencies = [
  "rustc_version",
  "toml 0.8.2",
  "vswhom",
- "winreg 0.52.0",
+ "winreg",
 ]
 
 [[package]]
@@ -4402,7 +4370,7 @@ checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c"
 dependencies = [
  "anyhow",
  "bytes",
- "dirs 5.0.1",
+ "dirs",
  "dunce",
  "embed_plist",
  "futures-util",
@@ -4453,7 +4421,7 @@ checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01"
 dependencies = [
  "anyhow",
  "cargo_toml",
- "dirs 5.0.1",
+ "dirs",
  "glob",
  "heck 0.5.0",
  "json-patch",
@@ -4525,21 +4493,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "tauri-plugin-autostart"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bba6bb936e0fd0a58ed958b49e2e423dd40949c9d9425cc991be996959e3838e"
-dependencies = [
- "auto-launch",
- "log",
- "serde",
- "serde_json",
- "tauri",
- "tauri-plugin",
- "thiserror 1.0.64",
-]
-
 [[package]]
 name = "tauri-plugin-cli"
 version = "2.0.1"
@@ -5039,7 +4992,7 @@ checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f"
 dependencies = [
  "core-graphics 0.24.0",
  "crossbeam-channel",
- "dirs 5.0.1",
+ "dirs",
  "libappindicator",
  "muda",
  "objc2",
@@ -5898,15 +5851,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winreg"
 version = "0.52.0"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 33db545..efbc788 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.2.8"
+version = "1.2.9"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -50,7 +50,6 @@ version = "0.58.0"
 features = ["Win32_System_TaskScheduler"]
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
-tauri-plugin-autostart = "2.0.1"
 tauri-plugin-cli = "2"
 tauri-plugin-single-instance = "2.0.1"
 tauri-plugin-window-state = "2"
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index 18899c0..3991351 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -30,10 +30,6 @@
     "core:webview:allow-webview-show",
     "core:webview:allow-webview-hide",
     "core:webview:allow-webview-close",
-    "autostart:default",
-    "autostart:allow-enable",
-    "autostart:allow-disable",
-    "autostart:allow-is-enabled",
     "core:tray:allow-get-by-id",
     "core:tray:allow-set-icon",
     "core:tray:allow-new",
diff --git a/src-tauri/capabilities/desktop.json b/src-tauri/capabilities/desktop.json
deleted file mode 100644
index a33e9fd..0000000
--- a/src-tauri/capabilities/desktop.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "identifier": "desktop-capability",
-  "platforms": [
-    "macOS",
-    "windows",
-    "linux"
-  ],
-  "windows": [
-    "main"
-  ],
-  "permissions": [
-    "cli:default"
-  ]
-}
\ No newline at end of file
diff --git a/src-tauri/easytier/config_template.json b/src-tauri/easytier/config_template.json
index 4552edb..322b90d 100644
--- a/src-tauri/easytier/config_template.json
+++ b/src-tauri/easytier/config_template.json
@@ -21,6 +21,8 @@
     "dhcp": false,  // 动态分配IP
     "devName": false, // 是否启用自定义网卡名
     "devNameValue": "", // 网卡名(启用devName之后才生效)
+    "enableCustonProtocol": false,  // 是否启用自定义协议
+    "customProtocol": "tcp", // 自定义协议类型
     "enableNetCardMetric": false,  // 自定义easytier每次生成的网卡跃点
     "netCardMetricValue": 1 // 网卡跃点数量(1-9999)
 }
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index afa0af4..1ddab89 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -15,7 +15,6 @@ use sysinfo::System;
 use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
 use tauri::Emitter;
 use tauri::Manager;
-use tauri_plugin_autostart::MacosLauncher;
 use windows::core::{BSTR, VARIANT};
 use windows::Win32::Foundation::VARIANT_BOOL;
 use windows::Win32::System::Com::*;
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index af3a341..6b57621 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.2.8",
+	"version": "1.2.9",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.2.8",
+				"title": "easytier-game 1.2.9",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
diff --git a/stores/index.ts b/stores/index.ts
index 538d93e..382fd56 100644
--- a/stores/index.ts
+++ b/stores/index.ts
@@ -13,6 +13,9 @@ export default defineStore("main", {
 				autoStart: false, // 是否自动启动
 				connectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
+				port: "11010", // 监听端口号
+				enableCustomListener: false, // 是否自定义监听
+				customListenerData: "", // 自定义监听地址
 				disbleListenner: false, // 是否禁用监听
 				disableEncryption: true, // 是否禁用加密
 				multiThread: false, //使用多线程
@@ -28,6 +31,8 @@ export default defineStore("main", {
 				logLevel: "error", //日志等级
 				devName: false, //自定义网卡名
 				devNameValue: "", //自定义网卡名
+				enableCustonProtocol: false, //自定义默认协议
+				customProtocol: "tcp", //自定义默认协议
 				enableNetCardMetric: false, //启用网卡自定义跃点
 				netCardMetricValue: 1 //自定义网卡跃点值
 			},
@@ -37,7 +42,7 @@ export default defineStore("main", {
 				serverWhiteList: "", // 服务器流量转发白名单
 				// enableListener: true, // 是否启用监听
 				autoStart: false, //随软件自启
-				port: "11010", // 服务器端口
+				port: "11010" // 服务器端口
 			},
 			cidrEnable: false,
 			basePeers: ["public.easytier.top:11010"],
@@ -48,7 +53,6 @@ export default defineStore("main", {
 			createConfigInEasytier: false, //在easytier目录生成config.json文件吗
 			githubFastUrl: "https://ghproxy.cc/",
 
-
 			winipBcPid: 0,
 			winipBcStart: false
 		};
@@ -83,14 +87,18 @@ export default defineStore("main", {
 			"config.devNameValue",
 			"config.enableNetCardMetric",
 			"config.netCardMetricValue",
+			"config.port",
+			"config.enableCustomListener",
+			"config.customListenerData",
+			"config.enableCustonProtocol",
+			"config.customProtocol",
 
 			"serverConfig.autoStart",
 			// 'serverConfig.enableListener',
-			'serverConfig.enableWhiteList',
-			'serverConfig.relayAllPeerrpc',
-			'serverConfig.serverWhiteList',
-			'serverConfig.port',
-
+			"serverConfig.enableWhiteList",
+			"serverConfig.relayAllPeerrpc",
+			"serverConfig.serverWhiteList",
+			"serverConfig.port",
 
 			"cidrEnable",
 			"basePeers",
@@ -99,8 +107,8 @@ export default defineStore("main", {
 			"configPath",
 			"winIpBcAutoStart",
 			"createConfigInEasytier",
-			"githubFastUrl",
-		],
+			"githubFastUrl"
+		]
 		// // 除了这些，其他都要存下来
 		// omit: ["winipBcPid", "winipBcStart"]
 	}
diff --git a/utils/index.ts b/utils/index.ts
index 5ceaaee..5cd1316 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -64,6 +64,12 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 		});
 };
 
+const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
+
+export const supportProtocols = () => {
+	return _supportProtocols.slice();
+}
+
 export const parsePeerInfo = (content: string) => {
 	if(!content) return [];
 	// 将表格字符串分割成行

From a2be6ebe86223f8f614c6f60881279c86e4e6837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= <leizi97@126.com>
Date: Tue, 3 Dec 2024 18:39:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=EF=BC=8C=E4=BF=AE=E5=A4=8Dwinipbroadcast?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=81=9C=E6=AD=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composables/netcard.ts | 88 ++++++++++++++++++++++--------------------
 composables/windows.ts |  2 -
 pages/tool.vue         | 14 ++++---
 3 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/composables/netcard.ts b/composables/netcard.ts
index c84833a..4baf8ec 100644
--- a/composables/netcard.ts
+++ b/composables/netcard.ts
@@ -6,51 +6,55 @@ import { BaseDirectory } from "@tauri-apps/api/path";
 import { exists } from "@tauri-apps/plugin-fs";
 
 const getWinIpBroadcastPid = async () => {
-    const mainStore = useMainStore();
-    const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
-    mainStore.winipBcPid = (pid as number) || 0;
-    if (mainStore.winipBcPid && mainStore.winipBcPid > 0) {
-        mainStore.winipBcStart = true;
-    } else {
-        mainStore.winipBcStart = false;
-    }
+	const mainStore = useMainStore();
+	const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
+	mainStore.winipBcPid = (pid as number) || 0;
+	mainStore.$patch({
+		winipBcStart: !!(mainStore.winipBcPid && mainStore.winipBcPid > 0)
+	});
 };
 
 export const handleWinipBcStart = async () => {
-    const mainStore = useMainStore();
-    if (!mainStore.winipBcStart) {
-        try {
-            await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
-            const isExists = await exists("easytier/tool/WinIPBroadcast.exe", { baseDir: BaseDirectory.Resource });
-            if(!isExists) {
-                ElMessage.error(`WinipBc不存在`);
-                console.error(`WinipBc不存在`);
-                return;
-            }
-            const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
-            mainStore.winipBcPid = child.pid || 0;
-            if (mainStore.winipBcPid) {
-                mainStore.winipBcStart = true;
-				mainStore.winIpBcAutoStart = true;
-            } else {
-                ElMessage.error(`WinipBc失败`);
-            }
-        } catch (err) {
-            ElMessage.error(`WinipBc失败`);
-            console.error(err);
-        }
-    } else {
-		mainStore.winIpBcAutoStart = false;
-        await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
-        await getWinIpBroadcastPid();
-    }
+	const mainStore = useMainStore();
+	if (!mainStore.winipBcStart) {
+		try {
+			await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
+			const isExists = await exists("easytier/tool/WinIPBroadcast.exe", { baseDir: BaseDirectory.Resource });
+			if (!isExists) {
+				ElMessage.error(`WinipBc不存在`);
+				console.error(`WinipBc不存在`);
+				return;
+			}
+			const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
+			mainStore.winipBcPid = child.pid || 0;
+			await getWinIpBroadcastPid();
+			if (mainStore.winipBcPid) {
+				mainStore.$patch({
+					winIpBcAutoStart: true
+				});
+			} else {
+				ElMessage.error(`WinipBc失败`);
+			}
+		} catch (err) {
+			ElMessage.error(`WinipBc失败`);
+			console.error(err);
+		}
+	} else {
+		await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
+		await getWinIpBroadcastPid();
+		if (mainStore.winipBcPid <= 0) {
+			mainStore.$patch({
+				winIpBcAutoStart: true
+			});
+		}
+	}
 };
 
 export const initStartWinIpBroadcast = async () => {
-    const mainStore = useMainStore();
-    await getWinIpBroadcastPid();
-    // console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
-    if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
-        await handleWinipBcStart();
-    }
-};
\ No newline at end of file
+	const mainStore = useMainStore();
+	await getWinIpBroadcastPid();
+	// console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
+	if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
+		await handleWinipBcStart();
+	}
+};
diff --git a/composables/windows.ts b/composables/windows.ts
index a9034fc..f344f5e 100644
--- a/composables/windows.ts
+++ b/composables/windows.ts
@@ -73,8 +73,6 @@ export const dataSubscribe = async (cb?: (...args: any) => any) => {
 		await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
 	});
 	const unlisten = currentWindow.listen<any>("global-main-store", event => {
-		console.log('global-main-store')
-		console.log(event);
 		removeSubscribe && removeSubscribe();
 		mainStore.$patch({ ...event.payload.store }); // 更新全局状态
 		removeSubscribe = mainStore.$subscribe(async (...args) => {
diff --git a/pages/tool.vue b/pages/tool.vue
index cffb0a5..a019c20 100644
--- a/pages/tool.vue
+++ b/pages/tool.vue
@@ -253,18 +253,18 @@
 					if (output.stderr) {
 						data.pingLog += `${i + 1}error - ${output.stderr}`;
 					}
-					if(i != data.pingNum - 1) {
+					if (i != data.pingNum - 1) {
 						await awaitTime(1000);
 					}
 				}
-				data.pingLog += '完毕'
+				data.pingLog += "完毕";
 			} catch (err) {
 				ElMessage.error("Ping发生错误");
 				console.error(err);
 			} finally {
 				data.isPing = false;
 			}
-		}else {
+		} else {
 			ElMessage.error("请输入正确的IP");
 		}
 	};
@@ -328,9 +328,13 @@
 		}
 	};
 
-
 	dataSubscribe(async (...a) => {
-		return { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } };
+		return {
+			winIpBcAutoStart: mainStore.winIpBcAutoStart,
+			winipBcStart: mainStore.winipBcStart,
+			winipBcPid: mainStore.winipBcPid,
+			config: { ...mainStore.config }
+		};
 	});
 
 	onMounted(() => {