增加tooltip文本提示

- 修复服务器地址过长导致无法删除地址的问题
- 新增设置网卡跃点功能
- 优化config.json serverUrl的输入格式，可数组或字符串逗号分隔

.gitignore

@@ -10,7 +10,5 @@ dist
 .idea
 .vscode
 release
-src-tauri/easytier-cli.exe
-src-tauri/easytier-core.exe
-src-tauri/Packet.dll
-src-tauri/wintun.dll
+
+src-tauri/easytier/logs

README.md

@@ -28,7 +28,7 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 - 如果还是无法满足您的需求，可以使用配置文件进行启动，具体如何配置，可以查看文档[配置文件](/guide/network/config-file.html)
     ![game-step5](/assets/game-step5.png)
 
-- easytier内核升级后，可以点击更新插件按钮就可以进行更新，但是需要出国，如果无法更新，可以在群里获取
+- easytier内核升级后，可以点击内核管理按钮就可以进行内核切换和更新，但是需要出国或者github加速链接，如果无法更新，可以在群里获取
     ![game-step6](/assets/game-step6.png)
 
 - 1.1.4更新了 配置分享功能 可以与朋友之间分享配置，方便联机
@@ -46,6 +46,9 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
 **解压zip后你可以查看 easytier/config_template.json 里的注释进行配置**
 ![game-step10](/assets/game-step10.png)
 
+- 1.2.3新增了帮助.txt 位于“easytier/帮助.txt" 内含 无法打开界面和卸载EasytierGame的办法，新增 "easytier/clear_local_data.bat" 用于清除easytierGame的本地缓存数据（需要管理员模式运行）
+![game-step11](/assets/game-step11.png)
+
 ## 特性
 
 - 基于easytier组网工具开发，界面清晰简单

app.vue

@@ -6,6 +6,30 @@
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
 	import { initTheme } from "@/composables/theme";
+	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) => {
+			original(message);
+			if (import.meta.env.PROD) {
+				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);
+
 	const mainStore = useMainStore();
 	// console.log(mainStore.theme)
 	initTheme(mainStore.theme);

assets/css/main.css

@@ -32,3 +32,8 @@ html.dark body {
 	box-sizing: border-box;
 	padding: 3px 5px;
 }
+
+.full-label .el-form-item__label {
+	width: 100%;
+	padding-right: 0;
+}

composables/configJson.ts

@@ -1,16 +1,45 @@
 import { BaseDirectory, writeTextFile } from "@tauri-apps/plugin-fs";
 import useMainStore from "@/stores/index";
 import { ElMessage } from "element-plus";
-export const updateConfigJson = async () => {
-    
+import { uniq, intersection, isNil } from "lodash-es";
+export const updateConfigJson = async (configJsonSeverUrl: Array<string> | string | null | undefined) => {
 	const mainStore = useMainStore();
-    const path = import.meta.env.VITE_CONFIG_FILE_NAME;
-    try {
-        const { proxyNetworks, autoStart, relayAllPeerrpc, coonectAfterStart, multiThread, enablExitNode, useSmoltcp, saveErrorLog, logLevel, ...otherConfig } =
-            mainStore.config;
-        await writeTextFile(path, JSON.stringify(otherConfig, null, 4), { baseDir: BaseDirectory.Resource });
-    } catch (err) {
-        console.log(err);
-        ElMessage.error(`更新config.json失败`);
-    }
-}
+	const path = import.meta.env.VITE_CONFIG_FILE_NAME;
+	if (isNil(configJsonSeverUrl)) {
+		configJsonSeverUrl = [];
+	}
+	const isArray = Array.isArray(configJsonSeverUrl);
+	const isString = typeof configJsonSeverUrl === "string";
+	try {
+		const {
+			proxyNetworks,
+			autoStart,
+			relayAllPeerrpc,
+			connectAfterStart,
+			multiThread,
+			enablExitNode,
+			useSmoltcp,
+			saveErrorLog,
+			logLevel,
+			serverUrl,
+			...otherConfig
+		} = mainStore.config;
+		let writeServerUrl: Array<string> | string = serverUrl;
+		if (isArray) {
+			writeServerUrl = intersection(
+				uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean),
+				mainStore.basePeers
+			);
+		}
+		if (isString && configJsonSeverUrl) {
+			writeServerUrl = intersection(
+				uniq([serverUrl, ...(configJsonSeverUrl as string).split(",")]).filter(boolean => boolean),
+				mainStore.basePeers
+			).join(",");
+		}
+		await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
+	} catch (err) {
+		console.error(err);
+		ElMessage.error(`更新config.json失败`);
+	}
+};

composables/log.ts

@@ -1,8 +0,0 @@
-// const infoDialog = new WebviewWindow("log", {
-//     title: "日志",
-//     resizable: false,
-//     width: 600,
-//     height: 400,
-//     parent: appWindow,
-//     url: "/log"
-// });

composables/netcard.ts

@@ -2,6 +2,8 @@ import { invoke } from "@tauri-apps/api/core";
 import { Command } from "@tauri-apps/plugin-shell";
 import { ElMessage, type TabPaneName } from "element-plus";
 import useMainStore from "@/stores/index";
+import { BaseDirectory } from "@tauri-apps/api/path";
+import { exists } from "@tauri-apps/plugin-fs";
 
 const getWinIpBroadcastPid = async () => {
     const mainStore = useMainStore();
@@ -19,17 +21,23 @@ export const handleWinipBcStart = async () => {
     if (!mainStore.winipBcStart) {
         try {
             await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
+            const isExists = await exists("easytier/tool/WinIPBroadcast.exe", { baseDir: BaseDirectory.Resource });
+            if(!isExists) {
+                ElMessage.error(`WinipBc不存在`);
+                console.error(`WinipBc不存在`);
+                return;
+            }
             const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
             mainStore.winipBcPid = child.pid || 0;
             if (mainStore.winipBcPid) {
                 mainStore.winipBcStart = true;
 				mainStore.winIpBcAutoStart = true;
             } else {
-                ElMessage.error(`启动失败`);
+                ElMessage.error(`WinipBc失败`);
             }
         } catch (err) {
-            ElMessage.error(`启动失败`);
-            console.log(err);
+            ElMessage.error(`WinipBc失败`);
+            console.error(err);
         }
     } else {
 		mainStore.winIpBcAutoStart = false;
@@ -41,7 +49,7 @@ export const handleWinipBcStart = async () => {
 export const initStartWinIpBroadcast = async () => {
     const mainStore = useMainStore();
     await getWinIpBroadcastPid();
-    // console.log(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
+    // console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
     if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
         await handleWinipBcStart();
     }

composables/tray.ts

@@ -4,6 +4,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 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";
 
 const DEFAULT_TRAY_NAME = "main";
 
@@ -16,7 +17,7 @@ async function toggleVisibility() {
 	}
 }
 
-export async function useTray(init: boolean = false, beforExit: Function) {
+export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function) {
 	let tray;
 	try {
 		tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
@@ -27,7 +28,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 				id: DEFAULT_TRAY_NAME,
 				menu: await Menu.new({
 					id: "main",
-					items: await generateMenuItem(beforExit),
+					items: await generateMenuItem(beforExit, handleConnection),
 				}),
 				action: async (e) => {
 					toggleVisibility();
@@ -35,7 +36,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 			});
 		}
 	} catch (error) {
-		console.warn("Error while creating tray icon:", error);
+		console.error("Error while creating tray icon:", error);
 		return null;
 	}
 
@@ -45,7 +46,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 		tray.setMenu(
 			await Menu.new({
 				id: "main",
-				items: await generateMenuItem(beforExit),
+				items: await generateMenuItem(beforExit, handleConnection),
 			})
 		);
 	}
@@ -53,9 +54,10 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 	return tray;
 }
 
