修复与功能更新

1.解决UAC开机自启失败的问题
2.联机成功后右下角图标增加 ip地址的 tooltip提示
3.高级选项: 新增软件启动自动联机的功能开关，搭配修复后的开机自启功能，可实现类windows服务的无感联机
4.高级选项：增加日志配置

assets/css/main.css

@@ -27,17 +27,3 @@ body {
 	box-sizing: border-box;
 	padding: 3px 5px;
 }
-
-::-webkit-scrollbar {
-	width: 6px;
-}
-
-::-webkit-scrollbar-thumb {
-	background-color: #0003;
-	border-radius: 10px;
-	transition: all 0.2s ease-in-out;
-}
-
-::-webkit-scrollbar-track {
-	border-radius: 10px;
-}

composables/tray.ts

@@ -92,15 +92,14 @@ export async function MenuItemShow(text: string) {
 
 export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean = false) {
 	if (!tray) return;
-	tray.setIcon(isRunning ? "icons/icon-inactive.ico" : "icons/icon.ico");
+	await tray.setIcon(isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico");
 }
 
-// export async function setTrayTooltip(tooltip: string) {
+export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) {
-//   if (tooltip) {
+	if (!tray) return;
-//     const tray = await useTray()
+	if (tooltip) {
-//     if (!tray)
+		await tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`);
-//       return
+	} else {
-//     tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`)
+		await tray.setTooltip(`EasyTier\n${pkg.version}`);
-//     tray.setTitle(`EasyTier\n${pkg.version}\n${tooltip}`)
+	}
-//   }
+}
-// }

composables/windows.ts

@@ -0,0 +1,53 @@
+import { type UnlistenFn } from "@tauri-apps/api/event";
+import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window } from "@tauri-apps/api/window";
+import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
+import type { WebviewLabel, WebviewOptions, } from "@tauri-apps/api/webview";
+export default async (
+	label: WebviewLabel,
+	options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
+	afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
+	beforeCloseFunc?: () => void | null
+) => {
+    let defaultOpts = {
+		parent: undefined,
+		closable: true,
+		resizable: true,
+		decorations: true,
+		maximizable: false,
+		minimizable: false,
+        x: 0,
+        y: 0
+	};
+	const appWindow = getCurrentWindow();
+	if (appWindow) {
+		const appSize = await appWindow.outerSize();
+		const factor = await appWindow.scaleFactor();
+		const appPosition = await appWindow.outerPosition();
+		const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
+        defaultOpts.parent = appWindow as any;
+        defaultOpts.x = logicalPosition.x;
+        defaultOpts.y = logicalPosition.y;
+	}
+	let unListenlogClose: UnlistenFn | null = null;
+	let unlistenLogCreated: UnlistenFn | null = null;
+	let dialog = await WebviewWindow.getByLabel(label);
+	if (!dialog) {
+		dialog = new WebviewWindow(label, {...defaultOpts, ...options});
+		unlistenLogCreated = await dialog.once("tauri://webview-created", async () => {
+			if (dialog) {
+				afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
+				await dialog.show();
+			}
+		});
+		unListenlogClose = await dialog.onCloseRequested(async () => {
+			beforeCloseFunc && (await beforeCloseFunc());
+			unListenlogClose && (await unListenlogClose());
+		});
+	} else {
+		const visible = await dialog.isVisible();
+		if (visible) {
+			await dialog.close();
+			unlistenLogCreated && (await (unlistenLogCreated as Function)());
+		}
+	}
+};

env/.env.dev

@@ -0,0 +1,3 @@
+VITE_CONFIG_PATH=easytier/config/
+VITE_LOG_PATH=easytier/logs/
+VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

env/.env.prod

@@ -0,0 +1,3 @@
+VITE_CONFIG_PATH=easytier/config/
+VITE_LOG_PATH=easytier/logs/
+VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart

layouts/default.vue

@@ -5,6 +5,8 @@
 <script setup lang="tsx">
 	//屏蔽右键菜单
 	document.addEventListener("contextmenu", (e: MouseEvent) => {
-		e.preventDefault();
+		if (import.meta.env.PROD) {
+			e.preventDefault();
+		}
 	});
 </script>

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.0.6",
+	"version": "1.1.0",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod"
@@ -25,8 +25,7 @@
 		"@vitejs/plugin-vue-jsx": "^3.1.0",
 		"dayjs": "^1.11.10",
 		"defu": "^6.1.4",
-		"element-plus": "^2.7.1",
+		"element-plus": "^2.8.6",
-		"javascript-obfuscator": "^4.1.0",
 		"less": "^4.2.0",
 		"lodash-es": "^4.17.21",
 		"nuxt": "^3.11.2",
@@ -39,6 +38,7 @@
 		"xlsx": "^0.18.5"
 	},
 	"dependencies": {
-		"@tauri-apps/plugin-autostart": "~2"
+		"@tauri-apps/plugin-autostart": "~2",
+		"@tauri-apps/plugin-fs": "~2"
 	}
 }

pages/advance.vue

@@ -0,0 +1,67 @@
+<template>
+	<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
+		<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
+		<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.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
+		<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>
+		<div>
+			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包，即使对等节点不在转发网络白名单内</ElCheckbox>
+		</div>
+		<div class="flex items-center gap-[5px] flex-nowrap">
+			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
+			<div class="w-[140px]">
+				<ElSelect
+					v-model="mainStore.config.logLevel"
+					placeholder="请选择日志等级"
+					class="ml-[5px]"
+				>
+					<ElOption
+						v-for="item in data"
+						:key="item"
+						:label="`level - ${item}`"
+						:value="item"
+					></ElOption>
+				</ElSelect>
+			</div>
+			<ElButton
+				@click="openLogDir"
+				size="small"
+			>
+				打开日志目录
+			</ElButton>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+	import useMainStore from "@/stores/index";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
+	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
+	import { Command } from "@tauri-apps/plugin-shell";
+	import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
+
+	const mainStore = useMainStore();
+	const appWindow = getCurrentWindow();
+	const data = ["trace", "debug", "info", "warn", "error", "off"];
+	const openLogDir = async () => {
+		const resourceDir = await getResourceDir();
+		const logPath = import.meta.env.VITE_LOG_PATH;
+		const logDirPath = await join(resourceDir, logPath);
+		const isExists = await exists(logPath, { baseDir: BaseDirectory.Resource });
+		if (!isExists) {
+			try {
+				await mkdir(logPath, { baseDir: BaseDirectory.Resource });
+			} catch (err) {}
+		}
+		await Command.create("explorer", [logDirPath]).execute();
+	};
+	mainStore.$subscribe((...a) => {
+		// console.log("subscribe", a);
+		appWindow.emitTo("main", "config", { config: { ...mainStore.config } });
+	});
+</script>

pages/cidr.vue

