重大结构更新

+ 升级rust为1.8版本 + 升级tauri为最新版，以及其他包升级 + 现在构建分为window7和window7以上两种版本 + 优化分享配置弹窗遮盖问题 + 增加uninstall.exe（不会删除日志） + 增加windows.0.48.5.lib + 增加build.bat 内含windows7构建之前的操作
这是一个测试分支，用于rust最新包更新与适配
2025-05-19 10:27:56 +00:00 · 2025-01-16 16:53:51 +08:00 · 2025-01-10 18:42:02 +08:00 · 2025-01-09 10:33:42 +08:00 · 2025-01-09 09:53:35 +08:00 · 2025-01-08 15:04:57 +08:00
39 changed files with 3671 additions and 1970 deletions
@@ -1 +1 @@
-18.18.2
+20.18.1
@@ -0,0 +1,23 @@
+{
+    "plugins": ["prettier-plugin-tailwindcss"],
+    "arrowParens": "avoid",
+    "bracketSpacing": true,
+    "endOfLine": "lf",
+    "htmlWhitespaceSensitivity": "ignore",
+    "insertPragma": false,
+    "singleAttributePerLine": true,
+    "bracketSameLine": false,
+    "jsxBracketSameLine": false,
+    "jsxSingleQuote": true,
+    "printWidth": 150,
+    "proseWrap": "preserve",
+    "quoteProps": "as-needed",
+    "requirePragma": false,
+    "semi": true,
+    "singleQuote": false,
+    "tabWidth": 4,
+    "trailingComma": "none",
+    "useTabs": true,
+    "embeddedLanguageFormatting": "auto",
+    "vueIndentScriptAndStyle": true
+}
@@ -56,6 +56,9 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 - 1.2.6重写 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html),也可查看帮助.txt
 ![game-step13](/assets/game-step13.png)

+- 1.3.5 增强工具 新增了forceBindIP
+![game-step14](/assets/game-step14.png)
+
 ## 特性

 - 基于easytier组网工具开发，界面清晰简单
@@ -9,26 +9,26 @@
 	import { warn, debug, trace, info, error } from "@tauri-apps/plugin-log";
 	function forwardConsole(fnName: "log" | "debug" | "info" | "warn" | "error", logger: (message: string) => Promise<void>) {
 		const original = console[fnName];
-		console[fnName] = (message) => {
+		console[fnName] = message => {
 			original(message);
-			if (import.meta.env.PROD) {
-				try {
-					if (typeof message === "string") {
-						logger(message);
-					} else {
-						logger(JSON.stringify(message));
-					}
-				} catch (e) {
-					logger(`${message}`);
+			try {
+				if (typeof message === "string") {
+					logger(message);
+				} else {
+					logger(JSON.stringify(message));
 				}
+			} catch (e) {
+				logger(`${message}`);
 			}
 		};
 	}
-	forwardConsole("log", info);
-	forwardConsole("debug", debug);
-	forwardConsole("info", info);
-	forwardConsole("warn", warn);
-	forwardConsole("error", error);
+	if (import.meta.env.PROD) {
+		forwardConsole("log", info);
+		forwardConsole("debug", debug);
+		forwardConsole("info", info);
+		forwardConsole("warn", warn);
+		forwardConsole("error", error);
+	}

 	const mainStore = useMainStore();
 	// console.log(mainStore.theme)
@@ -9,7 +9,9 @@
 		font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", STHeiti, "Microsoft YaHei";
 	}
 } */
-
+html {
+	font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 html,
 body {
 	height: 100%;
@@ -47,3 +49,11 @@ html.dark body {
 	overflow: auto;
 	flex: 1;
 }
+
+.el-table {
+	font-size: 12px!important;
+}
+
+.el-select-dropdown__wrap {
+	max-height: 150px!important;
+}
@@ -0,0 +1,11 @@
+rustup default nightly
+@echo 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
+@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
+@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
+@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
+@echo 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
+pnpm run release
+pnpm run release-win7
@@ -0,0 +1,3 @@
+<template>
+    <ElTag size="small" type="danger">内核 >= {{ $attrs.version }}</ElTag>
+</template>
@@ -24,7 +24,10 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 			serverUrl,
 			port,
 			enableCustomListener,
+			enablePreventSleep,
 			customListenerData,
+			customListenerV6Data,
+			enableCustomListenerV6,
 			...otherConfig
 		} = mainStore.config;
 		let writeServerUrl: Array<string> | string = serverUrl;
@@ -44,7 +44,7 @@ export const handleWinipBcStart = async () => {
 		await getWinIpBroadcastPid();
 		if (mainStore.winipBcPid <= 0) {
 			mainStore.$patch({
-				winIpBcAutoStart: true
+				winIpBcAutoStart: false
 			});
 		}
 	}
@@ -5,6 +5,9 @@ import pkg from "@/package.json";
 import { setTheme } from "~/composables/theme";
 import useMainStore from "@/stores/index";
 import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
+import { invoke } from "@tauri-apps/api/core";
+// import { ElConfirmPrimary } from "~/utils/element";
+import { open } from "@tauri-apps/plugin-shell";

 const DEFAULT_TRAY_NAME = "main";

@@ -13,6 +16,7 @@ async function toggleVisibility() {
 		await getCurrentWindow().hide();
 	} else {
 		await getCurrentWindow().show();
+		await getCurrentWindow().unminimize();
 		await getCurrentWindow().setFocus();
 	}
 }
@@ -60,6 +64,8 @@ export async function generateMenuItem(beforExit: Function, handleConnection:Fun
 		await MenuItemExchangeConnection("联机 / 断开", handleConnection),
 		await MenuItemTheme(),
 		await PredefinedMenuItem.new({ item: "Separator" }),
+		await MenuItemPublicPeers(),
+		await PredefinedMenuItem.new({ item: "Separator" }),
 		await MenuItemExit("退出", beforExit),
 	];
 }
@@ -77,6 +83,17 @@ export async function MenuItemExit(text: string, beforExit: Function) {
 	});
 }

+export async function MenuItemPublicPeers() {
+
+	return await MenuItem.new({
+		id: "publicPeers",
+		text: "公共节点",
+		action: async () => {
+			await open("https://easytier.gd.nkbpal.cn/status/easytier")
+		},
+	});
+}
+
 export async function MenuItemShow(text: string) {
 	return await MenuItem.new({
 		id: "show",
@@ -140,3 +157,19 @@ export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | n
 		await tray.setTooltip(`EasyTierGame\n${pkg.version}`);
 	}
 }
+
+
+export const checkNewVersion = async () => {
+	let [tagName, downloadUrl] = await invoke<string[]>("fetch_game_releases");
+	if(tagName && pkg.version !== tagName) {
+		return true; //有新版
+		// const [err] = await ElConfirmPrimary("有新版本是否下载?", "发现新版本", {
+		// 	confirmButtonText: "下载",
+		// 	cancelButtonText: "取消",
+		// })
+		// if(!err) {
+		// 	open(downloadUrl);
+		// }
+	}
+	return false; //没有新版
+}
@@ -3,38 +3,40 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.2.9",
+	"version": "1.3.7",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod",
-		"release": "node zip.js"
+		"release": "node zip.js",
+		"release-win7": "node zip.js win7"
 	},
 	"devDependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@element-plus/nuxt": "^1.1.0",
-		"@nuxtjs/tailwindcss": "^6.12.0",
-		"@pinia/nuxt": "0.8.0",
-		"@tauri-apps/api": "^2.1.1",
-		"@tauri-apps/cli": "^2.1.0",
-		"@tauri-apps/plugin-cli": "^2.0.0",
-		"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
-		"@tauri-apps/plugin-fs": "~2",
-		"@tauri-apps/plugin-http": "^2.0.1",
-		"@tauri-apps/plugin-log": "^2.0.0",
-		"@tauri-apps/plugin-shell": "~2",
-		"@tauri-apps/plugin-window-state": "~2",
+		"@element-plus/nuxt": "^1.1.1",
+		"@nuxtjs/tailwindcss": "6.13.1",
+		"@pinia/nuxt": "0.9.0",
+		"@tauri-apps/api": "^2.2.0",
+		"@tauri-apps/cli": "2.2.4",
+		"@tauri-apps/plugin-cli": "^2.2.0",
+		"@tauri-apps/plugin-clipboard-manager": "2.2.0",
+		"@tauri-apps/plugin-fs": "^2.2.0",
+		"@tauri-apps/plugin-log": "^2.2.0",
+		"@tauri-apps/plugin-shell": "^2.2.0",
+		"@tauri-apps/plugin-window-state": "^2.2.0",
+		"@tauri-apps/plugin-dialog": "2.2.0",
 		"@types/lodash-es": "^4.17.12",
-		"@vitejs/plugin-vue-jsx": "^4.1.0",
-		"@vueuse/core": "12.0.0",
+		"@vitejs/plugin-vue-jsx": "^4.1.1",
+		"@vueuse/core": "12.4.0",
 		"archiver": "^7.0.1",
-		"element-plus": "^2.8.7",
-		"less": "^4.2.0",
+		"element-plus": "2.9.3",
+		"less": "4.2.1",
 		"lodash-es": "^4.17.21",
-		"nuxt": "^3.14.1592",
-		"pinia": "^2.2.6",
-		"pinia-plugin-persistedstate": "^4.1.3",
+		"nuxt": "3.15.2",
+		"pinia": "^2.3.0",
+		"pinia-plugin-persistedstate": "^4.2.0",
 		"postcss": "^8.4.38",
-		"typescript": "^5.6.3",
+		"prettier": "3.4.2",
+		"prettier-plugin-tailwindcss": "0.6.10",
 		"vue-clipboard3": "^2.0.0"
 	}
 }
@@ -1,9 +1,8 @@
 <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 class="flex items-center gap-[15px] flex-nowrap">
-			<div class="flex items-center gap-[5px] flex-nowrap">
-				<ElCheckbox v-model="mainStore.config.enableCustonProtocol">自定义联机时使用的默认协议</ElCheckbox>
+	<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="如果没有支持该协议的节点地址，程序会自动处理，请放心使用">
 					<ElIcon><QuestionFilled /></ElIcon>
 				</ElTooltip>
@@ -24,32 +23,11 @@
 				</ElSelect>
 			</div>
 		</div>
-		<div class="flex items-center gap-[15px] flex-nowrap">
-			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
-			<div class="w-[140px]">
-				<ElSelect
-					size="small"
-					v-model="mainStore.config.logLevel"
-					placeholder="请选择日志等级"
-					class="ml-[5px]"
-				>
-					<ElOption
-						v-for="item in data"
-						:key="item"
-						:label="`level - ${item}`"
-						:value="item"
-					></ElOption>
-				</ElSelect>
-			</div>
-			<ElButton
-				@click="openLogDir"
-				size="small"
-			>
-				打开日志目录
-			</ElButton>
+		<div>
+			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">帮助对等节点建立直连(p2p)通信</ElCheckbox>
 		</div>
 		<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
