增加nat类型显示

app.vue

@@ -6,6 +6,20 @@
 <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);
+			logger(message);
+		};
+	}
+	forwardConsole("log", trace);
+	forwardConsole("debug", debug);
+	forwardConsole("info", info);
+	forwardConsole("warn", warn);
+	forwardConsole("error", error);
+
 	const mainStore = useMainStore();
 	// console.log(mainStore.theme)
 	initTheme(mainStore.theme);

composables/configJson.ts

@@ -15,7 +15,7 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 			proxyNetworks,
 			autoStart,
 			relayAllPeerrpc,
-			coonectAfterStart,
+			connectAfterStart,
 			multiThread,
 			enablExitNode,
 			useSmoltcp,
@@ -39,7 +39,7 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 		}
 		await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
 	} catch (err) {
-		console.log(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(`启动失败`);
+            ElMessage.error(`WinipBc失败`);
-            console.log(err);
+            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";
 
@@ -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;
 	}
 
@@ -113,7 +114,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.9",
+	"version": "1.2.2",
 	"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

@@ -26,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
@@ -123,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

@@ -2,8 +2,7 @@
 	<ElForm
 		size="small"
 		label-position="top"
-		:model="config"
+		:model="config">
-	>
 		<!-- element-loading-custom-class="config-start"
 			v-loading="mainStore.configStartEnable"
 			:element-loading-spinner="'<path />'"
@@ -11,28 +10,24 @@
 		<!-- <div> -->
 		<ElFormItem
 			label="服务器"
-			prop="serverUrl"
+			prop="serverUrl">
-		>
 			<template #label>
 				<div class="flex items-center gap-[0_5px]">
 					<div>服务器</div>
 					<span>-</span>
 					<ElTag
 						effect="dark"
-						:type="data.isSuccessGetIp ? 'success' : 'info'"
+						:type="data.isSuccessGetIp ? 'success' : 'info'">
-					>
 						{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
 					</ElTag>
 					<ElButton
 						v-if="!data.coreVersion"
-						@click="getCoreVersion(true)"
+						@click="getCoreVersion(true)">
-					>
 						获取内核版本
 					</ElButton>
 					<ElTag
 						v-else
-						type="info"
+						type="info">
-					>
 						{{ data.coreVersion }}
 					</ElTag>
 					<ElPopconfirm
@@ -41,15 +36,13 @@
 						confirm-button-text="继续"
 						title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
 						也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
-						@confirm="handleUpdateCore"
+						@confirm="handleUpdateCore">
-					>
 						<template #reference>
 							<ElButton
 								:disabled="data.isStart"
 								:loading="data.update"
 								type="warning"
-								size="small"
+								size="small">
-							>
 								{{ data.coreVersion ? "更新内核" : "下载内核" }}
 							</ElButton>
 						</template>
@@ -62,8 +55,7 @@
 				placeholder="请选择服务器地址"
 				default-first-option
 				v-model="config.serverUrl"
-				@change="handleServerUrlChange"
+				@change="handleServerUrlChange">
-			>
 				<template #prefix>
 					<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
 						<ElSelect
@@ -72,14 +64,12 @@
 							collapse-tags
 							@click.stop
 							v-model="config.protocol"
-							@change="handleServerUrlChange"
+							@change="handleServerUrlChange">
-						>
 							<ElOption
 								v-for="item in protocols"
 								:key="item"
 								:label="item"
-								:value="item"
+								:value="item"></ElOption>
-							></ElOption>
 						</ElSelect>
 					</div>
 				</template>
@@ -87,8 +77,7 @@
 					v-for="item in mainStore.basePeers"
 					:key="item"
 					:label="item"
-					:value="item"
+					:value="item">
-				>
 					<div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]">
 						<ElTooltip :content="item">
 							<p class="truncate">{{ item }}</p>
@@ -98,8 +87,7 @@
 								@click.stop="handleDeleteServerUrl(item)"
 								round
 								:icon="Delete"
-								type="danger"
+								type="danger"></ElButton>
-							></ElButton>
 						</div>
 					</div>
 				</ElOption>
@@ -119,8 +107,7 @@
 					<ElInput
 						maxlength="100"
 						placeholder="请输入网络名"
-						v-model="config.networkName"
+						v-model="config.networkName"></ElInput>
-					></ElInput>
 				</ElFormItem>
 			</div>
 			<div class="flex-1">
@@ -138,8 +125,7 @@
 						maxlength="100"
 						placeholder="请输入网络密码"
 						v-model="config.networkPassword"
-						type="password"
+						type="password"></ElInput>
-					></ElInput>
 				</ElFormItem>
 			</div>
 		</div>
@@ -156,13 +142,11 @@
 				<ElInput
 					maxlength="100"
 					placeholder="例如: Player1"
-					v-model="config.hostname"
+					v-model="config.hostname"></ElInput>
-				></ElInput>
 			</ElFormItem>
 			<ElFormItem
 				class="w-[70%]"
-				label="局域网IP"
+				label="局域网IP">
-			>
 				<template #label>
 					<div class="flex items-center h-[20px]">
 						虚拟网IP
@@ -175,16 +159,14 @@
 							inline-prompt
 							inactive-text="固定IP"
 							active-text="动态获取IP"
-							size="small"
+							size="small"></ElSwitch>
-						></ElSwitch>
 					</div>
 				</template>
 				<ElInput
 					maxlength="100"
 					:disabled="config.dhcp"
 					:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
-					v-model="config.ipv4"
+					v-model="config.ipv4"></ElInput>
-				></ElInput>
 			</ElFormItem>
 		</div>
 		<!-- </div> -->
@@ -198,28 +180,24 @@
 						size="default"
 						:type="!data.isStart ? 'primary' : 'danger'"
 						:disabled="data.startLoading || !data.coreVersion || data.update"
-						@click="handleConnection"
+						@click="handleConnection">
-					>
 						{{ !data.isStart ? "启动联机" : "停止联机" }}
 						<template #dropdown>
 							<ElDropdownMenu>
 								<ElDropdownItem
 									command="import_config"
-									:icon="Link"
+									:icon="Link">
-								>
 									导入配置
 								</ElDropdownItem>
 								<ElDropdownItem
 									command="share_config"
-									:icon="Share"
+									:icon="Share">
-								>
 									分享配置
 								</ElDropdownItem>
 								<ElDropdownItem
 									:icon="Tools"
 									command="toml"
-									:disabled="data.isStart"
+									:disabled="data.isStart">
-								>
 									使用外部配置文件
 								</ElDropdownItem>
 							</ElDropdownMenu>
@@ -229,55 +207,51 @@
 				<div class="mt-[6px] pl-[2px]">
 					<ElTooltip
 						placement="left"
-						content="日志"
+						content="日志">
-					>
 						<ElButton
 							:type="!data.logVisible ? 'info' : 'warning'"
 							@click="handleShowLogDialog"
 							:icon="List"
 							size="small"
-							plain
+							plain></ElButton>
-						></ElButton>
 					</ElTooltip>
 					<ElTooltip
 						placement="left"
-						content="成员"
+						content="成员">
-					>
 						<ElButton
 							@click="handleShowMemberDialog"
 							:icon="UserFilled"
 							plain
 							type="success"
-							size="small"
+							size="small"></ElButton>
-						></ElButton>
 					</ElTooltip>
 				</div>
 			</div>
 			<div class="ml-auto">
 				<ElCheckbox
 					v-model="config.disbleP2p"
-					size="small"
+					size="small">
-				>
 					强制中转
 				</ElCheckbox>
-				<ElCheckbox
+				<ElTooltip
-					@change="handleAutoStart"
+					placement="top-start"
-					:model-value="config.autoStart"
+					content="自启后隐藏于托盘，不显示界面">
-					size="small"
+					<ElCheckbox
-				>
+						@change="handleAutoStartByTask"
-					开机自启
+						:model-value="config.autoStart"
-				</ElCheckbox>
+						size="small">
+						开机自启
+					</ElCheckbox>
+				</ElTooltip>
 				<div>
 					<ElButton
 						@click="handleShowCidrDialog"
-						:icon="Share"
+						:icon="Share">
-					>
 						子网代理
 					</ElButton>
 					<ElButton
 						@click="handleShowAdvanceDialog"
-						:icon="Setting"
+						:icon="Setting">
-					>
 						高级选项
 					</ElButton>
 				</div>
@@ -288,8 +262,7 @@
 							type="primary"
 							size="small"
 							:icon="MagicStick"
-							@click="handleShowToolDialog"
+							@click="handleShowToolDialog">
-						>
 							增强工具
 						</ElButton>
 					</div>
@@ -297,8 +270,7 @@
 						class="!text-[9px] pb-[2px] ml-[8px] truncate"
 						type="info"
 						:underline="false"
-						@click="open('https://github.com/EasyTier/EasytierGame')"
+						@click="open('https://github.com/EasyTier/EasytierGame')">
-					>
 						EasytierGame主页
 					</ElLink>
 				</div>
@@ -313,14 +285,12 @@
 		class="!mb-0"
 		v-model="importConfigData.visible"
 		:close-on-press-escape="false"
-		title="导入分享"
+		title="导入分享">
-	>
 		<ElInput
 			type="textarea"
 			:rows="6"
 			placeholder="请粘贴分享的配置"
-			v-model="importConfigData.data"
+			v-model="importConfigData.data"></ElInput>
-		></ElInput>
 		<template #footer>
 			<div>
 				<el-text type="danger">导入成功后，您当前的部分配置将被替换</el-text>
@@ -329,8 +299,7 @@
 				<ElButton
 					size="small"
 					@click="handleStartImport"
-					type="primary"
+					type="primary">
-				>
 					导入
 				</ElButton>
 			</div>
@@ -344,8 +313,7 @@
 		class="!mb-0"
 		v-model="configStart.visible"
 		:close-on-press-escape="false"
-		title="配置文件启动"
+		title="配置文件启动">
-	>
 		<div class="flex items-center gap-[0_4px]">
 			<span>启用</span>
 			<ElSwitch v-model="mainStore.configStartEnable"></ElSwitch>
@@ -354,16 +322,14 @@
 			</ElTooltip>
 			<ElButton
 				@click="openConfigDir"
-				size="small"
+				size="small">
-			>
 				打开配置目录
 			</ElButton>
 			<ElButton
 				@click="handleStartCommand('toml')"
 				type="primary"
 				:icon="RefreshRight"
-				size="small"
+				size="small">
-			>
 				刷新
 			</ElButton>
 		</div>
@@ -371,14 +337,12 @@
 			<ElSelect
 				v-model="mainStore.configPath"
 				no-data-text="目录没有配置文件"
-				placeholder="选择配置文件"
+				placeholder="选择配置文件">
-			>
 				<ElOption
 					v-for="item in configStart.list"
 					:key="item.path"
 					:value="item.path"
-					:label="item.name"
+					:label="item.name"></ElOption>
-				></ElOption>
 			</ElSelect>
 		</div>
 		<template #footer>
@@ -386,8 +350,7 @@
 				<ElButton
 					size="small"
 					@click="configStart.visible = false"
-					type="danger"
+					type="danger">
-				>
 					关闭
 				</ElButton>
 			</div>
@@ -425,8 +388,8 @@
 
 	const mainStore = useMainStore();
 	const config = mainStore.config;
-	// console.log(config);
+	// console.error(config);
-	const protocols = ["tcp", "udp", "ws", "wss", "wg"];
+	const protocols = ["tcp", "udp", "ws", "wss", "wg", "quic"];
 	const data = reactive({
 		logVisible: false,
 		cidrVisible: false,
@@ -443,28 +406,28 @@
 		startLoading: false,
 		isStart: false,
 		connectionSuccess: false,
-		configJsonSeverUrl: "" // 本地保存一次，用于回填config.json
+		configJsonSeverUrl: "", // 本地保存一次，用于回填config.json
 	});
 
 	const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
 		visible: false,
 		loading: false,
-		list: [] //配置文件列表
+		list: [], //配置文件列表
 	});
 
 	const importConfigData = reactive<{ data: ""; [key: string]: any }>({
 		visible: false,
 		loading: false,
-		data: ""
+		data: "",
 	});
 
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
-			appWindow.onCloseRequested(async event => {
+			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();
 				}
@@ -482,10 +445,24 @@
 			newBasePeers.splice(idx, 1);
 		}
 		mainStore.basePeers = uniq([...newBasePeers]);