@@ -0,0 +1,25 @@
+<template>
+	<div class="h-full flex flex-col gap-[10px]">
+		<ElRadioGroup v-model="mainStore.cidrEnable">
+			<ElRadioButton :value="true">开启</ElRadioButton>
+			<ElRadioButton :value="false">关闭</ElRadioButton>
+		</ElRadioGroup>
+		<div class="flex-1 overflow-auto">
+			<ElInput
+				placeholder="例如: 192.168.1.0/24 一行一个"
+				v-model="mainStore.config.proxyNetworks"
+				type="textarea"
+				:rows="30"
+				resize="none"></ElInput>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+	import useMainStore from "@/stores/index";
+    import { getCurrentWindow } from "@tauri-apps/api/window";
+	const mainStore = useMainStore();
+	const appWindow = getCurrentWindow();
+	mainStore.$subscribe((...a) => {
+		appWindow.emitTo("main", "config", { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } });
+	});
+</script>

pages/index.vue

@@ -16,7 +16,7 @@
 						effect="dark"
 						:type="data.isSuccessGetIp ? 'success' : 'info'"
 					>
-						{{ data.isSuccessGetIp ? "联机成功" : "联机中" }}
+						{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
 					</ElTag>
 					<ElButton
 						v-if="!data.coreVersion"
@@ -28,7 +28,7 @@
 						v-else
 						type="info"
 					>
-						core-{{ data.coreVersion }}
+						{{ data.coreVersion }}
 					</ElTag>
 					<ElButton
 						:disabled="data.isStart"
@@ -37,7 +37,7 @@
 						@click="handleUpdateCore"
 						size="small"
 					>
-						{{ data.coreVersion ? "更新" : "下载" }}
+						{{ data.coreVersion ? "更新插件" : "下载插件" }}
 					</ElButton>
 				</div>
 			</template>
@@ -54,6 +54,7 @@
 							placeholder="协议"
 							multiple
 							collapse-tags
+							@click.stop
 							v-model="config.protocol"
 							@change="handleServerUrlChange"
 						>
@@ -166,22 +167,34 @@
 				></ElInput>
 			</ElFormItem>
 		</div>
-		<div class="flex items-start gap-[0_30px]">
+		<div class="flex items-start gap-[0_10px]">
-			<div class="w-[95px]">
+			<div class="w-[122px]">
 				<div>
-					<ElButton
+					<ElDropdown
+						@command="handleStartCommand"
+						split-button
+						size="default"
 						:type="!data.isStart ? 'primary' : 'danger'"
 						:disabled="data.startLoading || !data.coreVersion || data.update"
 						@click="handleConnection"
-						size="default"
 					>
 						{{ !data.isStart ? "启动联机" : "停止联机" }}
-					</ElButton>
+						<template #dropdown>
+							<ElDropdownMenu>
+								<ElDropdownItem
+									command="toml"
+									:disabled="data.isStart"
+								>
+									配置文件启动
+								</ElDropdownItem>
+							</ElDropdownMenu>
+						</template>
+					</ElDropdown>
 				</div>
-				<div class="mt-[6px]">
+				<div class="mt-[6px] pl-[2px]">
 					<ElTooltip
-						placement="right"
+						placement="left"
-						:content="data.logVisible ? '关闭日志' : '打开日志'"
+						content="日志"
 					>
 						<ElButton
 							:type="!data.logVisible ? 'info' : 'warning'"
@@ -193,7 +206,7 @@
 					</ElTooltip>
 					<ElTooltip
 						placement="left"
-						content="成员信息"
+						content="成员"
 					>
 						<ElButton
 							@click="handleShowMemberDialog"
@@ -210,27 +223,29 @@
 					v-model="config.disbleP2p"
 					size="small"
 				>
-					禁用p2p
+					强制中转
 				</ElCheckbox>
 				<ElCheckbox
-					v-model="config.disableIpv6"
+					@change="handleAutoStartByTask"
-					size="small"
-				>
-					禁用ipv6
-				</ElCheckbox>
-				<ElCheckbox
-					@change="handleAutoStart"
 					:model-value="config.autoStart"
 					size="small"
 				>
 					开机自启
 				</ElCheckbox>
-				<ElCheckbox
+				<div>
-					v-model="config.disbleListenner"
+					<ElButton
-					size="small"
+						@click="handleShowCidrDialog"
-				>
+						:icon="Share"
-					禁用端口监听
+					>
-				</ElCheckbox>
+						子网代理
+					</ElButton>
+					<ElButton
+						@click="handleShowAdvanceDialog"
+						:icon="Setting"
+					>
+						高级选项
+					</ElButton>
+				</div>
 				<div class="flex items-center gap-[0_5px]">
 					<div>
 						<ElLink
@@ -266,19 +281,73 @@
 			</div>
 		</div>
 	</ElForm>
+	<ElDialog
+		width="95%"
+		top="10px"
+		v-model="configStart.visible"
+		:close-on-press-escape="false"
+		title="配置文件启动"
+	>
+		<div class="flex items-center gap-[0_4px]">
+			<span>启用</span>
+			<ElSwitch v-model="mainStore.configStartEnable"></ElSwitch>
+			<ElTooltip content="启用后将完全使用选中的配置文件作为联机配置，其余界面配置不会生效">
+				<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
+			</ElTooltip>
+			<ElButton
+				@click="openConfigDir"
+				size="small"
+			>
+				打开配置目录
+			</ElButton>
+			<ElButton
+				@click="handleStartCommand('toml')"
+				type="primary"
+				:icon="RefreshRight"
+				size="small"
+			>
+				刷新
+			</ElButton>
+		</div>
+		<div class="mt-[5px]">
+			<ElSelect
+				v-model="mainStore.configPath"
+				no-data-text="目录没有配置文件"
+				placeholder="选择配置文件"
+			>
+				<ElOption
+					v-for="item in configStart.list"
+					:key="item.path"
+					:value="item.path"
+					:label="item.name"
+				></ElOption>
+			</ElSelect>
+		</div>
+		<div class="mt-[5px] text-right">
+			<ElButton
+				@click="configStart.visible = false"
+				type="danger"
+			>
+				关闭
+			</ElButton>
+		</div>
+	</ElDialog>
 </template>
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
-	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
+	import { listen } from "@tauri-apps/api/event";
 	import { open, Command } from "@tauri-apps/plugin-shell";
-	import { QuestionFilled, Delete, List, UserFilled } from "@element-plus/icons-vue";
+	import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight } from "@element-plus/icons-vue";
 	import { reactive, onBeforeUnmount, onMounted } from "vue";
-	import { useTray, setTrayRunState } from "~/composables/tray";
+	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
 	import useMainStore from "@/stores/index";