-		<div class="flex items-center gap-[15px] flex-nowrap">
+		<div class="flex flex-nowrap items-center gap-[15px]">
 			<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
 			<ElButton
 				@click="openConfigJsonDir"
@@ -58,6 +36,14 @@
 				打开config.json目录
 			</ElButton>
 		</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)来回切换的情况">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
 		<ElDivider />
 		<div class="flex items-center gap-[10px]">
 			<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox>
@@ -123,6 +109,27 @@
 				</template>
 			</ElDialog>
 		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox
+				:disabled="mainStore.config.disbleListenner"
+				v-model="mainStore.config.enableCustomListenerV6"
+			>
+				自定义IPV6监听地址
+			</ElCheckbox>
+			<div class="w-[200px]">
+				<ElInput
+					:disabled="mainStore.config.disbleListenner || mainStore.config.enableCustomListenerV6"
+					size="small"
+					:maxlength="100"
+					v-model="mainStore.config.customListenerV6Data"
+					placeholder="请输入自定义IPV6监听地址"
+				/>
+			</div>
+			<ElTooltip content="例如：tcp://[::]:11010，如果未设置，将在随机UDP端口上监听">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<CoreVersionWarning version="2.1.0" />
+		</div>
 		<ElDivider />
 		<div class="flex items-center gap-[10px]">
 			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
@@ -164,13 +171,54 @@
 		<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-[10px]">
+			<ElText>压缩算法</ElText>
+			<div class="w-[160px]">
+				<ElSelect
+					size="small"
+					v-model="mainStore.config.compression"
+					placeholder="请选择压缩算法"
+				>
+					<ElOption
+						v-for="item in [
+							['none', '不压缩(游戏联机推荐)'],
+							['zstd', 'zstd算法']
+						]"
+						:key="item[0]"
+						:label="item[1]"
+						:value="item[0]"
+					></ElOption>
+				</ElSelect>
+			</div>
+			<CoreVersionWarning version="2.1.0" />
+		</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.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
-		<div>
-			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包，即使对等节点不在转发网络白名单内</ElCheckbox>
+		<div class="flex flex-nowrap items-center gap-[15px]">
+			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
+			<div class="w-[140px]">
+				<ElSelect
+					size="small"
+					v-model="mainStore.config.logLevel"
+					placeholder="请选择日志等级"
+					class="ml-[5px]"
+				>
+					<ElOption
+						v-for="item in data"
+						:key="item"
+						:label="`level - ${item}`"
+						:value="item"
+					></ElOption>
+				</ElSelect>
+			</div>
+			<ElButton
+				@click="openLogDir"
+				size="small"
+			>
+				打开日志目录
+			</ElButton>
 		</div>
 	</div>
 </template>
@@ -179,11 +227,13 @@
 	import { QuestionFilled } from "@element-plus/icons-vue";
 	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 { exists, mkdir, BaseDirectory, remove } from "@tauri-apps/plugin-fs";
 	import { ElMessage } from "element-plus";
 	import { reactive } from "vue";
 	import { dataSubscribe } from "@/composables/windows";
-	import { supportProtocols } from "~/utils";
+	import { ATJ, supportProtocols } from "~/utils";
+	import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
+	import { ElConfirmDanger } from "~/utils/element";

 	const protocols = supportProtocols();
 	const listenerDialogData = reactive<{ [key: string]: any }>({
@@ -225,6 +275,25 @@
 	};

 	dataSubscribe(async (...a) => {
+		if (!mainStore.createConfigInEasytier) {
+			// 考虑删除本地config.json文件
+			const configJsonPath = import.meta.env.VITE_CONFIG_FILE_NAME;
+			const isExists = await exists(configJsonPath, { baseDir: BaseDirectory.Resource });
+			// console.log({ isExists });
+			if (isExists) {
+				const [error, _] = await ElConfirmDanger("生成配置文件功能被关闭,是否删除本地config.json", "提示", {
+					confirmButtonText: "删除",
+					cancelButtonText: "保留"
+				});
+				if (!error) {
+					// 删除本地config.json文件
+					const [error, _] = await ATJ(remove(configJsonPath, { baseDir: BaseDirectory.Resource }));
+					if (error) {
+						ElMessage.error("删除失败，请打开目录手动删除");
+					}
+				}
+			}
+		}
 		return {
 			config: { ...mainStore.config },
 			createConfigInEasytier: mainStore.createConfigInEasytier
@@ -1,6 +1,9 @@
 <template>
-	<div class="h-full flex flex-col gap-[10px]">
-		<ElRadioGroup v-model="mainStore.cidrEnable">
+	<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>
@@ -9,16 +12,107 @@
 				placeholder="例如: 192.168.1.0/24 一行一个"
 				v-model="mainStore.config.proxyNetworks"
 				type="textarea"
-				:rows="30"
+				:rows="5"
 				resize="none"
 			></ElInput>
+			<ElTable
+				stripe
+				border
+				empty-text="暂无数据"
+				:data="data.route"
+				class="mt-[5px]"
+			>
+				<ElTableColumn
+					sortable
+					width="140"
+					label="主机名"
+					prop="hostname"
+				></ElTableColumn>
+				<ElTableColumn
+					width="120"
+					sortable
+					label="虚拟网IP"
+					prop="ipv4"
+				></ElTableColumn>
+				<ElTableColumn
+					sortable
+					label="被代理的子网"
+					prop="proxy_cidrs"
+				></ElTableColumn>
+			</ElTable>
 		</div>
 	</div>
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
 	import { dataSubscribe } from "@/composables/windows";
+	import { invoke } from "@tauri-apps/api/core";
+	import { reactive, onMounted, onBeforeUnmount } from "vue";
+	import { ATJ, parseCliInfo } from "@/utils";
+	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
 	const mainStore = useMainStore();
+
+	const data = reactive<{ [key: string]: any }>({
+		route: [],
+		isStart: false,
+		isSwitchEnable: false,
+		isRunning: false
+	});
+
+	const listenOutput = async () => {
+		data.isRunning = true;
+		const [error, member] = await ATJ(invoke<string>("get_route_by_cli"));
+		data.isRunning = false;
+		// if(!member) return;
+		if (error) {
+			data.route = [];
+			return "";
+		}
+		if (member === "_EasytierGameCliFailedToConnect_") {
+			data.route = [];
+			await listenOutput();
+			return;
+		}
+		const routeInfo = parseCliInfo(member);
+		routeInfo.forEach(value => {
+			if (value.cost === "Local") {
+				value.cost = "本机";
+			}
+			if (value.ipv4 && value.ipv4.includes("/")) {
+				value.ipv4 = value.ipv4.split("/")[0];
+			}
+		});
+		data.route = routeInfo;
+	};
+
+	const listenStart = async () => {
+		const unListen = await listen<boolean>("route", async event => {
+			data.isStart = event.payload;
+			if (data.isStart) {
+				data.isSwitchEnable = false;
+				if (mainStore.cidrEnable && !data.isRunning) {
+					await listenOutput();
+				} else {
+					data.route = [];
+				}
+			} else {
+				data.isSwitchEnable = true;
+				data.route = [];
+			}
+		});
+		return unListen;
+	};
+
+	let unlistenStart: UnlistenFn | null = null;
+
+	onMounted(async () => {
+		unlistenStart = await listenStart();
+	});
+
+	onBeforeUnmount(() => {
+		unlistenStart && unlistenStart();
+	});
+
 	dataSubscribe(async (...a) => {
 		return { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } };
 	});
@@ -11,7 +11,12 @@
 		>
 			<template #label>
 				<div class="flex flex-nowrap items-center gap-[0_5px]">
-					<div>服务器</div>
+					<div class="flex flex-nowrap items-center gap-[5px]">
+						<div>服务器</div>
+						<ElTooltip content="服务器是什么协议，中转就是什么协议">
+							<ElIcon><QuestionFilled /></ElIcon>
+						</ElTooltip>
+					</div>
 					<span>-</span>
 					<ElTag
 						effect="dark"
@@ -29,7 +34,7 @@
 						v-else
 						class="flex-1 truncate"
 					>
-						<ElTooltip :content="data.coreVersion">
+						<ElTooltip :content="`内核版本:${data.coreVersion}(不是软件的版本)`">
 							<ElTag type="info">
 								{{ data.coreVersion }}
 							</ElTag>
@@ -55,6 +60,7 @@
 				placeholder="请选择服务器地址"
 				default-first-option
 				v-model="config.serverUrl"
+				no-data-text="无服务器地址"
 				@change="handleServerUrlChange"
 			>
 				<template #prefix>
@@ -83,15 +89,34 @@
 					:value="item"
 				>
 					<div class="flex max-w-[calc(100vw-62px)] flex-nowrap items-center gap-[20px] overflow-hidden">
-						<ElTooltip v-if="item && item.length > 30" placement="top" :content="item || '-'">
+						<ElTooltip
+							v-if="item && item.length > 26"
+							placement="top"
+							:content="item || '-'"
+						>
 							<p class="truncate">{{ item }}</p>
 						</ElTooltip>
-						<p v-else class="truncate">{{ item }}</p>
+						<p
+							v-else
+							class="truncate"
+						>
+							{{ item }}
+						</p>
 						<div class="ml-auto flex-shrink-0">
+							<ElButton
+								@click.stop="copyServerUrl(item)"
+								circle
+								size="small"
+								title="复制"
+								:icon="CopyDocument"
+							></ElButton>
+
 							<ElButton
 								@click.stop="handleDeleteServerUrl(item)"
-								round
+								circle
+								size="small"
 								:icon="Delete"
+								title="删除"
 								type="danger"
 							></ElButton>
 						</div>
@@ -101,10 +126,10 @@
 		</ElFormItem>
 		<div class="flex flex-wrap items-center gap-[0_10px]">
 			<div class="flex-1">
-				<ElFormItem label="网络名">
+				<ElFormItem label="房间名">
 					<template #label>
 						<div class="flex items-center">
-							网络名
+							房间名
 							<ElTooltip content="对应命令行参数 --network-name">
 								<ElIcon><QuestionFilled /></ElIcon>
 							</ElTooltip>
@@ -112,16 +137,16 @@
 					</template>
 					<ElInput
 						maxlength="100"
-						placeholder="请输入网络名"
+						placeholder="请输入房间名"
 						v-model="config.networkName"
 					></ElInput>
 				</ElFormItem>
 			</div>
 			<div class="flex-1">
-				<ElFormItem label="网络密码">
+				<ElFormItem label="房间密码">
 					<template #label>
 						<div class="flex items-center">
-							网络密码
+							房间密码
 							<ElTooltip content="对应命令行参数 --network-secret">
 								<ElIcon><QuestionFilled /></ElIcon>
 							</ElTooltip>
@@ -130,7 +155,7 @@
 					<ElInput
 						show-password
 						maxlength="100"
-						placeholder="请输入网络密码"
+						placeholder="请输入房间密码"
 						v-model="config.networkPassword"
 						type="password"
 					></ElInput>
@@ -138,10 +163,10 @@
 			</div>
 		</div>
 		<div class="flex gap-[0_10px]">
-			<ElFormItem label="主机名">
+			<ElFormItem label="成员名">
 				<template #label>
 					<div class="flex items-center">
-						主机名
+						成员名
 						<ElTooltip content="对应命令行参数 --hostname">
 							<ElIcon><QuestionFilled /></ElIcon>
 						</ElTooltip>
@@ -249,18 +274,18 @@
 						plain
 					></ElButton>
 				</ElTooltip>
-				<ElTooltip
+				<!-- <ElTooltip
 					placement="left"
-					content="成员"
-				>
+					content="房间信息"
+				> -->
 					<ElButton
+						class="!ml-[7px]"
 						@click="handleShowMemberDialog"
-						:icon="UserFilled"
 						plain
 						type="success"
 						size="small"
-					></ElButton>
-				</ElTooltip>
+					>房间信息</ElButton>
+				<!-- </ElTooltip> -->
 			</div>
 		</div>
 		<div class="ml-auto">
@@ -310,14 +335,24 @@
 						增强工具
 					</ElButton>
 				</div>
-				<ElLink
-					class="ml-[8px] truncate pb-[2px] !text-[9px]"
-					type="info"
-					:underline="false"
-					@click="open('https://github.com/EasyTier/EasytierGame')"
+
+				<ElBadge
+					badge-class="!text-[9px] cursor-pointer"
+					:hidden="!data.hasNewVersion"
+					:offset="[6, 7]"
+					value="N"
 				>
-					EasytierGame主页
-				</ElLink>
+					<!-- <ElTooltip :disabled="!data.hasNewVersion" content="有新版发布了!"> -->
+					<ElLink
+						class="ml-[8px] truncate pb-[2px] !text-[9px]"
+						type="info"
+						:underline="false"
+						@click="open('https://github.com/EasyTier/EasytierGame')"
+					>
+						EasytierGame主页
+					</ElLink>
+					<!-- </ElTooltip> -->
+				</ElBadge>
 			</div>
 		</div>
 	</div>
@@ -343,7 +378,10 @@
 			>
 				刷新
 			</ElButton>
-			<ElTooltip content="打开内核缓存目录">
+			<ElTooltip
+				placement="top"
+				content="打开内核缓存目录"
+			>
 				<ElButton
 					:icon="Folder"
 					size="small"
@@ -507,23 +545,24 @@
 		Tools,
 		MagicStick,
 		SetUp,
-		Folder
+		Folder,
+		CopyDocument
 	} from "@element-plus/icons-vue";
-	import { reactive, onBeforeUnmount, onMounted, ref } from "vue";
-	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
+	import { reactive, onBeforeUnmount, onMounted, ref, toRaw } from "vue";
+	import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } 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 { ElMessage, ElMessageBox, ElTooltip } from "element-plus";
+	import { getCurrentWindow, type Window } from "@tauri-apps/api/window";
+	import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
 	import etWindows from "@/composables/windows";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
-	import { readDir, exists, mkdir, BaseDirectory, readTextFile } from "@tauri-apps/plugin-fs";
+	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile } from "@tauri-apps/plugin-fs";
 	import { updateConfigJson } from "~/composables/configJson";
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
 	import { sortedUniq, uniq } from "lodash-es";