-export async function generateMenuItem(beforExit: Function) {
+export async function generateMenuItem(beforExit: Function, handleConnection:Function) {
 	return [
 		await MenuItemShow("显示 / 隐藏"),
+		await MenuItemExchangeConnection("联机 / 断开", handleConnection),
 		await MenuItemTheme(),
 		await PredefinedMenuItem.new({ item: "Separator" }),
 		await MenuItemExit("退出", beforExit),
@@ -85,6 +87,17 @@ export async function MenuItemShow(text: string) {
 	});
 }
 
+export async function MenuItemExchangeConnection(text: string, handleConnection:Function) {
+	const menutItem =  await MenuItem.new({
+		id: "exchangeConnection",
+		text,
+		action: async () => {
+			const isStart = await handleConnection();
+		},
+	});
+	return menutItem;
+}
+
 export async function MenuItemTheme() {
 	return await MenuItem.new({
 		id: "theme",
@@ -113,7 +126,10 @@ export async function MenuItemTheme() {
 
 export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean = false) {
 	if (!tray) return;
-	await tray.setIcon(isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico");
+	const resourceDir = await getResourceDir();
+	const path = await join(resourceDir, isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico");
+	// "easytier/icons/icon-inactive.ico", { baseDir: BaseDirectory.Resource }
+	await tray.setIcon(path);
 }
 
 export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) {

composables/windows.ts

@@ -26,13 +26,13 @@ export default async (
 		if (appWindow) {
 			const appSize = await appWindow.outerSize();
 			// const monitor = await currentMonitor();
-			// console.log(monitor)
+			// console.error(monitor)
 			const factor = await appWindow.scaleFactor();
 			const appPosition = await appWindow.outerPosition();
-			// console.log((appPosition.x + appSize.width) / 1.25);
+			// console.error((appPosition.x + appSize.width) / 1.25);
 			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
 			defaultOpts.parent = appWindow;
-			// console.log(logicalPosition);
+			// console.error(logicalPosition);
 			defaultOpts.x = logicalPosition.x;
 			defaultOpts.y = logicalPosition.y;
 		}

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.1.8",
+	"version": "1.2.4",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod"
@@ -20,7 +20,9 @@
 		"@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",
 		"@types/lodash-es": "^4.17.12",
 		"@vitejs/plugin-vue-jsx": "^4.1.0",
 		"@vueuse/core": "^11.2.0",

pages/advance.vue

@@ -1,19 +1,12 @@
 <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-[10px]">
-			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
-			<ElInput
-				maxlength="10"
-				v-model="mainStore.config.devNameValue"
-				placeholder="请输入网卡名"
-			/>
-		</div>
 		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></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]"
@@ -33,7 +26,7 @@
 				打开日志目录
 			</ElButton>
 		</div>
-		<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
 		<div class="flex items-center gap-[15px] flex-nowrap">
 			<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
 			<ElButton
@@ -44,12 +37,49 @@
 			</ElButton>
 		</div>
 
+		<ElDivider />
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
+			<ElInput
+				size="small"
+				maxlength="10"
+				v-model="mainStore.config.devNameValue"
+				placeholder="请输入网卡名"
+			/>
+		</div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.enableNetCardMetric">自定义easytier网卡跃点</ElCheckbox>
+			<ElInputNumber
+				controls-position="right"
+				:min="1"
+				:value-on-clear="1"
+				:max="9999"
+				:step="1"
+				:precision="0"
+				size="small"
+				v-model="mainStore.config.netCardMetricValue"
+				placeholder="请选择跃点数"
+			/>
+			<ElTooltip content="设置easytier网卡的跃点，提升网卡优先级，跃点越小，网卡优先级越高">
+				<ElIcon><QuestionFilled /></ElIcon>
+			</ElTooltip>
+		</div>
+		<div>
+			<ElText
+				size="small"
+				type="warning"
+			>
+				(不使用自定义网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡，也可以使用 “设置跃点” 功能，除非你启用了下面的功能)
+			</ElText>
+		</div>
+		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备(网卡)，可以使用子网代理访问节点</ElCheckbox></div>
+
 		<ElDivider />
 		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为false，必须与对等节点相同</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为启用，必须与对等节点相同</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
 		<ElDivider />
-		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备，可以使用子网代理访问节点</ElCheckbox></div>
+
 		<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>
@@ -60,6 +90,7 @@
 </template>
 <script setup lang="ts">
 	import useMainStore from "@/stores/index";
+	import { QuestionFilled } from "@element-plus/icons-vue";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
 	import { Command } from "@tauri-apps/plugin-shell";
@@ -92,7 +123,7 @@
 		}
 	};
 	mainStore.$subscribe(async (...a) => {
-		// console.log("subscribe", a);
+		// console.error("subscribe", a);
 		await appWindow.emitTo("main", "config", { config: { ...mainStore.config }, createConfigInEasytier: mainStore.createConfigInEasytier });
 		// if(mainStore.createConfigInEasytier) {
 		// 	updateConfigJson();

pages/index.vue

@@ -12,9 +12,10 @@
 		<ElFormItem
 			label="服务器"
 			prop="serverUrl"
+			class="full-label"
 		>
 			<template #label>
-				<div class="flex items-center gap-[0_5px]">
+				<div class="flex items-center flex-nowrap gap-[0_5px]">
 					<div>服务器</div>
 					<span>-</span>
 					<ElTag
@@ -29,36 +30,45 @@
 					>
 						获取内核版本
 					</ElButton>
-					<ElTag
+					<div
 						v-else
-						type="info"
+						class="flex-1 truncate"
 					>
-						{{ data.coreVersion }}
-					</ElTag>
-					<ElPopconfirm
+						<ElTooltip :content="data.coreVersion">
+							<ElTag type="info">
+								{{ data.coreVersion }}
+							</ElTag>
+						</ElTooltip>
+					</div>
+
+					<!-- <ElPopconfirm
 						width="325"
 						cancel-button-text="取消"
 						confirm-button-text="继续"
 						title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
 						也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
-						@confirm="handleUpdateCore"
+						@confirm="handleCoreManagement"
 					>
-						<template #reference>
-							<ElButton
-								:disabled="data.isStart"
-								:loading="data.update"
-								type="warning"
-								size="small"
-							>
-								{{ data.coreVersion ? "更新内核" : "下载内核" }}
-							</ElButton>
-						</template>
-					</ElPopconfirm>
+						<template #reference> -->
+					<ElButton
+						class="ml-auto"
+						:disabled="data.isStart"
+						@click="handleCoreManagement"
+						:loading="data.update"
+						type="primary"
+						size="small"
+					>
+						内核管理
+						<!-- {{ data.coreVersion ? "更新内核" : "下载内核" }} -->
+					</ElButton>
+					<!-- </template>
+					</ElPopconfirm> -->
 				</div>
 			</template>
 			<ElSelect
 				allow-create
 				filterable
+				placeholder="请选择服务器地址"
 				default-first-option
 				v-model="config.serverUrl"
 				@change="handleServerUrlChange"
@@ -88,14 +98,18 @@
 					:label="item"
 					:value="item"
 				>
-					<div class="flex items-center justify-between">
-						<span style="float: left">{{ item }}</span>
-						<ElButton
-							@click.stop="handleDeleteServerUrl(item)"
-							round
-							:icon="Delete"
-							type="danger"
-						></ElButton>
+					<div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]">
+						<ElTooltip :content="item">
+							<p class="truncate">{{ item }}</p>
+						</ElTooltip>
+						<div class="flex-shrink-0 ml-auto">
+							<ElButton
+								@click.stop="handleDeleteServerUrl(item)"
+								round
+								:icon="Delete"
+								type="danger"
+							></ElButton>
+						</div>
 					</div>
 				</ElOption>
 			</ElSelect>
@@ -255,13 +269,18 @@
 				>
 					强制中转
 				</ElCheckbox>
-				<ElCheckbox
-					@change="handleAutoStart"
-					:model-value="config.autoStart"
-					size="small"
+				<ElTooltip
+					placement="top-start"
+					content="自启后隐藏于托盘，不显示界面"
 				>
-					开机自启
-				</ElCheckbox>
+					<ElCheckbox
+						@change="handleAutoStartByTask"
+						:model-value="config.autoStart"
+						size="small"
+					>
+						开机自启
+					</ElCheckbox>
+				</ElTooltip>
 				<div>
 					<ElButton
 						@click="handleShowCidrDialog"
@@ -300,6 +319,79 @@
 			</div>
 		</div>
 	</ElForm>
+	<ElDialog
+		width="95%"
+		top="10px"
+		append-to-body
+		:z-index="10"
+		class="!mb-0"
+		v-model="coreManagementData.visible"
+		:close-on-press-escape="false"
+		title="内核管理"
+	>
+		<div>
+			<ElText>当前版本: {{ data.coreVersion || "-" }}</ElText>
+		</div>
+		<div class="mt-[10px] pb-[5px]">
+			<ElText class="!mr-[10px]">选择一个内核版本安装</ElText>
+			<ElButton
+				:loading="coreManagementData.loading"
+				@click="getReleaseList"
+				size="small"
+			>
+				刷新
+			</ElButton>
+		</div>
+		<ElSelect
+			placeholder="请选择内核版本"
+			no-data-text="正在获取中..."
+			popper-class="!h-[120px]"
+			v-model="coreManagementData.data"
+		>
+			<ElOption
+				v-for="(release, idx) in data.releaseList"
+				:key="`${idx}-ray`"
+				:label="release[0]"
+				:value="`${release[2]}<>${release[1]}`"
+			>
+				{{ release ? release[0] : "" }}
+			</ElOption>
+		</ElSelect>
+		<div class="pb-[5px] mt-[10px]">
+			<ElTooltip content="不使用出国软件也能告诉下载github Release包的地址，可自行搜索替换使用">
+				<ElText>github下载加速地址</ElText>
+			</ElTooltip>
+		</div>
+		<ElInput
+			v-model="mainStore.githubFastUrl"
+			placeholder="请输入github加速地址"
+		></ElInput>
+		<template #footer>
+			<div class="text-right">
+				<ElButton
+					size="small"
+					:loading="data.update"
+					@click="handleInstallCore"
+					type="primary"
+				>
+					安装选中内核
+				</ElButton>
+				<ElButton
+					size="small"
+					type="warning"
+					@click="addQQGroup"
+				>
+					加群获取
+				</ElButton>
+				<ElButton
+					size="small"
+					@click="coreManagementData.visible = false"
+				>
+					取消
+				</ElButton>
+			</div>
+		</template>
+	</ElDialog>
 	<ElDialog
 		width="95%"
 		top="10px"
@@ -407,7 +499,8 @@
 	import { readDir, exists, mkdir, BaseDirectory, readTextFile } from "@tauri-apps/plugin-fs";
 	import { updateConfigJson } from "~/composables/configJson";
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
-	import { bounce } from "~/utils";
+	import { sortedUniq, uniq } from "lodash-es";
+	import { bounce, addQQGroup } from "~/utils";
 
 	let is_close = false;
 
@@ -415,13 +508,16 @@
 		is_close = true;
 		await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
 		await invoke("stop_command", { child_id: data.winipBcPid || 0 });
+	}, async () => {
+		await handleConnection();
+		return data.isStart
 	});
 
 	const mainStore = useMainStore();
 	const config = mainStore.config;
-	// console.log(config);
-	const protocols = ["tcp", "udp", "ws", "wss", "wg"];
-	const data = reactive({
+	// console.error(config);
+	const protocols = ["tcp", "udp", "ws", "wss", "wg", "quic"];
+	const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
@@ -432,11 +528,12 @@
 		log: "",
 		update: false,
 		releaseList: [],
-		coreVersion: "",
+		coreVersion: "-",
 		isSuccessGetIp: false,
 		startLoading: false,
 		isStart: false,
-		connectionSuccess: false
+		connectionSuccess: false,
+		configJsonSeverUrl: "" // 本地保存一次，用于回填config.json
 	});
 
 	const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
@@ -451,13 +548,19 @@
 		data: ""
 	});
 
+	const coreManagementData = reactive<{ data: ""; [key: string]: any }>({
+		visible: false,
+		loading: false,
+		data: ""
+	});
+
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
 			appWindow.onCloseRequested(async event => {
-				// console.log(appWindow.label);
+				// console.error(appWindow.label);
 				if (!is_close) {
-					// console.log(1);
+					// console.error(1);
 					event.preventDefault();
 					appWindow.hide();
 				}
@@ -474,11 +577,25 @@
 			}
 			newBasePeers.splice(idx, 1);
 		}
-		mainStore.basePeers = [...new Set([...newBasePeers])];
+		mainStore.basePeers = uniq([...newBasePeers]);
+		if (mainStore.basePeers.length > 0) {
+			mainStore.config.serverUrl = mainStore.basePeers[0];
+		}
 	};
 
 	const handleServerUrlChange = () => {
-		mainStore.basePeers = [...new Set([config.serverUrl, ...mainStore.basePeers])];
+		let inputProtocols: string | null = null;
+		for (const p of protocols) {
+			if (config.serverUrl.toLowerCase().startsWith(`${p}://`)) {
+				inputProtocols = p;
+				break;
+			}
+		}
+		if (inputProtocols) {
+			mainStore.config.protocol = [inputProtocols];
+			mainStore.config.serverUrl = mainStore.config.serverUrl.slice(inputProtocols.length + 3);
+		}
+		mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers]);
 	};
 
 	const listenObj: { [key: string]: any } = {
@@ -490,9 +607,11 @@
 			// const appWindow = getCurrentWindow();
 			const unListen = await listen("command-output", async event => {
 				data.isStart = true;
+				// console.error(event.payload);
 				if (event.payload) {
 					data.startLoading = false;
 					let ipv4 = /dhcp ip changed. old: None, new: Some\((\d+\.\d+\.\d+\.\d+).*\)/g.exec(event.payload as string)?.[1];
+					let devName = /tun device ready. dev: (.*)/g.exec(event.payload as string)?.[1];
 					if (config.dhcp || mainStore.configStartEnable) {
 						if (ipv4) {
 							config.ipv4 = ipv4;
@@ -501,12 +620,32 @@
 							await setTrayTooltip(tray, `IP: ${ipv4}`);
 						}
 					} else {
-						if ((event.payload as string).includes("new peer connection added")) {
+						if ((event.payload as string).includes("new peer connection added") && !data.isSuccessGetIp) {
 							await setTrayRunState(tray, true);
 							data.isSuccessGetIp = true;
 							await setTrayTooltip(tray, `IP: ${config.ipv4}`);
 						}
 					}
+					if (
+						devName &&
+						mainStore.config.enableNetCardMetric &&
+						mainStore.config.netCardMetricValue &&
+						mainStore.config.netCardMetricValue >= 1 &&
+						mainStore.config.netCardMetricValue <= 9999
+					) {
+						try {
+							const output = await Command.create(
+								"netsh",
+								["interface", "ipv4", "set", "interface", devName, "metric=", `${mainStore.config.netCardMetricValue}`],
+								{
+									encoding: "gb2312"
+								}
+							).execute();
+						} catch (err) {
+							console.error(err);
+							ElMessage.error("跃点设置失败");
+						}
+					}
 				}
 				const logArr = data.log.split("\n");
 				const start = logArr.length > 1000 ? logArr.length - 1000 : 0;
@@ -525,7 +664,7 @@
 		},
 		async listenConfigStart() {
 			const unListen = await listen("config", event => {
-				// console.log("config", event.payload);
+				// console.error("config", event.payload);
 				const ipv4 = config.ipv4;
 				mainStore.$patch(event.payload as any);
 				config.ipv4 = ipv4;
@@ -549,19 +688,23 @@
 	};
 
 	const checkUpdate = async () => {
-		await getReleaseList();
-		const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
-		if (latestVersionFileName) {
-			// console.log(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
-			const latestVersion = /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName)?.[1];
+		// const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
+		let [downloadUrl, versionFileName] = (coreManagementData.data as string).split("<>");
+		if (mainStore.githubFastUrl) {
+			let fastUrl = mainStore.githubFastUrl.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
+			if (!fastUrl.endsWith("/")) fastUrl += "/";
+			downloadUrl = fastUrl + downloadUrl;
+		}
+		if (versionFileName) {
+			// console.error(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
+			const version = /\-v(\d+\.\d+\.\d+)/g.exec(versionFileName)?.[1];
 			const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1];
-			if (latestVersion && currentVersion != latestVersion) {
-				// console.log({ currentVersion, latestVersion });
-				ElMessage.success(`更新 -> ${latestVersion}`);
-				const downloadUrl = data.releaseList?.[0]?.[0]?.[2];
-				return [true, downloadUrl, latestVersionFileName];
-			} else if (currentVersion === latestVersion) {
-				ElMessage.success(`当前是最新版`);
+			if (version && currentVersion != version) {
+				// console.error({ currentVersion, latestVersion });
+				ElMessage.success(`更新 -> ${version}`);
+				return [true, downloadUrl, versionFileName];
+			} else if (currentVersion === version) {
+				ElMessage.success(`当前版本无需安装`);
 				return [false, null, null];
 			} else {
 				ElMessage.error(`获取版本失败`);
@@ -573,22 +716,44 @@
 		return [false, null, null];
 	};
 
-	const handleUpdateCore = async () => {
-		data.update = true;
-		await getCoreVersion();
-		const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
-		if (isNeedUpdate) {
-			await reset();
-			// console.log(downloadUrl);
-			await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName });
+	const handleCoreManagement = async () => {
+		coreManagementData.visible = true;
+		await getReleaseList();
+	};
+
+	const handleInstallCore = async () => {
+		try {
+			if (!coreManagementData.data) {
+				return ElMessage.error("请选择一个内核");
+			}
+			data.update = true;
+			await getCoreVersion();
+			const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
+
+			if (isNeedUpdate) {
+				await reset();
+				// console.error(downloadUrl);
+				await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName });
+			}
+			await getCoreVersion();
+		} catch (err) {
+			console.error(err);
+		} finally {
+			data.update = false;
 		}
-		await getCoreVersion();
-		data.update = false;
 	};
 
 	const getReleaseList = async () => {
-		const list = await invoke("fetch_easytier_list");
-		data.releaseList = list as never[];
+		coreManagementData.loading = true;
+		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");
+			})
+		];
+		coreManagementData.loading = false;
+		// console.log(data.releaseList);
 	};
 
 	const handleAutoStart = async () => {
@@ -635,22 +800,29 @@
 
 	const compatibleInitAutoStart = async () => {
 		try {
-			// const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
-			// if (is_enable_by_task) {
-			// 	await tauriAutoStart.enable();
-			// 	await invoke("spawn_autostart", { enabled: false });
-			// }
 			const is_enable = await tauriAutoStart.isEnabled();
-			config.autoStart = is_enable;
+			if (is_enable) {
+				await invoke("spawn_autostart", { enabled: true });
+				await tauriAutoStart.disable();
+			}
+			let is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
+			if (is_enable_by_task) {
+				// 每次打开Exe重新加载一次开机自启，因为可能路径变了
+				await invoke("spawn_autostart", { enabled: false });
+				await invoke("spawn_autostart", { enabled: true });
+			}
+			is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
+			config.autoStart = is_enable_by_task;
 		} catch (err) {
-			// await invoke("spawn_autostart", { enabled: false });
-			await tauriAutoStart.disable();
-			config.autoStart = false;
+			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;
 		}
 	};
 
 	const initConnectAfterStart = async () => {
-		if (config.coonectAfterStart && data.coreVersion) {
+		if (config.connectAfterStart && data.coreVersion) {
 			await reset();
 			await handleConnection();
 		}
@@ -667,31 +839,47 @@
 					const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm;
 					const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1");
 					const guiJson = JSON.parse(resultStr);
+					let saveServerUrl = "";
+					if (guiJson.serverUrl) {
+						if (Array.isArray(guiJson.serverUrl)) {
+							mainStore.basePeers = uniq([...guiJson.serverUrl, ...mainStore.basePeers]);
+						}
+						if (typeof guiJson.serverUrl === "string") {
+							mainStore.basePeers = uniq([...guiJson.serverUrl.split(","), ...mainStore.basePeers]);
+						}
+						saveServerUrl = mainStore.basePeers[0] || "";
+					} else {
+						saveServerUrl = mainStore.basePeers.length > 0 ? mainStore.basePeers[0] || "" : "";
+					}
+					data.configJsonSeverUrl = guiJson.serverUrl;
 					mainStore.$patch({
 						config: {
 							...mainStore.config,
-							...guiJson
+							...guiJson,
+							serverUrl: saveServerUrl
 						}
 					});
-					if (guiJson.serverUrl) {
-						mainStore.basePeers = [...new Set([guiJson.serverUrl, ...mainStore.basePeers])];
+					if (mainStore.createConfigInEasytier) {
+						await updateConfigJson(data.configJsonSeverUrl);
 					}
 				} catch (err) {
+					console.error(err);
 					ElMessage.error(`config.json格式错误`);
+				} finally {
+					mainStore.$patch({
+						createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
+					});
 				}
 			}
 		}
 		const b = bounce(600);
-		mainStore.$subscribe(
-			(...a) => {
-				if (mainStore.createConfigInEasytier) {
-					b(async () => {
-						await updateConfigJson();
-					});
-				}
-			},
-			{ immediate: true }
-		);
+		mainStore.$subscribe((...a) => {
+			if (mainStore.createConfigInEasytier) {
+				b(async () => {
+					await updateConfigJson(data.configJsonSeverUrl);
+				});
+			}
+		});
 	};
 
 	let logsTimer: NodeJS.Timeout | null = null;
@@ -718,15 +906,33 @@
 	});
 
 	const getArgs = async () => {
-		// console.log(config.proxyNetworks);
+		// console.error(config.proxyNetworks);
 		const args = [];
-		if (mainStore.configStartEnable && mainStore.configPath) {
-			// const resourceDir = await getResourceDir();
-			// const configPath = await join(resourceDir, mainStore.configPath);
-			// args.push("-c", configPath);
-
-			args.push("-c", mainStore.configPath);
-			return args;
+		if (mainStore.configStartEnable) {
+			if (mainStore.configPath) {
+				const isExists = await exists(mainStore.configPath, { baseDir: BaseDirectory.Resource });
+				if (isExists) {
+					const resourceDir = await getResourceDir();
+					const configPath = await join(resourceDir, mainStore.configPath);
+					args.push("-c", configPath);
+					return args;
+				} else {
+					const appWindow = getCurrentWindow();
+					const isVisible = await appWindow.isVisible();
+					if (!isVisible) {
+						await appWindow.show();
+						await appWindow.setFocus();
+					}
+					mainStore.configPath = "";
+					ElMessage.error(`配置文件不存在 请重新选择`);
+					await handleStartCommand("toml"); // 配置文件不存在，显示配置文件弹窗
+					return [];
+				}
+			} else {
+				ElMessage.warning(`配置文件不存在 请选择`);
+				await handleStartCommand("toml"); // 配置文件不存在，显示配置文件弹窗
+				return [];
+			}
 		}
 		if (config.dhcp) {
 			args.push("-d");
@@ -757,7 +963,7 @@
 			args.push("--no-listener");
 		}
 		if (mainStore.cidrEnable && config.proxyNetworks) {
-			// console.log(config.proxyNetworks);
+			// console.error(config.proxyNetworks);
 			const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
 			const formatProxyNetworks = config.proxyNetworks
 				.split("\n")
@@ -825,9 +1031,11 @@
 		if (data.isStart) {
 			await reset();
 		} else {
+			await setTrayTooltip(tray, "请求联机中...");
 			const args = await getArgs();
 			if (!args || args.length <= 0) {
-				return ElMessage.error("无配置");
+				await reset();
+				return;
 			}
 			if (args[0] === "-c") {
 				ElMessage.warning({
@@ -873,7 +1081,7 @@
 				const {
 					proxyNetworks,
 					autoStart,
-					coonectAfterStart,
+					connectAfterStart,
 					multiThread,
 					hostname,
 					enablExitNode,
@@ -887,7 +1095,7 @@
 				await writeText(WT);
 				ElMessage.success("配置已复制");
 			} catch (err) {
-				console.log(err);
+				console.error(err);
 				ElMessage.error("分享失败");
 			}
 		}
@@ -912,9 +1120,9 @@
 			});
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
-			mainStore.basePeers = [...new Set([config.serverUrl, ...mainStore.basePeers])];
+			mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
 		} catch (err) {
-			console.log(err);
+			console.error(err);
 			if (err !== "cancel") {
 				ElMessage.error("导入失败");
 			}
@@ -929,14 +1137,16 @@
 			mainStore.configPath = "";
 			try {
 				await mkdir(path, { baseDir: BaseDirectory.Resource });
-			} catch (err) {}
+			} catch (err) {
+				console.error(err);
+			}
 		}
 	};
 
 	const openConfigDir = async () => {
 		const resourceDir = await getResourceDir();
 		const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_PATH);
-		// console.log(configPath);
+		// console.error(configPath);
 		await Command.create("explorer", [configPath]).execute();
 	};
 