-	import { ElMessage } from "element-plus";
+	import { ElDropdownMenu, ElMessage } from "element-plus";
-	import { getCurrentWindow, LogicalPosition, PhysicalPosition } from "@tauri-apps/api/window";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
-	import { WebviewWindow, getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
+	import { getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
+	import etWindows from "@/composables/windows";
 	import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
+	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
+	import { readDir, exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
 
 	let is_close = false;
 
@@ -290,9 +359,12 @@
 
 	const mainStore = useMainStore();
 	const config = mainStore.config;
+	// console.log(config);
 	const protocols = ["tcp", "udp", "ws", "wss", "wg"];
 	const data = reactive({
 		logVisible: false,
+		cidrVisible: false,
+		advanceVisible: false,
 		winipBcPid: 0, //WinIPBroadcast进程id
 		winipBcStart: false,
 		memberVisible: false,
@@ -305,12 +377,19 @@
 		isStart: false
 	});
 
+	const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
+		visible: false,
+		loading: false,
+		list: [] //配置文件列表
+	});
+
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
 			appWindow.onCloseRequested(async event => {
-				console.log(appWindow.label);
+				// console.log(appWindow.label);
 				if (!is_close) {
+					console.log(1);
 					event.preventDefault();
 					appWindow.hide();
 				}
@@ -337,6 +416,7 @@
 	const listenObj: { [key: string]: any } = {
 		unListenOutPut: null,
 		unListenThreadId: null,
+		unListenConfigStart: null,
 		thread_id: null,
 		async listenOutput() {
 			const appWindow = getCurrentWindow();
@@ -349,6 +429,7 @@
 						data.isSuccessGetIp = true;
 						await setTrayRunState(tray, true);
 						config.ipv4 = ipv4;
+						await setTrayTooltip(tray, `IP: ${ipv4}`);
 					}
 				}
 				appWindow.emitTo("log", "logs", data.log);
@@ -363,6 +444,15 @@
 				}
 			});
 			this.unListenThreadId = unListen;
+		},
+		async listenConfigStart() {
+			const unListen = await listen("config", event => {
+				// console.log("config", event.payload);
+				const ipv4 = config.ipv4;
+				mainStore.$patch(event.payload as any);
+				config.ipv4 = ipv4;
+			});
+			this.unListenConfigStart = unListen;
 		}
 	};
 
@@ -497,25 +587,70 @@
 		}
 	};
 
+	const handleAutoStartByTask = async () => {
+		await invoke("spawn_autostart", { enabled: !config.autoStart });
+		const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
+		config.autoStart = is_enable_by_task;
+	};
+
+	const compatibleInitAutoStart = async () => {
+		try {
+			const is_enable = await tauriAutoStart.isEnabled();
+			if (is_enable) {
+				await tauriAutoStart.disable();
+				await invoke("spawn_autostart", { enabled: true });
+				const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
+				config.autoStart = is_enable_by_task;
+			} else {
+				const 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 });
+			config.autoStart = false;
+		}
+	};
+
+	const initConnectAfterStart = async () => {
+		if (config.coonectAfterStart && data.coreVersion) {
+			await reset();
+			await handleConnection();
+		}
+	};
+
 	let logsTimer: NodeJS.Timeout | null = null;
 
 	onMounted(async () => {
 		// await handleUpdateCore();  //默认不自动更新
-		await initAutoStart();
+		await compatibleInitAutoStart();
+		// await initAutoStart();
 		await initStartWinIpBroadcast();
 		await getCoreVersion();
 		await listenObj.listenThreadId();
+		await listenObj.listenConfigStart();
+		await initConfigDir();
+		await initConnectAfterStart();
 		closePrevent();
 	});
 
 	onBeforeUnmount(() => {
 		unListenAll();
 		listenObj.unListenReleaseList && listenObj.unListenReleaseList();
+		listenObj.unListenConfigStart && listenObj.unListenConfigStart();
 		logsTimer && clearInterval(logsTimer);
 	});
 
-	const getArgs = () => {
+	const getArgs = async () => {
+		// console.log(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 (config.dhcp) {
 			args.push("-d");
 		}
@@ -544,6 +679,43 @@
 		if (config.disbleListenner) {
 			args.push("--no-listener");
 		}
+		if (mainStore.cidrEnable && config.proxyNetworks) {
+			// console.log(config.proxyNetworks);
+			const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
+			const formatProxyNetworks = config.proxyNetworks
+				.split("\n")
+				.map(item => item.trim())
+				.filter(item => item && reg.test(item));
+			args.push("--proxy-networks", ...formatProxyNetworks);
+			config.proxyNetworks = formatProxyNetworks.join("\n");
+		}
+		if (config.disableEncryption) {
+			args.push("--disable-encryption");
+		}
+		if (config.multiThread) {
+			args.push("--multi-thread");
+		}
+		if (config.enablExitNode) {
+			args.push("--enable-exit-node");
+		}
+		if (config.noTun) {
+			args.push("--no-tun");
+		}
+		if (config.latencyfirst) {
+			args.push("--latency-first");
+		}
+		if (config.useSmoltcp) {
+			args.push("--use-smoltcp");
+		}
+		if (config.disableUdpHolePunching) {
+			args.push("--disable-udp-hole-punching");
+		}
+		if (config.relayAllPeerrpc) {
+			args.push("--relay-all-peer-rpc");
+		}
+		if (config.saveErrorLog) {
+			args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
+		}
 		return args;
 	};
 
@@ -565,6 +737,7 @@
 			}
 		}
 		await setTrayRunState(tray, false);
+		await setTrayTooltip(tray);
 		await unListenAll();
 	};
 
@@ -572,18 +745,65 @@
 		if (data.isStart) {
 			await reset();
 		} else {
+			const args = await getArgs();
+
+			if (!args || args.length <= 0) {
+				return ElMessage.error("无配置");
+			}
+			data.log = ""; //清空日志
 			data.startLoading = true;
 			await unListenAll();
 			await listenObj.listenOutput();
-			const args = getArgs();
+
 			await invoke("run_command", {
 				args
 			});
 		}
 	};
 
