1.4.8发布

允许在使用电池时自启动

build.bat

@@ -1,10 +1,10 @@
 pnpm run build
 rustup default nightly
-rem 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
-rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
-rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
-rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
-rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
+@REM rem 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
+@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
+@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
+@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
+@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
 pnpm tauri build -- -Z  build-std --target x86_64-win7-windows-msvc
 rustup default stable
 pnpm tauri build

composables/configJson.ts

@@ -2,7 +2,21 @@ import { BaseDirectory, writeTextFile } from "@tauri-apps/plugin-fs";
 import useMainStore from "@/stores/index";
 import { ElMessage } from "element-plus";
 import { uniq, intersection, isNil } from "lodash-es";
-export const updateConfigJson = async (configJsonSeverUrl: Array<string> | string | null | undefined) => {
+import { bounce } from "~/utils";
+
+const b = bounce(600);
+export type ConfigServerUrlType = Array<string> | string | null | undefined | null;
+
+export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType) => {
+	b(async () => {
+		const mainStore = useMainStore();
+		if (mainStore.createConfigInEasytier) {
+			await updateConfigJson(configJsonSeverUrl);
+		}
+	});
+};
+
+export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType) => {
 	const mainStore = useMainStore();
 	const path = import.meta.env.VITE_CONFIG_FILE_NAME;
 	if (isNil(configJsonSeverUrl)) {
@@ -19,6 +33,14 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 			serverUrl,
 			enableCustomListener,
 			customListenerData,
+			bindDeviceEnable,
+			acceptDNS,
+			enablePortForward,
+			portForwardData,
+			tcpWhitelist,
+			udpWhitelist,
+			tcpWhitelistEnable,
+			udpWhitelistEnable,
 			...otherConfig
 		} = mainStore.config;
 		let writeServerUrl: Array<string> | string = serverUrl;

composables/netcard.ts

@@ -6,55 +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;
-	mainStore.$patch({
-		winipBcStart: !!(mainStore.winipBcPid && mainStore.winipBcPid > 0)
-	});
+	// 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;
-			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: false
-			});
-		}
-	}
+	// 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: false
+	// 		});
+	// 	}
+	// }
 };
 
 export const initStartWinIpBroadcast = async () => {
-	const mainStore = useMainStore();
-	await getWinIpBroadcastPid();
+	// const mainStore = useMainStore();
+	// await getWinIpBroadcastPid();
 	// console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
-	if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
-		await handleWinipBcStart();
-	}
+	// if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
+		// await handleWinipBcStart();
+	// }
 };

composables/server.ts

@@ -20,5 +20,17 @@ export const getServerArgs = () => {
 	if (!whiteList && mainStore.serverConfig.enableWhiteList) {
 		args.push("--relay-network-whitelist");
 	}
+	if (mainStore.serverConfig.privateMode) {
+		args.push("--private-mode", "true");
+	}
+	const networkName = mainStore.serverConfig.privateNetworkName.trim();
+	if (networkName) {
+		args.push("--network-name", networkName);
+	}
+	const networkSecret = mainStore.serverConfig.privateNetworkPassword.trim();
+	if (networkSecret) {
+		args.push("--network-secret", networkSecret);
+	}
+
 	return args;
 };

composables/tray.ts

@@ -22,7 +22,7 @@ async function toggleVisibility() {
 	}
 }
 
-export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function) {
+export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function, handleReconnect: Function) {
 	let tray;
 	try {
 		tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
@@ -31,7 +31,7 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
 				tooltip: `EasyTierGame\n${pkg.version}`,
 				title: `EasyTierGame\n${pkg.version}`,
 				id: DEFAULT_TRAY_NAME,
-				menu: await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }),
+				menu: await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection, handleReconnect) }),
 				action: async e => {
 					toggleVisibility();
 				}
@@ -45,16 +45,17 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
 	if (init) {
 		tray.setTooltip(`EasyTierGame\n${pkg.version}`);
 		tray.setShowMenuOnLeftClick(false);
-		tray.setMenu(await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }));
+		tray.setMenu(await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection, handleReconnect) }));
 	}
 
 	return tray;
 }
 
-export async function generateMenuItem(beforExit: Function, handleConnection: Function) {
+export async function generateMenuItem(beforExit: Function, handleConnection: Function, handleReconnect: Function) {
 	return [
 		await MenuItemShow("显示 / 隐藏"),
 		await MenuItemExchangeConnection("联机 / 断开", handleConnection),
+		await MenuItemReconnect("重新联机", handleReconnect),
 		await MenuItemTheme(),
 		await PredefinedMenuItem.new({ item: "Separator" }),
 		await MenuItemPublicPeers(),
@@ -63,6 +64,16 @@ export async function generateMenuItem(beforExit: Function, handleConnection: Fu
 	];
 }
 
+export async function MenuItemReconnect(text: string, handleReconnect: Function) {
+	return await MenuItem.new({
+		id: "reconnect",
+		text,
+		action: async () => {
+			await handleReconnect();
+		}
+	});
+}
+
 export async function MenuItemExit(text: string, beforExit: Function) {
 	return await MenuItem.new({
 		id: "quit",

composables/windows.ts

@@ -1,20 +1,32 @@
 import { type UnlistenFn } from "@tauri-apps/api/event";
-import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } from "@tauri-apps/api/window";
+import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor, PhysicalSize } 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";
+import { updateConfigJsonBounce, type ConfigServerUrlType } from "./configJson";
 
-const _listenersMaps: { [key: string]: [UnlistenFn | null, UnlistenFn | null] } = {};
+const _listenersMaps: { [key: string]: [UnlistenFn | null] } = {};
 
+const dealCloseListener = async (dialog: WebviewWindow, label: string, beforeCloseFunc?: () => void | null) => {
+	const unlistenFnList: [UnlistenFn | null] = _listenersMaps[label] || [null];
+	let [unListenlogClose] = unlistenFnList;
+
+	unListenlogClose && (await unListenlogClose());
+
+	unListenlogClose = await dialog.onCloseRequested(async () => {
+		beforeCloseFunc && (await beforeCloseFunc());
+		unListenlogClose && (await unListenlogClose());
+		console.log("close");
+	});
+};
 export default async (
 	label: WebviewLabel,
 	options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
 	afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
 	beforeCloseFunc?: () => void | null
 ) => {
-	const unlistenFnList: [UnlistenFn | null, UnlistenFn | null] = _listenersMaps[label] || [null, null];
-	let [unlistenLogCreated, unListenlogClose] = unlistenFnList;
+	const unlistenFnList: [UnlistenFn | null] = _listenersMaps[label] || [null];
 	let dialog = await WebviewWindow.getByLabel(label);
 	if (!dialog) {
 		let defaultOpts: { [key: string]: any; parent: Window | undefined } = {
@@ -29,54 +41,58 @@ export default async (
 		};
 		const appWindow = getCurrentWindow();
 		if (appWindow) {
-			const appSize = await appWindow.outerSize();
-			const factor = await appWindow.scaleFactor();
-			const appPosition = await appWindow.outerPosition();
-			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) {
-				afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
-				await dialog.show();
+			if (defaultOpts.x == 0 && defaultOpts.y == 0) {
+				const logicalAppSize = {
+					width: 340,
+					height: 305
+				}
+				const factor = await appWindow.scaleFactor();
+				const appPosition = await appWindow.outerPosition();
+				const logicalPosition = new PhysicalPosition(appPosition.x + Math.ceil((logicalAppSize.width + 5) * factor), appPosition.y).toLogical(factor);
+				defaultOpts.x = logicalPosition.x;
+				defaultOpts.y = logicalPosition.y;
 			}
-		});
-		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;
+		}
+		dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
+		await dealCloseListener(dialog, label, beforeCloseFunc);
+		await dialog.show();
+		afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
 	} else {
 		const visible = await dialog.isVisible();
 		if (visible) {
 			await dialog.close();
-			unlistenLogCreated && (await (unlistenLogCreated as Function)());
+		} else {
+			const appWindow = getCurrentWindow();
+			await dealCloseListener(dialog, label, beforeCloseFunc);
+			await dialog.show();
+			afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
 		}
 	}
 };
 
-export const dataSubscribe = async (cb?: (...args: any) => any) => {
-	if (!cb) return;
+export const dataSubscribe = async (cb?: any, getconfigServerUrl?: () => ConfigServerUrlType) => {
 	const mainStore = useMainStore();
 	const abort = new AbortController();
-	window.addEventListener("storage", async () => {
-		mainStore.$hydrate();
-		if (cb && cb instanceof Function) {
-			await cb();
+
+	window.addEventListener(
+		"storage",
+		async () => {
+			// console.log("触发", {dhcp:mainStore.config.dhcp, c: mainStore.createConfigInEasytier})
+			mainStore.$hydrate();
+			const configServerUrl = getconfigServerUrl && getconfigServerUrl instanceof Function ? getconfigServerUrl() : null;
+			updateConfigJsonBounce(configServerUrl);
+			if (cb && cb instanceof Function) {
+				await cb();
+			}
+		},
+		{
+			signal: abort.signal
 		}
-	}, {
-		signal: abort.signal
-	})
+	);
 	onBeforeUnmount(() => {
+		console.log("取消监听");
 		abort?.abort();
-	})
+	});
 };

layouts/default.vue

@@ -6,7 +6,8 @@
 	//屏蔽右键菜单
 	document.addEventListener("contextmenu", (e: MouseEvent) => {
 		const el = (e.target as HTMLElement);
-		if (import.meta.env.PROD && !el.classList.contains("el-input__inner") && !el.classList.contains("el-textarea__inner")) { // 所有输入框不禁用右键
+		if (import.meta.env.PROD && !el.classList.contains("el-input__inner") && !el.classList.contains("el-textarea__inner")
+	&& !el.classList.contains("allow-contextmenu")) { // 所有输入框不禁用右键
 			e.preventDefault();
 		}
 	});

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.4.2",
+	"version": "1.4.8",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod",
@@ -12,30 +12,33 @@
 	},
 	"devDependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@element-plus/nuxt": "^1.1.1",
-		"@nuxtjs/tailwindcss": "6.13.1",
-		"@pinia/nuxt": "0.10.1",
-		"@tauri-apps/api": "2.3.0",
-		"@tauri-apps/cli": "2.3.0",
-		"@tauri-apps/plugin-cli": "^2.2.0",
-		"@tauri-apps/plugin-clipboard-manager": "2.2.1",
-		"@tauri-apps/plugin-dialog": "2.2.0",
-		"@tauri-apps/plugin-fs": "^2.2.0",
-		"@tauri-apps/plugin-log": "2.2.2",
-		"@tauri-apps/plugin-shell": "^2.2.0",
-		"@tauri-apps/plugin-window-state": "2.2.1",
+		"@element-plus/nuxt": "1.1.4",
+		"@nuxtjs/tailwindcss": "6.13.2",
+		"@pinia/nuxt": "0.11.1",
+		"@tauri-apps/api": "2.7.0",
+		"@tauri-apps/cli": "2.7.1",
+		"@tauri-apps/plugin-cli": "2.4.0",
+		"@tauri-apps/plugin-clipboard-manager": "2.3.0",
+		"@tauri-apps/plugin-dialog": "2.3.1",
+		"@tauri-apps/plugin-fs": "2.4.1",
+		"@tauri-apps/plugin-log": "2.6.0",
+		"@tauri-apps/plugin-shell": "2.3.0",
+		"@tauri-apps/plugin-window-state": "2.4.0",
 		"@types/lodash-es": "^4.17.12",
-		"@vitejs/plugin-vue-jsx": "^4.1.1",
+		"@vitejs/plugin-vue-jsx": "5.0.1",
 		"@vueuse/core": "12.7.0",
 		"archiver": "^7.0.1",
-		"element-plus": "2.9.4",
+		"element-plus": "2.10.7",
 		"less": "4.2.1",
 		"lodash-es": "^4.17.21",
-		"nuxt": "3.15.4",
-		"pinia": "3.0.1",
-		"pinia-plugin-persistedstate": "^4.2.0",
+		"nuxt": "3.18.1",
+		"pinia": "3.0.3",
+		"pinia-plugin-persistedstate": "4.4.1",
 		"postcss": "^8.4.38",
-		"prettier": "3.5.2",
-		"prettier-plugin-tailwindcss": "0.6.11"
+		"prettier": "3.6.2",
+		"prettier-plugin-tailwindcss": "0.6.14"
+	},
+	"dependencies": {
+		"is-ip": "^5.0.1"
 	}
 }