@@ -952,7 +1162,7 @@
 			"member",
 			{
 				title: "成员列表",
-				width: 470,
+				width: 875,
 				height: 380,
 				url: "#/member"
 			},

pages/member.vue

@@ -8,24 +8,55 @@
 				:data="data.member"
 				v-else>
 				<ElTableColumn
-					v-for="prop in showTableHeader"
 					sortable
-					:prop="prop[0]"
-					:label="prop[1]"
-					:key="prop[0]">
+					width="140"
+					label="主机名"
+					prop="hostname"></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="90"
+					prop="cost"
+					label="路由">
 					<template #default="{ row }">
-						<span v-if="prop[0] == 'loss_rate'">
-							{{ row[prop[0]] && row[prop[0]] != "-" ? Number(row[prop[0]] * 100).toFixed(2) + "%" : row[prop[0]] }}
-						</span>
-						<span v-else-if="prop[0] != 'cost'">{{ row[prop[0]] }}</span>
 						<ElTag
-							v-else
 							effect="dark"
-							:type="row[prop[0]] == 'p2p' ? 'success' : 'info'">
-							{{ row[prop[0]] }}
+							:type="row.cost == 'p2p' ? 'success' : 'info'">
+							{{ row.cost }}
 						</ElTag>
 					</template>
 				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="120"