-	import { bounce, addQQGroup, supportProtocols } from "~/utils";
+	import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ } from "~/utils";
 	import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
 	import { getServerArgs } from "@/composables/server";

@@ -536,6 +575,7 @@
 			await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
 			await invoke("stop_command", { child_id: data.winipBcPid || 0 });
 			await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
+			await stopPreventSleep(); //关闭防休眠
 		},
 		async () => {
 			await handleConnection();
@@ -548,6 +588,7 @@
 	// console.error(config);
 	const protocols = supportProtocols();
 	const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
+		hasNewVersion: false, //easytierGame有没有新版
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
@@ -586,13 +627,24 @@
 		data: ""
 	});

+	const copyServerUrl = async (serverUrl: string) => {
+		const [err, _] = await ATJ(writeText(serverUrl));
+
+		if (!err) {
+			ElMessage.success("地址已复制");
+		} else {
+			console.error(err);
+			ElMessage.success("复制失败");
+		}
+	};
+
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
 			appWindow.onCloseRequested(async event => {
 				// console.error(appWindow.label);
 				if (!is_close) {
-					// console.error(1);
+					// console.error(1);s
 					event.preventDefault();
 					appWindow.hide();
 				}
@@ -644,6 +696,17 @@
 		mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers]);
 	};

+	// 手动触发持久化数据
+	const persist = async (appWindow: Window) => {
+		try {
+			appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
+			mainStore.$persist();
+		} catch (err) {
+			console.error(err);
+			ElMessage.error("手动持久数据失败");
+		}
+	};
+
 	const listenObj: { [key: string]: any } = {
 		unListenOutPut: null,
 		unListenThreadId: null,
@@ -668,9 +731,9 @@
 							mainStore.config.ipv4 = configIpv4;
 						}
 					}
-					if (event.payload.includes("peer connection removed")) {
-						data.isSuccessGetIp = false;
-					}
+					// if (event.payload.includes("peer connection removed")) {
+					// 	data.isSuccessGetIp = false;
+					// }
 					if (event.payload.includes("new peer connection added") && !data.isSuccessGetIp) {
 						await setTrayRunState(tray, true);
 						data.isSuccessGetIp = true;
@@ -737,15 +800,19 @@
 		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 } });