pages/advance.vue

@@ -2,8 +2,8 @@
 	<div class="flex h-full flex-col items-start overflow-auto px-[25px]">
 		<div class="flex flex-nowrap items-center gap-[15px]">
 			<div class="flex flex-nowrap items-center gap-[5px]">
-				<ElCheckbox v-model="mainStore.config.enableCustomProtocol">默认直连(p2p)使用的协议</ElCheckbox>
-				<ElTooltip content="如果没有支持该协议的节点地址，程序会自动处理，请放心使用">
+				<ElCheckbox v-model="mainStore.config.enableCustomProtocol">直连(P2P)优先使用传输协议</ElCheckbox>
+				<ElTooltip content="若无法建立指定的协议，会自动使用可建立连接的协议">
 					<ElIcon><QuestionFilled /></ElIcon>
 				</ElTooltip>
 			</div>
@@ -24,7 +24,7 @@
 			</div>
 		</div>
 		<div>
-			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">帮助对等节点建立直连(p2p)通信</ElCheckbox>
+			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">帮助他人建立直连(P2P)连接</ElCheckbox>
 		</div>
 		<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
 		<div class="flex flex-nowrap items-center gap-[15px]">
@@ -38,28 +38,76 @@
 		</div>
 		<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止系统休眠(比如:屏幕会一直亮着)</ElCheckbox></div>
 		<div class="flex flex-nowrap items-center gap-[5px]">
-			<ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量</ElCheckbox>
-			<ElTooltip content="视网络质量进行选择，可能会出现中转与直连(p2p)来回切换的情况">
+			<ElCheckbox v-model="mainStore.config.latencyfirst">使用低延迟模式</ElCheckbox>
+			<ElTooltip content="弱网环境下可能会导致网络延迟延迟忽高忽低">
 				<ElIcon><QuestionFilled /></ElIcon>
 			</ElTooltip>
 		</div>
 		<div class="flex flex-nowrap items-center gap-[5px]">
-			<ElCheckbox v-model="mainStore.config.enableKcpProxy">启用KCP代理</ElCheckbox>
-			<ElTooltip content="将TCP流量转为KCP流量，降低传输延迟，提升传输速度">
+			<ElCheckbox
+				@change="handleKcpProxyChange"
+				v-model="mainStore.config.enableKcpProxy"
+			>
+				启用KCP代理
+			</ElCheckbox>
+			<ElTooltip content="（不可与QUIC代理同时开启）将TCP流量转为KCP流量，降低传输延迟，提升传输速度">
 				<ElIcon><QuestionFilled /></ElIcon>
 			</ElTooltip>
 			<CoreVersionWarning version="2.2.0" />
 		</div>
 		<div class="flex flex-nowrap items-center gap-[5px]">
 			<ElCheckbox v-model="mainStore.config.disableKcpInput">禁用KCP输入</ElCheckbox>
-			<ElTooltip content="禁用KCP入站流量，其他开启KCP代理的节点无法连接到本节点">
+			<ElTooltip content="不允许其他节点使用 KCP 代理 TCP 流到此节点。开启 KCP 代理的节点访问此节点时，依然使用原始 TCP 连接">
 				<ElIcon><QuestionFilled /></ElIcon>
 			</ElTooltip>
 			<CoreVersionWarning version="2.2.0" />
 		</div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox
+				@change="handleQuicProxyChange"
+				v-model="mainStore.config.enableQuicProxy"
+			>
+				启用QUIC代理
+			</ElCheckbox>
+			<ElTooltip content="（不可与KCP代理同时开启）使用 QUIC 代理 TCP 流，提高在 UDP 丢包网络上的延迟和吞吐量">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.3.2" />
+		</div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.disableQuicInput">禁用QUIC输入</ElCheckbox>
+			<ElTooltip content="不允许其他节点使用 QUIC 代理 TCP 流到此节点。开启 QUIC 代理的节点访问此节点时，依然使用原始 TCP 连接">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.3.2" />
+		</div>
 		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.acceptDNS">魔法DNS</ElCheckbox>
+			<ElTooltip content="您可以使用域名访问其他节点，例如：<hostname>.et.net。魔法DNS将修改您的系统DNS设置，请谨慎启用">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.3.0" />
+		</div>
+		<div class="flex flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.privateMode">启用私有模式</ElCheckbox>
+			<ElTooltip content="启用后，不允许使用了与本网络不同的房间名和密码的节点通过本节点进行握手或中转">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.3.1" />
+		</div>
 		<ElDivider />
+		<div class="flex w-full flex-nowrap items-center gap-[5px] mb-[3px]">
+			<ElCheckbox v-model="mainStore.config.tcpWhitelistEnable">TCP端口白名单</ElCheckbox>
+			<ElInput class="flex-1" v-model="mainStore.config.tcpWhitelist" placeholder="支持单个端口（80）和范围（8000-9000）" />
+			<CoreVersionWarning version="2.4.2" />
+		</div>
+		<div class="flex w-full flex-nowrap items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.udpWhitelistEnable">UDP端口白名单</ElCheckbox>
+			<ElInput class="flex-1" v-model="mainStore.config.udpWhitelist" placeholder="支持单个端口（53）和范围（5000-6000）" />
+			<CoreVersionWarning version="2.4.2" />
+		</div>
 		<div class="flex items-center gap-[10px]">
 			<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox>
 			<ElTooltip content="无法联机时，可以尝试开启这个选项">
@@ -103,6 +151,7 @@
 				class="!mb-0"
 				v-model="listenerDialogData.visible"
 				:close-on-press-escape="false"
+				:close-on-click-modal="false"
 				title="自定义监听地址"
 			>
 				<ElInput
@@ -125,38 +174,76 @@
 			</ElDialog>
 		</div>
 		<div class="flex items-center gap-[10px]">
-			<ElCheckbox
-				:disabled="mainStore.config.disbleListenner"
-				v-model="mainStore.config.enableCustomListenerV6"
+			<ElCheckbox v-model="mainStore.config.enablePortForward">端口转发</ElCheckbox>
+			<ElTooltip
+				:disabled="mainStore.config.enablePortForward"
+				content="请先开启端口转发功能"
 			>
-				自定义IPV6监听地址
-			</ElCheckbox>
-			<div class="w-[200px]">
-				<ElInput
-					:disabled="mainStore.config.disbleListenner || mainStore.config.enableCustomListenerV6"
+				<ElButton
 					size="small"
-					:maxlength="100"
-					v-model="mainStore.config.customListenerV6Data"
-					placeholder="请输入自定义IPV6监听地址"
-				/>
-			</div>
-			<ElTooltip content="例如：tcp://[::]:11010，如果未设置，将在随机UDP端口上监听">
+					:disabled="!mainStore.config.enablePortForward"
+					@click="handlePortForwardDialog"
+				>
+					配置
+				</ElButton>
+			</ElTooltip>
+			<ElTooltip
+				content="将本地端口转发到虚拟网络中的远程端口.如：udp://0.0.0.0:12345/10.126.126.1:23456,表示将本地UDP端口12345转发到虚拟网络中的10.126.126.1:23456.可以指定多个"
+			>
 				<ElIcon><QuestionFilled /></ElIcon>
 			</ElTooltip>
-			<CoreVersionWarning version="2.1.0" />
+			<CoreVersionWarning version="2.3.0" />
+			<ElDialog
+				width="95%"
+				top="5px"
+				append-to-body
+				:z-index="10"
+				class="!mb-0"
+				v-model="portForwardDialogData.visible"
+				:close-on-press-escape="false"
+				:close-on-click-modal="false"
+				title="端口转发配置"
+			>
+				<div class="mb-4">
+					<ElText
+						size="small"
+						type="info"
+					>
+						<div>• 每行一个转发规则</div>
+						<div>• 格式：协议://本地地址:本地端口/目标地址:目标端口</div>
+						<div class="flex items-center">
+							<span class="mr-auto">• 例如：udp://0.0.0.0:12345/10.126.126.1:23456</span>
+							<ElButton
+								size="default"
+								type="primary"
+								@click.stop="handleFinishInputPortForward"
+							>
+								填写完毕
+							</ElButton>
+						</div>
+					</ElText>
+				</div>
+				<ElInput
+					type="textarea"
+					:rows="10"
+					placeholder="请输入端口转发规则，每行一个&#10;例如：&#10;udp://0.0.0.0:12345/10.126.126.1:23456&#10;tcp://0.0.0.0:8080/192.168.1.100:80"
+					v-model="mainStore.config.portForwardData"
+				></ElInput>
+				<!--  -->
+			</ElDialog>
 		</div>
 		<ElDivider />
 		<div class="flex items-center gap-[10px]">
-			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
+			<ElCheckbox v-model="mainStore.config.devName">自定义虚拟网卡名称</ElCheckbox>
 			<ElInput
 				size="small"
 				maxlength="10"
 				v-model="mainStore.config.devNameValue"
-				placeholder="请输入网卡名"
+				placeholder="请输入虚拟网卡名称"
 			/>
 		</div>
 		<div class="flex items-center gap-[10px]">
-			<ElCheckbox v-model="mainStore.config.enableNetCardMetric">自定义easytier网卡跃点</ElCheckbox>
+			<ElCheckbox v-model="mainStore.config.enableNetCardMetric">自定义虚拟网卡优先级</ElCheckbox>
 			<ElInputNumber
 				controls-position="right"
 				:min="1"
@@ -166,9 +253,9 @@
 				:precision="0"
 				size="small"
 				v-model="mainStore.config.netCardMetricValue"
-				placeholder="请选择跃点数"
+				placeholder="请输入优先级"
 			/>
-			<ElTooltip content="设置easytier网卡的跃点，提升网卡优先级，跃点越小，网卡优先级越高">
+			<ElTooltip content="数值越小，优先级越高">
 				<ElIcon><QuestionFilled /></ElIcon>
 			</ElTooltip>
 		</div>
@@ -177,17 +264,43 @@
 				size="small"
 				type="warning"
 			>
-				(不使用自定义网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡，也可以使用 “设置跃点” 功能，除非你启用了下面的功能)
+				(不使用自定义虚拟网卡名称,那么联机时默认会生成一个名为 "et_xxx" 的网卡，也可以使用 “自定义虚拟网卡优先级”
+				功能，除非你启用了下面的功能)
 			</ElText>
 		</div>
-		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备(网卡)，可以使用子网代理访问节点</ElCheckbox></div>
+
+		<div class="flex items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.noTun">不创建TUN虚拟网卡</ElCheckbox>
+
+			<ElTooltip content="开启后该节点无法主动访问其他节点">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+
+		<div class="flex items-center gap-[5px]">
+			<div><ElCheckbox v-model="mainStore.config.bindDeviceEnable">绑定物理网卡</ElCheckbox></div>
+			<ElTooltip content="将连接器的套接字绑定到物理设备以避免路由问题。比如子网代理网段与某节点的网段冲突，绑定物理设备后可以与该节点正常通信">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.2.3" />
+		</div>
 
 		<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.multiThread">启用多线程运行</ElCheckbox></div>
+		<div class="flex items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.disableEncryption">关闭信息加密</ElCheckbox>
+			<ElTooltip content="关闭后通信数据将在互联网上明文传输，如房间名和密码">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div class="flex items-center gap-[5px]">
+			<ElCheckbox v-model="mainStore.config.multiThread">开启多线程</ElCheckbox>
+			<ElTooltip content="开启后可能会提高网络性能">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
 		<div class="flex items-center gap-[10px]">