+					prop="ipv4"
+					label="虚拟网IP"></ElTableColumn>
+				<ElTableColumn
+					sortable
+					prop="lat_ms"
+					width="130"
+					label="延迟/ms"></ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="120"
+					prop="loss_rate"
+					label="丢包率">
+					<template #default="{ row }">
+						{{ row.loss_rate && row.loss_rate != "-" ? Number(row.loss_rate * 100).toFixed(2) + "%" : row.loss_rate }}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					width="120"
+					label="nat_type"
+					prop="NAT类型">
+					<template #default="{ row }">
+						{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
+					</template>
+				</ElTableColumn>
+				<ElTableColumn
+					sortable
+					prop="version"
+					label="版本"></ElTableColumn>
 			</ElTable>
 		</div>
 	</div>
@@ -34,23 +65,50 @@
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
 	import { parsePeerInfo } from "@/utils";
+	// 	enum NatType {
+	//   // has NAT; but own a single public IP, port is not changed
+	//   Unknown = 0;
+	//   OpenInternet = 1;
+	//   NoPAT = 2;
+	//   FullCone = 3;
+	//   Restricted = 4;
+	//   PortRestricted = 5;
+	//   Symmetric = 6;
+	//   SymUdpFirewall = 7;
+	//   SymmetricEasyInc = 8;
+	//   SymmetricEasyDec = 9;
+	// }
+	const natMaps = {
+		unknown: "未知",
+		OpenInternet: "nat0-openinternet",
+		nopat: "nat0-nopat",
+		fullcone: "nat1",
+		restricted: "nat2",
+		portrestricted: "nat3",
+		symmetric: "nat4",
+		SymmetricEasyDec: "nat4-easydec",
+		SymmetricEasyInc: "nat4-easyinc",
+		SymUdpFirewall: "nat4-udpfirewall",
+	};
+	type natKyes = keyof typeof natMaps;
+
 	const data = reactive<{ member: any[] }>({
 		member: [],
 	});
 
-	const showTableHeader = [
+	const _showTableHeader = [
 		["hostname", "主机名"],
-		["lat_ms", "延迟/ms"],
-		["ipv4", "虚拟网IP"],
 		["cost", "路由"],
+		["ipv4", "虚拟网IP"],
+		["lat_ms", "延迟/ms"],
 		["loss_rate", "丢包率"],
 		["nat_type", "NAT类型"],
 		["version", "版本"],
 	];
 
 	const listenOutput = async () => {
-		const member = await invoke("get_members_by_cli");
-		const peerInfo = parsePeerInfo(member as string);
+		const member = await invoke<string>("get_members_by_cli");
+		const peerInfo = parsePeerInfo(member);
 		peerInfo.forEach((value) => {
 			if (value.cost === "Local") {
 				value.cost = "本机";
@@ -59,7 +117,7 @@
 				value.ipv4 = value.ipv4.split("/")[0];
 			}
 		});
-		// console.log(peerInfo);
+		// console.error(peerInfo);
 		data.member = peerInfo;
 	};
 

pages/tool.vue

@@ -226,7 +226,7 @@
 				ElMessage.success("设置成功");
 				await initNetCardInfo();
 			} catch (err) {
-				console.log(err);
+				console.error(err);
 			}
 		}
 	};