+		if (mainStore.basePeers.length > 0) {
+			mainStore.config.serverUrl = mainStore.basePeers[0];
+		}
 	};
 
 	const handleServerUrlChange = () => {
-		mainStore.basePeers = uniq([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 } = {
@@ -495,8 +472,9 @@
 		thread_id: null,
 		async listenOutput() {
 			// const appWindow = getCurrentWindow();
-			const unListen = await listen("command-output", async event => {
+			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];
@@ -527,11 +505,11 @@
 								"netsh",
 								["interface", "ipv4", "set", "interface", devName, "metric=", `${mainStore.config.netCardMetricValue}`],
 								{
-									encoding: "gb2312"
+									encoding: "gb2312",
 								}
 							).execute();
 						} catch (err) {
-							console.log(err);
+							console.error(err);
 							ElMessage.error("跃点设置失败");
 						}
 					}
@@ -544,7 +522,7 @@
 			this.unListenOutPut = unListen;
 		},
 		async listenThreadId() {
-			const unListen = await listen("thread-id", event => {
+			const unListen = await listen("thread-id", (event) => {
 				if (event.payload) {
 					this.thread_id = event.payload;
 				}
@@ -552,14 +530,14 @@
 			this.unListenThreadId = unListen;
 		},
 		async listenConfigStart() {
-			const unListen = await listen("config", event => {
+			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;
 			});
 			this.unListenConfigStart = unListen;
-		}
+		},
 	};
 
 	const unListenAll = async () => {
@@ -580,11 +558,11 @@
 		await getReleaseList();
 		const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
 		if (latestVersionFileName) {
-			// console.log(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
+			// console.error(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
 			const latestVersion = /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName)?.[1];
 			const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1];
 			if (latestVersion && currentVersion != latestVersion) {
-				// console.log({ currentVersion, latestVersion });
+				// console.error({ currentVersion, latestVersion });
 				ElMessage.success(`更新 -> ${latestVersion}`);
 				const downloadUrl = data.releaseList?.[0]?.[0]?.[2];
 				return [true, downloadUrl, latestVersionFileName];
@@ -602,21 +580,28 @@
 	};
 
 	const handleUpdateCore = async () => {
-		data.update = true;
+		try {
-		await getCoreVersion();
+			data.update = true;
-		const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
+			await getCoreVersion();
-		if (isNeedUpdate) {
+			const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
-			await reset();
+
-			// console.log(downloadUrl);
+			if (isNeedUpdate) {
-			await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName });
+				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[];
+		console.error(data.releaseList);
 	};
 
 	const handleAutoStart = async () => {
@@ -663,22 +648,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 });
+			console.error(err);
-			await tauriAutoStart.disable();
+			await invoke("spawn_autostart", { enabled: false });
-			config.autoStart = 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();
 		}
@@ -710,16 +702,21 @@
 					data.configJsonSeverUrl = guiJson.serverUrl;
 					mainStore.$patch({
 						config: {
-							...guiJson,
 							...mainStore.config,
-							serverUrl: saveServerUrl
+							...guiJson,
-						}
+							serverUrl: saveServerUrl,
+						},
 					});
 					if (mainStore.createConfigInEasytier) {
 						await updateConfigJson(data.configJsonSeverUrl);
 					}
 				} catch (err) {
+					console.error(err);
 					ElMessage.error(`config.json格式错误`);
+				} finally {
+					mainStore.$patch({
+						createConfigInEasytier: true, // 发现本地存在config.json 默认启用该功能
+					});
 				}
 			}
 		}