-			<ElText>压缩算法</ElText>
+			<ElText>传输数据压缩算法</ElText>
 			<div class="w-[160px]">
 				<ElSelect
 					size="small"
@@ -210,8 +323,8 @@
 		<ElDivider />
 
 		<div class="flex items-center gap-[10px]">
-			<ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox>
-			<ElTooltip content="使用用户态TCP/IP协议栈smoltcp，避免操作系统防火墙问题导致无法子网代理">
+			<ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理和 KCP 代理开启用户网络栈</ElCheckbox>
+			<ElTooltip content="开启后会降低网络性能，但不需要配置防火墙">
 				<ElIcon><QuestionFilled /></ElIcon>
 			</ElTooltip>
 		</div>
@@ -261,6 +374,15 @@
 		loading: false
 	});
 
+	const portForwardDialogData = reactive<{ [key: string]: any }>({
+		visible: false,
+		loading: false
+	});
+
+	const handlePortForwardDialog = () => {
+		portForwardDialogData.visible = true;
+	};
+
 	const handleListenerDialog = () => {
 		listenerDialogData.visible = true;
 	};
@@ -269,6 +391,10 @@
 		listenerDialogData.visible = false;
 	};
 
+	const handleFinishInputPortForward = async () => {
+		portForwardDialogData.visible = false;
+	};
+
 	const mainStore = useMainStore();
 	const data = ["trace", "debug", "info", "warn", "error", "off"];
 	const guids = ref<string[][]>([]);
@@ -296,8 +422,26 @@
 		}
 	};
 
+	const handleKcpProxyChange = () => {
+		if (mainStore.config.enableKcpProxy) {
+			if (mainStore.config.enableQuicProxy) {
+				ElMessage.warning("KCP代理和QUIC代理不能同时开启");
+			}
+			mainStore.config.enableQuicProxy = false;
+		}
+	};
+
+	const handleQuicProxyChange = () => {
+		if (mainStore.config.enableQuicProxy) {
+			if (mainStore.config.enableKcpProxy) {
+				ElMessage.warning("KCP代理和QUIC代理不能同时开启");
+			}
+			mainStore.config.enableKcpProxy = false;
+		}
+	};
+
 	// 为bind_device功能增加改方法
-	const _getGuids = async () => {
+	const getGuids = async () => {
 		const guidsValue = await invoke<string[][]>("get_network_adapter_guids");
 		guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : [];
 	};

pages/cidr.vue

@@ -1,12 +1,18 @@
 <template>
 	<div class="flex h-full flex-col gap-[10px]">
-		<ElRadioGroup
-			:disabled="!data.isSwitchEnable"
-			v-model="mainStore.cidrEnable"
-		>
-			<ElRadioButton :value="true">开启</ElRadioButton>
-			<ElRadioButton :value="false">关闭</ElRadioButton>
-		</ElRadioGroup>
+		<div class="flex items-center gap-[10px]">
+			<ElRadioGroup
+				:disabled="!data.isSwitchEnable"
+				v-model="mainStore.cidrEnable"
+			>
+				<ElRadioButton :value="true">开启</ElRadioButton>
+				<ElRadioButton :value="false">关闭</ElRadioButton>
+			</ElRadioGroup>
+			<div class="flex items-center gap-[10px]">
+				<ElCheckbox v-model="mainStore.proxyForwardBySystem">通过系统内核转发子网代理数据包，禁用内置NAT</ElCheckbox>
+				<CoreVersionWarning version="2.2.3" />
+			</div>
+		</div>
 		<div class="flex-1 overflow-auto">
 			<ElInput
 				placeholder="例如: 192.168.1.0/24 一行一个"
@@ -107,12 +113,11 @@
 
 	onMounted(async () => {
 		unlistenStart = await listenStart();
-		dataSubscribe();
 	});
 
+	dataSubscribe();
+
 	onBeforeUnmount(() => {
 		unlistenStart && unlistenStart();
 	});
-
-
 </script>

pages/index.vue

@@ -2,7 +2,7 @@
 	<ElForm
 		size="small"
 		label-position="top"
-		:model="config"
+		:model="mainStore.config"
 	>
 		<ElFormItem
 			label="服务器"
@@ -70,18 +70,18 @@
 				filterable
 				placeholder="请选择服务器地址"
 				default-first-option
-				v-model="config.serverUrl"
+				v-model="mainStore.config.serverUrl"
 				no-data-text="无服务器地址"
 				@change="handleServerUrlChange"
 			>
 				<template #prefix>
-					<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
+					<div :class="mainStore.config.protocol && mainStore.config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
 						<ElSelect
 							placeholder="协议"
 							multiple
 							collapse-tags
 							@click.stop
-							v-model="config.protocol"
+							v-model="mainStore.config.protocol"
 							@change="handleServerUrlChange"
 						>
 							<ElOption
@@ -98,7 +98,7 @@
 						<ElLink
 							type="primary"
 							size="small"
-							:underline="false"
+							underline="never"
 							@click.stop="open(publicPeersLink)"
 						>
 							其他公共服务器
@@ -161,7 +161,7 @@
 					<ElInput
 						maxlength="100"
 						placeholder="请输入房间名"
-						v-model="config.networkName"
+						v-model="mainStore.config.networkName"
 					></ElInput>
 				</ElFormItem>
 			</div>
@@ -179,7 +179,7 @@
 						show-password
 						maxlength="100"
 						placeholder="请输入房间密码"
-						v-model="config.networkPassword"
+						v-model="mainStore.config.networkPassword"
 						type="password"
 					></ElInput>
 				</ElFormItem>
@@ -198,7 +198,7 @@
 				<ElInput
 					maxlength="100"
 					placeholder="例如: Player1"
-					v-model="config.hostname"
+					v-model="mainStore.config.hostname"
 				></ElInput>
 			</ElFormItem>
 			<ElFormItem
@@ -206,23 +206,40 @@
 				label="局域网IP"
 			>
 				<template #label>
-					<div class="flex h-[20px] items-center gap-[3px]">
-						虚拟网IP
+					<div class="flex h-[22px] items-center gap-[3px]">
+						<div class="mr-[8px]">IP</div>
+						<ElSwitch
+							v-model="mainStore.config.dhcp"
+							inline-prompt
+							inactive-text="固定V4"
+							active-text="动态V4"
+							size="small"
+						></ElSwitch>
+						<ElTooltip>
+							<template #content>
+								<div>选填V6地址，可与IPv4一起使用以进行双栈操作</div>
+								<div>----------------------------------------</div>
+								<div>当前V6地址: {{ mainStore.config.ipv6 || "-" }}</div>
+							</template>
+							<ElButton
+								text
+								size="small"
+								class="cursor-pointer"
+								@click="handleDealIpv6"
+								:type="mainStore.config.ipv6 ? 'success' : 'info'"
+							>
+								V6
+							</ElButton>
+						</ElTooltip>
+						<ElDivider direction="vertical" />
 						<ElButton
 							@click.stop="handleCopyIp"
 							type="primary"
 							text
 							size="small"
-							title="复制IP"
+							title="复制V4"
 							:icon="CopyDocument"
 						></ElButton>
-						<ElSwitch
-							v-model="config.dhcp"
-							inline-prompt
-							inactive-text="固定IP"
-							active-text="动态获取"
-							size="small"
-						></ElSwitch>
 						<!-- <ElTooltip content="对应命令行参数 --ipv4">
 							<ElIcon><QuestionFilled /></ElIcon>
 						</ElTooltip> -->
@@ -230,21 +247,21 @@
 				</template>
 				<ElInput
 					maxlength="100"
-					:readonly="config.dhcp"
-					:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
-					v-model="config.ipv4"
+					:readonly="mainStore.config.dhcp"
+					:placeholder="data.isStart && mainStore.config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
+					v-model="mainStore.config.ipv4"
 				>
 					<template #prefix>
 						<ElTooltip
 							class="!text-[10px]"
 							placement="top-end"
-							:content="config.dhcp ? '动态获取无法手动填写' : '固定IP可以手动填写'"
+							:content="mainStore.config.dhcp ? '动态获取无法手动填写' : '固定IP可以手动填写'"
 						>
 							<ElTag
 								size="small"
-								:type="config.dhcp ? 'info' : 'success'"
+								:type="mainStore.config.dhcp ? 'info' : 'success'"
 							>
-								{{ config.dhcp ? "只读" : "可填" }}
+								{{ mainStore.config.dhcp ? "只读" : "可填" }}
 							</ElTag>
 						</ElTooltip>
 					</template>
@@ -252,6 +269,10 @@
 			</ElFormItem>
 		</div>
 	</ElForm>
+	<!-- <div class="flex justify-center items-center gap-[5px]">
+		<el-button>分享当前配置</el-button>
+		<el-button>导入联机配置</el-button>
+	</div> -->
 	<div class="mt-auto flex items-start">
 		<div>
 			<div class="pt-[4px]">
@@ -268,21 +289,6 @@
 					{{ !data.isStart ? "启动联机" : "停止联机" }}
 					<template #dropdown>
 						<ElDropdownMenu>
-							<ElDropdownItem
-								command="import_config"
-								:icon="Link"
-							>
-								导入联机配置
-							</ElDropdownItem>
-							<ElDropdownItem
-								command="share_config"
-								:icon="Share"
-							>
-								分享联机配置
-							</ElDropdownItem>
-							<ElDropdownItem disabled>
-								<ElDivider class="!m-0 !h-[2px]" />
-							</ElDropdownItem>
 							<ElDropdownItem
 								:icon="SetUp"
 								command="create_server"
@@ -324,13 +330,34 @@
 							>
 								本地游戏列表
 							</ElDropdownItem>
+							<ElDropdownItem disabled>
+								<ElDivider class="!m-0 !h-[2px]" />
+							</ElDropdownItem>
+							<ElDropdownItem
+								command="import_config"
+								:icon="Link"
+							>
+								导入联机配置
+							</ElDropdownItem>
+							<ElDropdownItem
+								command="share_config"
+								:icon="Share"
+							>
+								分享联机配置
+							</ElDropdownItem>
+							<ElDropdownItem
+								command="reconnect"
+								:icon="RefreshRight"
+							>
+								重新联机
+							</ElDropdownItem>
 						</ElDropdownMenu>
 					</template>
 				</ElDropdown>
 			</div>
 			<div class="mt-[10px] pl-[2px]">
 				<ElTooltip
-					placement="left"
+					placement="top"
 					content="日志"
 				>
 					<ElButton
@@ -359,7 +386,7 @@
 		</div>
 		<div class="ml-auto">
 			<ElCheckbox
-				v-model="config.disbleP2p"
+				v-model="mainStore.config.disbleP2p"
 				size="small"
 			>
 				强制中转
@@ -370,7 +397,7 @@
 			>
 				<ElCheckbox
 					@change="handleAutoStartByTask"
-					:model-value="config.autoStart"
+					:model-value="mainStore.config.autoStart"
 					size="small"
 				>
 					开机自启
@@ -415,7 +442,7 @@
 					<ElLink
 						class="ml-[8px] truncate pb-[2px] !text-[9px]"
 						type="info"
-						:underline="false"
+						underline="never"
 						@click="open('https://github.com/EasyTier/EasytierGame')"
 					>
 						EasytierGame主页
@@ -688,6 +715,35 @@
 			</div>
 		</template>
 	</ElDialog>
+	<ElDialog
+		width="95%"
+		top="30px"
+		append-to-body
+		:z-index="10"
+		class="!mb-0"
+		title="IPV6地址填写"
+		:close-on-press-escape="false"
+		:close-on-click-modal="false"
+		:show-close="false"
+		v-model="ipv6InputDialog.visible"
+	>
+		<ElInput
+			v-model="mainStore.config.ipv6"
+			clearable
+			placeholder="请输入IPV6地址"
+		></ElInput>
+		<template #footer>
+			<div class="text-right">
+				<ElButton
+					type="primary"
+					size="small"
+					@click="handleValidateIpv6"
+				>
+					确定
+				</ElButton>
+			</div>
+		</template>
+	</ElDialog>
 </template>
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
@@ -716,17 +772,18 @@
 	import { initStartWinIpBroadcast } from "~/composables/netcard";
 	import useMainStore from "@/stores/index";
 	import { ElMessage, ElMessageBox, ElTooltip } from "element-plus";
-	import { getCurrentWindow, type Window } from "@tauri-apps/api/window";
+	import { getCurrentWindow, PhysicalSize, type Window } from "@tauri-apps/api/window";
 	import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
 	import etWindows, { dataSubscribe } from "@/composables/windows";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
-	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile, remove as removeFile } from "@tauri-apps/plugin-fs";
-	import { updateConfigJson } from "~/composables/configJson";
+	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile, remove as removeFile, stat } from "@tauri-apps/plugin-fs";
+	import { updateConfigJson, updateConfigJsonBounce } from "~/composables/configJson";
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
 	import { sortedUniq, uniq } from "lodash-es";