@@ -260,7 +260,7 @@
 				data.pingLog += '完毕'
 			} catch (err) {
 				ElMessage.error("Ping发生错误");
-				console.log(err);
+				console.error(err);
 			} finally {
 				data.isPing = false;
 			}
@@ -291,7 +291,7 @@
 				}) as any;
 		} catch (err) {
 			ElMessage.error("网卡获取失败");
-			console.log(err);
+			console.error(err);
 		}
 	};
 
@@ -324,13 +324,13 @@
 		} catch (err) {
 			// netsh advfirewall firewall add rule name="EXE名称" dir=out action=allow program="EXE绝对路径"
 			ElMessage.error("获取防火墙状态失败");
-			console.log(err);
+			console.error(err);
 		}
 	};
 
 	const appWindow = getCurrentWindow();
 	mainStore.$subscribe((...a) => {
-		// console.log("subscribe", a);
+		// console.error("subscribe", a);
 		appWindow.emitTo("main", "config", { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } });
 	});
 

pnpm-lock.yaml

@@ -41,9 +41,15 @@ importers:
       '@tauri-apps/plugin-http':
         specifier: ^2.0.1
         version: 2.0.1
+      '@tauri-apps/plugin-log':
+        specifier: ^2.0.0
+        version: 2.0.0
       '@tauri-apps/plugin-shell':
         specifier: ~2
         version: 2.0.1