@@ -757,7 +754,7 @@
 	});
 
 	const getArgs = async () => {
-		// console.log(config.proxyNetworks);
+		// console.error(config.proxyNetworks);
 		const args = [];
 		if (mainStore.configStartEnable && mainStore.configPath) {
 			// const resourceDir = await getResourceDir();
@@ -784,7 +781,7 @@
 		}
 		if (config.serverUrl) {
 			const formatUrl = config.serverUrl.replace(/\\/g, "/");
-			args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
+			args.push("--peers", ...config.protocol.map((protocol) => `${protocol}://${formatUrl}`));
 		}
 		if (config.disbleP2p) {
 			args.push("--disable-p2p");
@@ -796,12 +793,12 @@
 			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")
-				.map(item => item.trim())
+				.map((item) => item.trim())
-				.filter(item => item && reg.test(item));
+				.filter((item) => item && reg.test(item));
 			args.push("--proxy-networks", ...formatProxyNetworks);
 			config.proxyNetworks = formatProxyNetworks.join("\n");
 		}
@@ -845,7 +842,7 @@
 			config.ipv4 = "";
 		}
 		const memberDialog = await getAllWebviewWindows();
-		const memberDialogs = memberDialog.filter(item => item.label === "member");
+		const memberDialogs = memberDialog.filter((item) => item.label === "member");
 		if (memberDialogs && memberDialogs.length > 0) {
 			data.memberVisible = false;
 			for (const memberDialog of memberDialogs) {
@@ -871,7 +868,7 @@
 			if (args[0] === "-c") {
 				ElMessage.warning({
 					message: "使用配置文件中.",
-					duration: 5000
+					duration: 5000,
 				});
 			}
 			data.log = ""; //清空日志
@@ -880,7 +877,7 @@
 			await listenObj.listenOutput();
 
 			await invoke("run_command", {
-				args
+				args,
 			});
 		}
 	};