-	let unListenMemberClose: UnlistenFn | null = null;
+	//configStart
-	let unlistenMemberCreated: UnlistenFn | null = null;
+	const handleStartCommand = async (command: string | number | object) => {
+		if (command === "toml") {
+			configStart.visible = true;
+			const path = import.meta.env.VITE_CONFIG_PATH;
+			const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
+			if (isExists) {
+				const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
+				configStart.list = entries
+					.filter(item => item.isFile)
+					.map(item => ({
+						name: item.name,
+						path: `${path}${item.name}`
+					})) as any;
+			} else {
+				mainStore.configStartEnable = false;
+				mainStore.configPath = "";
+				try {
+					await mkdir(path, { baseDir: BaseDirectory.Resource });
+				} catch (err) {}
+			}
+		}
+	};
+
+	const initConfigDir = async () => {
+		const path = import.meta.env.VITE_CONFIG_PATH;
+		const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
+		if (!isExists) {
+			mainStore.configStartEnable = false;
+			mainStore.configPath = "";
+			try {
+				await mkdir(path, { baseDir: BaseDirectory.Resource });
+			} catch (err) {}
+		}
+	};
+
+	const openConfigDir = async () => {
+		const resourceDir = await getResourceDir();
+		const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_PATH);
+		console.log(configPath);
+		await Command.create("explorer", [configPath]).execute();
+	};
+
 	const handleShowMemberDialog = async () => {
 		if (!data.isStart) {
 			return ElMessage.warning("请先开始联机");
@@ -591,96 +811,82 @@
 		if (!mainStore.config.ipv4) {
 			return ElMessage.warning("请等待获取IP");
 		}
-		const appWindow = getCurrentWindow();
+
-		if (appWindow) {
+		await etWindows(
-			const appSize = await appWindow.outerSize();
+			"member",
-			const factor = await appWindow.scaleFactor();
+			{
-			const appPosition = await appWindow.outerPosition();
+				title: "成员列表",
-			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
+				width: 470,
-			let memberDialog = await WebviewWindow.getByLabel("member");
+				height: 380,
-			if (!memberDialog) {
+				url: "#/member"
-				memberDialog = new WebviewWindow("member", {
+			},
-					title: "成员列表",
+			() => {
-					width: 470,
+				data.memberVisible = true;
-					height: 380,
+			},
-					parent: appWindow,
+			() => {
-					closable: true,
+				data.memberVisible = false;
-					resizable: true,
-					decorations: true,
-					maximizable: false,
-					minimizable: false,
-					x: logicalPosition.x,
-					y: logicalPosition.y,
-					url: "#/member"
-				});
-				unlistenMemberCreated = await memberDialog.once("tauri://webview-created", async () => {
-					if (memberDialog) {
-						data.logVisible = true;
-						await memberDialog.show();
-					}
-				});
-				unListenMemberClose = await memberDialog.onCloseRequested(() => {
-					data.logVisible = false;
-					unListenMemberClose && unListenMemberClose();
-				});
-			} else {
-				const visible = await memberDialog.isVisible();
-				if (visible) {
-					data.memberVisible = false;
-					await memberDialog.close();
-					unlistenMemberCreated && unlistenMemberCreated();
-				}
 			}
-		}
+		);
 	};
 
-	let unListenlogClose: UnlistenFn | null = null;
-	let unlistenLogCreated: UnlistenFn | null = null;
 	const handleShowLogDialog = async () => {
-		logsTimer && clearInterval(logsTimer);
+		await etWindows(
-		const appWindow = getCurrentWindow();
+			"log",
-		if (appWindow) {
+			{
-			const appSize = await appWindow.outerSize();
+				title: "联机日志",
-			const factor = await appWindow.scaleFactor();
+				width: 600,
-			const appPosition = await appWindow.outerPosition();
+				height: 380,
-			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
+				resizable: false,
-			let infoDialog = await WebviewWindow.getByLabel("log");
+				url: "#/log"
-			if (!infoDialog) {
+			},
-				infoDialog = new WebviewWindow("log", {
+			(_, appWindow) => {
-					title: "日志",
+				data.logVisible = true;
-					width: 600,
+				logsTimer && clearInterval(logsTimer);
-					height: 380,
+				logsTimer = setInterval(() => {
-					parent: appWindow,
+					appWindow.emitTo("log", "logs", data.log);
-					closable: true,
+				}, 600);
-					resizable: false,
+			},
-					decorations: true,
+			() => {
-					maximizable: false,
+				data.logVisible = false;
-					minimizable: false,
-					x: logicalPosition.x,
-					y: logicalPosition.y,
-					url: "#/log"
-				});
-				unlistenLogCreated = await infoDialog.once("tauri://webview-created", async () => {
-					if (infoDialog) {
-						data.logVisible = true;
-						logsTimer = setInterval(() => {
-							appWindow.emitTo("log", "logs", data.log);
-						}, 3000);
-						await infoDialog.show();
-					}
-				});
-				unListenlogClose = await infoDialog.onCloseRequested(() => {
-					data.logVisible = false;
-					unListenlogClose && unListenlogClose();
-				});
-			} else {
-				const visible = await infoDialog.isVisible();
-				if (visible) {
-					data.logVisible = false;
-					await infoDialog.close();
-					unlistenLogCreated && unlistenLogCreated();
-				}
 			}
-		}
+		);
+	};
+
+	const handleShowCidrDialog = async () => {
+		await etWindows(
+			"cidr",
+			{
+				title: "子网代理",
+				width: 600,
+				height: 380,
+				resizable: false,
+				url: "#/cidr"
+			},
+			(_, appWindow) => {
+				data.cidrVisible = true;
+			},
+			() => {
+				data.cidrVisible = false;
+			}
+		);
+	};
+
+	const handleShowAdvanceDialog = async () => {
+		await etWindows(
+			"advance",
+			{
+				title: "高级选项",
+				width: 600,
+				height: 380,
+				resizable: false,
+				url: "#/advance"
+			},
+			(_, appWindow) => {
+				data.advanceVisible = true;
+			},
+			() => {
+				data.advanceVisible = false;
+			}
+		);
 	};
 </script>

pages/log.vue

@@ -1,11 +1,11 @@
 <template>
 	<ElInput
 		type="textarea"
-		rows="17"
+		:rows="17"
 		v-model="data.log"
 		resize="none"
 		readonly
-		placeholder="等待日志中..."
+		placeholder="等待日志中，请先'启动联机'..."
 	/>
 </template>
 <script setup lang="ts">

pages/member.vue

@@ -33,6 +33,7 @@
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
+	import { parsePeerInfo } from "@/utils";
 	const data = reactive<{ member: any[] }>({
 		member: []
 	});
@@ -45,137 +46,19 @@
 		["loss_rate", "丢包率"],
 		["version", "版本"]
 	];
-	const headers = [
-		"ipv4",
-		"hostname",
-		"cost",
-		"lat_ms",
-		"loss_rate",
-		"rx_bytes",
-		"rx_unit",
-		"tx_bytes",
-		"tx_unit",
-		"tunnel_proto",
-		"nat_type",
-		"id",
-		"version"
-	];
-
-	const formatData = (data: any[]) => {
-		if (!data) return [];
-		const result = [];
-		let obj: any = {};
-		let length = data.length;
-		for (let idx = 0; idx < length; idx++) {
-			let headersIdx = idx % headers.length;
-			if (headersIdx === 0) {
-				console.log(idx, [...data]);
-				obj = {};
-				result.push(obj);
-			}
-			if (["ipv4"].includes(headers[headersIdx]) && !/\d+\.\d+\.\d+\.\d\/\d+/.test(data[idx]) && data[idx]) {
-				const next = data[idx];
-				data[idx] = "-";
-				const head = data.slice(0, idx);
-				const latest = data.slice(idx);
-				data = [...head, next, ...latest];
-				length = data.length;
-			} else if (["rx_bytes", "tx_bytes"].includes(headers[headersIdx]) && data[idx] == "-") {
-				const head = data.slice(0, idx);
-				const latest = data.slice(idx);
-				data = [...head, "-", ...latest];
-				length = data.length;
-			} else if (
-				["tunnel_proto"].includes(headers[headersIdx]) &&
-				![
-					"tcp",
-					"udp",
-					"ws",
-					"wss",
-					"wg",
-					"-",
-					"tcp,udp",
-					"ws,wss",
-					"tcp,udp,ws,wss,wg",
-					"tcp,ws,wss,wg",
-					"udp,ws,wss,wg",
-					"tcp,wg",
-					"udp,wg",
-					"tcp,ws",
-					"tcp,wss",
-					"udp,ws",
-					"udp,wss",
-					"tcp,udp,ws",
-					"tcp,udp,wss",
-					"tcp,udp,ws,wss",
-					"tcp,udp,ws,wss,wg",
-					"tcp,udp,wg",
-					"tcp,udp,ws,wg",
-					"udp,tcp",
-					"udp,tcp,ws",
-					"udp,tcp,wss",
-					"udp,tcp,ws,wss",
-					"udp,tcp,ws,wss,wg",
-					"udp,tcp,wg",
-					"udp,tcp,ws,wg",
-					"tcp,udp,wss,wg",
-					"tcp,udp,ws,wg",
-					"tcp,udp,wss,wg",
-					"ws,tcp",
-					"ws,udp",
-					"ws,tcp,udp",
-					"ws,tcp,udp,ws",
-					"ws,tcp,udp,wss",
-					"ws,tcp,udp,ws,wss",
-					"ws,tcp,udp,ws,wss,wg",
-					"ws,tcp,udp,wg",
-					"ws,tcp,udp,ws,wg",
-					"ws,udp,tcp",
-					"ws,udp,tcp,ws",
-					"ws,udp,tcp,wss",
-					"ws,udp,tcp,ws,wss",
-					"wss,tcp",
-					"wss,udp",
-					"wss,tcp,udp",
-					"wss,tcp,udp,ws",
-					"wss,tcp,udp,wss",
-					"wss,tcp,udp,ws,wss",
-					"wss,tcp,udp,ws,wss,wg",
-					"wss,tcp,udp,wg",
-					"wg,tcp",
-					"wg,udp",
-					"wg,tcp,udp",
-					"wg,tcp,udp,ws",
-					"wg,tcp,udp,wss",
-					"wg,tcp,udp,ws,wss",
-					"wg,tcp,udp,ws,wss,wg",
-					"wg,tcp,udp,wg",
-					"wg,udp,tcp"
-				].includes(data[idx])
-			) {
-				const head = data.slice(0, idx);
-				const latest = data.slice(idx);
-				data = [...head, "-", ...latest];
-				length = data.length;
-			}
-			obj[headers[headersIdx]] = data[idx];
-		}
-		return result;
-	};
 
 	const listenOutput = async () => {
 		const member = await invoke("get_members_by_cli");
-		let memberData = ((member as string) || "")
+		const peerInfo = parsePeerInfo(member as string);
-			.replace(/[\│\├\┌\└\─\┬\┴\┼\┤\┐\┘]+/g, "")
+		peerInfo.forEach(value => {
-			.split(" ")
+			if (value.cost === "Local") {
-			.filter(el => el && !["\n", "\n\n"].includes(el))
+				value.cost = "本机";
-			.slice(11);
+			}
-		if (memberData.length <= 0) {
+			if (value.ipv4 && value.ipv4.includes("/")) {
-			return;
+				value.ipv4 = value.ipv4.split("/")[0];
-		}
+			}
-		const result = formatData(memberData);
+		});
-		data.member = result;
+		data.member = peerInfo;
-		console.log({ member: data.member });
 	};
 
 	let timer: NodeJS.Timeout | null = null;

src-tauri/.gitignore

@@ -2,5 +2,4 @@
 # will have compiled files and executables
 /target/
 /gen/schemas
-/easytier-windows-x86_64-v2.0.3.zip
+/easytier/
-/easytier-windows-x86_64/

src-tauri/Cargo.lock

@@ -97,9 +97,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
 
 [[package]]
 name = "arbitrary"
@@ -422,9 +422,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "6.0.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -1109,9 +1109,10 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.0.6"
+version = "1.1.0"
 dependencies = [
  "log",
+ "planif",
  "reqwest",
  "serde",
  "serde_json",
@@ -1119,9 +1120,12 @@ dependencies = [
  "tauri",
  "tauri-build",
  "tauri-plugin-autostart",
+ "tauri-plugin-fs",
  "tauri-plugin-log",
  "tauri-plugin-shell",
  "tauri-plugin-single-instance",
+ "whoami",
+ "windows 0.58.0",
  "zip",
 ]
 
@@ -2164,7 +2168,19 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
 dependencies = [
- "jsonptr",
+ "jsonptr 0.4.7",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "json-patch"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
+dependencies = [
+ "jsonptr 0.6.3",
  "serde",
  "serde_json",
  "thiserror",
@@ -2181,6 +2197,16 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "jsonptr"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "keyboard-types"
 version = "0.7.0"
@@ -2532,7 +2558,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
  "malloc_buf",
- "objc_exception",
 ]
 
 [[package]]
@@ -2540,6 +2565,9 @@ name = "objc-sys"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+dependencies = [
+ "cc",
+]
 
 [[package]]
 name = "objc2"
@@ -2567,6 +2595,30 @@ dependencies = [
  "objc2-quartz-core",
 ]
 
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-contacts"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-core-data"
 version = "0.2.2"
@@ -2591,6 +2643,18 @@ dependencies = [
  "objc2-metal",
 ]
 
+[[package]]
+name = "objc2-core-location"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-contacts",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-encode"
 version = "4.0.3"
@@ -2609,6 +2673,18 @@ dependencies = [
  "objc2",
 ]
 
+[[package]]
+name = "objc2-link-presentation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-metal"
 version = "0.2.2"
@@ -2635,21 +2711,71 @@ dependencies = [
 ]
 
 [[package]]
-name = "objc_exception"
+name = "objc2-symbols"
-version = "0.1.2"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
 dependencies = [
- "cc",
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
-name = "objc_id"
+name = "objc2-ui-kit"
-version = "0.1.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "objc",
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-foundation",
+ "objc2-link-presentation",
+ "objc2-quartz-core",
+ "objc2-symbols",
+ "objc2-uniform-type-identifiers",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-uniform-type-identifiers"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-web-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68bc69301064cebefc6c4c90ce9cba69225239e4b8ff99d445a2b5563797da65"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -2987,6 +3113,14 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
+[[package]]
+name = "planif"
+version = "1.0.0"
+source = "git+https://github.com/mattrobineau/planif?tag=1.0.1#90e228e2bc0f142b16a0ba415ec242e1c836cc35"
+dependencies = [
+ "windows 0.48.0",
+]
+
 [[package]]
 name = "plist"
 version = "1.7.0"
@@ -4112,9 +4246,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.0.2"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5920aad0804ea5e86808d4b6e8753d3bcbae7efc8f4e41a4da00b45427559868"
+checksum = "d3889b392db6d32a105d3757230ea0220090b8f94c90d3e60b6c5eb91178ab1b"
 dependencies = [
  "anyhow",
  "bytes",
@@ -4163,16 +4297,16 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "935f9b3c49b22b3e2e485a57f46d61cd1ae07b1cbb2ba87387a387caf2d8c4e7"
+checksum = "9f96827ccfb1aa40d55d0ded79562d18ba18566657a553f992a982d755148376"
 dependencies = [
  "anyhow",
  "cargo_toml",
  "dirs 5.0.1",
  "glob",
  "heck 0.5.0",
- "json-patch",
+ "json-patch 3.0.1",
  "schemars",
  "semver",
  "serde",
@@ -4185,14 +4319,14 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e"
+checksum = "8947f16f47becd9e9cd39b74ee337fd1981574d78819be18e4384d85e5a0b82f"
 dependencies = [
  "base64 0.22.1",
  "brotli",
  "ico",
- "json-patch",
+ "json-patch 2.0.0",
  "plist",
  "png",
  "proc-macro2",
@@ -4212,9 +4346,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d2c0963ccfc3f5194415f2cce7acc975942a8797fbabfb0aa1ed6f59326ae7f"
+checksum = "8bd1c8d4a66799d3438747c3a79705cd665a95d6f24cb5f315413ff7a981fe2a"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -4256,6 +4390,27 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "tauri-plugin-fs"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96ba7d46e86db8c830d143ef90ab5a453328365b0cc834c24edea4267b16aba0"
+dependencies = [
+ "anyhow",
+ "dunce",
+ "glob",
+ "percent-encoding",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "tauri",
+ "tauri-plugin",
+ "thiserror",
+ "url",
+ "uuid",
+]
+
 [[package]]
 name = "tauri-plugin-log"
 version = "2.0.1"
@@ -4280,9 +4435,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-shell"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "371fb9aca2823990a2d0db7970573be5fdf07881fcaa2b835b29631feb84aec1"
+checksum = "0ad7880c5586b6b2104be451e3d7fc0f3800c84bda69e9ba81c828f87cb34267"
 dependencies = [
  "encoding_rs",
  "log",
@@ -4316,9 +4471,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af12ad1af974b274ef1d32a94e6eba27a312b429ef28fcb98abc710df7f9151d"
+checksum = "a1ef7363e7229ac8d04e8a5d405670dbd43dde8fc4bc3bc56105c35452d03784"
 dependencies = [
  "dpi",
  "gtk",
@@ -4335,9 +4490,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45e88aa0b11b302d836e6ea3e507a6359044c4a8bc86b865ba99868c695753d"
+checksum = "62fa2068e8498ad007b54d5773d03d57c3ff6dd96f8c8ce58beff44d0d5e0d30"
 dependencies = [
  "gtk",
  "http",
@@ -4361,9 +4516,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045"
+checksum = "1fc65d6f5c54e56b66258948a6d9e47a82ea41f4b5a7612bfbdd1634c2913ed0"
 dependencies = [
  "brotli",
  "cargo_metadata",
@@ -4372,7 +4527,7 @@ dependencies = [
  "glob",
  "html5ever",
  "infer",
- "json-patch",
+ "json-patch 2.0.0",
  "kuchikiki",
  "log",
  "memchr",
@@ -4893,6 +5048,12 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.93"
@@ -5063,6 +5224,17 @@ dependencies = [
  "windows-core 0.58.0",
 ]
 
+[[package]]
+name = "whoami"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
+dependencies = [
+ "redox_syscall",
+ "wasite",
+ "web-sys",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -5108,6 +5280,15 @@ dependencies = [
  "windows-version",
 ]
 
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows"
 version = "0.57.0"
@@ -5498,14 +5679,12 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.44.1"
+version = "0.46.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "440600584cfbd8b0d28eace95c1f2c253db05dae43780b79380aa1e868f04c73"
+checksum = "6fa1c8c760041c64ce6be99f83d6cb55fe3fcd85a1ad46d32895f6e65cee87ba"
 dependencies = [
  "base64 0.22.1",
- "block",
+ "block2",
- "cocoa",
- "core-graphics",
  "crossbeam-channel",
  "dpi",
  "dunce",
@@ -5518,8 +5697,11 @@ dependencies = [
  "kuchikiki",
  "libc",
  "ndk",
- "objc",
+ "objc2",
- "objc_id",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-ui-kit",
+ "objc2-web-kit",
  "once_cell",
  "percent-encoding",
  "raw-window-handle",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.0.6"
+version = "1.1.0"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -12,31 +12,39 @@ rust-version = "1.77.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+
 [lib]
 name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.0.1", features = [] }
+tauri-build = { version = "2.0.2", features = [] }
 # prost-build = "0.13.2"
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.0.2", features = [
+tauri = { version = "2.0.6", features = [
     "tray-icon",
     "image-png",
     "image-ico",
 ] }
-tauri-plugin-log = "2.0.0-rc"
+tauri-plugin-log = "2.0.1"
-tauri-plugin-shell = "2"
+tauri-plugin-shell = "2.0.2"
 reqwest = { version = "0.12", features = ["json"] }
 zip = "2.2.0"
 sysinfo = '0.32.0'
+planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
+whoami = "1.5.2"
+tauri-plugin-fs = "2"
 # prost = "0.13"
 # prost-types = "0.13"
 
+[dependencies.windows]
+version = "0.58.0"
+features = ["Win32_System_TaskScheduler"]
+
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
-tauri-plugin-autostart = "2"
+tauri-plugin-autostart = "2.0.1"
-tauri-plugin-single-instance = "2"
+tauri-plugin-single-instance = "2.0.1"

src-tauri/capabilities/default.json

@@ -2,7 +2,7 @@
 	"$schema": "../gen/schemas/desktop-schema.json",
 	"identifier": "default",
 	"description": "enables the default permissions",
-	"windows": ["main", "log"],
+	"windows": ["main", "log", "member", "cidr", "advance"],
 	"permissions": [
 		"core:default",
 		"core:window:allow-minimize",
@@ -20,6 +20,7 @@
 		"core:webview:allow-webview-show",
 		"core:webview:allow-webview-hide",
 		"core:webview:allow-webview-close",
+		"autostart:default",
 		"autostart:allow-enable",
 		"autostart:allow-disable",
 		"autostart:allow-is-enabled",
@@ -31,7 +32,7 @@
 			"allow": [
 				{
 					"args": ["run"],
-					"cmd": "WinIPBroadcast",
+					"cmd": "easytier/tool/WinIPBroadcast",
 					"name": "WinIPBroadcast"
 				}
 			]
@@ -41,10 +42,26 @@
 			"allow": [
 				{
 					"args": ["run"],
-					"cmd": "WinIPBroadcast",
+					"cmd": "easytier/tool/WinIPBroadcast",
 					"name": "WinIPBroadcast"
+				},
+				{
+					"args": true,
+					"cmd": "easytier/tool/nssm",
+					"name": "nssm"
+				},
+				{
+					"args": true,
+					"cmd": "explorer",
+					"name": "explorer"
 				}
 			]
-		}
+		},
+		"fs:default",
+		"fs:allow-read-dir",
+		"fs:allow-exists",
+		"fs:allow-open",
+		"fs:allow-resource-read",
+		"fs:allow-resource-read-recursive"
 	]
 }

src-tauri/capabilities/desktop.json

@@ -1,11 +0,0 @@
-{
-  "identifier": "desktop-capability",
-  "platforms": [
-    "macOS",
-    "windows",
-    "linux"
-  ],
-  "permissions": [
-    "autostart:default"
-  ]
-}

src-tauri/easytier/README.md

@@ -0,0 +1 @@
+这里存放每次打包需要用到的最新版本的easytier 和 相关工具

src-tauri/easytier/config/test.toml

@@ -0,0 +1,26 @@
+hostname = "Test1"
+instance_name = "default"
+instance_id = "8803362c-e4f1-4df1-93e8-721653945f77"
+dhcp = true
+listeners = [
+    "tcp://0.0.0.0:11010",
+    "udp://0.0.0.0:11010",
+    "wg://0.0.0.0:11011",
+    "ws://0.0.0.0:11011/",
+    "wss://0.0.0.0:11012/",
+]
+exit_nodes = []
+rpc_portal = "0.0.0.0:15888"
+
+[network_identity]
+network_name = "default"
+network_secret = ""
+
+[[peer]]
+uri = "tcp://public.easytier.top:11010"
+
+[[peer]]
+uri = "udp://public.easytier.top:11010"
+
+[[proxy_network]]
+cidr = "192.168.1.0/24"

src-tauri/src/lib.rs

@@ -1,3 +1,7 @@
+use planif::enums::TaskCreationFlags;
+use planif::schedule::TaskScheduler as planIfTaskScheduler;
+use planif::schedule_builder::{Action, ScheduleBuilder};
+use planif::settings::{Duration, LogonType, PrincipalSettings, RunLevel};
 use reqwest::{Client, Error};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -15,6 +19,10 @@ use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent}
 use tauri::Emitter;
 use tauri::Manager;
 use tauri_plugin_autostart::MacosLauncher;
+use windows::core::{BSTR, VARIANT};
+use windows::Win32::Foundation::VARIANT_BOOL;
+use windows::Win32::System::Com::*;
+use windows::Win32::System::TaskScheduler::*;
 
 // 定义GitHub Release的结构体
 #[derive(Debug, Deserialize)]
@@ -52,7 +60,7 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
 
 #[tauri::command(rename_all = "snake_case")]
 fn get_core_version() -> String {
-    match Command::new("easytier-core.exe")
+    match Command::new("easytier/easytier-core.exe")
         .arg("--version")
         .creation_flags(0x08000000)
         .output()
@@ -67,7 +75,7 @@ fn get_core_version() -> String {
 
 #[tauri::command(rename_all = "snake_case")]
 fn get_cli_version() -> String {
-    match Command::new("easytier-cli.exe")
+    match Command::new("easytier/easytier-cli.exe")
         .arg("--version")
         .creation_flags(0x08000000)
         .output()
@@ -114,7 +122,7 @@ struct MyResponse {
 
 #[tauri::command(rename_all = "snake_case")]
 fn get_members_by_cli() -> String {
-    match Command::new("easytier-cli.exe")
+    match Command::new("easytier/easytier-cli.exe")
         .arg("peer")
         .arg("list")
         .creation_flags(0x08000000)
@@ -130,11 +138,17 @@ fn get_members_by_cli() -> String {
 
 #[tauri::command(rename_all = "snake_case")]
 async fn download_easytier_zip(download_url: String, file_name: String) {
-    let target = format!("https://ghp.ci/{}", download_url);
+    let target = format!("{}", download_url);
     let response = reqwest::get(target)
         .await
         .expect("error to download easytier url");
-    let file_path = format!("./{}", file_name);
+    let file_path = format!("./easytier/{}", file_name);
+
+    let easytier_dir = path::Path::new("./easytier");
+    if !easytier_dir.exists() {
+        fs::create_dir_all(&easytier_dir).unwrap();
+    }
+
     let path = path::Path::new(&file_path);
 
     let mut file = match File::create(&path) {
@@ -183,7 +197,14 @@ fn unzip(fname: &path::Path) {
         //         fs::create_dir_all(p).unwrap();
         //     }
         // }
-        let out_file_path = path::Path::new("./").join(outpath.file_name().clone().unwrap());
+
+        let easytier_dir = path::Path::new("./easytier");
+        // if !easytier_dir.exists() {
+        //     fs::create_dir_all(&easytier_dir).unwrap();
+        // }
+
+        // let out_file_path = path::Path::new("./").join(outpath.file_name().clone().unwrap());
+        let out_file_path = easytier_dir.join(outpath.file_name().clone().unwrap());
         println!("outFilePath: {}", out_file_path.display());
         let mut outfile = fs::File::create(&out_file_path).unwrap();
         std::io::copy(&mut file, &mut outfile).unwrap();
@@ -196,10 +217,6 @@ fn run_command(
     args: Vec<String>,
     stop_signal: tauri::State<Arc<AtomicBool>>,
 ) {
-    // if !path::Path::new("easytier-core.exe").exists() {
-    //     app_handle.emit("command-output", "easytier-core.exe 不存在");
-    //     return
-    // }
     let (tx, rx) = mpsc::channel();
     stop_signal.store(false, Ordering::Relaxed);
     let app_handle1 = app_handle.clone();
@@ -208,7 +225,8 @@ fn run_command(
     let stop_signal2 = Arc::clone(&stop_signal);
     let args2 = args.clone();
     thread::spawn(move || {
-        let mut child = Command::new("easytier-core.exe")
+        // trace, debug, info, warn, error, off
+        let mut child = Command::new("easytier/easytier-core.exe")
             .args(args)
             .creation_flags(0x08000000)
             .stdout(Stdio::piped())
@@ -332,6 +350,165 @@ fn search_pid_by_pname(target_process_name: String) -> u32 {
     return 0;
 }
 
+#[tauri::command]
+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());
+            ret_vec.push(exe_path.display().to_string());
+            ret_vec.push(exe_path.parent().unwrap().display().to_string());
+            return ret_vec;
+        }
+        Err(e) => {
+            println!("failed to get current exe path: {e}");
+            ret_vec.push("".to_string());
+            ret_vec.push("".to_string());
+            return ret_vec;
+        }
+    };
+}
+
+#[tauri::command]
+fn spawn_autostart(enabled: bool) {
+    let (tx, rx) = mpsc::channel();
+
+    thread::spawn(move || match autostart(enabled) {
+        Ok(_) => {
+            let _ = tx.send(true);
+        }
+        Err(e) => {
+            println!("Error: {}", e);
+            let _ = tx.send(false);
+        }
+    });
+
+    match rx.recv() {
+        Ok(_) => {
+            // println!("autostart enabled: {}", enabled);
+        }
+        Err(_e) => {}
+    }
+}
+
+fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
+    unsafe {
+        let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
+        task_service
+            .Connect(
+                &VARIANT::default(),
+                &VARIANT::default(),
+                &VARIANT::default(),
+                &VARIANT::default(),
+            )
+            ?;
+
+        // 指定要删除的任务文件夹路径
+        let folder_path = BSTR::from("\\easytierGame");
+        // let root = BSTR::from("\\");
+        let task_name = BSTR::from("auto start");
+        let mut penabled = VARIANT_BOOL::from(false);
+        let bool_ptr: *mut VARIANT_BOOL = &mut penabled;
+
+        // 获取任务文件夹F
+        let task_folder: ITaskFolder = task_service
+            .GetFolder(&folder_path)
+            ?;
+        let task = task_folder
+            .GetTask(&task_name)
+            ?;
+        task.Definition()
+            ?
+            .Triggers()
+            ?
+            .get_Item(1)
+            ?
+            .Enabled(bool_ptr)
+            ?;
+        // 释放 COM 库
+        CoUninitialize();
+        // return penabled.as_bool();
+        Ok(penabled.as_bool())
+    }
+}
+
+#[tauri::command]
+fn autostart_is_enabled() -> bool {
+    match autostart_enabled() {
+        Ok(enabled) => {
+            println!("autostart enabled: {}", enabled);
+            return enabled;
+        }
+        Err(e) => {
+            println!("autostart enabled: false -> {}", e);
+            return false;
+        }
+    }
+}
+
+fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error>> {
+    if !enabled {
+        unsafe {
+            let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
+            task_service.Connect(
+                &VARIANT::default(),
+                &VARIANT::default(),
+                &VARIANT::default(),
+                &VARIANT::default(),
+            )?;
+
+            // 指定要删除的任务文件夹路径
+            let folder_path = BSTR::from("\\easytierGame");
+            let root = BSTR::from("\\");
+            let task_name = BSTR::from("auto start");
+
+            // 获取任务文件夹
+            let task_folder: ITaskFolder = task_service.GetFolder(&folder_path)?;
+            task_folder.DeleteTask(&task_name, 0)?;
+            println!("Task AutoStart Task deleted successfully.");
+
+            let task_folder: ITaskFolder = task_service.GetFolder(&root)?;
+
+            // 删除任务文件夹
+            task_folder.DeleteFolder(&folder_path, 0)?;
+
+            println!("Task folder easytierGame deleted successfully.");
+
+            // 释放 COM 库
+            CoUninitialize();
+        }
+    } else {
+        let ts = planIfTaskScheduler::new()?;
+        let com = ts.get_com();
+        let sb = ScheduleBuilder::new(&com).unwrap();
+
+        let exe = std::env::current_exe()?;
+        let exe = exe.to_str().unwrap();
+
+        let settings = PrincipalSettings {
+            display_name: "".to_string(),
+            group_id: None,
+            id: "".to_string(),
+            logon_type: LogonType::InteractiveToken,
+            run_level: RunLevel::Highest,
+            user_id: Some(whoami::username()),
+        };
+        sb.create_logon()
+            .author("heixiansen")?
+            .trigger("trigger", enabled)?
+            .action(Action::new("auto start", exe, "", ""))?
+            .in_folder("easytierGame")?
+            .principal(settings)?
+            .delay(Duration {
+                seconds: Some(6),
+                ..Default::default()
+            })?
+            .build()?
+            .register("auto start", TaskCreationFlags::CreateOrUpdate as i32)?;
+    }
+    Ok(())
+}
+
 pub const AUTOSTART_ARG: &str = "--autostart";
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
@@ -340,6 +517,7 @@ pub fn run() {
     let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆，用于传递给命令
     let context = tauri::generate_context!();
     tauri::Builder::default()
+        .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_autostart::init(
             MacosLauncher::LaunchAgent,
             Some(vec![AUTOSTART_ARG]),
@@ -389,7 +567,10 @@ pub fn run() {
             download_easytier_zip,
             get_cli_version,
             get_members_by_cli,
-            search_pid_by_pname
+            search_pid_by_pname,
+            get_exe_directory,
+            spawn_autostart,
+            autostart_is_enabled
         ])
         .run(context)
         .expect("error while running tauri application");

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.0.6",
+	"version": "1.1.0",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -14,13 +14,13 @@
 		"windows": [
 			{
 				"title": "easytier-game",
-				"width": 331,
+				"width": 335,
-				"height": 285,
+				"height": 305,
 				"resizable": false,
 				"fullscreen": false,
 				"decorations": true,
-				"maximizable": false,
 				"center": true,
+				"maximizable": false,
 				"transparent": false
 			}
 		],
@@ -28,18 +28,25 @@
 			"csp": null
 		}
 	},
-
+	"plugins": {},
 	"bundle": {
 		"active": false,
 		"targets": "all",
-		"externalBin": ["WinIPBroadcast"],
+		"resources": [
-		"resources": ["icons/icon-inactive.ico", "icons/icon.ico"],
+			"easytier/config/",
+			"easytier/icons/",
+			"easytier/tool/WinIPBroadcast.exe",
+			"easytier/easytier-cli.exe",
+			"easytier/easytier-core.exe",
+			"easytier/Packet.dll",
+			"easytier/wintun.dll"
+		],
 		"windows": {
 			"webviewInstallMode": {
 				"type": "embedBootstrapper"
 			}
 		},
 		"createUpdaterArtifacts": false,
-		"icon": ["icons/icon.png", "icons/icon.rgba", "icons/icon.icns", "icons/icon.ico", "icons/icon-inactive.ico"]
+		"icon": ["icons/icon.png", "icons/icon.rgba", "icons/icon.icns", "icons/icon.ico"]
 	}
 }

stores/index.ts

@@ -9,28 +9,56 @@ export default defineStore("main", {
 				networkPassword: "",
 				hostname: "",
 				ipv4: "",
+				proxyNetworks: "", // 子网代理
 				autoStart: false, // 是否自动启动
+				coonectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
 				disbleListenner: false, // 是否禁用监听
+				disableEncryption: false, // 是否禁用加密
+				multiThread: false, //使用多线程
+				enablExitNode: false, // 是否启用退出节点
+				noTun: false, // 是否使用TUN
+				latencyfirst: false, // 是否优先延迟
+				useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
+				disableUdpHolePunching: false, // 是否禁用UDP打洞
+				relayAllPeerrpc: false, // 是否启用所有对等RPC
 				disbleP2p: false, // 是否使用P2P
 				dhcp: true, // 是否使用DHCP
+				saveErrorLog: true, // 是否保存错误日志
+				logLevel: "error", //日志等级
 			},
+			configStartEnable: false, //使用配置文件启动
+			configPath: "", //配置文件路径
+			cidrEnable: false,
 			basePeers: ["public.easytier.top:11010"],
 		};
 	},
 	persist: {
 		paths: [
 			"basePeers",
+			"cidrEnable",
+			"config.proxyNetworks",
 			"config.serverUrl",
 			"config.networkName",
 			"config.protocol",
 			"config.networkPassword",
 			"config.disbleP2p",
 			"config.autoStart",
+			"config.coonectAfterStart",
 			"config.disableIpv6",
 			"config.disbleListenner",
+			"config.disableEncryption",
+			"config.multiThread",
+			"config.enablExitNode",
+			"config.noTun",
+			"config.latencyfirst",
+			"config.useSmoltcp",
+			"config.disableUdpHolePunching",
+			"config.relayAllPeerrpc",
 			"config.hostname",
 			"config.dhcp",
+			"config.saveErrorLog",
+			"config.logLevel"
 		],
 	},
 });

typings/index.d.ts

@@ -1 +1,7 @@
+interface ImportMetaEnv {
+	readonly VITE_CONFIG_PATH: string;
+}
 
+interface ImportMeta {
+	readonly env: ImportMetaEnv;
+}

utils/index.ts

@@ -77,7 +77,38 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
 		});
 };
 
-export const openBrowser = (key: string) => {
+export const parsePeerInfo = (content: string) => {
-	// logger.info(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`)
+	// 将表格字符串分割成行
-	// _launcherApi.openBrowser(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`);
+	const lines = content.split('\n')
-};
+  
+	// 提取表头（keys）
+	const headers = lines[1]
+	  .split('│')
+	  .slice(1, -1)
+	  .map((h) => h.trim())
+  
+	// 初始化结果数组
+	const result: any[] = []
+  
+	// 遍历数据行
+	for (let i = 3; i < lines.length - 1; i += 2) {
+	  if (lines[i].trim() === '') continue // 跳过空行
+  
+	  // 分割每一行的数据
+	  const values = lines[i]
+		.split('│')
+		.slice(1, -1)
+		.map((v) => v.trim())
+  
+	  // 创建对象并添加到结果数组
+	  const obj: any = {}
+	  headers.forEach((header, index) => {
+		obj[header] = values[index] === '-' || values[index] === '' ? null : values[index]
+	  })
+  
+	  // 每行数据都作为一个新对象添加到结果数组中
+	  result.push(obj)
+	}
+  
+	return result
+  }