+      '@tauri-apps/plugin-window-state':
+        specifier: ~2
+        version: 2.0.0
       '@types/lodash-es':
         specifier: ^4.17.12
         version: 4.17.12
@@ -1044,9 +1050,15 @@ packages:
   '@tauri-apps/plugin-http@2.0.1':
     resolution: {integrity: sha512-j6IA3pVBybSCwPpsihpX4z8bs6PluuGtr06ahL/xy4D8HunNBTmRmadJrFOQi0gOAbaig4MkQ15nzNLBLy8R1A==}
 
+  '@tauri-apps/plugin-log@2.0.0':
+    resolution: {integrity: sha512-C+NII9vzswqnOQE8k7oRtnaw0z5TZsMmnirRhXkCKDEhQQH9841Us/PC1WHtGiAaJ8za1A1JB2xXndEq/47X/w==}
+
   '@tauri-apps/plugin-shell@2.0.1':
     resolution: {integrity: sha512-akU1b77sw3qHiynrK0s930y8zKmcdrSD60htjH+mFZqv5WaakZA/XxHR3/sF1nNv9Mgmt/Shls37HwnOr00aSw==}
 
+  '@tauri-apps/plugin-window-state@2.0.0':
+    resolution: {integrity: sha512-O82iRlrh1BLgBI8CTc+NMTPxQhQo8II5admKq9mLvH45Us5i4Zcr74At6eM46nOflFd7R8bZsVNGy+PxOEqUmQ==}
+
   '@trysound/sax@0.2.0':
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -4755,10 +4767,18 @@ snapshots:
     dependencies:
       '@tauri-apps/api': 2.1.1
 
+  '@tauri-apps/plugin-log@2.0.0':
+    dependencies:
+      '@tauri-apps/api': 2.1.1
+
   '@tauri-apps/plugin-shell@2.0.1':
     dependencies:
       '@tauri-apps/api': 2.1.1
 
+  '@tauri-apps/plugin-window-state@2.0.0':
+    dependencies:
+      '@tauri-apps/api': 2.1.1
+
   '@trysound/sax@0.2.0': {}
 
   '@types/estree@1.0.6': {}

src-tauri/.gitignore

@@ -2,4 +2,5 @@
 # will have compiled files and executables
 /target/
 /gen/schemas