@@ -894,10 +891,10 @@
 			if (isExists) {
 				const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
 				configStart.list = entries
-					.filter(item => item.isFile)
+					.filter((item) => item.isFile)
-					.map(item => ({
+					.map((item) => ({
 						name: item.name,
-						path: `${path}${item.name}`
+						path: `${path}${item.name}`,
 					})) as any;
 			} else {
 				mainStore.configStartEnable = false;
@@ -912,7 +909,7 @@
 				const {
 					proxyNetworks,
 					autoStart,
-					coonectAfterStart,
+					connectAfterStart,
 					multiThread,
 					hostname,
 					enablExitNode,
@@ -926,7 +923,7 @@
 				await writeText(WT);
 				ElMessage.success("配置已复制");
 			} catch (err) {
-				console.log(err);
+				console.error(err);
 				ElMessage.error("分享失败");
 			}
 		}
@@ -940,20 +937,20 @@
 		try {
 			await ElMessageBox.confirm("确定导入?", "提示", {
 				confirmButtonText: "确定",
-				cancelButtonText: "取消"
+				cancelButtonText: "取消",
 			});
 			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
 			mainStore.$patch({
 				config: {
 					...mainStore.config,
-					...payload.config
+					...payload.config,
-				}
+				},
 			});
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
 			mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
 		} catch (err) {
-			console.log(err);
+			console.error(err);
 			if (err !== "cancel") {
 				ElMessage.error("导入失败");
 			}
@@ -968,14 +965,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();
 	};
 
@@ -991,9 +990,9 @@
 			"member",
 			{
 				title: "成员列表",
-				width: 470,
+				width: 875,
 				height: 380,
-				url: "#/member"
+				url: "#/member",
 			},
 			() => {
 				data.memberVisible = true;
@@ -1012,7 +1011,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/log"
+				url: "#/log",
 			},
 			(_, appWindow) => {
 				data.logVisible = true;
@@ -1035,7 +1034,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/cidr"
+				url: "#/cidr",
 			},
 			(_, appWindow) => {
 				data.cidrVisible = true;
@@ -1054,7 +1053,7 @@
 				width: 600,
 				height: 380,
 				resizable: false,
-				url: "#/advance"
+				url: "#/advance",
 			},
 			(_, appWindow) => {
 				data.advanceVisible = true;
@@ -1073,7 +1072,7 @@
 				width: 460,
 				height: 480,
 				resizable: true,
-				url: "#/tool"
+				url: "#/tool",
 			},
 			(_, appWindow) => {
 				data.toolVisible = true;

pages/member.vue

@@ -8,24 +8,55 @@
 				:data="data.member"
 				v-else>
 				<ElTableColumn
-					v-for="prop in showTableHeader"
 					sortable
-					:prop="prop[0]"
+					width="140"
-					:label="prop[1]"
+					label="主机名"
-					:key="prop[0]">
+					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'">
+							:type="row.cost == 'p2p' ? 'success' : 'info'">
-							{{ row[prop[0]] }}
+							{{ 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 member = await invoke<string>("get_members_by_cli");
-		const peerInfo = parsePeerInfo(member as string);
+		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/Cargo.lock

@@ -1176,7 +1176,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.1.9"
+version = "1.2.2"
 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.9"
+version = "1.2.2"
 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

@@ -41,7 +41,7 @@
           "args": [
             "run"
           ],
-          "cmd": "easytier/tool/WinIPBroadcast",
+          "cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
           "name": "WinIPBroadcast"
         }
       ]
@@ -53,12 +53,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 +88,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/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")]
+// #[tauri::command(rename_all = "snake_case")]
-fn get_cli_version() -> String {
+// #[warn(dead_code)]
-    match Command::new("easytier/easytier-cli.exe")
+// fn get_cli_version() -> String {
-        .arg("--version")
+//     let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
-        .creation_flags(0x08000000)
+//     match Command::new(&cli_path)
-        .output()
+//         .arg("--version")
-    {
+//         .creation_flags(0x08000000)
-        Ok(output) => {
+//         .output()
-            let output_str = String::from_utf8_lossy(&output.stdout);
+//     {
-            return output_str.trim().to_string();
+//         Ok(output) => {
-        }
+//             let output_str = String::from_utf8_lossy(&output.stdout);
-        Err(_e) => return "".to_string(),
+//             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_path = get_tool_exe_path(String::from("\\easytier"));
-        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();
         // }
@@ -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| {
+        .setup(move |app| {
-            if cfg!(debug_assertions) {
+            let args = args.clone();
-                app.handle().plugin(
+            // if cfg!(debug_assertions) {
-                    tauri_plugin_log::Builder::default()
+            let log_path = get_tool_exe_path(String::from("\\easytier\\guiLogs"));
-                        .level(log::LevelFilter::Info)
+            app.handle().plugin(
-                        .build(),
+                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.9",
+	"version": "1.2.2",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,8 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.1.9",
+				"title": "easytier-game 1.2.2",
+				"label": "main",
 				"minWidth": 340,
 				"width": 340,
 				"height": 305,
@@ -24,6 +25,7 @@
 				"fullscreen": false,
 				"decorations": true,
 				"center": true,
+				"visible": false,
 				"maximizable": false,
 				"transparent": false
 			}

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, // 是否禁用加密
@@ -54,7 +54,7 @@ export default defineStore("main", {
 			"config.ipv4",
 			"config.proxyNetworks",
 			"config.autoStart",
-			"config.coonectAfterStart",
+			"config.connectAfterStart",
 			"config.disableIpv6",
 			"config.disbleListenner",
 			"config.disableEncryption",