+				if (mainStore.config.enablePreventSleep) {
+					preventSleep();
+				} else {
+					stopPreventSleep();
+				}
+				persist(appWindow);
 			});
 			const unListen2 = mainStore.$subscribe(() => {
-				appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
-			})
+				persist(appWindow);
+			});
 			this.unListenConfigStart = [unListen, unListen2];
 		},
 		async listenStartStopServer() {
@@ -795,7 +862,7 @@
 			const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1];
 			if (version && currentVersion != version) {
 				// console.error({ currentVersion, latestVersion });
-				ElMessage.success(`更新 -> ${version}`);
+				ElMessage.success(`变更为 -> ${version}`);
 				return [true, downloadUrl, versionFileName];
 			} else if (currentVersion === version) {
 				ElMessage.success(`当前版本无需安装`);
@@ -885,9 +952,11 @@
 		const path = import.meta.env.VITE_CONFIG_FILE_NAME;
 		const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
 		if (isExists) {
-			const guiJsonStr = await readTextFile(path, { baseDir: BaseDirectory.Resource });
-			if (guiJsonStr) {
+			const guiJsonStrUint8 = await readFile(path, { baseDir: BaseDirectory.Resource });
+			if (guiJsonStrUint8) {
 				try {
+					const decoder = new TextDecoder("utf-8");
+					const guiJsonStr = decoder.decode(guiJsonStrUint8);
 					const regex = /^(\s*\/\/.*)/gm;
 					const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm;
 					const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1");
@@ -917,16 +986,16 @@
 					}
 				} catch (err) {
 					console.error(err);
-					ElMessage.error(`config.json格式错误`);
+					ElMessage.error(`config.json格式或编码错误`);
 				} finally {
-					mainStore.$patch({
-						createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
-					});
+					// mainStore.$patch({
+					// 	createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
+					// });
 				}
 			}
 		}
 		const b = bounce(600);
-		mainStore.$subscribe((...a) => {
+		mainStore.$subscribe(async (...a) => {
 			if (mainStore.createConfigInEasytier) {
 				b(async () => {
 					await updateConfigJson(data.configJsonSeverUrl);
@@ -949,6 +1018,12 @@
 		}
 	};

+	const initPreventSleep = async () => {
+		if (mainStore.config.enablePreventSleep) {
+			preventSleep();
+		}
+	};
+
 	const mountedShow = async () => {
 		const args = await getMatches();
 		if (!args.args?.["task-auto-start"]?.value) {
@@ -960,6 +1035,7 @@

 	let logsTimer: NodeJS.Timeout | null = null;
 	let serverLogsTimer: NodeJS.Timeout | null = null;
+	let cidrTimer: NodeJS.Timeout | null = null;

 	onMounted(async () => {
 		await initGuiJson();
@@ -974,8 +1050,10 @@
 		await initConfigDir();
 		await initAutoStartServer();
 		await initConnectAfterStart();
+		initPreventSleep();
 		mountedShow(); // 不需要await
 		closePrevent();
+		data.hasNewVersion = await checkNewVersion();
 	});

 	onBeforeUnmount(() => {
@@ -986,6 +1064,8 @@
 		listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
 		logsTimer && clearInterval(logsTimer);
 		serverLogsTimer && clearInterval(serverLogsTimer);
+		cidrTimer && clearInterval(cidrTimer);
+		stopPreventSleep();
 	});

 	const getArgs = async () => {
@@ -1031,13 +1111,13 @@
 			args.push("--network-secret", config.networkPassword);
 		}
 		if (config.ipv4) {
-			args.push("--ipv4", config.ipv4);
+			args.push("--ipv4", config.ipv4.trim());
 		}
 		if (config.serverUrl) {
 			const formatUrl = config.serverUrl.replace(/\\/g, "/");
 			args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
 		}
-		if (config.enableCustonProtocol) {
+		if (config.enableCustomProtocol) {
 			const includes = config.protocol.includes(config.customProtocol);
 			if (includes) {
 				args.push("--default-protocol", config.customProtocol);
@@ -1062,17 +1142,22 @@
 				args.push("-l", ...customListener);
 			}
 		}
+		if (!config.disbleListenner && config.enableCustomListenerV6 && config.customListenerV6Data) {
+			args.push("--ipv6-listener", config.customListenerV6Data);
+		}
 		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;
-			const formatProxyNetworks = config.proxyNetworks
-				.split("\n")
-				.map(item => item.trim())
-				.filter(item => item && reg.test(item));
-			args.push("--proxy-networks", ...formatProxyNetworks);
+			let formatProxyNetworks = config.proxyNetworks.trim().split("\n");
+			const newformatProxyNetworks = formatProxyNetworks
+				.map(el => el.trim())
+				.filter(cidr => {
+					return /^\d+\.\d+\.\d+\.\d+\/\d+$/g.test(cidr);
+				});
+			if (newformatProxyNetworks.length > 0) {
+				args.push("--proxy-networks", ...newformatProxyNetworks);
+			}
 			config.proxyNetworks = formatProxyNetworks.join("\n");
 		}
 		if (config.disableEncryption) {
@@ -1105,6 +1190,9 @@
 		if (config.devName && config.devNameValue) {
 			args.push("--dev-name", config.devNameValue);
 		}
+		if (config.compression && config.compression != "none") {
+			args.push("--compression", config.compression);
+		}
 		return args;
 	};

@@ -1150,7 +1238,6 @@
 			data.startLoading = true;
 			await unListenAll();
 			await listenObj.listenOutput();
-
 			await invoke("run_command", {
 				args
 			});
@@ -1182,25 +1269,83 @@
 		if (command === "share_config") {
 			try {
 				const {
-					proxyNetworks,
-					autoStart,
-					connectAfterStart,
+					protocol,
+					serverUrl,
+					networkName,
+					networkPassword,
+					dhcp,
+					disableIpv6,
+					disbleP2p,
+					enableCustomProtocol,
+					customProtocol,
+					disbleListenner,
+					port,
+					enableCustomListener,
+					customListenerData,
+					enableCustomListenerV6,
+					customListenerV6Data,
+					devName,
+					devNameValue,
+					enableNetCardMetric,
+					netCardMetricValue,
+					disableEncryption,
 					multiThread,
-					hostname,
-					enablExitNode,
-					useSmoltcp,
-					saveErrorLog,
-					logLevel,
-					ipv4,
-					...otherConfig
+					latencyfirst,
+					disableUdpHolePunching,
+					relayAllPeerrpc,
+					compression,
+					enablePreventSleep
 				} = mainStore.config;
-				const WT = btoa(encodeURIComponent(JSON.stringify({ config: otherConfig })));
+				const WT = btoa(
+					encodeURIComponent(
+						JSON.stringify({
+							config: {
+								protocol,
+								serverUrl,
+								networkName,
+								networkPassword,
+								dhcp,
+								disableIpv6,
+								disbleP2p,
+								enableCustomProtocol,
+								customProtocol,
+								disbleListenner,
+								port,
+								enableCustomListener,
+								customListenerData,
+								enableCustomListenerV6,
+								customListenerV6Data,
+								devName,
+								devNameValue,
+								enableNetCardMetric,
+								netCardMetricValue,
+								disableEncryption,
+								multiThread,
+								latencyfirst,
+								disableUdpHolePunching,
+								relayAllPeerrpc,
+								compression,
+								enablePreventSleep
+							}
+						})
+					)
+				);
 				await writeText(WT);
+				await ElConfirmPrimary(
+					`{action} 虚拟网IP，主机名，子网代理，为子网代理启用smoltcp堆栈，开机自启，软件启动自动联机，出口节点，不生成Tun网卡，错误日志相关配置`,
+					"提示",
+					{
+						confirmButtonText: "知道了",
+						showCancelButton: false,
+						action: "不会分享"
+					}
+				);
 				ElMessage.success("配置已复制");
 			} catch (err) {
 				console.error(err);
 				ElMessage.error("分享失败");
 			}
+			
 		}
 		if (command === "import_config") {
 			importConfigData.data = "";
@@ -1218,6 +1363,7 @@
 		});
 		if (!err) {
 			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
+			payload.config.serverUrl = payload?.config?.serverUrl?.trim() || config.serverUrl;
 			mainStore.$patch({
 				config: {
 					...mainStore.config,
@@ -1226,7 +1372,7 @@
 			});
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
-			mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
+			mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers].filter(el => el.trim()));
 		} else {
 			console.error(err);
 			if (err !== "cancel") {
@@ -1317,8 +1463,13 @@
 			},
 			(_, appWindow) => {
 				data.cidrVisible = true;
+				cidrTimer && clearInterval(cidrTimer);
+				cidrTimer = setInterval(() => {
+					appWindow.emitTo({ kind: "WebviewWindow", label: "cidr" }, "route", data.isStart);
+				}, 1000);
 			},
 			() => {
+				cidrTimer && clearInterval(cidrTimer);
 				data.cidrVisible = false;
 			}
 		);
@@ -16,8 +16,8 @@
 	});

 	const listenStart = async () => {
-		const unListen = await listen("logs", event => {
-			data.log = (event.payload as string) || "";
+		const unListen = await listen<string>("logs", event => {
+			data.log = event.payload || "";
 		});
 		return unListen;
 	};
@@ -1,7 +1,12 @@
 <template>
-	<div class="overflow-auto h-full">
+	<div class="h-full overflow-auto">
 		<div class="w-[1200px]">
-			<span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span>
+			<ElText
+				size="small"
+				v-if="!data.member || data.member.length <= 0"
+			>
+				{{ "等待成员信息中..." }}
+			</ElText>
 			<ElTable
 				stripe
 				border
@@ -11,25 +16,30 @@
 				<ElTableColumn
 					sortable
 					width="140"
-					label="主机名"
+					label="成员名"
 					prop="hostname"
 				>
-					<template #default="{row}">
-						{{ (row.hostname || "").toLowerCase().includes('publicserver') ? (row.hostname || "").replace("PublicServer", "服务器") : (row.hostname || "-") }}
+					<template #default="{ row }">
+						{{
+							(row.hostname || "").toLowerCase().includes("publicserver")
+								? (row.hostname || "").replace("PublicServer", "服务器")
+								: row.hostname || "-"
+						}}
 					</template>
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
 					width="90"
 					prop="cost"
-					label="路由"
+					label="方式"
 				>
 					<template #default="{ row }">
 						<ElTag
+							size="small"
 							effect="dark"
 							:type="row.cost == 'p2p' ? 'success' : 'info'"
 						>
-							{{ row.cost }}
+							{{ row.cost ? row.cost.replace("relay", "中转") : row.cost }}
 						</ElTag>
 					</template>
 				</ElTableColumn>
@@ -42,12 +52,12 @@
 				<ElTableColumn
 					sortable
 					prop="lat_ms"
-					width="130"
+					width="100"
 					label="延迟/ms"
 				></ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					width="100"
 					prop="loss_rate"
 					label="丢包率"
 				>
@@ -57,7 +67,7 @@
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					width="110"
 					label="NAT类型"
 					prop="nat_type"
 				>
@@ -67,17 +77,19 @@
 				</ElTableColumn>
 				<ElTableColumn
 					sortable
-					width="120"
+					width="122"
 					prop="version"
 					label="版本"
 				></ElTableColumn>
 				<ElTableColumn
 					sortable
+					width="100"
 					prop="tunnel_proto"
 					label="隧道协议"
 				></ElTableColumn>
 				<ElTableColumn
 					sortable
+					width="90"
 					prop="rx_bytes"
 					label="接收"
 				></ElTableColumn>
@@ -93,9 +105,9 @@
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	import { ATJ, parsePeerInfo } from "@/utils";
+	import { ATJ, parseCliInfo } from "@/utils";
 	import { ElConfirmDanger } from "~/utils/element";
-import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
 	// 	enum NatType {
 	//   // has NAT; but own a single public IP, port is not changed
 	//   Unknown = 0;
@@ -123,7 +135,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 	};
 	type natKyes = keyof typeof natMaps;

-	const data = reactive<{ member: {hostname: string, cost: string, ipv4: string, lat_msg: string, loss_rate: string, nat_type: string}[] }>({
+	const data = reactive<{ member: { hostname: string; cost: string; ipv4: string; lat_msg: string; loss_rate: string; nat_type: string }[] }>({
 		member: []
 	});

@@ -136,8 +148,8 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 		["nat_type", "NAT类型"],
 		["version", "版本"],
 		["tunnel_proto", "隧道协议"],
-		['rx_bytes', '接收'],
-		['tx_bytes', '传输']
+		["rx_bytes", "接收"],
+		["tx_bytes", "传输"]
 	];

 	let timer: NodeJS.Timeout | null = null;
@@ -164,7 +176,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 			}
 			return;
 		}
-		const peerInfo = parsePeerInfo(member);
+		const peerInfo = parseCliInfo(member);
 		peerInfo.forEach(value => {
 			if (value.cost === "Local") {
 				value.cost = "本机";
@@ -188,7 +200,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 	const stopTimer = () => {
 		timer && clearTimeout(timer);
 		timer = null;
-	}
+	};

 	onMounted(async () => {
 		await listenOutput();
@@ -8,7 +8,7 @@
 			<ElTabPane
 				label="联机失败解决办法"
 				name="netcard"
-				class="flex flex-col h-full"
+				class="flex h-full flex-col"
 			>
 				<div>
 					<div>
@@ -23,7 +23,7 @@
 						</ElTooltip>
 					</div>
 					<ElLink
-						class="!text-[15px] mr-[10px]"
+						class="mr-[10px] !text-[15px]"
 						type="info"
 						:underline="false"
 						@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
@@ -41,14 +41,102 @@
 					></ElSwitch>
 				</div>
 				<div>
-					<ElTooltip content="设置网卡的跃点，提升网卡优先级，尝试将您联机使用的网卡跃点设置为最小，请先查询网卡信息">
+					<ElTooltip
+						content="使用ForceBindIP启动应用 (强制绑定IP或者网卡)，如果还有没启动联机，请先启动联机，联机成功后，点击刷新获取easytier生成的网卡"
+					>
 						<ElText>
 							方案2
 							<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
 						</ElText>
 					</ElTooltip>
 				</div>
-				<div class="flex items-center mt-[5px]">
+				<div>
+					<div>
+						<ElLink
+							class="!text-[15px]"
+							type="info"
+							:underline="false"
+							@click="open('https://r1ch.net/projects/forcebindip')"
+						>
+							ForceBindIP
+						</ElLink>
+					</div>
+					<div>
+						<ElRadioGroup
+							class="mr-[30px]"
+							v-model="mainStore.forceBindIpBit"
+						>
+							<ElRadio
+								label="32位"
+								value="32"
+							></ElRadio>
+							<ElRadio
+								label="64位"
+								value="64"
+							></ElRadio>
+						</ElRadioGroup>
+						<ElTooltip
+							placement="top"
+							content="如果目标应用程序在启动时崩溃或出现其他意外行为，请尝试开启它，ForceBindIP 加载程序将等待应用程序进入其消息循环后再注入拦截 DLL"
+						>
+							<ElCheckbox
+								v-model="mainStore.delayInjectDll"
+								label="延迟注入DLL"
+							></ElCheckbox>
+						</ElTooltip>
+					</div>
+					<div class="flex items-center gap-[5px]">
+						<ElSelect
+							placeholder="请输入IP地址或选择网卡"
+							v-model="mainStore.forceBindInput"
+							filterable
+							allow-create
+							no-data-text="暂无网卡数据，请尝试刷新"
+						>
+							<ElOption
+								v-for="guid in data.guids"
+								:key="guid[0]"
+								:label="guid[1]"
+								:value="guid[0]"
+							></ElOption>
+						</ElSelect>
+						<ElButton @click="getGuids">刷新</ElButton>
+					</div>
+					<div class="mt-[5px] flex items-center gap-[5px]">
+						<ElInput
+							placeholder="请选择或输入应用程序路径"
+							:disabled="data.forceBindStart"
+							v-model="mainStore.forceBindFile"
+						></ElInput>
+						<div class="flex items-center">
+							<ElButton
+								@click="handleBrowser"
+								:disabled="data.forceBindStart"
+							>
+								浏览
+							</ElButton>
+							<ElButton
+								:disabled="data.forceBindStart"
+								@click="startForceBindIp"
+								type="primary"
+							>
+								启动
+							</ElButton>
+						</div>
+					</div>
+				</div>
+				<div>
+					<!-- const guids = await invoke<string[]>("get_network_adapter_guids"); -->
+				</div>
+				<div>
+					<ElTooltip content="设置网卡的跃点，提升网卡优先级，尝试将您联机使用的网卡跃点设置为最小，请先查询网卡信息">
+						<ElText>
+							方案3
+							<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
+						</ElText>
+					</ElTooltip>
+				</div>
+				<div class="mt-[5px] flex items-center">
 					<ElButton
 						@click="initNetCardInfo"
 						size="small"
@@ -58,7 +146,7 @@
 					</ElButton>
 					<div
 						v-if="data.row.name"
-						class="ml-auto flex items-center flex-nowrap gap-[10px]"
+						class="ml-auto flex flex-nowrap items-center gap-[10px]"
 					>
 						<ElTooltip content="跃点越小，网卡优先级越高，范围(1-9999)">
 							<ElInput
@@ -78,7 +166,7 @@
 						</ElButton>
 					</div>
 				</div>
-				<div class="flex-1 overflow-auto mt-[5px]">
+				<div class="mt-[5px] flex-1 overflow-auto">
 					<ElTable
 						height="100%"
 						empty-text="暂无数据"
@@ -103,7 +191,7 @@
 			<ElTabPane
 				label="防火墙"
 				name="firewall"
-				class="flex flex-col h-full"
+				class="flex h-full flex-col"
 			>
 				<div class="flex flex-col items-center">
 					<div class="mb-[10px]">
@@ -113,6 +201,13 @@
 						>
 							一键关闭防火墙
 						</ElButton>
+						<ElButton
+							@click="handleCustomFireWall"
+							type="danger"
+							size="small"
+						>
+							自定义防火墙策略
+						</ElButton>
 					</div>
 					<div class="mb-[10px]">
 						<ElText class="!mx-[10px]">域防火墙</ElText>
@@ -176,6 +271,7 @@
 </template>
 <script setup lang="ts">
 	import { open, Command } from "@tauri-apps/plugin-shell";
+	import { open as dialogOpen } from "@tauri-apps/plugin-dialog";
 	import { ElMessage, type TabPaneName } from "element-plus";
 	import { QuestionFilled } from "@element-plus/icons-vue";
 	import { onMounted, reactive } from "vue";
@@ -183,9 +279,11 @@
 	import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
 	import { isValidIP } from "~/utils";
 	import { dataSubscribe } from "~/composables/windows";
+	import { invoke } from "@tauri-apps/api/core";
+	import { BaseDirectory, exists } from "@tauri-apps/plugin-fs";

 	const mainStore = useMainStore();
-	const data = reactive({
+	const data = reactive<{ guids: string[][]; [key: string]: any }>({
 		activeTab: "netcard",
 		winipBcPid: 0,
 		pingNum: 1,
@@ -202,9 +300,15 @@
 			name: "",
 			metric: ""
 		},
-		netcardList: []
+		netcardList: [],
+		guids: [],
+		forceBindStart: false
 	});

+	const handleCustomFireWall = async () => {
+		await open("wf.msc");
+	}
+
 	const handleTabsChange = async (tabPaneName: TabPaneName) => {
 		if (tabPaneName === "netcard") {
 			// await initNetCardInfo();
@@ -328,17 +432,78 @@
 		}
 	};

+	const handleBrowser = async () => {
+		const file = await dialogOpen({
+			multiple: false,
+			directory: false
+		});
+		if (file) {
+			mainStore.forceBindFile = file;
+		} else {
+			ElMessage.error("获取文件路径失败");
+		}
+	};
+
+	const startForceBindIp = async () => {
+		if (!mainStore.forceBindInput) {
+			return ElMessage.error("请输入IP地址或者选择一个网卡");
+		}
+		if (!mainStore.forceBindFile) {
+			return ElMessage.error("请选择一个执行文件");
+		}
+
+		const forceBindIpExe = mainStore.forceBindIpBit == "32" ? "ForceBindIP" : "ForceBindIP64";
+		const isExists = await exists(`easytier/tool/${forceBindIpExe}.exe`, { baseDir: BaseDirectory.Resource });
+		if (!isExists) {
+			return ElMessage.error("forcebindIP文件不存在");
+		}
+
+		data.forceBindStart = true;
+		try {
+			const dealyDll = mainStore.delayInjectDll ? "-i" : "";
+			const child = await Command.create(
+				forceBindIpExe,
+				[dealyDll, mainStore.forceBindInput, mainStore.forceBindFile.replace(/\//g, "\\")].filter(el => el),
+				{
+					encoding: "gb2312"
+				}
+			).spawn();
+			// console.log({child});
+		} catch (err) {
+			ElMessage.error("forcebindIP启动发生未知错误");
+			console.error(err);
+		} finally {
+			data.forceBindStart = false;
+		}
+	};
+
 	dataSubscribe(async (...a) => {
 		return {
 			winIpBcAutoStart: mainStore.winIpBcAutoStart,
 			winipBcStart: mainStore.winipBcStart,
 			winipBcPid: mainStore.winipBcPid,
+			forceBindIpBit: mainStore.forceBindIpBit,
+			delayInjectDll: mainStore.delayInjectDll,
+			forceBindInput: mainStore.forceBindInput,
+			forceBindFile: mainStore.forceBindFile,
 			config: { ...mainStore.config }
 		};
 	});

+	const getGuids = async () => {
+		const guids = await invoke<string[][]>("get_network_adapter_guids");
+		data.guids = guids && guids.length > 0 ? guids : [];
+		if (mainStore.forceBindInput.startsWith("{")) {
+			const has = data.guids.find(el => el[0] == mainStore.forceBindInput);
+			if (!has) {
+				mainStore.forceBindInput = "";
+			}
+		}
+	};
+
 	onMounted(() => {
 		data.pingIp = mainStore.config.ipv4;
 		initStartWinIpBroadcast();
+		getGuids();
 	});
 </script>
@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.2.9"
+version = "1.3.7"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -8,7 +8,7 @@ authors = ["leizi97"]
 license = "LICENSE"

 edition = "2021"
-rust-version = "1.77.2"
+# rust-version = "1.77.2"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@@ -18,38 +18,41 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]

 [build-dependencies]
-tauri-build = { version = "2.0.3", features = [] }
+tauri-build = { version = "2.0.5", features = [] }
 # prost-build = "0.13.2"

 [dependencies]
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-log = "0.4"
-tauri = { version = "2.1.1", features = [
+serde_json = "1.0.135"
+serde = { version = "1.0.217", features = ["derive"] }
+log = "0.4.25"
+tauri = { version = "2.2.2", features = [
    "tray-icon",
    "image-png",
    "image-ico",
+    "devtools"
 ] }

-tauri-plugin-log = "2.0.2"
-tauri-plugin-shell = "2.0.2"
-reqwest = { version = "0.12", features = ["json"] }
-zip = "2.2.0"
-sysinfo = '0.32.0'
+tauri-plugin-log = "2.2.0"
+tauri-plugin-shell = "2.2.0"
+reqwest = { version = "0.12.12", features = ["json"] }
+zip = "2.2.2"
+sysinfo = '0.33.1'
 planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
 whoami = "1.5.2"
-tauri-plugin-fs = "2"
-tauri-plugin-clipboard-manager = "2.0.2"
-tokio = { version = "1.41.1", features = ["process"] }
+tauri-plugin-fs = "2.2.0"
+tauri-plugin-clipboard-manager = "2.2.0"
+rand = "0.8.5"
+tokio = { version = "1.43.0", features = ["process"] }
+tauri-plugin-dialog = "2.2.0"
 # prost = "0.13"
 # prost-types = "0.13"
-
+hashbrown = "0.15.2"

 [dependencies.windows]
 version = "0.58.0"
-features = ["Win32_System_TaskScheduler"]
+features = ["Win32_System_TaskScheduler", "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"
-tauri-plugin-single-instance = "2.0.1"
-tauri-plugin-window-state = "2"
+tauri-plugin-cli = "2.2.0"
+tauri-plugin-single-instance = "2.2.1"
+tauri-plugin-window-state = "2.2.0"
@@ -1,103 +1,115 @@
 {
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "enables the default permissions",
-  "windows": [
-    "main",
-    "log",
-    "member",
-    "cidr",
-    "advance",
-    "tool",
-    "server"
-  ],
-  "permissions": [
-    "core:default",
-    "core:window:allow-minimize",
-    "core:window:allow-hide",
-    "core:window:allow-close",
-    "core:window:allow-set-focus",
-    "core:window:allow-is-visible",
-    "shell:allow-open",
-    "core:window:allow-show",
-    "core:window:allow-create",
-    "core:window:allow-set-position",
-    "core:window:allow-destroy",
-    "core:webview:allow-create-webview-window",
-    "core:webview:allow-set-webview-size",
-    "core:webview:allow-set-webview-position",
-    "core:webview:allow-create-webview",
-    "core:webview:allow-webview-show",
-    "core:webview:allow-webview-hide",
-    "core:webview:allow-webview-close",
-    "core:tray:allow-get-by-id",
-    "core:tray:allow-set-icon",
-    "core:tray:allow-new",
-    {
-      "identifier": "shell:allow-spawn",
-      "allow": [
-        {
-          "args": [
-            "run"
-          ],
-          "cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
-          "name": "WinIPBroadcast"
-        }
-      ]
-    },
-    {
-      "identifier": "shell:allow-execute",
-      "allow": [
-        {
-          "args": [
-            "run"
-          ],
-          "cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
-          "name": "WinIPBroadcast"
-        },
-        {
-          "args": true,
-          "cmd": "$RESOURCE/easytier/tool/nssm",
-          "name": "nssm"
-        },
-        {
-          "args": true,
-          "cmd": "explorer",
-          "name": "explorer"
-        },
-        {
-          "args": true,
-          "cmd": "netsh",
-          "name": "netsh"
-        },
-        {
-          "args": true,
-          "cmd": "ping",
-          "name": "ping"
-        }
-      ]
-    },
-    "fs:default",
-    "fs:allow-read-dir",
-    "fs:allow-exists",
-    "fs:allow-open",
-    "fs:allow-resource-read",
-    "fs:allow-resource-read-recursive",
-    "fs:allow-resource-write",
-    "fs:allow-resource-write-recursive",
-    "clipboard-manager:allow-clear",
-    "clipboard-manager:allow-read-text",
-    "clipboard-manager:allow-write-text",
-
-    "window-state:default",
-    "window-state:allow-save-window-state",
-    "window-state:allow-restore-state",
-
-    
-    "cli:default",
-    "cli:allow-cli-matches",
-
-    "log:default",
-    "log:allow-log"
-  ]
+	"$schema": "../gen/schemas/desktop-schema.json",
+	"identifier": "default",
+	"description": "enables the default permissions",
+	"windows": ["main", "log", "member", "cidr", "advance", "tool", "server"],
+	"permissions": [
+		"core:default",
+		"core:window:allow-minimize",
+		"core:window:allow-unminimize",
+		"core:window:allow-hide",
+		"core:window:allow-close",
+		"core:window:allow-set-focus",
+		"core:window:allow-is-visible",
+		"shell:allow-open",
+		"core:window:allow-show",
+		"core:window:allow-create",
+		"core:window:allow-set-position",
+		"core:window:allow-destroy",
+		"core:webview:allow-create-webview-window",
+		"core:webview:allow-set-webview-size",
+		"core:webview:allow-set-webview-position",
+		"core:webview:allow-create-webview",
+		"core:webview:allow-webview-show",
+		"core:webview:allow-webview-hide",
+		"core:webview:allow-webview-close",
+		"core:tray:allow-get-by-id",
+		"core:tray:allow-set-icon",
+		"core:tray:allow-new",
+		{
+			"identifier": "shell:allow-spawn",
+			"allow": [
+				{
+					"args": ["run"],
+					"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
+					"name": "WinIPBroadcast"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
+					"name": "ForceBindIP"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
+					"name": "ForceBindIP64"
+				}
+			]
+		},
+		{
+			"identifier": "shell:allow-execute",
+			"allow": [
+				{
+					"args": ["run"],
+					"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
+					"name": "WinIPBroadcast"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
+					"name": "ForceBindIP"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
+					"name": "ForceBindIP64"
+				},
+				{
+					"args": true,
+					"cmd": "$RESOURCE/easytier/tool/nssm",
+					"name": "nssm"
+				},
+				{
+					"args": true,
+					"cmd": "explorer",
+					"name": "explorer"
+				},
+				{
+					"args": true,
+					"cmd": "wf.msc",
+					"name": "wf.msc"
+				},
+				{
+					"args": true,
+					"cmd": "netsh",
+					"name": "netsh"
+				},
+				{
+					"args": true,
+					"cmd": "ping",
+					"name": "ping"
+				}
+			]
+		},
+		"fs:default",
+		"fs:allow-read-dir",
+		"fs:allow-exists",
+		"fs:allow-open",
+		"fs:allow-resource-read",
+		"fs:allow-resource-read-recursive",
+		"fs:allow-resource-write",
+		"fs:allow-resource-write-recursive",
+		"clipboard-manager:allow-clear",
+		"clipboard-manager:allow-read-text",
+		"clipboard-manager:allow-write-text",
+		"window-state:default",
+		"window-state:allow-save-window-state",
+		"window-state:allow-restore-state",
+		"cli:default",
+		"cli:allow-cli-matches",
+		"log:default",
+		"log:allow-log",
+		"dialog:default",
+		"dialog:allow-open"
+	]
 }
@@ -9,6 +9,7 @@ use std::fs::{self, File};
 use std::io::{BufRead, BufReader, Write};
 use std::os::windows::process::CommandExt;
 use std::process::{Command, Stdio};
+use std::ptr;
 use std::sync::mpsc;
 use std::{path, thread};
 use sysinfo::System;
@@ -17,11 +18,109 @@ use tauri::Emitter;
 use tauri::Manager;
 use windows::core::{BSTR, VARIANT};
 use windows::Win32::Foundation::VARIANT_BOOL;
+use windows::Win32::NetworkManagement::IpHelper::{
+    GetAdaptersAddresses, GAA_FLAG_INCLUDE_PREFIX, IP_ADAPTER_ADDRESSES_LH,
+};
+use windows::Win32::Networking::WinSock::AF_UNSPEC;
 use windows::Win32::System::Com::*;
 use windows::Win32::System::TaskScheduler::*;
+// use std::ffi::CStr;

+use windows::Win32::System::Power::SetThreadExecutionState;
+use windows::Win32::System::Power::{
+    ES_CONTINUOUS, ES_DISPLAY_REQUIRED, ES_SYSTEM_REQUIRED, EXECUTION_STATE,
+};
+
+use rand::Rng;
 use tokio::process::Command as tokioCommand;

+#[tauri::command(rename_all = "snake_case")]
+fn get_network_adapter_guids() -> Vec<[String; 2]> {
+    let mut guids: Vec<[String; 2]> = Vec::new();
+    unsafe {
+        let mut buffer_length: u32 = 0;
+        let mut result = GetAdaptersAddresses(
+            AF_UNSPEC.0.into(),
+            GAA_FLAG_INCLUDE_PREFIX,
+            Some(ptr::null_mut()),
+            Some(ptr::null_mut()),
+            &mut buffer_length,
+        );
+
+        if result != 0 {
+            let mut buffer: Vec<u8> = vec![0; buffer_length as usize];
+            let adapter_addresses: *mut IP_ADAPTER_ADDRESSES_LH = buffer.as_mut_ptr() as *mut _;
+
+            result = GetAdaptersAddresses(
+                AF_UNSPEC.0.into(),
+                GAA_FLAG_INCLUDE_PREFIX,
+                Some(ptr::null_mut()),
+                Some(adapter_addresses),
+                &mut buffer_length,
+            );
+
+            if result == 0 {
+                let mut current_address = adapter_addresses;
+
+                while !current_address.is_null() {
+                    let adapter = &*current_address;
+
+                    let guid = adapter.AdapterName.to_string().unwrap();
+                    let desc = adapter.Description.to_string().unwrap();
+                    guids.push([guid, desc]);
+
+                    current_address = adapter.Next;
+                }
+            } else {
+                log::error!("GetAdaptersAddresses failed with error");
+            }
+        } else {
+            log::error!("GetAdaptersAddresses failed to retrieve buffer length with error");
+        }
+    }
+
+    return guids;
+}
+
+fn generate_random_user_agent() -> String {
+    let user_agents = vec![
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/{version} Safari/605.1.15",
+        "Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/{version} Mobile/15E148 Safari/604.1",
+        "Mozilla/5.0 (Linux; Android 10; SM-G973F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Mobile Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:{version}) Gecko/20100101 Firefox/{version}",
+    ];
+
+    let mut rng = rand::thread_rng();
+    let template = user_agents[rng.gen_range(0..user_agents.len())];
+
+    // 生成随机版本号
+    let version_major: u8 = rng.gen_range(70..90);
+    let version_minor: u8 = rng.gen_range(0..10);
+    let version_patch: u8 = rng.gen_range(0..10);
+    let version = format!("{}.{}.{}", version_major, version_minor, version_patch);
+
+    // 替换模板中的版本号占位符
+    template.replace("{version}", &version)
+}
+
+#[tauri::command(rename_all = "snake_case")]
+fn prevent_sleep() -> bool {
+    unsafe {
+        let result =
+            SetThreadExecutionState(ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_CONTINUOUS);
+        result != EXECUTION_STATE(0)
+    }
+}
+
+#[tauri::command(rename_all = "snake_case")]
+fn allow_sleep() -> bool {
+    unsafe {
+        let result = SetThreadExecutionState(ES_CONTINUOUS);
+        result != EXECUTION_STATE(0)
+    }
+}
+
 // 定义GitHub Release的结构体
 #[derive(Debug, Deserialize)]
 pub struct Release {
@@ -45,20 +144,61 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
    let client = Client::new();
    // 构建请求的URL
    let url = format!("https://api.github.com/repos/easytier/easytier/releases",);
-
+    let user_agent = generate_random_user_agent();
    // 发送HTTP GET请求
    let response = client
        .get(&url)
-        .header("User-Agent", "Tauri-fetch")
+        .header("User-Agent", user_agent)
        .send()
        .await?;
    // 反序列化响应体为Release列表
    response.json::<Vec<Release>>().await
 }

+#[tauri::command(rename_all = "snake_case")]
+async fn fetch_game_releases() -> [String; 2] {
+    // 创建HTTP客户端
+    let client = Client::new();
+    // 构建请求的URL
+    let url = format!("https://api.github.com/repos/Easytier/EasytierGame/releases",);
+    let user_agent = generate_random_user_agent();
+    // 发送HTTP GET请求
+    if let Ok(response) = client
+        .get(&url)
+        .header("User-Agent", user_agent)
+        .send()
+        .await
+    {
+        // 反序列化响应体为Release列表
+        match response.json::<Vec<Release>>().await {
+            Ok(releases) => {
+                if releases.len() <= 0 {
+                    return [String::from(""), String::from("")];
+                }
+                let release = releases.first().unwrap();
+                let tag_name = release.tag_name.as_str();
+                let browser_download_url = release
+                    .assets
+                    .first()
+                    .unwrap()
+                    .browser_download_url
+                    .as_str();
+                [String::from(tag_name), String::from(browser_download_url)]
+            }
+            Err(_e) => {
+                log::error!("game release {}", _e.to_string());
+                [String::from(""), String::from("")]
+            }
+        }
+    } else {
+        log::error!("failed to get game release");
+        [String::from(""), String::from("")]
+    }
+}
+
 #[tauri::command(rename_all = "snake_case")]
 fn get_core_version() -> String {
-    let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+    let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
    match Command::new(&core_path)
        .arg("--version")
        .creation_flags(0x08000000)
@@ -78,7 +218,7 @@ fn get_core_version() -> String {
 // #[tauri::command(rename_all = "snake_case")]
 // #[warn(dead_code)]
 // fn get_cli_version() -> String {
-//     let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
+//     let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
 //     match Command::new(&cli_path)
 //         .arg("--version")
 //         .creation_flags(0x08000000)
@@ -92,9 +232,10 @@ fn get_core_version() -> String {
 //     }
 // }

-fn get_tool_exe_path(path: String) -> String {
+fn get_tool_exe_path(path: &str) -> String {
    let cur_vec = get_exe_directory();
-    let tool_path = cur_vec[1].to_string() + &path.to_string();
+    let tool_path = format!("{}{}", cur_vec[1].as_str(), path);
+    // log::error!("tool path: {}", tool_path);
    return tool_path;
 }

@@ -132,7 +273,7 @@ struct MyResponse {

 #[tauri::command(rename_all = "snake_case")]
 async fn get_members_by_cli() -> String {
-    let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
+    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
    match tokioCommand::new(&cli_path)
        .arg("peer")
        .arg("list")
@@ -157,9 +298,35 @@ async fn get_members_by_cli() -> String {
    }
 }

+#[tauri::command(rename_all = "snake_case")]
+async fn get_route_by_cli() -> String {
+    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
+    match tokioCommand::new(&cli_path)
+        .arg("route")
+        .creation_flags(0x08000000)
+        .output()
+        .await
+    {
+        Ok(output) => {
+            if output.status.success() {
+                let output_str = String::from_utf8_lossy(&output.stdout);
+                return output_str.trim().to_string();
+            } else {
+                let output_str = String::from_utf8_lossy(&output.stderr);
+                log::error!("{}", output_str.trim().to_string());
+                return "_EasytierGameCliFailedToConnect_".to_string();
+            }
+        }
+        Err(_e) => {
+            log::error!("get route list error");
+            return "".to_string();
+        }
+    }
+}
+
 #[tauri::command(rename_all = "snake_case")]
 async fn download_easytier_zip(download_url: String, file_name: String) {
-    let cache_dir_path = get_tool_exe_path(String::from("\\easytier\\cache"));
+    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);
    if cache_file_name_path.exists() {
@@ -171,7 +338,7 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
    let response = reqwest::get(target)
        .await
        .expect("error to download easytier url");
-    let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+    let easytier_path = get_tool_exe_path("\\easytier");
    let file_path = format!("{}\\{}", easytier_path, file_name);
    println!("download easytier to {}", file_path);

@@ -238,7 +405,7 @@ fn unzip(fname: &path::Path) {
        //         fs::create_dir_all(p).unwrap();
        //     }
        // }
-        let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+        let easytier_path = get_tool_exe_path("\\easytier");
        let easytier_dir = path::Path::new(&easytier_path);
        // if !easytier_dir.exists() {
        //     fs::create_dir_all(&easytier_dir).unwrap();
@@ -270,7 +437,7 @@ fn run_command(app_handle: tauri::AppHandle, args: Vec<String>, is_server: Optio
        command_output_str = "server-command-output";
    }
    thread::spawn(move || {
-        let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+        let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
        // trace, debug, info, warn, error, off
        let mut child = Command::new(&core_path)
            .args(args)
@@ -356,20 +523,17 @@ async fn fetch_easytier_list() -> Vec<Vec<[String; 3]>> {
            }
            release_list.push(assets_list);
        }
-        return release_list;
+        release_list
    } else {
-        return Vec::new();
+        Vec::new()
    }
 }

 fn toggle_window_visibility<R: tauri::Runtime>(app: &tauri::AppHandle<R>) {
    if let Some(window) = app.get_webview_window("main") {
-        if window.is_visible().unwrap_or_default() {
-            let _ = window.hide();
-        } else {
-            let _ = window.show();
-            let _ = window.set_focus();
-        }
+        let _ = window.show();
+        let _ = window.unminimize();
+        let _ = window.set_focus();
    }
 }

@@ -554,6 +718,7 @@ pub fn run() {

    let context = tauri::generate_context!();
    tauri::Builder::default()
+        .plugin(tauri_plugin_dialog::init())
        .plugin(tauri_plugin_cli::init())
        .plugin(
            tauri_plugin_window_state::Builder::new()
@@ -573,7 +738,7 @@ pub fn run() {
        .setup(move |app| {
            // let args = args.clone();
            // if cfg!(debug_assertions) {
-            let log_path = get_tool_exe_path(String::from("\\easytier\\guiLogs"));
+            let log_path = get_tool_exe_path("\\easytier\\guiLogs");
            app.handle().plugin(
                tauri_plugin_log::Builder::default()
                    .target(tauri_plugin_log::Target::new(
@@ -589,7 +754,7 @@ pub fn run() {
            // }
            #[cfg(not(target_os = "android"))]
            let _tray_menu = TrayIconBuilder::with_id("main")
-                .menu_on_left_click(false)
+                .show_menu_on_left_click(false)
                .on_tray_icon_event(|tray, event| {
                    if let TrayIconEvent::Click {
                        button: MouseButton::Left,
@@ -621,12 +786,17 @@ pub fn run() {
            stop_command,
            get_core_version,
            fetch_easytier_list,
+            fetch_game_releases,
            download_easytier_zip,
            get_members_by_cli,
+            get_route_by_cli,
            search_pid_by_pname,
            get_exe_directory,
            spawn_autostart,
-            autostart_is_enabled
+            autostart_is_enabled,
+            prevent_sleep,
+            allow_sleep,
+            get_network_adapter_guids
        ])
        .run(context)
        .expect("error while running tauri application");
@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.2.9",
+	"version": "1.3.7",
 	"identifier": "com.tauri.easytier-game",

 	"build": {
@@ -13,7 +13,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.2.9",
+				"title": "easytier-game 1.3.7",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
@@ -53,13 +53,18 @@
 			"easytier/icons/",
 			"easytier/config_template.json",
 			"easytier/tool/WinIPBroadcast.exe",
+			"easytier/tool/ForceBindIP.exe",
+			"easytier/tool/ForceBindIP64.exe",
+			"easytier/tool/BindIP.dll",
+			"easytier/tool/BindIP64.dll",
 			"easytier/tool/MicrosoftEdgeWebview2Setup.exe",
 			"easytier/easytier-cli.exe",
 			"easytier/easytier-core.exe",
 			"easytier/Packet.dll",
 			"easytier/wintun.dll",
 			"easytier/clear_local_data.bat",
-			"帮助.txt"
+			"帮助.txt",
+			"uninstall.exe"
 		],
 		"windows": {
 			"webviewInstallMode": {
@@ -1,9 +1,9 @@
-import { defineStore } from "pinia";
-export default defineStore("main", {
+import { acceptHMRUpdate, defineStore } from "pinia";
+const store = defineStore("main", {
 	state() {
 		return {
 			config: {
-				protocol: ["tcp", "udp"], // 网络协议
+				protocol: ["tcp"], // 网络协议
 				serverUrl: "public.easytier.top:11010",
 				networkName: "",
 				networkPassword: "",
@@ -14,27 +14,31 @@ export default defineStore("main", {
 				connectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
 				port: "11010", // 监听端口号
-				enableCustomListener: false, // 是否自定义监听
-				customListenerData: "", // 自定义监听地址
+				enableCustomListener: true, // 是否自定义监听
+				customListenerV6Data: "udp://[::]:11010", //自定义ipv6监听
+				enableCustomListenerV6: true, // 是否自定义监听
+				customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
 				disbleListenner: false, // 是否禁用监听
-				disableEncryption: true, // 是否禁用加密
+				disableEncryption: false, // 是否禁用加密
 				multiThread: false, //使用多线程
 				enablExitNode: false, // 是否启用退出节点
 				noTun: false, // 是否使用TUN
 				latencyfirst: false, // 是否优先延迟
 				useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
 				disableUdpHolePunching: false, // 是否禁用UDP打洞
-				relayAllPeerrpc: false, // 是否启用所有对等RPC
+				relayAllPeerrpc: true, // 是否启用所有对等RPC
 				disbleP2p: false, // 是否使用P2P
 				dhcp: true, // 是否使用DHCP
 				saveErrorLog: true, // 是否保存错误日志
 				logLevel: "error", //日志等级
-				devName: false, //自定义网卡名
-				devNameValue: "", //自定义网卡名
-				enableCustonProtocol: false, //自定义默认协议
+				devName: true, //自定义网卡名
+				devNameValue: "etgame", //自定义网卡名
+				enableCustomProtocol: true, //自定义默认协议
 				customProtocol: "tcp", //自定义默认协议
-				enableNetCardMetric: false, //启用网卡自定义跃点
-				netCardMetricValue: 1 //自定义网卡跃点值
+				enableNetCardMetric: true, //启用网卡自定义跃点
+				netCardMetricValue: 1, //自定义网卡跃点值
+				enablePreventSleep: false, //组织系统休眠
+				compression: "none", //加密算法
 			},
 			serverConfig: {
 				enableWhiteList: true, // 是否启用白名单
@@ -45,7 +49,7 @@ export default defineStore("main", {
 				port: "11010" // 服务器端口
 			},
 			cidrEnable: false,
-			basePeers: ["public.easytier.top:11010"],
+			basePeers: ["public.easytier.top:11010","public.easytier.net:11010"],
 			theme: false, //主题  false light true dark
 			configStartEnable: false, //使用配置文件启动
 			configPath: "", //配置文件路径
@@ -53,6 +57,12 @@ export default defineStore("main", {
 			createConfigInEasytier: false, //在easytier目录生成config.json文件吗
 			githubFastUrl: "https://ghproxy.cc/",

+			// forceBindIp配置
+			forceBindIpBit: "64",
+			delayInjectDll: false,
+			forceBindInput: "",
+			forceBindFile: "",
+
 			winipBcPid: 0,
 			winipBcStart: false
 		};
@@ -70,7 +80,6 @@ export default defineStore("main", {
 			"config.autoStart",
 			"config.connectAfterStart",
 			"config.disableIpv6",
-			"config.disbleListenner",
 			"config.disableEncryption",
 			"config.multiThread",
 			"config.enablExitNode",
@@ -88,10 +97,17 @@ export default defineStore("main", {
 			"config.enableNetCardMetric",
 			"config.netCardMetricValue",
 			"config.port",
+			
+			"config.disbleListenner",
 			"config.enableCustomListener",
 			"config.customListenerData",
-			"config.enableCustonProtocol",
+			"config.enableCustomListenerV6",
+			"config.customListenerV6Data",
+
+			"config.enableCustomProtocol",
 			"config.customProtocol",
+			"config.enablePreventSleep",
+			"config.compression",

 			"serverConfig.autoStart",
 			// 'serverConfig.enableListener',
@@ -107,9 +123,16 @@ export default defineStore("main", {
 			"configPath",
 			"winIpBcAutoStart",
 			"createConfigInEasytier",
-			"githubFastUrl"
+			"githubFastUrl",
+
+			"forceBindIpBit",
+			"delayInjectDll",
+			"forceBindInput",
+			"forceBindFile"
 		]
 		// // 除了这些，其他都要存下来
 		// omit: ["winipBcPid", "winipBcStart"]
 	}
 });
+if (import.meta.hot) import.meta.hot.accept(acceptHMRUpdate(store, import.meta.hot));
+export default store;
@@ -1,8 +1,8 @@
 /** @type {import('tailwindcss').Config} */
 /** @type {import('tailwindcss/plugin')} */
-
-const plugin = require("tailwindcss/plugin");
-module.exports = {
+import plugin from "tailwindcss/plugin"
+// const plugin = require("tailwindcss/plugin");
+export default {
 	content: ["./components/**/*.{js,vue,ts}", "./layouts/**/*.vue", "./pages/**/*.vue", "./plugins/**/*.{js,ts}", "./app.vue", "./error.vue"],
 	theme: {
 		extend: {}
@@ -1,6 +1,9 @@
 interface ImportMetaEnv {
 	readonly VITE_CONFIG_PATH: string;
 	readonly VITE_CONFIG_FILE_NAME: string;
+	readonly VITE_LOG_PATH: string;
+	readonly VITE_CACHE_PATH: string;
+	readonly VITE_AUTO_START_SERVICE_NAME: string;
 }

 interface ImportMeta {
@@ -1,7 +1,7 @@
 import { ElMessageBox } from "element-plus";
 import { ATJ } from "./index";
 import { h, type VNode } from "vue";
-type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null }
+type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null, showCancelButton?:boolean }
 export const ElConfirmDanger = (
 	content: string,
 	title: string,
@@ -81,10 +81,11 @@ export const ElConfirmPrimary = (
 		action: "",
 		confirmButtonText: "确定",
 		cancelButtonText: "取消",
+		showCancelButton: true,
 		VNode: null
 	}
 ): Promise<any | [any, any]> => {
-	const { action = "", confirmButtonText = "确定", cancelButtonText = "取消", VNode = null } = opt;
+	const { action = "", confirmButtonText = "确定", cancelButtonText = "取消", VNode = null, showCancelButton = true } = opt;
 	const formatContentArr = content.split("{action}");
 	const action_length = formatContentArr.length - 1;
 	const messageArr = [];
@@ -103,6 +104,7 @@ export const ElConfirmPrimary = (
 		ElMessageBox.confirm(message, title, {
 			closeOnClickModal: false, // 点击遮罩层不关闭弹窗
 			closeOnPressEscape: false, // 按下Esc键不关闭弹窗
+			showCancelButton,
 			cancelButtonText,
 			confirmButtonText,
 			confirmButtonClass: "el-button--primary"
@@ -1,3 +1,4 @@
+import { invoke } from "@tauri-apps/api/core";
 import { open } from "@tauri-apps/plugin-shell";
 export const ENV = import.meta.env;

@@ -70,7 +71,23 @@ export const supportProtocols = () => {
 	return _supportProtocols.slice();
 }

-export const parsePeerInfo = (content: string) => {
+let _prevent_timer: NodeJS.Timeout| null = null;
+let _prevent_timer_count = 15; // 秒
+export const preventSleep = () => {
+	_prevent_timer && clearInterval(_prevent_timer);
+	_prevent_timer = setInterval(async () => {
+	    const result = await invoke('prevent_sleep');
+		// console.log(`trigger prevent sleep ${result}`);
+	}, _prevent_timer_count * 1000);
+}
+
+export const stopPreventSleep = async () => {
+	_prevent_timer && clearInterval(_prevent_timer);
+	_prevent_timer = null;
+	const _result = await invoke('allow_sleep');
+}
+
+export const parseCliInfo = (content: string) => {
 	if(!content) return [];
 	// 将表格字符串分割成行
 	const lines = content.split("\n");
@@ -1,5 +1,4 @@
 import useMainStore from "@/stores/index";
-import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
 import { open, Command } from "@tauri-apps/plugin-shell";
 import { invoke } from "@tauri-apps/api/core";

@@ -52,19 +51,3 @@ const handleAutoStartByNssm = async () => {
 		}
 	}
 };
-
-// 兼容autostart插件
-const compatibleAutoStart = async () => {
-    const config = useMainStore().config;
-	const is_enable = await tauriAutoStart.isEnabled();
-	if (is_enable) {
-		try {
-			await tauriAutoStart.disable();
-			config.autoStart = false;
-		} catch (err) {
-			// ElMessage.error(`取消自启失败`);
-		}
-	}
-	const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
-	console.log(serverStatus);
-};
@@ -1,14 +1,15 @@
 /**
 * 生成 release 发布包 zip 文件
 */
-
-const releaseDir = "./src-tauri/target/release";
+const pkg = require("./package.json");
+const isWin7 = process.argv[2] == 'win7';
+const releaseDir = isWin7 ? "./src-tauri/target/x86_64-win7-windows-msvc/release" : "./src-tauri/target/release";
+const fileName = isWin7 ?  `easytier-game_windows7_fix_${pkg.version}.zip` : `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
 const releaseDirEasytier = `${releaseDir}/easytier/`;
 const releaseExe = `${releaseDir}/easytier-game.exe`;
 const releaseHelp = `${releaseDir}/帮助.txt`;
+const releaseUninstall = `${releaseDir}/uninstall.exe`;
 const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
-const pkg = require("./package.json");
-const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
 const releaseZipDir = "./release";
 const releaseZip = `${releaseZipDir}/${fileName}`;

@@ -62,5 +63,6 @@ archive.pipe(output);
 archive
 	.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
 	.append(fs.createReadStream(path.join(__dirname, releaseHelp)), { name: "帮助.txt" })
+	.append(fs.createReadStream(path.join(__dirname, releaseUninstall)), { name: "uninstall.exe" })
 	.directory(path.join(__dirname, releaseDirEasytier), "easytier")
 	.finalize();
Author	SHA1	Message	Date
黑先森	41f58f1df6	重大结构更新 + 升级rust为1.8版本 + 升级tauri为最新版，以及其他包升级 + 现在构建分为window7和window7以上两种版本 + 优化分享配置弹窗遮盖问题 + 增加uninstall.exe（不会删除日志） + 增加windows.0.48.5.lib + 增加build.bat 内含windows7构建之前的操作	2025-01-16 16:53:51 +08:00
黑先森	0a17c269ea	这是一个测试分支，用于rust最新包更新与适配	2025-01-10 18:42:02 +08:00
黑先森	6fd3b999d7	修复安全漏洞	2025-01-09 10:33:42 +08:00
黑先森	3773e11b24	去除房间信息tooltip	2025-01-09 09:53:35 +08:00
黑先森	987541ab52	Merge branch 'dev_1.3.6_package_upgrade'	2025-01-08 15:04:57 +08:00
黑先森	d800a414c0	升级package,增强工具防火墙类别，新增自定义防火墙策略界面开启按钮	2025-01-08 12:12:00 +08:00
黑先森	922ba3f1ea	优化主界面文字说明，高级选项排版和文字说明	2025-01-06 20:00:47 +08:00
黑先森	a5954744a1	更新readme	2025-01-03 17:28:15 +08:00
黑先森	8ed652ee26	托盘菜单新增公共节点	2025-01-03 17:16:06 +08:00
黑先森	9d976707ac	增强工具内新增forceBindIP方案	2025-01-03 16:55:47 +08:00
黑先森	0b54a623a8	版本号 -> 1.3.5 + 优化字段信息	2025-01-03 11:42:52 +08:00
黑先森	7501a5661c	修复不启用config.json，但是本地存在config.json，无法取消勾选的bug，增加删除config.json的提示	2025-01-03 10:39:54 +08:00
黑先森	539092d769	升级nuxt -> 3.15.0 修复防止休眠无法停止的问题	2024-12-31 11:46:04 +08:00
黑先森	cefcc930b8	打包最新版easytier内核 2.1.1	2024-12-25 15:32:42 +08:00
黑先森	e7d92cce47	更新包版本，优化分享配置操作，增加不进行分享的配置提示 Cargo.toml + tauri-plugin-single-instance 2.2.0 + tauri-plugin-cli 2.2.0 + tauri-plugin-window-state 2.2.0 + tauri-plugin-fs 2.2.0 + tauri-plugin-log 2.2.0 + tauri-plugin-shell 2.2.0 package.json + "@tauri-apps/plugin-cli" -> ^2.2.0	2024-12-25 15:26:27 +08:00
黑先森	76bdec0e1d	修复自定义协议勾选后没持久化存储的bug	2024-12-21 17:53:55 +08:00
黑先森	997f3798ae	优化文字提示，修复压缩算法选择不生效问题	2024-12-20 22:29:04 +08:00
黑先森	f9e0b8e1db	新增 + 优化 + 高级选项增加2.1.0内核功能压缩算法和ipv6监听地址 + 增加服务器地址栏复制按钮 + 更新内核为最新版本 + config.json 新增压缩算法配置可参考 config_template.json	2024-12-20 16:10:57 +08:00
黑先森	582a4ab819	增加子网代理使用的判断	2024-12-19 17:23:28 +08:00
黑先森	0fde619516	优化对githubApi的请求，减少被过滤无法获取的情况发生	2024-12-19 17:11:03 +08:00
黑先森	410f0dc32b	新增+修复+优化 + 新增子网代理页面表格查看代理情况 + 修复子网代理启动联机被覆盖的bug + 优化部分代码逻辑	2024-12-19 16:41:09 +08:00
leizi97	e977c633d6	1.3.1发布	2024-12-17 22:44:02 +08:00
黑先森	3cbfae072c	增加easytierGame发布新版的提示	2024-12-17 17:48:11 +08:00
黑先森	9b856f31af	优化与修复 + 点击托盘只显示窗口，优化显示窗口逻辑，修复无法显示到最上层的问题 + 防止休眠代码优化，修复防止休眠选中后没保存的问题	2024-12-17 15:50:27 +08:00
黑先森	7d6e93d796	增加防止系统休眠功能修复winipboadcast关闭后再次打开又启动的bug，优化成员列表字体大小和布局	2024-12-04 18:13:55 +08:00
黑先森	0253d95597	Merge branch 'dev_1.2.9'	2024-12-03 19:00:26 +08:00
黑先森	5875b30c34	增加 prettier 包	2024-12-02 14:49:46 +08:00
@@ -1 +1 @@
 .18.2
 .18.1