-/easytier/logs
+/easytier/logs
+/easytier/logs/*.*

src-tauri/Cargo.lock

@@ -1176,7 +1176,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.1.8"
+version = "1.2.4"
 dependencies = [
  "log",
  "planif",
@@ -1192,6 +1192,7 @@ dependencies = [
  "tauri-plugin-log",
  "tauri-plugin-shell",
  "tauri-plugin-single-instance",
+ "tauri-plugin-window-state",
  "whoami",
  "windows 0.58.0",
  "zip",
@@ -4543,6 +4544,21 @@ dependencies = [
  "zbus",
 ]
 
+[[package]]
+name = "tauri-plugin-window-state"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683c8764751fbbcebf3a594bcee24cf84c62773fa0080d1b40fc80698472421e"
+dependencies = [
+ "bitflags 2.6.0",
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 1.0.64",
+]
+
 [[package]]
 name = "tauri-runtime"
 version = "2.2.0"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.1.8"
+version = "1.2.4"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -50,3 +50,4 @@ features = ["Win32_System_TaskScheduler"]
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
 tauri-plugin-autostart = "2.0.1"
 tauri-plugin-single-instance = "2.0.1"
+tauri-plugin-window-state = "2"

src-tauri/capabilities/default.json

@@ -15,6 +15,8 @@
     "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",
@@ -41,7 +43,7 @@
           "args": [
             "run"
           ],
-          "cmd": "easytier/tool/WinIPBroadcast",
+          "cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
           "name": "WinIPBroadcast"
         }
       ]
@@ -53,12 +55,12 @@
           "args": [
             "run"
           ],
-          "cmd": "easytier/tool/WinIPBroadcast",
+          "cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
           "name": "WinIPBroadcast"
         },
         {
           "args": true,
-          "cmd": "easytier/tool/nssm",
+          "cmd": "$RESOURCE/easytier/tool/nssm",
           "name": "nssm"
         },
         {
@@ -88,6 +90,13 @@
     "fs:allow-resource-write-recursive",
     "clipboard-manager:allow-clear",
     "clipboard-manager:allow-read-text",
-    "clipboard-manager:allow-write-text"
+    "clipboard-manager:allow-write-text",
+
+    "window-state:default",
+    "window-state:allow-save-window-state",
+    "window-state:allow-restore-state",
+
+    "log:default",
+    "log:allow-log"
   ]
 }

src-tauri/easytier/clear_local_data.bat

@@ -0,0 +1,57 @@
+@echo off
+chcp 65001 >nul
+setlocal
+
+REM 检查是否具有管理员权限
+openfiles >nul 2>&1
+if %errorlevel% neq 0 (
+    echo 当前没有管理员权限，鼠标右键clear_data.bat，选择使用管理员模式运行...
+    pause
+    exit /b
+)
+
+REM 获取当前用户的 Local 目录路径
+set "local_dir=%LOCALAPPDATA%"
+
+REM 设置要删除的任务计划程序文件夹名称
+set "folder_name=\easytierGame"
+set "task_name=auto start"
+
+REM 设置要删除的目标文件夹
+set "target_data_dir=%local_dir%\com.tauri.easytier-game"
+echo ---
+REM 打印 Local 目录路径
+echo 当前数据目录: %target_data_dir%
+echo ---
+echo 您确定要清除EasytierGame的本地数据吗? (y/n)
+echo ---
+
+REM 等待用户输入
+set /p confirm=输入'y/n'进行确认:
+
+if /i "%confirm%"=="y" (
+    echo 清除数据中,请稍后...
+    echo ---
+    @REM REM 删除任务计划程序文件夹
+    echo delete auto_start task ...
+    echo ---
+
+    echo ---
+    schtasks /delete /tn "%folder_name%\%task_name%" /f
+    schtasks /delete /tn "%folder_name%" /f
+    echo ---
+    echo 开始清除本地缓存数据，没有使用开机自启上面就会报错，不影响数据清理...
+
+    if exist "%target_data_dir%" (
+        REM 删除目标文件夹及其内容
+        rd /s /q "%target_data_dir%"
+    )
+    echo 清除本地缓存数据完毕.
+    echo ---
+    echo 您可以手动删除EasytierGame目录下所有文件，即可完成卸载.
+) else (
+    echo 取消清理数据
+)
+
+pause
+endlocal

src-tauri/easytier/config_template.json

@@ -4,7 +4,9 @@
         "tcp",
         "udp"
     ], // 协议类型
-    "serverUrl": "public.easytier.top:11010", // easytier服务地址
+    
+    // easytier服务地址 - 可填写多个 方式1，逗号分隔，"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] （默认选中第一个）
+    "serverUrl": "public.easytier.top:11010", 
     "networkName": "",  // 网络名
     "networkPassword": "", // 网络密码
     "hostname": "configTest", // 主机名
@@ -18,5 +20,7 @@
     "disbleP2p": false,  // 禁用p2p, 强制中转
     "dhcp": false,  // 动态分配IP
     "devName": false, // 是否启用自定义网卡名
-    "devNameValue": "" // 网卡名(启用devName之后才生效)
+    "devNameValue": "", // 网卡名(启用devName之后才生效)
+    "enableNetCardMetric": false,  // 自定义easytier每次生成的网卡跃点
+    "netCardMetricValue": 1 // 网卡跃点数量(1-9999)
 }

src-tauri/easytier/帮助.txt

@@ -0,0 +1,16 @@
+[如果界面无法打开]
+
+1. 如果您已经启动easytier-game.exe，那它可能会在后台运行，打开任务管理器关闭easytier-game.exe
+
+2. 使用easytier-game安装目录下的 easytier/tool/MicrosoftEdgeWebview2Setup.exe 安装webview2
+
+3. 再次启用easytier-game.exe
+
+
+[如果想彻底删除easytierGame]
+
+1. 关闭easytierGame
+
+2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认，清除本地存储数据
+
+3. 删除easytierGame文件夹

src-tauri/src/lib.rs

@@ -60,7 +60,8 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
 
 #[tauri::command(rename_all = "snake_case")]
 fn get_core_version() -> String {
-    match Command::new("easytier/easytier-core.exe")
+    let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
+    match Command::new(&core_path)
         .arg("--version")
         .creation_flags(0x08000000)
         .output()
@@ -69,23 +70,34 @@ fn get_core_version() -> String {
             let output_str = String::from_utf8_lossy(&output.stdout);
             return output_str.trim().to_string();
         }
-        Err(_e) => return "".to_string(),
+        Err(_e) => {
+            log::error!("{}", _e.to_string());
+            return "".to_string();
+        }
     }
 }
 
-#[tauri::command(rename_all = "snake_case")]
-fn get_cli_version() -> String {
-    match Command::new("easytier/easytier-cli.exe")
-        .arg("--version")
-        .creation_flags(0x08000000)
-        .output()
-    {
-        Ok(output) => {
-            let output_str = String::from_utf8_lossy(&output.stdout);
-            return output_str.trim().to_string();
-        }
-        Err(_e) => return "".to_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"));
+//     match Command::new(&cli_path)
+//         .arg("--version")
+//         .creation_flags(0x08000000)
+//         .output()
+//     {
+//         Ok(output) => {
+//             let output_str = String::from_utf8_lossy(&output.stdout);
+//             return output_str.trim().to_string();
+//         }
+//         Err(_e) => return "".to_string(),
+//     }
+// }
+
+fn get_tool_exe_path(path: String) -> String {
+    let cur_vec = get_exe_directory();
+    let tool_path = cur_vec[1].to_string() + &path.to_string();
+    return tool_path;
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -122,7 +134,8 @@ struct MyResponse {
 
 #[tauri::command(rename_all = "snake_case")]
 fn get_members_by_cli() -> String {
-    match Command::new("easytier/easytier-cli.exe")
+    let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
+    match Command::new(&cli_path)
         .arg("peer")
         .arg("list")
         .creation_flags(0x08000000)
@@ -142,14 +155,17 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
     let response = reqwest::get(target)
         .await
         .expect("error to download easytier url");
-    let file_path = format!("./easytier/{}", file_name);
+    let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+    let file_path = format!("{}\\{}", easytier_path, file_name);
+    println!("download easytier to {}", file_path);
 
-    let easytier_dir = path::Path::new("./easytier");
+    let easytier_dir = path::Path::new(&easytier_path);
     if !easytier_dir.exists() {
         fs::create_dir_all(&easytier_dir).unwrap();
     }
 
     let path = path::Path::new(&file_path);
+    println!("download easytier to {}", path.display());
 
     let mut file = match File::create(&path) {
         Err(why) => panic!("couldn't create {}", why),
@@ -163,7 +179,7 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
     unzip(path);
     match fs::remove_file(path) {
         Ok(_) => println!("删除zip文件成功"),
-        Err(_) => println!("删除zip文件失败"),
+        Err(_) => log::error!("删除zip文件失败"),
     }
 }
 
@@ -197,8 +213,8 @@ fn unzip(fname: &path::Path) {
         //         fs::create_dir_all(p).unwrap();
         //     }
         // }
-
-        let easytier_dir = path::Path::new("./easytier");
+        let easytier_path = get_tool_exe_path(String::from("\\easytier"));
+        let easytier_dir = path::Path::new(&easytier_path);
         // if !easytier_dir.exists() {
         //     fs::create_dir_all(&easytier_dir).unwrap();
         // }
@@ -225,8 +241,9 @@ fn run_command(
     let stop_signal2 = Arc::clone(&stop_signal);
     let args2 = args.clone();
     thread::spawn(move || {
+        let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
         // trace, debug, info, warn, error, off
-        let mut child = Command::new("easytier/easytier-core.exe")
+        let mut child = Command::new(&core_path)
             .args(args)
             .creation_flags(0x08000000)
             .stdout(Stdio::piped())
@@ -249,7 +266,7 @@ fn run_command(
                     tx.send(line).expect("failed to send line");
                 }
                 Err(e) => {
-                    eprintln!("error reading line: {}", e);
+                    log::error!("error reading line: {}", e);
                     break;
                 }
             }
@@ -355,7 +372,7 @@ fn get_exe_directory() -> Vec<String> {
     let mut ret_vec: Vec<String> = Vec::new();
     match std::env::current_exe() {
         Ok(exe_path) => {
-            println!("Path of this executable is: {}", exe_path.display());
+            // println!("Path of this executable is: {}", exe_path.display());
             ret_vec.push(exe_path.display().to_string());
             ret_vec.push(exe_path.parent().unwrap().display().to_string());
             return ret_vec;
@@ -378,7 +395,7 @@ fn spawn_autostart(enabled: bool) {
             let _ = tx.send(true);
         }
         Err(e) => {
-            println!("Error: {}", e);
+            log::error!("Error: {}", e);
             let _ = tx.send(false);
         }
     });
@@ -430,12 +447,14 @@ fn autostart_is_enabled() -> bool {
             return enabled;
         }
         Err(e) => {
-            println!("autostart enabled: false -> {}", e);
+            log::error!("autostart enabled: false -> {}", e);
             return false;
         }
     }
 }
 
+pub const AUTOSTART_ARG: &str = "--autostart";
+pub const TASKAUTOSTART_ARG: &str = "--task-auto-start";
 fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error>> {
     if !enabled {
         unsafe {
@@ -486,7 +505,7 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
         sb.create_logon()
             .author("heixiansen")?
             .trigger("trigger", enabled)?
-            .action(Action::new("auto start", exe, "", ""))?
+            .action(Action::new("auto start", exe, "", &TASKAUTOSTART_ARG))?
             .in_folder("easytierGame")?
             .principal(settings)?
             .delay(Duration {
@@ -499,14 +518,20 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
     Ok(())
 }
 
-pub const AUTOSTART_ARG: &str = "--autostart";
-
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
+    // 获取命令行参数
+    let args: Vec<String> = std::env::args().collect();
+
     let stop_signal = Arc::new(AtomicBool::new(false)); // 创建一个原子布尔值，用于控制命令的停止
     let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆，用于传递给命令
     let context = tauri::generate_context!();
     tauri::Builder::default()
+        .plugin(
+            tauri_plugin_window_state::Builder::new()
+                .with_state_flags(tauri_plugin_window_state::StateFlags::SIZE)
+                .build(),
+        )
         .plugin(tauri_plugin_clipboard_manager::init())
         .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_autostart::init(
@@ -518,16 +543,26 @@ pub fn run() {
             let _ = app
                 .get_webview_window("main")
                 .expect("no main window")
-                .set_focus();
+                .set_focus()
+                .expect("failed to set focus");
         }))
-        .setup(|app| {
-            if cfg!(debug_assertions) {
-                app.handle().plugin(
-                    tauri_plugin_log::Builder::default()
-                        .level(log::LevelFilter::Info)
-                        .build(),
-                )?;
-            }
+        .setup(move |app| {
+            let args = args.clone();
+            // if cfg!(debug_assertions) {
+            let log_path = get_tool_exe_path(String::from("\\easytier\\guiLogs"));
+            app.handle().plugin(
+                tauri_plugin_log::Builder::default()
+                    .target(tauri_plugin_log::Target::new(
+                        tauri_plugin_log::TargetKind::Folder {
+                            path: std::path::PathBuf::from(log_path),
+                            file_name: None,
+                        },
+                    ))
+                    .max_file_size(50_000 /* bytes */)
+                    .level(log::LevelFilter::Error)
+                    .build(),
+            )?;
+            // }
             #[cfg(not(target_os = "android"))]
             let _tray_menu = TrayIconBuilder::with_id("main")
                 .menu_on_left_click(false)