-	import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName } from "~/utils";
+	import { addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName } from "~/utils";
 	import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
 	import { getServerArgs } from "@/composables/server";
+	import { isIPv6 } from "is-ip";
 
 	let is_close = false;
 	const publicPeersLink = import.meta.env.VITE_PUBLIC_PEERS_URL;
@@ -742,14 +799,17 @@
 		async () => {
 			await handleConnection();
 			return data.isStart;
+		},
+		async () => {
+			await handleReconnect();
 		}
 	);
 
 	const mainStore = useMainStore();
-	const config = mainStore.config;
-	// console.error(config);
+
 	const protocols = supportProtocols();
-	const data = reactive({ //easytierGame有没有新版
+	const data = reactive({
+		//easytierGame有没有新版
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
@@ -810,12 +870,54 @@
 		}
 	};
 
+	const ipv6InputDialog = reactive<{ visible: boolean; [key: string]: any }>({
+		visible: false
+	});
+
+	const handleDealIpv6 = async () => {
+		ipv6InputDialog.visible = true;
+	};
+
+	const handleValidateIpv6 = () => {
+		mainStore.config.ipv6 = mainStore.config.ipv6?.trim() || "";
+		if (mainStore.config.ipv6 && !isIPv6(mainStore.config.ipv6)) {
+			ElMessage.error("请输入正确的IPV6地址");
+			return;
+		}
+		ipv6InputDialog.visible = false;
+	};
+
 	const handleCopyIp = async () => {
-		if (!config.ipv4?.trim()) return;
-		if (data.isStart || !config.dhcp) {
-			await copyText(mainStore.config.ipv4);
+		const v6 = mainStore.config.ipv6?.trim();
+		const v4 = mainStore.config.ipv4?.trim();
+		if (v6) {
+			const [err] = await ElConfirmPrimary("检测到您填写了IPV6地址，是否复制IPV6地址？", "提示", {
+				confirmButtonText: "复制IPV6",
+				cancelButtonText: "复制IPV4"
+			});
+			if (!err) {
+				await copyText(v6);
+			} else {
+				if (!v4) {
+					ElMessage.error("没有IPV4地址，无法复制");
+					return;
+				}
+				if (data.isStart || !mainStore.config.dhcp) {
+					await copyText(v4);
+				} else {
+					await copyText(v4, "复制成功,联机后IP可能会变化");
+				}
+			}
 		} else {
-			await copyText(mainStore.config.ipv4, "复制成功,联机后IP可能会变化");
+			if (!v4) {
+				ElMessage.error("没有IPV4地址，无法复制");
+				return;
+			}
+			if (data.isStart || !mainStore.config.dhcp) {
+				await copyText(v4);
+			} else {
+				await copyText(v4, "复制成功,联机后IP可能会变化");
+			}
 		}
 	};
 
@@ -837,8 +939,8 @@
 		const newBasePeers = [...mainStore.basePeers];
 		const idx = newBasePeers.indexOf(url);
 		if (idx >= 0) {
-			if (config.serverUrl === url) {
-				config.serverUrl = "";
+			if (mainStore.config.serverUrl === url) {
+				mainStore.config.serverUrl = "";
 			}
 			newBasePeers.splice(idx, 1);
 		}
@@ -851,7 +953,7 @@
 	const handleServerUrlChange = () => {
 		let inputProtocols: string | null = null;
 		for (const p of protocols) {
-			if (config.serverUrl.toLowerCase().startsWith(`${p}://`)) {
+			if (mainStore.config.serverUrl.toLowerCase().startsWith(`${p}://`)) {
 				inputProtocols = p;
 				break;
 			}
@@ -1081,8 +1183,8 @@
 		const list = await invoke<string[][][]>("fetch_easytier_list");
 		data.releaseList = [
 			...list.flat().filter(el => {
-				// console.log(el, el[0], el[2]);
-				return el && el[0] && el[2] && !el[2].includes("gui");
+				// console.log(el, el[0], el[2], el[3]); // el[3] 是prerelease bool值
+				return el && el[0] && el[2] && !el[2].includes("gui") && (el[3] != "true" || !el[3]);
 			})
 		] as any;
 		coreManagementData.loading = false;
@@ -1091,9 +1193,9 @@
 
 	const handleAutoStartByTask = async () => {
 		if (import.meta.env.DEV) return ElMessage.warning("开发环境不支持开机自启");
-		await invoke("spawn_autostart", { enabled: !config.autoStart });
+		await invoke("spawn_autostart", { enabled: !mainStore.config.autoStart });
 		const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
-		config.autoStart = is_enable_by_task;
+		mainStore.config.autoStart = is_enable_by_task;
 	};
 
 	const compatibleInitAutoStart = async () => {
@@ -1106,17 +1208,35 @@
 				await invoke("spawn_autostart", { enabled: true });
 			}
 			is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
-			config.autoStart = is_enable_by_task;
+			mainStore.config.autoStart = is_enable_by_task;
 		} catch (err) {
 			console.error(err);
 			await invoke("spawn_autostart", { enabled: false });
 			const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
-			config.autoStart = is_enable_by_task;
+			mainStore.config.autoStart = is_enable_by_task;
 		}
 	};
 
+	// const compatibleIpv6Listener = async () => {
+	// 	// ipv6监听在后续版本合并到customListenner里了，这里做兼容处理，去掉IPV6监听
+	// 	const customListenerV4 = mainStore.config.customListenerData
+	// 				.trim()
+	// 				.split("\n")
+	// 				.map(el => el.trim())
+	// 				.filter(el => el);
+	// 	const udpv6 = customListenerV4.indexOf("udp://[::]:11010")
+	// 	const tcpv6 = customListenerV4.indexOf("tcp://[::]:11010")
+	// 	if (udpv6 != -1) {
+	// 		customListenerV4.splice(udpv6, 1);
+	// 	}
+	// 	if (tcpv6 != -1) {
+	// 		customListenerV4.splice(tcpv6, 1);
+	// 	}
+	// 	mainStore.config.customListenerData = customListenerV4.join("\n");
+	// };
+
 	const initConnectAfterStart = async () => {
-		if (config.connectAfterStart && data.coreVersion) {
+		if (mainStore.config.connectAfterStart && data.coreVersion) {
 			await reset();
 			await handleConnection();
 		}
@@ -1150,6 +1270,10 @@
 						saveServerUrl = mainStore.basePeers.length > 0 ? mainStore.basePeers[0] || "" : "";
 					}
 					data.configJsonSeverUrl = guiJson.serverUrl;
+					if (guiJson.enableKcpProxy && guiJson.enableQuicProxy) {
+						// 如果同时开启kcp代理和quic代理，则禁用quic代理
+						guiJson.enableQuicProxy = false;
+					}
 					mainStore.$patch({
 						config: {
 							...mainStore.config,
@@ -1200,18 +1324,29 @@
 			await appWindow.show();
 			await appWindow.setFocus();
 		}
+		const appWindow = getCurrentWindow();
+		const logicalAppSize = {
+			width: 340,
+			height: 305
+		};
+		const scaleFactor = await appWindow.scaleFactor();
+		const size = new PhysicalSize(Math.ceil(logicalAppSize.width * scaleFactor), Math.ceil(logicalAppSize.height * scaleFactor));
+		appWindow.setSize(size);
+		appWindow.onScaleChanged(({ payload: { scaleFactor } }) => {
+			console.log("scaleFactor", scaleFactor);
+			appWindow.setSize(new PhysicalSize(Math.ceil(logicalAppSize.width * scaleFactor), Math.ceil(logicalAppSize.height * scaleFactor)));
+		});
 	};
 
 	let logsTimer: NodeJS.Timeout | null = null;
 	let serverLogsTimer: NodeJS.Timeout | null = null;
 	let cidrTimer: NodeJS.Timeout | null = null;
 
-	const b = bounce(600);
 	onMounted(async () => {
 		await initGuiJson();
 		await compatibleInitAutoStart();
 		// await initAutoStart();
-		await initStartWinIpBroadcast();
+		// await initStartWinIpBroadcast();  // 对于三层tun而言，winipbroadcast没有作用，先禁用
 		await getCoreVersion();
 		await listenObj.listenThreadId();
 		await listenObj.listenServerThreadId();
@@ -1222,15 +1357,21 @@
 		initPreventSleep();
 		mountedShow(); // 不需要await
 		closePrevent();
-		dataSubscribe(async () => {
-			if (mainStore.createConfigInEasytier) {
-				b(async () => {
-					await updateConfigJson(data.configJsonSeverUrl);
-				});
-			}
-		});
-		getReleaseList();
-		checkNewVersion();
+		if (import.meta.env.PROD) {
+			getReleaseList();
+			checkNewVersion();
+		}
+		await storageDialog();
+	});
+
+	// storageEventEmitter.addEventListener("localStorageChange", () => {
+	// 	if(mainStore.createConfigInEasytier) {
+	// 		updateConfigJsonBounce(data.configJsonSeverUrl)
+	// 	}
+	// })
+
+	dataSubscribe(null, () => {
+		return data.configJsonSeverUrl;
 	});
 
 	onBeforeUnmount(() => {
@@ -1241,6 +1382,7 @@
 		serverLogsTimer && clearInterval(serverLogsTimer);
 		cidrTimer && clearInterval(cidrTimer);
 		stopPreventSleep();
+		// unListenStorage && unListenStorage();
 	});
 
 	const getArgs = async () => {
@@ -1273,42 +1415,42 @@
 			}
 		}
 
-		if (config.dhcp) {
+		if (mainStore.config.dhcp) {
 			args.push("-d");
 		}
-		if (config.hostname) {
-			args.push("--hostname", config.hostname);
+		if (mainStore.config.hostname) {
+			args.push("--hostname", mainStore.config.hostname);
 		}
-		if (config.networkName) {
-			args.push("--network-name", config.networkName);
+		if (mainStore.config.networkName) {
+			args.push("--network-name", mainStore.config.networkName);
 		}
-		if (config.networkPassword) {
-			args.push("--network-secret", config.networkPassword);
+		if (mainStore.config.networkPassword) {
+			args.push("--network-secret", mainStore.config.networkPassword);
 		}
-		if (config.ipv4) {
-			args.push("--ipv4", config.ipv4.trim());
+		if (mainStore.config.ipv4) {
+			args.push("--ipv4", mainStore.config.ipv4.trim());
 		}
-		if (config.serverUrl) {
-			const formatUrl = config.serverUrl.replace(/\\/g, "/");
-			args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
+		if (mainStore.config.serverUrl) {
+			const formatUrl = mainStore.config.serverUrl.replace(/\\/g, "/");
+			args.push("--peers", ...mainStore.config.protocol.map(protocol => `${protocol}://${formatUrl}`));
 		}
-		if (config.enableCustomProtocol) {
-			const includes = config.protocol.includes(config.customProtocol);
+		if (mainStore.config.enableCustomProtocol) {
+			const includes = mainStore.config.protocol.includes(mainStore.config.customProtocol);
 			if (includes) {
-				args.push("--default-protocol", config.customProtocol);
+				args.push("--default-protocol", mainStore.config.customProtocol);
 			}
 		}
-		if (config.disbleP2p) {
+		if (mainStore.config.disbleP2p) {
 			args.push("--disable-p2p");
 		}
-		if (config.disableIpv6) {
+		if (mainStore.config.disableIpv6) {
 			args.push("--disable-ipv6");
 		}
-		if (config.disbleListenner) {
+		if (mainStore.config.disbleListenner) {
 			args.push("--no-listener");
 		}
-		if (!config.disbleListenner && config.enableCustomListener && config.customListenerData) {
-			const customListener = config.customListenerData
+		if (!mainStore.config.disbleListenner && mainStore.config.enableCustomListener && mainStore.config.customListenerData) {
+			const customListener = mainStore.config.customListenerData
 				.trim()
 				.split("\n")
 				.map(el => el.trim())
@@ -1317,14 +1459,12 @@
 				args.push("-l", ...customListener);
 			}
 		}
-		if (!config.disbleListenner && config.enableCustomListenerV6 && config.customListenerV6Data) {
-			args.push("--ipv6-listener", config.customListenerV6Data);
+
+		if (!mainStore.config.disbleListenner && !mainStore.config.enableCustomListener && mainStore.config.port) {
+			args.push("-l", mainStore.config.port);
 		}
-		if (!config.disbleListenner && !config.enableCustomListener && config.port) {
-			args.push("-l", config.port);
-		}
-		if (mainStore.cidrEnable && config.proxyNetworks) {
-			let formatProxyNetworks = config.proxyNetworks.trim().split("\n");
+		if (mainStore.cidrEnable && mainStore.config.proxyNetworks) {
+			let formatProxyNetworks = mainStore.config.proxyNetworks.trim().split("\n");
 			const newformatProxyNetworks = formatProxyNetworks
 				.map(el => el.trim())
 				.filter(cidr => {
@@ -1333,46 +1473,84 @@
 			if (newformatProxyNetworks.length > 0) {
 				args.push("--proxy-networks", ...newformatProxyNetworks);
 			}
-			config.proxyNetworks = formatProxyNetworks.join("\n");
+			mainStore.config.proxyNetworks = formatProxyNetworks.join("\n");
 		}
-		if (config.disableEncryption) {
+		if (mainStore.config.disableEncryption) {
 			args.push("--disable-encryption");
 		}
-		if (config.multiThread) {
+		if (mainStore.config.multiThread) {
 			args.push("--multi-thread");
 		}
-		if (config.enablExitNode) {
+		if (mainStore.config.enablExitNode) {
 			args.push("--enable-exit-node");
 		}
-		if (config.noTun) {
+		if (mainStore.config.noTun) {
 			args.push("--no-tun");
 		}
-		if (config.latencyfirst) {
+		if (mainStore.config.latencyfirst) {
 			args.push("--latency-first");
 		}
-		if (config.useSmoltcp) {
+		if (mainStore.config.useSmoltcp) {
 			args.push("--use-smoltcp");
 		}
-		if (config.disableUdpHolePunching) {
+		if (mainStore.config.disableUdpHolePunching) {
 			args.push("--disable-udp-hole-punching");
 		}
-		if (config.relayAllPeerrpc) {
+		if (mainStore.config.relayAllPeerrpc) {
 			args.push("--relay-all-peer-rpc");
 		}
-		if (config.saveErrorLog) {
-			args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
+		if (mainStore.config.saveErrorLog) {
+			args.push("--file-log-level", mainStore.config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
 		}
-		if (config.devName && config.devNameValue) {
-			args.push("--dev-name", config.devNameValue);
+		if (mainStore.config.devName && mainStore.config.devNameValue) {
+			args.push("--dev-name", mainStore.config.devNameValue);
 		}
-		if (config.compression && config.compression != "none") {
-			args.push("--compression", config.compression);
+		if (mainStore.config.compression && mainStore.config.compression != "none") {
+			args.push("--compression", mainStore.config.compression);
 		}
-		if (config.enableKcpProxy) {
-			args.push("--enable-kcp-proxy");
+		if (mainStore.config.enableKcpProxy) {
+			args.push("--enable-kcp-proxy", "true");
 		}
-		if (config.disableKcpInput) {
-			args.push("--disable-kcp-input");
+		if (mainStore.config.disableKcpInput) {
+			args.push("--disable-kcp-input", "true");
+		}
+		if (mainStore.config.enableQuicProxy) {
+			args.push("--enable-quic-proxy", "true");
+		}
+		if (mainStore.config.disableQuicInput) {
+			args.push("--disable-quic-input", "true");
+		}
+		if (mainStore.config.bindDeviceEnable) {
+			args.push("--bind-device", "true");
+		}
+		if (mainStore.proxyForwardBySystem) {
+			args.push("--proxy-forward-by-system");
+		}
+		if (mainStore.config.acceptDNS) {
+			args.push("--accept-dns", "true");
+		}
+		if (mainStore.config.enablePortForward) {
+			let formatPortForward = mainStore.config.portForwardData.trim().split("\n");
+			const newformatPortForward = formatPortForward.map(el => el.trim()).filter(el => el);
+			if (newformatPortForward.length > 0) {
+				newformatPortForward.map(el => {
+					args.push("--port-forward", el);
+				});
+			}
+		}
+		if (mainStore.config.privateMode) {
+			args.push("--private-mode", "true");
+		}
+		if (mainStore.config.ipv6 && !mainStore.config.disableIpv6) {
+			args.push("--ipv6", mainStore.config.ipv6.trim());
+		}
+		const tcpWhitelist = mainStore.config.tcpWhitelist.trim();
+		if (mainStore.config.tcpWhitelistEnable && tcpWhitelist) {
+			args.push("--tcp-whitelist", tcpWhitelist);
+		}
+		const udpWhitelist = mainStore.config.udpWhitelist.trim();
+		if (mainStore.config.udpWhitelistEnable && udpWhitelist) {
+			args.push("--udp-whitelist", udpWhitelist);
 		}
 		return args;
 	};
@@ -1380,8 +1558,8 @@
 	const reset = async () => {
 		data.isStart = false;
 		data.isSuccessGetIp = false;
-		if (config.dhcp) {
-			config.ipv4 = "";
+		if (mainStore.config.dhcp) {
+			mainStore.config.ipv4 = "";
 		}
 		const memberDialog = await getAllWebviewWindows();
 		const memberDialogs = memberDialog.filter(item => item.label === "member");
@@ -1468,8 +1646,6 @@
 					port,
 					enableCustomListener,
 					customListenerData,
-					enableCustomListenerV6,
-					customListenerV6Data,
 					devName,
 					devNameValue,
 					enableNetCardMetric,
@@ -1482,7 +1658,10 @@
 					compression,
 					enablePreventSleep,
 					enableKcpProxy,
-					disableKcpInput
+					disableKcpInput,
+					enableQuicProxy,
+					disableQuicInput,
+					privateMode
 				} = mainStore.config;
 				const WT = btoa(
 					encodeURIComponent(
@@ -1501,8 +1680,6 @@
 								port,
 								enableCustomListener,
 								customListenerData,
-								enableCustomListenerV6,
-								customListenerV6Data,
 								devName,
 								devNameValue,
 								enableNetCardMetric,
@@ -1515,7 +1692,10 @@
 								compression,
 								enablePreventSleep,
 								enableKcpProxy,
-								disableKcpInput
+								disableKcpInput,
+								enableQuicProxy,
+								disableQuicInput,
+								privateMode
 							}
 						})
 					)
@@ -1634,6 +1814,25 @@
 				}
 			);
 		}
+
+		if (command === "reconnect") {
+			handleReconnect();
+		}
+	};
+
+	const handleReconnect = async () => {
+		if (data.isStart) {
+			ElMessage.info({
+				message: "正在重新联机...",
+				duration: 2200
+			});
+			await handleConnection();
+			setTimeout(() => {
+				handleConnection();
+			}, 2000);
+		} else {
+			handleConnection();
+		}
 	};
 
 	const handleDeleteAdminConfig = async () => {
@@ -1686,7 +1885,7 @@
 		});
 		if (!err) {
 			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
-			payload.config.serverUrl = payload?.config?.serverUrl?.trim() || config.serverUrl;
+			payload.config.serverUrl = payload?.config?.serverUrl?.trim() || mainStore.config.serverUrl;
 			mainStore.$patch({
 				config: {
 					...mainStore.config,
@@ -1695,7 +1894,7 @@
 			});
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
-			mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers].filter(el => el.trim()));
+			mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers].filter(el => el.trim()));
 		} else {
 			console.error(err);
 			if (err !== "cancel") {
@@ -1795,7 +1994,7 @@
 				cidrTimer && clearInterval(cidrTimer);
 				cidrTimer = setInterval(() => {
 					appWindow.emitTo({ kind: "WebviewWindow", label: "cidr" }, "route", data.isStart);
-				}, 1000);
+				}, 650);
 			},
 			() => {
 				cidrTimer && clearInterval(cidrTimer);
@@ -1870,4 +2069,28 @@
 			}
 		);
 	};
+
+	const storageDialog = async () => {
+		await etWindows(
+			"storage-listener",
+			{
+				title: "存储监听",
+				minWidth: 0,
+				minHeight: 0,
+				width: 0,
+				height: 0,
+				x: 9999,
+				y: 9999,
+				resizable: false,
+				transparent: true,
+				hiddenTitle: true,
+				alwaysOnBottom: true,
+				visible: false,
+				url: "#/storage-listener"
+			},
+			dialog => {
+				dialog.hide();
+			}
+		);
+	};
 </script>

pages/log.vue

@@ -1,27 +1,139 @@
 <template>
-	<ElInput
+	<!-- <ElInput
 		type="textarea"
 		:rows="17"
-		v-model="data.log"
+		v-model="data.originLog"
 		resize="none"
 		readonly
 		placeholder="等待日志中，请先'启动联机'..."
-	/>
+	/> -->
+	<div
+		ref="logRef"
+		@scroll="handleScroll"
+		class="overflow-auto"
+	>
+		<div v-if="!data.log || data.log.length <= 0" class="p-[5px]">
+			<ElText type="info">等待日志中，请先'启动联机'...</ElText>
+		</div>
+		<div
+			v-else
+			v-for="item in data.log"
+			:key="item.id"
+			class="p-[5px]"
+		>
+			<div class="group/item flex items-center justify-start leading-[26px]">
+				<ElText
+					:closable="false"
+					:type="item.type"
+				>
+					{{ item.text }}
+					<ElTooltip
+						placement="right"
+						content="复制"
+					>
+						<ElButton
+							class="ml-[3px] !hidden w-fit group-hover/item:!inline-flex"
+							@click.stop="handleCopyLog(item.text)"
+							type="success"
+							size="small"
+							circle
+							plain
+							:icon="CopyDocument"
+						></ElButton>
+					</ElTooltip>
+				</ElText>
+			</div>
+		</div>
+		<ElAffix
+			v-if="data.originLog"
+			class="w-full"
+			position="bottom"
+			:offset="10"
+		>
+			<div class="bg-(var(--el-color-primary)) mr-[10px] flex items-center justify-end">
+				<ElTooltip
+					content="复制全部"
+					placement="top"
+				>
+					<ElButton
+						@click.stop="handleCopyLog(data.originLog)"
+						type="info"
+						size="large"
+						circle
+						:icon="CopyDocument"
+					></ElButton>
+				</ElTooltip>
+			</div>
+		</ElAffix>
+	</div>
 </template>
 <script setup lang="ts">
+	import { CopyDocument } from "@element-plus/icons-vue";
 	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
-	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	const data = reactive({
-		log: ""
+	import { reactive, onMounted, onBeforeUnmount, useTemplateRef, nextTick } from "vue";
+	import { copyText } from "~/utils";
+	type LogItem = { id: string; text: string; type: "danger" | "info" | "warning" | "primary" };
+	const data = reactive<{ log: LogItem[]; originLog: string; autoScrollToBottom: boolean }>({
+		log: [],
+		originLog: "", // 原始日志
+		autoScrollToBottom: true // 是否允许自动滚动到底部
 	});
 
+	const logEl = useTemplateRef<HTMLDivElement>("logRef");
+
+	const scrollToBottom = () => {
+		if (data.autoScrollToBottom) {
+			logEl.value?.scrollTo({
+				top: logEl.value?.scrollHeight,
+				behavior: "smooth"
+			});
+		}
+	};
+
+	const handleScroll = () => {
+		if (logEl.value) {
+			const autoScrollToBottom = logEl.value.scrollTop + logEl.value.clientHeight >= logEl.value.scrollHeight;
+			data.autoScrollToBottom = autoScrollToBottom;
+		}
+	};
+
 	const listenStart = async () => {
-		const unListen = await listen<string>("logs", event => {
-			data.log = event.payload || "";
+		const unListen = await listen<string>("logs", async event => {
+			const payload = event.payload || "";
+			if (data.originLog === payload) return;
+			data.originLog = payload;
+			data.log = payload
+				.split("\n")
+				.filter(text => text.trim())
+				.map((text, idx) => {
+					const toLowerCaseText = text.toLocaleLowerCase();
+					return {
+						id: `${text}-${idx}`,
+						text,
+						type:
+							toLowerCaseText.includes("error") ||
+							toLowerCaseText.includes("fail") ||
+							toLowerCaseText.includes("failed") ||
+							toLowerCaseText.includes("exception") ||
+							toLowerCaseText.includes("err")
+								? "danger"
+								: toLowerCaseText.includes("warn")
+									? "warning"
+									: toLowerCaseText.includes("new peer connection")
+										? "primary"
+										: "info"
+					};
+				});
+			await nextTick();
+			scrollToBottom();
 		});
 		return unListen;
 	};
 
+	const handleCopyLog = async (text: string) => {
+		await copyText(text, "复制记录成功");
+	};
+
 	let unlistenStart: UnlistenFn | null = null;
 	onMounted(async () => {
 		unlistenStart = await listenStart();

pages/member.vue

@@ -48,13 +48,21 @@
 					width="120"
 					prop="ipv4"
 					label="虚拟网IP"
+					:sort-method="sortIpv4"
+					:sort-orders="['ascending', 'descending', null]"
 				></ElTableColumn>
 				<ElTableColumn
 					sortable
 					prop="lat_ms"
 					width="100"
 					label="延迟/ms"
-				></ElTableColumn>
+					:sort-method="sortLatMs"
+					:sort-orders="['ascending', 'descending', null]"
+				>
+					<template #default="{ row }">
+						{{ formatLatency(row.lat_ms) }}
+					</template>
+				</ElTableColumn>
 				<ElTableColumn
 					sortable
 					width="100"
@@ -92,11 +100,15 @@
 					width="90"
 					prop="rx_bytes"
 					label="接收"
+					:sort-method="sortBytes"
+					:sort-orders="['ascending', 'descending', null]"
 				></ElTableColumn>
 				<ElTableColumn
 					sortable
 					prop="tx_bytes"
 					label="传输"
+					:sort-method="(a, b) => sortBytes(a, b, 'tx_bytes')"
+					:sort-orders="['ascending', 'descending', null]"
 				></ElTableColumn>
 			</ElTable>
 		</div>
@@ -108,6 +120,7 @@
 	import { ATJ, parseCliInfo } from "@/utils";
 	import { ElConfirmDanger } from "~/utils/element";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { isNaN } from "lodash-es";
 	// 	enum NatType {
 	//   // has NAT; but own a single public IP, port is not changed
 	//   Unknown = 0;
@@ -139,6 +152,146 @@
 		member: []
 	});
 
+	// 延迟排序函数
+	const sortLatMs = (a: any, b: any): number => {
+		const getLatencyValue = (row: any): number => {
+			const latMs = row.lat_ms;
+
+			if (latMs === null || latMs === undefined || latMs === "") {
+				return Infinity;
+			}
+
+			const num = Number(latMs);
+			if (isNaN(num) || num < 0) {
+				return Infinity;
+			}
+
+			return Math.floor(num);
+		};
+
+		const valueA = getLatencyValue(a);
+		const valueB = getLatencyValue(b);
+
+		if (valueA === Infinity && valueB === Infinity) {
+			return 0;
+		}
+
+		return valueA - valueB;
+	};
+
+	// IP地址排序函数
+	const sortIpv4 = (a: any, b: any): number => {
+		const ipToNumber = (ip: string): number => {
+			if (!ip || ip === "-" || ip === "") {
+				return 0;
+			}
+
+			// 处理可能包含端口号或子网掩码的情况
+			const cleanIp = ip.split("/")[0].split(":")[0];
+			const parts = cleanIp.split(".");
+
+			if (parts.length !== 4) {
+				return 0;
+			}
+
+			try {
+				const nums = parts.map(part => {
+					const num = parseInt(part, 10);
+					return isNaN(num) || num < 0 || num > 255 ? 0 : num;
+				});
+
+				// 将IP地址转换为32位数字进行比较
+				return (nums[0] << 24) + (nums[1] << 16) + (nums[2] << 8) + nums[3];
+			} catch {
+				return 0;
+			}
+		};
+
+		const numA = ipToNumber(a.ipv4);
+		const numB = ipToNumber(b.ipv4);
+
+		return numA - numB;
+	};
+
+	// 字节数据排序函数
+	const sortBytes = (a: any, b: any, field: string = 'rx_bytes'): number => {
+		const parseBytes = (bytesStr: string): number => {
+			if (!bytesStr || bytesStr === "-" || bytesStr === "") {
+				return 0;
+			}
+
+			// 统一转换为小写并去除空格
+			const cleanStr = bytesStr.toLowerCase().trim();
+			
+			// 使用正则表达式匹配数字和单位
+			const match = cleanStr.match(/^(\d+(?:\.\d+)?)\s*([a-z]*)$/);
+			if (!match) {
+				return 0;
+			}
+
+			const value = parseFloat(match[1]);
+			const unit = match[2];
+
+			if (isNaN(value)) {
+				return 0;
+			}
+
+			// 根据单位转换为字节数
+			switch (unit) {
+				case 'b':
+				case 'byte':
+				case 'bytes':
+				case '':
+					return value;
+				case 'k':
+				case 'kb':
+				case 'kib':
+					return value * 1024;
+				case 'm':
+				case 'mb':
+				case 'mib':
+					return value * 1024 * 1024;
+				case 'g':
+				case 'gb':
+				case 'gib':
+					return value * 1024 * 1024 * 1024;
+				case 't':
+				case 'tb':
+				case 'tib':
+					return value * 1024 * 1024 * 1024 * 1024;
+				case 'p':
+				case 'pb':
+				case 'pib':
+					return value * 1024 * 1024 * 1024 * 1024 * 1024;
+				default:
+					return value; // 未知单位当作字节处理
+			}
+		};
+
+		const bytesA = parseBytes(a[field]);
+		const bytesB = parseBytes(b[field]);
+
+		return bytesA - bytesB;
+	};
+
+	// 格式化延迟显示
+	const formatLatency = (latMs: any): string => {
+		if (latMs === null || latMs === undefined || latMs === "") {
+			return "-";
+		}
+
+		const num = Number(latMs);
+		if (isNaN(num)) {
+			return "-";
+		}
+
+		if (num < 0) {
+			return "-";
+		}
+
+		return num.toFixed(0);
+	};
+
 	const _showTableHeader = [
 		["hostname", "主机名"],
 		["cost", "路由"],

pages/server.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="flex flex-col gap-[10px] h-full">
+	<div class="flex h-full flex-col gap-[10px]">
 		<ElForm
 			size="small"
 			label-position="top"
@@ -8,7 +8,7 @@
 			<ElFormItem
 				label="白名单"
 				prop="ServerWhiteList"
-				class="full-label full-content overflow-hidden !flex flex-col h-full !mb-[0]"
+				class="full-label full-content !mb-[0] !flex h-full flex-col overflow-hidden"
 			>
 				<template #label>
 					<div class="flex items-center gap-[10px]">
@@ -27,6 +27,17 @@
 							>
 								<ElCheckbox v-model="mainStore.serverConfig.autoStart">自动启动</ElCheckbox>
 							</ElTooltip>
+							<ElTooltip
+								placement="top"
+								content="启用后，不允许使用了与本网络不同的房间名和密码的节点通过本节点进行握手或中转"
+							>
+								<ElCheckbox
+									@click.stop="handlePrivateModeClick"
+									:model-value="mainStore.serverConfig.privateMode"
+								>
+									私有模式
+								</ElCheckbox>
+							</ElTooltip>
 							<ElTooltip
 								placement="top"
 								content="帮助其他虚拟网建立P2P链接"
@@ -36,7 +47,7 @@
 						</div>
 					</div>
 				</template>
-				<div class="h-full w-full flex flex-col overflow-hidden">
+				<div class="flex h-full w-full flex-col overflow-hidden">
 					<div class="flex-1 overflow-auto">
 						<ElInput
 							:disabled="!mainStore.serverConfig.enableWhiteList"
@@ -70,6 +81,58 @@
 			</ElButton>
 		</div>
 
+		<ElDialog
+			v-model="privateModeDialogData.visible"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			title="私有模式"
+			:show-close="false"
+			width="300px"
+		>
+			<ElAlert
+				type="primary"
+				:closable="false"
+			>
+				建议为服务器设置一个房间名和密码
+			</ElAlert>
+			<div class="h-[15px]"></div>
+			<ElForm
+				:model="mainStore.serverConfig"
+				label-position="top"
+			>
+				<ElFormItem
+					label="房间名"
+					prop="privateNetworkName"
+				>
+					<ElInput
+						clearable
+						placeholder="请输入房间名 (默认为default)"
+						v-model="mainStore.serverConfig.privateNetworkName"
+					></ElInput>
+				</ElFormItem>
+				<ElFormItem
+					label="密码"
+					prop="privateNetworkPassword"
+				>
+					<ElInput
+						clearable
+						type="password"
+						show-password
+						placeholder="请输入密码 (可选)"
+						v-model="mainStore.serverConfig.privateNetworkPassword"
+					></ElInput>
+				</ElFormItem>
+			</ElForm>
+			<template #footer>
+				<ElButton
+					type="primary"
+					@click="handlePrivateModeDialogConfirm"
+				>
+					继续启用
+				</ElButton>
+			</template>
+		</ElDialog>
+
 		<ElInput
 			placeholder="服务器日志"
 			:model-value="data.log"
@@ -81,13 +144,14 @@
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
-	import { reactive, onMounted, onBeforeUnmount } from "vue";
+	import { reactive, onMounted, onBeforeUnmount, useTemplateRef, nextTick } from "vue";
 	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";
+	import { ElMessage, type FormInstance } from "element-plus";
 
-    const appWindow = getCurrentWindow();
+	const appWindow = getCurrentWindow();
 	const mainStore = useMainStore();
 	const data = reactive({
 		log: "",
@@ -119,10 +183,30 @@
 
 	const hanldeClickStart = async () => {
 		data.loading = true;
-        const args = getServerArgs();
+		const args = getServerArgs();
 		await appWindow.emitTo("main", "startStopServer", { args });
 	};
 
-	dataSubscribe();
+	// const privateModeDialogFormEl = useTemplateRef<FormInstance>("privateModeDialogFormRef");
 
+	const privateModeDialogData = reactive({
+		visible: false
+	});
+
+
+	const handlePrivateModeClick = async () => {
+		if (mainStore.serverConfig.privateMode) {
+			mainStore.serverConfig.privateMode = false;
+			return;
+		}
+		privateModeDialogData.visible = true;
+	};
+
+	const handlePrivateModeDialogConfirm = async () => {
+		privateModeDialogData.visible = false;
+		mainStore.serverConfig.privateMode = true;
+		
+	};
+
+	dataSubscribe();
 </script>

pages/storage-listener.vue

@@ -0,0 +1,6 @@
+<template></template>
+<script setup lang="ts">
+	import { dataSubscribe } from "~/composables/windows";
+
+	dataSubscribe();
+</script>

pages/tool.vue

@@ -10,7 +10,7 @@
 				name="netcard"
 				class="flex h-full flex-col"
 			>
-				<div>
+				<!-- <div>
 					<div>
 						<ElTooltip
 							content="找不到游戏房间时，就开启它后再尝试搜索房间(默认开启)
@@ -25,7 +25,7 @@
 					<ElLink
 						class="mr-[10px] !text-[15px]"
 						type="info"
-						:underline="false"
+						underline="never"
 						@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
 					>
 						WinIPBroadcast
@@ -39,13 +39,13 @@
 						active-text="已开启"
 						inactive-text="已关闭"
 					></ElSwitch>
-				</div>
+				</div> -->
 				<div>
 					<ElTooltip
 						content="使用ForceBindIP启动应用 (强制绑定IP或者网卡)，如果还没有启动联机，请先启动联机，联机成功后，点击刷新获取easytier生成的网卡"
 					>
 						<ElText>
-							方案2
+							方案1
 							<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
 						</ElText>
 					</ElTooltip>
@@ -55,7 +55,7 @@
 						<ElLink
 							class="!text-[15px]"
 							type="info"
-							:underline="false"
+							underline="never"
 							@click="open('https://r1ch.net/projects/forcebindip')"
 						>
 							ForceBindIP
@@ -131,7 +131,7 @@
 				<div>
 					<ElTooltip content="设置网卡的跃点，提升网卡优先级，尝试将您联机使用的网卡跃点设置为最小，请先查询网卡信息">
 						<ElText>
-							方案3
+							方案2
 							<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
 						</ElText>
 					</ElTooltip>
@@ -198,16 +198,10 @@
 						<ElButton
 							type="warning"
 							size="small"
+							@click.stop="handleCloseAllFireWall"
 						>
 							一键关闭防火墙
 						</ElButton>
-						<ElButton
-							@click="handleCustomFireWall"
-							type="danger"
-							size="small"
-						>
-							自定义防火墙策略
-						</ElButton>
 					</div>
 					<div class="mb-[10px]">
 						<ElText class="!mx-[10px]">域防火墙</ElText>
@@ -251,10 +245,17 @@
 					<ElButton
 						size="small"
 						:disabled="data.isPing"
-						@click="handleTestPing"
+						@click="handleTestPing('v4')"
 					>
 						Ping一下
 					</ElButton>
+					<!-- <ElButton
+						size="small"
+						:disabled="data.isPing"
+						@click="handleTestPing('v6')"
+					>
+						Ping一下(v6)
+					</ElButton> -->
 				</div>
 				<div class="mt-[5px] flex-1 overflow-auto">
 					<ElInput
@@ -305,8 +306,18 @@
 		forceBindStart: false
 	});
 
-	const handleCustomFireWall = async () => {
-		await open("wf.msc");
+
+	const handleCloseAllFireWall = async () => {
+		try {
+				const output = await Command.create("netsh", ["advfirewall", "set", "allprofiles", "state", "off"], {
+					encoding: "gb2312"
+				}).execute();
+				ElMessage.success("关闭成功");
+				await initFirewall();
+			} catch (err) {
+				ElMessage.error(`关闭失败${err}`);
+				console.error(err);
+			}
 	}
 
 	const handleTabsChange = async (tabPaneName: TabPaneName) => {
@@ -341,14 +352,15 @@
 		});
 	};
 
-	const handleTestPing = async () => {
+	const handleTestPing = async (type: 'v4' | 'v6' = 'v4') => {
 		// const is = isValidIP(data.pingIp);
 		if (data.pingIp) {
 			data.pingLog = "";
 			data.isPing = true;
+			const args = type === 'v4' ? ["-n", "1", data.pingIp] : ["-6", '-n', "1", data.pingIp]
 			try {
 				for (let i = 0; i < data.pingNum; i++) {
-					const output = await Command.create("ping", ["-n", "1", data.pingIp], {
+					const output = await Command.create("ping", args, {
 						encoding: "gb2312"
 					}).execute();
 					if (output.stdout) {
@@ -490,8 +502,9 @@
 
 	onMounted(() => {
 		data.pingIp = mainStore.config.ipv4;
-		initStartWinIpBroadcast();
+		// initStartWinIpBroadcast();
 		getGuids();
-		dataSubscribe();
 	});
+	
+	dataSubscribe();
 </script>

src-tauri/.gitignore

@@ -1,6 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
-/gen/schemas
-/easytier/logs
-/easytier/logs/*.*
+target/
+gen/schemas
+./easytier/logs
+easytier/logs

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.4.2"
+version = "1.4.8"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -18,41 +18,44 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.0.6", features = [] }
+tauri-build = { version = "2.3.1", features = [] }
 # prost-build = "0.13.2"
 
+[target.x86_64-pc-windows-msvc.build-dependencies]
+thunk-rs = { git = "https://github.com/easytier/thunk.git", default-features = false, features = ["win7"] } # 需要安装curl和7zip，并添加他们的路径到环境变量
+
 [dependencies]
 serde_json = "1.0.137"
 serde = { version = "1.0.217", features = ["derive"] }
 log = "0.4.26"
-tauri = { version = "2.3.0", features = [ "protocol-asset",
+tauri = { version = "2.7.0", features = [ "protocol-asset",
     "tray-icon",
     "image-png",
     "image-ico"
 ] }
 
-tauri-plugin-log = "2.2.2"
-tauri-plugin-shell = "2.2.0"
+tauri-plugin-log = "2.6.0"
+tauri-plugin-shell = "2.3.0"
 reqwest = { version = "0.12.12", features = ["json"] }
 zip = "2.2.3"
 sysinfo = '0.33.1'
-planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
+# planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
 whoami = "1.5.2"
-tauri-plugin-fs = "2.2.0"
-tauri-plugin-clipboard-manager = "2.2.1"
+tauri-plugin-fs = "2.4.1"
+tauri-plugin-clipboard-manager = "2.3.0"
 rand = "0.9.0"
-tokio = { version = "1.43.0", features = ["process"] }
-tauri-plugin-dialog = "2.2.0"
+tokio = { version = "1.45.1", features = ["process"] }
+tauri-plugin-dialog = "2.3.1"
 # prost = "0.13"
 # prost-types = "0.13"
 hashbrown = "0.15.2"
 # futures-util = "0.3"
 
 [dependencies.windows]
-version = "0.58.0"
+version = "0.61.3"
 features = ["Win32_System_TaskScheduler", "Win32_System_Com", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"]
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
-tauri-plugin-cli = "2.2.0"
-tauri-plugin-single-instance = "2.2.2"
-tauri-plugin-window-state = "2.2.1"
+tauri-plugin-cli = "2.4.0"
+tauri-plugin-single-instance = "2.3.2"
+tauri-plugin-window-state = "2.4.0"

src-tauri/build.rs

@@ -1,4 +1,5 @@
 fn main() {
+    thunk::thunk();
     let mut windows = tauri_build::WindowsAttributes::new();
     windows = windows.app_manifest(
         r#"

src-tauri/capabilities/default.json

@@ -2,7 +2,7 @@
 	"$schema": "../gen/schemas/desktop-schema.json",
 	"identifier": "default",
 	"description": "enables the default permissions",
-	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList"],
+	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList", "storage-listener"],
 	"permissions": [
 		"core:default",
 		"core:window:allow-minimize",
@@ -26,6 +26,7 @@
 		"core:tray:allow-get-by-id",
 		"core:tray:allow-set-icon",
 		"core:tray:allow-new",
+		"core:window:allow-set-size",
 		{
 			"identifier": "shell:allow-spawn",
 			"allow": [

src-tauri/easytier/config_template.json

@@ -9,16 +9,13 @@
     "enableCustomListener": true,
     "customListenerData": [
         "tcp://0.0.0.0:11010",
-        "udp://0.0.0.0:11010",
-        "tcp://[::]:11010"
+        "udp://0.0.0.0:11010"
     ],
     "networkName": "",  //房间名
     "networkPassword": "", //房间密码
     "hostname": "", //主机名
     "ipv4": "", // 虚拟IP地址
     "disableIpv6": false,  // 禁用ipv6
-    "enableCustomListenerV6": true, // 启用ipv6监听
-    "customListenerV6Data": "udp://[::]:11010",  // ipv6监听地址
     "disbleListenner": false, //    禁用监听
     "disableEncryption": false, // 禁用加密
     "enablExitNode": false, // 启用出口节点
@@ -35,6 +32,9 @@
     "netCardMetricValue": 1, // 网卡跃点
     "enablePreventSleep": false, // 启用防止睡眠
     "compression": "none", // 压缩算法
-    "enableKcpProxy": true, // 启用kcp代理
-    "disableKcpInput": false //     禁用kcp输入
+    "enableKcpProxy": true, // 启用kcp代理，就不能启用quic代理
+    "disableKcpInput": false, //     禁用kcp输入
+    "enableQuicProxy": false, // 启用quic代理，就不能启用kcp代理
+    "disableQuicInput": false, // 禁用quic输入
+    "privateMode": false // 启用私有模式
 }

src-tauri/src/lib.rs

@@ -1,7 +1,3 @@
-use planif::enums::TaskCreationFlags;
-use planif::schedule::TaskScheduler as planIfTaskScheduler;
-use planif::schedule_builder::{Action, ScheduleBuilder};
-use planif::settings::{Duration, LogonType, PrincipalSettings, RunLevel};
 use reqwest::{Client, Error};
 // use futures_util::StreamExt;
 use serde::{Deserialize, Serialize};
@@ -17,7 +13,8 @@ use sysinfo::System;
 use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
 use tauri::Emitter;
 use tauri::Manager;
-use windows::core::{BSTR, VARIANT};
+use windows::Win32::System::Variant::VARIANT;
+use windows::core::{Interface, BSTR};
 use windows::Win32::Foundation::VARIANT_BOOL;
 use windows::Win32::NetworkManagement::IpHelper::{
     GetAdaptersAddresses, GAA_FLAG_INCLUDE_PREFIX, IP_ADAPTER_ADDRESSES_LH,
@@ -326,7 +323,11 @@ async fn get_route_by_cli() -> String {
 }
 
 #[tauri::command(rename_all = "snake_case")]
-async fn download_easytier_zip(app_handle: tauri::AppHandle ,download_url: String, file_name: String) {
+async fn download_easytier_zip(
+    app_handle: tauri::AppHandle,
+    download_url: String,
+    file_name: String,
+) {
     let cache_dir_path = get_tool_exe_path("\\easytier\\cache");
     let cache_file_name = format!("{}\\{}", cache_dir_path, file_name);
     let cache_file_name_path = path::Path::new(&cache_file_name);
@@ -359,14 +360,18 @@ async fn download_easytier_zip(app_handle: tauri::AppHandle ,download_url: Strin
     while let Some(item) = response.chunk().await.unwrap() {
         match file.write_all(&item) {
             Ok(_) => {
-                app_handle.emit("download_core_progress", [item.len() as u64, context_size]).expect("error to emit download_core_progress");
-            },Err(why) => {
+                app_handle
+                    .emit("download_core_progress", [item.len() as u64, context_size])
+                    .expect("error to emit download_core_progress");
+            }
+            Err(why) => {
                 log::error!("error to write file: {}", why);
-                app_handle.emit("download_core_progress_error", why.to_string()).expect("error to emit download_core_progress_error");
-                return
+                app_handle
+                    .emit("download_core_progress_error", why.to_string())
+                    .expect("error to emit download_core_progress_error");
+                return;
             }
         };
-        
     }
     println!("下载完成");
     unzip(path);
@@ -516,18 +521,19 @@ fn stop_command(child_id: u32) {
 }
 
 #[tauri::command(rename_all = "snake_case")]
-async fn fetch_easytier_list() -> Vec<Vec<[String; 3]>> {
+async fn fetch_easytier_list() -> Vec<Vec<[String; 4]>> {
     // 获取release列表
     if let Ok(release) = fetch_releases().await {
-        let mut release_list = Vec::new();
+        let mut release_list: Vec<Vec<[String; 4]>> = Vec::new();
         for re in release {
-            let mut assets_list = Vec::new();
+            let mut assets_list: Vec<[String; 4]> = Vec::new();
             for asset in re.assets {
                 if asset.name.contains("windows-x86_64") {
                     assets_list.push([
                         re.tag_name.clone(),
                         asset.name.clone(),
                         asset.browser_download_url.clone(),
+                        re.prerelease.to_string(),
                     ]);
                 }
             }
@@ -656,6 +662,50 @@ fn autostart_is_enabled() -> bool {
     }
 }
 
+// 新增辅助函数
+fn ensure_task_folder_and_cleanup(
+    task_service: &ITaskService,
+    folder_path: &BSTR,
+    task_name: &BSTR,
+) -> Result<ITaskFolder, Box<dyn std::error::Error>> {
+    unsafe {
+        let root = BSTR::from("\\");
+        let root_folder: ITaskFolder = task_service.GetFolder(&root)?;
+
+        match task_service.GetFolder(folder_path) {
+            Ok(existing_folder) => {
+                println!("任务文件夹已存在: {}", folder_path);
+
+                // 检查并清理现有任务
+                if let Ok(_existing_task) = existing_folder.GetTask(task_name) {
+                    println!("发现同名任务: {}，准备删除", task_name);
+                    match existing_folder.DeleteTask(task_name, 0) {
+                        Ok(_) => println!("成功删除现有任务"),
+                        Err(e) => {
+                            log::error!("删除现有任务失败: {}", e);
+                            // 继续执行，尝试覆盖
+                        }
+                    }
+                }
+                Ok(existing_folder)
+            }
+            Err(_) => {
+                println!("创建新的任务文件夹: {}", folder_path);
+                match root_folder.CreateFolder(folder_path, &VARIANT::default()) {
+                    Ok(new_folder) => {
+                        println!("成功创建任务文件夹");
+                        Ok(new_folder)
+                    }
+                    Err(e) => {
+                        log::error!("创建任务文件夹失败: {}", e);
+                        Err(e.into())
+                    }
+                }
+            }
+        }
+    }
+}
+
 // 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>> {
@@ -690,33 +740,71 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
             CoUninitialize();
         }
     } else {
-        let ts = planIfTaskScheduler::new()?;
-        let com = ts.get_com();
-        let sb = ScheduleBuilder::new(&com).unwrap();
+        unsafe {
+            let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
+            task_service.Connect(
+                &VARIANT::default(),
+                &VARIANT::default(),
+                &VARIANT::default(),
+                &VARIANT::default(),
+            )?;
 
-        let exe = std::env::current_exe()?;
-        let exe = exe.to_str().unwrap();
+            let folder_path = BSTR::from("\\easytierGame");
+            let task_name = BSTR::from("auto start");
 
-        let settings = PrincipalSettings {
-            display_name: "".to_string(),
-            group_id: None,
-            id: "".to_string(),
-            logon_type: LogonType::InteractiveToken,
-            run_level: RunLevel::Highest,
-            user_id: Some(whoami::username()),
-        };
-        sb.create_logon()
-            .author("heixiansen")?
-            .trigger("trigger", enabled)?
-            .action(Action::new("auto start", exe, "", &TASKAUTOSTART_ARG))?
-            .in_folder("easytierGame")?
-            .principal(settings)?
-            .delay(Duration {
-                seconds: Some(6),
-                ..Default::default()
-            })?
-            .build()?
-            .register("auto start", TaskCreationFlags::CreateOrUpdate as i32)?;
+            let task_definition = task_service.NewTask(0)?;
+
+            // 设置任务信息
+            let registration_info = task_definition.RegistrationInfo()?;
+            registration_info.SetDescription(&BSTR::from("EasytierGame auto start task"))?;
+            registration_info.SetAuthor(&BSTR::from("EasytierGame"))?;
+
+            // 改为用户登录触发
+            let triggers = task_definition.Triggers()?;
+            let trigger = triggers.Create(TASK_TRIGGER_LOGON)?;
+            let logon_trigger: ILogonTrigger = trigger.cast()?;
+            logon_trigger.SetEnabled(VARIANT_BOOL::from(true))?;
+
+            // 设置动作
+            let actions = task_definition.Actions()?;
+            let action = actions.Create(TASK_ACTION_EXEC)?;
+            let exec_action: IExecAction = action.cast()?;
+            let exe = std::env::current_exe()?;
+            let exe_path: &str = exe.to_str().unwrap();
+            exec_action.SetPath(&BSTR::from(exe_path))?;
+            exec_action.SetArguments(&BSTR::from("--task-auto-start"))?;
+
+            // 使用当前用户运行
+            let principal = task_definition.Principal()?;
+            principal.SetUserId(&BSTR::from(whoami::username().as_str()))?;
+            principal.SetLogonType(TASK_LOGON_INTERACTIVE_TOKEN)?;
+            principal.SetRunLevel(TASK_RUNLEVEL_HIGHEST)?;
+
+            // 设置任务设置
+            let settings = task_definition.Settings()?;
+            settings.SetEnabled(VARIANT_BOOL::from(true))?;
+            settings.SetCompatibility(TASK_COMPATIBILITY_V2)?; // Windows 7
+            settings.SetStartWhenAvailable(VARIANT_BOOL::from(true))?;
+            // settings.SetHidden(VARIANT_BOOL::from(true))?; // 注释掉让任务可见
+            settings.SetExecutionTimeLimit(&BSTR::from("PT0S"))?;
+            settings.SetDisallowStartIfOnBatteries(VARIANT_BOOL(0))?; // 允许在电池供电时启动
+
+            // 获取文件夹并注册任务
+            let task_folder =
+                ensure_task_folder_and_cleanup(&task_service, &folder_path, &task_name)?;
+
+            let _auto_task = task_folder.RegisterTaskDefinition(
+                &task_name,
+                &task_definition,
+                TASK_CREATE_OR_UPDATE.0,
+                &VARIANT::default(),
+                &VARIANT::default(),
+                TASK_LOGON_INTERACTIVE_TOKEN,
+                &VARIANT::default(),
+            )?;
+
+            CoUninitialize();
+        }
     }
     Ok(())
 }

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.4.2",
+	"version": "1.4.8",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -12,14 +12,14 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.4.2",
+				"title": "easytier-game 1.4.8",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
 				"height": 305,
 				"minHeight": 305,
-				"maxHeight": 305,
-				"maxWidth": 360,
+				"maxHeight": 405,
+				"maxWidth": 460,
 				"resizable": true,
 				"fullscreen": false,
 				"decorations": true,

stores/index.ts

@@ -1,4 +1,7 @@
 import { acceptHMRUpdate, defineStore } from "pinia";
+
+
+
 const store = defineStore("main", {
 	state() {
 		return {
@@ -9,15 +12,18 @@ const store = defineStore("main", {
 				networkPassword: "",
 				hostname: "",
 				ipv4: "",
+				ipv6:"",
+				tcpWhitelistEnable: false, // tcp端口白名单
+				udpWhitelistEnable: false, // udp端口白名单
+				tcpWhitelist: "", // tcp端口白名单
+				udpWhitelist: "", // udp端口白名单
 				proxyNetworks: "", // 子网代理
 				autoStart: false, // 是否自动启动
 				connectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
 				port: "11010", // 监听端口号
 				enableCustomListener: true, // 是否自定义监听
-				enableCustomListenerV6: true, // 是否自定义IPV6监听
-				customListenerV6Data: "udp://[::]:11010", //自定义ipv6监
-				customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
+				customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010", // 自定义监听地址
 				disbleListenner: false, // 是否禁用监听
 				disableEncryption: false, // 是否禁用加密
 				multiThread: false, //使用多线程
@@ -40,7 +46,15 @@ const store = defineStore("main", {
 				enablePreventSleep: false, //组织系统休眠
 				compression: "none", //加密算法
 				enableKcpProxy: true, //启用kcp代理  默认开启
-				disableKcpInput: false //禁用kcp输入
+				disableKcpInput: false, //禁用kcp输入
+				enableQuicProxy: false, //启用quic代理  默认开启
+				disableQuicInput: false, //禁用quic输入
+				bindDeviceEnable: false, //是否绑定设备
+				acceptDNS: false, //魔法dns
+				privateMode: false, //是否启用私有模式
+
+				enablePortForward: false, //是否启用端口转发
+				portForwardData: "", //端口转发数据
 			},
 			serverConfig: {
 				enableWhiteList: true, // 是否启用白名单
@@ -48,9 +62,13 @@ const store = defineStore("main", {
 				serverWhiteList: "", // 服务器流量转发白名单
 				// enableListener: true, // 是否启用监听
 				autoStart: false, //随软件自启
-				port: "11010" // 服务器端口
+				port: "11010", // 服务器端口
+				privateMode: false, //是否启用私有模式
+				privateNetworkName: "", // 私有模式房间名
+				privateNetworkPassword: "", // 私有模式密码
 			},
 			cidrEnable: false,
+			proxyForwardBySystem: false, // 是否通过系统内核转发子网代理数据包，禁用内置NAT
 			basePeers: ["public.easytier.top:11010", "public.easytier.net:11010"],
 			theme: false, //主题  false light true dark
 			configStartEnable: false, //使用配置文件启动
@@ -81,6 +99,7 @@ const store = defineStore("main", {
 			"config.networkPassword",
 			"config.hostname",
 			"config.ipv4",
+			"config.ipv6",
 			"config.proxyNetworks",
 			"config.autoStart",
 			"config.connectAfterStart",
@@ -102,12 +121,17 @@ const store = defineStore("main", {
 			"config.enableNetCardMetric",
 			"config.netCardMetricValue",
 			"config.port",
+			"config.tcpWhitelist",
+			"config.udpWhitelist",
+			"config.tcpWhitelistEnable",
+			"config.udpWhitelistEnable",
+
+			"config.enablePortForward",
+			"config.portForwardData",
 
 			"config.disbleListenner",
 			"config.enableCustomListener",
 			"config.customListenerData",
-			"config.enableCustomListenerV6",
-			"config.customListenerV6Data",
 
 			"config.enableCustomProtocol",
 			"config.customProtocol",
@@ -116,6 +140,15 @@ const store = defineStore("main", {
 
 			"config.enableKcpProxy",
 			"config.disableKcpInput",
+			"config.enableQuicProxy",
+			"config.disableQuicInput",
+
+
+			"config.bindDeviceEnable",
+
+			"config.acceptDNS",
+
+			"config.privateMode",
 
 			"serverConfig.autoStart",
 			// 'serverConfig.enableListener',
@@ -123,8 +156,12 @@ const store = defineStore("main", {
 			"serverConfig.relayAllPeerrpc",
 			"serverConfig.serverWhiteList",
 			"serverConfig.port",
+			"serverConfig.privateMode",
+			"serverConfig.privateNetworkName",
+			"serverConfig.privateNetworkPassword",
 
 			"cidrEnable",
+			"proxyForwardBySystem",
 			"basePeers",
 			"theme",
 			"configStartEnable",

utils/index.ts

@@ -67,7 +67,7 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 		});
 };
 
-const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
+const _supportProtocols = ["tcp", "udp", "ws", "wss"];
 
 export const supportProtocols = () => {
 	return _supportProtocols.slice();