@@ -547,6 +582,14 @@ pub fn run() {
                 ))?)
                 .icon_as_template(false)
                 .build(app)?;
+
+            // 开机自启隐藏到托盘或者显示主窗口
+            if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
+                let main_window = app.get_webview_window("main").unwrap();
+                main_window.show().expect("failed to show window");
+                main_window.set_focus().expect("failed to set focus");
+            }
+
             Ok(())
         })
         .manage(stop_signal_clone)
@@ -556,7 +599,6 @@ pub fn run() {
             get_core_version,
             fetch_easytier_list,
             download_easytier_zip,
-            get_cli_version,
             get_members_by_cli,
             search_pid_by_pname,
             get_exe_directory,

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.1.8",
+	"version": "1.2.4",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,8 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.1.8",
+				"title": "easytier-game 1.2.4",
+				"label": "main",
 				"minWidth": 340,
 				"width": 340,
 				"height": 305,
@@ -24,6 +25,7 @@
 				"fullscreen": false,
 				"decorations": true,
 				"center": true,
+				"visible": false,
 				"maximizable": false,
 				"transparent": false
 			}
@@ -41,10 +43,13 @@
 			"easytier/icons/",
 			"easytier/config_template.json",
 			"easytier/tool/WinIPBroadcast.exe",
+			"easytier/tool/MicrosoftEdgeWebview2Setup.exe",
 			"easytier/easytier-cli.exe",
 			"easytier/easytier-core.exe",
 			"easytier/Packet.dll",
-			"easytier/wintun.dll"
+			"easytier/wintun.dll",
+			"easytier/clear_local_data.bat",
+			"easytier/帮助.txt"
 		],
 		"windows": {
 			"webviewInstallMode": {

stores/index.ts

@@ -11,7 +11,7 @@ export default defineStore("main", {
 				ipv4: "",
 				proxyNetworks: "", // 子网代理
 				autoStart: false, // 是否自动启动
-				coonectAfterStart: false, //软件打开后，是否自动连接
+				connectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
 				disbleListenner: false, // 是否禁用监听
 				disableEncryption: false, // 是否禁用加密
@@ -27,7 +27,9 @@ export default defineStore("main", {
 				saveErrorLog: true, // 是否保存错误日志
 				logLevel: "error", //日志等级
 				devName: false, //自定义网卡名
-				devNameValue: "" //自定义网卡名
+				devNameValue: "", //自定义网卡名
+				enableNetCardMetric: false, //启用网卡自定义跃点
+				netCardMetricValue: 1 //自定义网卡跃点值
 			},
 			cidrEnable: false,
 			basePeers: ["public.easytier.top:11010"],
@@ -36,17 +38,53 @@ export default defineStore("main", {
 			configPath: "", //配置文件路径
 			winIpBcAutoStart: true,
 			createConfigInEasytier: false, //在easytier目录生成config.json文件吗
+			githubFastUrl: "https://ghproxy.cc/",
 
 			winipBcPid: 0,
-			winipBcStart: false,
-
+			winipBcStart: false
 		};
 	},
 	persist: {
-		// 除了这些，其他都要存下来
-		omit: [
-			"winipBcPid",
-			"winipBcStart"
-		]
+		// 防止持久化保存 用户使用config.json输入的无用的字段
+		pick: [
+			"config.protocol",
+			"config.serverUrl",
+			"config.networkName",
+			"config.networkPassword",
+			"config.hostname",
+			"config.ipv4",
+			"config.proxyNetworks",
+			"config.autoStart",
+			"config.connectAfterStart",
+			"config.disableIpv6",
+			"config.disbleListenner",
+			"config.disableEncryption",
+			"config.multiThread",
+			"config.enablExitNode",
+			"config.noTun",
+			"config.latencyfirst",
+			"config.useSmoltcp",
+			"config.disableUdpHolePunching",
+			"config.relayAllPeerrpc",
+			"config.disbleP2p",
+			"config.dhcp",
+			"config.saveErrorLog",
+			"config.logLevel",
+			"config.devName",
+			"config.devNameValue",
+			"config.enableNetCardMetric",
+			"config.netCardMetricValue",
+
+			"cidrEnable",
+			"basePeers",
+			"theme",
+			"configStartEnable",
+			"configPath",
+			"winIpBcAutoStart",
+			"createConfigInEasytier",
+			"githubFastUrl"
+		],
+		// // 除了这些，其他都要存下来
+		// omit: ["winipBcPid", "winipBcStart"]
 	}
 });

utils/index.ts

@@ -1,6 +1,6 @@
+import { open } from "@tauri-apps/plugin-shell";
 export const ENV = import.meta.env;
 
-
 //防抖
 export const bounce = (time = 3000) => {
 	let bounceTimer: NodeJS.Timeout | null = null;
@@ -50,8 +50,8 @@ export const numRemoveZero = (num: Number) => {
 // await-to-js
 export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefined) => {
 	return promise
-		.then(data => [null, data])
-		.catch(err => {
+		.then((data) => [null, data])
+		.catch((err) => {
 			if (errorExt) {
 				if (typeof errorExt !== "object") {
 					return [errorExt, undefined];
@@ -72,7 +72,7 @@ export const parsePeerInfo = (content: string) => {
 	const headers = lines[1]
 		.split("│")
 		.slice(1, -1)
-		.map(h => h.trim());
+		.map((h) => h.trim());
 
 	// 初始化结果数组
 	const result: any[] = [];
@@ -85,7 +85,7 @@ export const parsePeerInfo = (content: string) => {
 		const values = lines[i]
 			.split("│")
 			.slice(1, -1)
-			.map(v => v.trim());
+			.map((v) => v.trim());
 
 		// 创建对象并添加到结果数组
 		const obj: any = {};
@@ -100,6 +100,10 @@ export const parsePeerInfo = (content: string) => {
 	return result;
 };
 
+export const addQQGroup = () => {
+	open("https://qm.qq.com/q/Yo3HmaEIWC");
+};
+
 export function isValidIP(ip: string) {
 	const ipv4Pattern =
 		/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;