修复与优化

- 没有自动保存配置文件启动的bug
- 修复配置文件启动无法打开成员列表的bug
- 修复动态ipv4获取后，没有正确赋值到界面上的bug
- 增加使用配置文件启动时的提示

README.md

@@ -1,10 +1,60 @@
-# EasyiterGame
+# [EasyTier游戏联机启动器](https://github.com/EasyTier/EasytierGame)
-基于easytier的简易游戏联机客户端
 
-1. 开发环境如何运行
+## 简介
-   拉取仓库，使用命令行  pnpm install  安装包
+
-   安装完成后， 使用 pnpm tauri dev 进行rust编译 等待启动
+EasyTierGame游戏联机启动器，由`nuxt3` `typescript` `rust` `tauri` 开发
+具有简易的界面，附带最新版easytier内核，联机游玩的时候无论是心理上和使用上都能给予您最舒服的体验，同时支持自定义配置文件启动，满足各种需求
+
+## 下载
+
+Github
+Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.com/EasyTier/EasytierGame/releases)
+
+- 只有绿色zip包，个人不喜欢安装包各种写注册表，解压即用就行，目录清爽干净
+
+![game-step1](/assets/game-step1.png)
+
+
+## 使用教程
+
+- 第一次使用，输入一个“主机名”点击启动联机即可，后续可以自建服务器或者使用爱心群友提供的服务器
+    ![game-step2](/assets/game-step2.png)
+
+![game-step3](/assets/game-step3.png)
+
+- 高级选项里有一些特殊配置，可以自行选择
+    ![game-step4](/assets/game-step4.png)
+
+- 如果还是无法满足您的需求，可以使用配置文件进行启动，具体如何配置，可以查看文档[配置文件](/guide/network/config-file.html)
+    ![game-step5](/assets/game-step5.png)
+
+- easytier内核升级后，可以点击更新插件按钮就可以进行更新，但是需要出国，如果无法更新，可以在群里获取
+    ![game-step6](/assets/game-step6.png)
+
+- 1.1.4更新了 配置分享功能 可以与朋友之间分享配置，方便联机
+
+
+![game-step7](/assets/game-step7.png)
+
+- 1.1.5 合并额外插件于 "增强工具" 窗口 新增了网卡跃点设置 关闭防火墙功能 ping功能
+![game-step8](/assets/game-step8.png)
+
+![game-step9](/assets/game-step9.png)
+
+## 特性
+
+- 基于easytier组网工具开发，界面清晰简单
+- 自带“更新”按钮，在easytier组网工具发布新版本时，点击更新即可（需要出国工具）
+- 第一次使用，输入一个“主机名”点击启动联机即可，后续可以自建服务器或者使用群友的服务器
+- 配置简单，也含有高级功能，同时也支持自定义配置文件启动
+- 默认开启 **WinIPBroadcast** 不再怕联机找不到房间（例如：无主之地3）
+- 已经测试 **艾尔登法环学习版**，**无主之地3**，**深岩银河**，**怪物猎人世界** 等都可稳定联机游玩
+
+## 系统支持
+
+支持Windows 11 、Windows 10 、 Windows 7
+
+
+
+## 请不要将本程序和仓库代码用于任何违法用途，由此产生的一切后果，仓库所有者和参与开发的人员不承担任何责任
 
-2. 生产环境发布
-   执行 pnpm tauri build
-   产物位于 src-tauri/target/release 下 easytier-game.exe

app.vue

@@ -4,4 +4,9 @@
 	</NuxtLayout>
 </template>
 <script setup lang="ts">
+	import useMainStore from "@/stores/index";
+	import { initTheme } from "@/composables/theme";
+	const mainStore = useMainStore();
+	// console.log(mainStore.theme)
+	initTheme(mainStore.theme);
 </script>

assets/css/main.css

@@ -1,14 +1,14 @@
-@tailwind base;
+/* @tailwind base; */
 
 /*
 	用于进行主题更换，如果要更换elemenet-plus-ui的主题记得加上!important，不然更换会失败
 */
 
-@layer base {
+/* @layer base {
 	html {
 		font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", STHeiti, "Microsoft YaHei";
 	}
-}
+} */
 
 html,
 body {
@@ -19,25 +19,16 @@ body {
 * {
 	outline: none;
 }
+body {
+	background-color: #fff;
+}
+html.dark body {
+	background-color: #000;
+}
 
 #__easytier {
 	height: 100%;
 	overflow: hidden;
-	background-color: #fff;
 	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/netcard.ts

@@ -0,0 +1,48 @@
+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";
+
+const getWinIpBroadcastPid = async () => {
+    const mainStore = useMainStore();
+    const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
+    mainStore.winipBcPid = (pid as number) || 0;
+    if (mainStore.winipBcPid && mainStore.winipBcPid > 0) {
+        mainStore.winipBcStart = true;
+    } else {
+        mainStore.winipBcStart = false;
+    }
+};
+
+export const handleWinipBcStart = async () => {
+    const mainStore = useMainStore();
+    if (!mainStore.winipBcStart) {
+        try {
+            await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
+            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(`启动失败`);
+            }
+        } catch (err) {
+            ElMessage.error(`启动失败`);
+            console.log(err);
+        }
+    } else {
+		mainStore.winIpBcAutoStart = false;
+        await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
+        await getWinIpBroadcastPid();
+    }
+};
+
+export const initStartWinIpBroadcast = async () => {
+    const mainStore = useMainStore();
+    await getWinIpBroadcastPid();
+    // console.log(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
+    if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
+        await handleWinipBcStart();
+    }
+};

composables/theme.ts

@@ -0,0 +1,21 @@
+import { useDark, useToggle, usePreferredDark } from "@vueuse/core";
+import { isFunction } from "lodash-es";
+// const isDark = usePreferredDark();
+const darkConfig = useDark({
+	selector: "html",
+	attribute: "class",
+	valueDark: "dark",
+	valueLight: "",
+});
+const toggleDark = useToggle(darkConfig);
+export const initTheme = (isDark: boolean) => {
+	if (isDark && isFunction(toggleDark)) {
+		toggleDark(isDark);
+	}
+};
+
+export const setTheme = (dark: boolean) => {
+    if (isFunction(toggleDark)) {
+		toggleDark(dark);
+	}
+}

composables/tray.ts

@@ -2,6 +2,8 @@ import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
 import { TrayIcon } from "@tauri-apps/api/tray";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import pkg from "@/package.json";
+import { setTheme } from "~/composables/theme";
+import useMainStore from "@/stores/index";
 
 const DEFAULT_TRAY_NAME = "main";
 
@@ -20,16 +22,16 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 		tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
 		if (!tray) {
 			tray = await TrayIcon.new({
-				tooltip: `EasyTier\n${pkg.version}`,
+				tooltip: `EasyTierGame\n${pkg.version}`,
-				title: `EasyTier\n${pkg.version}`,
+				title: `EasyTierGame\n${pkg.version}`,
 				id: DEFAULT_TRAY_NAME,
 				menu: await Menu.new({
 					id: "main",
-					items: await generateMenuItem(beforExit)
+					items: await generateMenuItem(beforExit),
 				}),
-				action: async e => {
+				action: async (e) => {
 					toggleVisibility();
-				}
+				},
 			});
 		}
 	} catch (error) {
@@ -38,12 +40,12 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 	}
 
 	if (init) {
-		tray.setTooltip(`EasyTier\n${pkg.version}`);
+		tray.setTooltip(`EasyTierGame\n${pkg.version}`);
 		tray.setMenuOnLeftClick(false);
 		tray.setMenu(
 			await Menu.new({
 				id: "main",
-				items: await generateMenuItem(beforExit)
+				items: await generateMenuItem(beforExit),
 			})
 		);
 	}
@@ -52,7 +54,12 @@ export async function useTray(init: boolean = false, beforExit: Function) {
 }
 
 export async function generateMenuItem(beforExit: Function) {
-	return [await MenuItemExit("退出", beforExit), await PredefinedMenuItem.new({ item: "Separator" }), await MenuItemShow("显示 / 隐藏")];
+	return [
+		await MenuItemShow("显示 / 隐藏"),
+		await MenuItemTheme(),
+		await PredefinedMenuItem.new({ item: "Separator" }),
+		await MenuItemExit("退出", beforExit),
+	];
 }
 
 export async function MenuItemExit(text: string, beforExit: Function) {
@@ -64,7 +71,7 @@ export async function MenuItemExit(text: string, beforExit: Function) {
 				await beforExit();
 			}
 			await getCurrentWindow().close();
-		}
+		},
 	});
 }
 
@@ -74,7 +81,21 @@ export async function MenuItemShow(text: string) {
 		text,
 		action: async () => {
 			await toggleVisibility();
-		}
+		},
+	});
+}
+
+export async function MenuItemTheme() {
+	return await MenuItem.new({
+		id: "theme",
+		text: "主题切换",
+		action: async () => {
+			const mainStore = useMainStore();
+			mainStore.theme = !mainStore.theme;
+			// const appWindow = getCurrentWindow();
+			// appWindow.emitTo("main", "config", { theme: mainStore.theme });
+			await setTheme(mainStore.theme);
+		},
 	});
 }
 
@@ -92,15 +113,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(`EasyTierGame\n${pkg.version}\n${tooltip}`);
-//       return
+	} else {
-//     tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`)
+		await tray.setTooltip(`EasyTierGame\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>

nuxt.config.ts

@@ -22,7 +22,7 @@ export default defineNuxtConfig({
 		autoImport: false
 	},
 
-	css: ["~/assets/css/main.css"],
+	css: ["~/assets/css/main.css", 'element-plus/theme-chalk/dark/css-vars.css'],
 	modules: ["@element-plus/nuxt", "@pinia/nuxt", "@pinia-plugin-persistedstate/nuxt", "@nuxtjs/tailwindcss"],
 
 	alias: {

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.6",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod"
@@ -23,10 +23,10 @@
 		"@types/lodash-es": "^4.17.12",
 		"@types/qs": "^6.9.15",
 		"@vitejs/plugin-vue-jsx": "^3.1.0",
+		"@vueuse/core": "^11.2.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 +39,8 @@
 		"xlsx": "^0.18.5"
 	},
 	"dependencies": {
-		"@tauri-apps/plugin-autostart": "~2"
+		"@tauri-apps/plugin-autostart": "~2",
+		"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
+		"@tauri-apps/plugin-fs": "~2"
 	}
 }

pages/advance.vue

@@ -0,0 +1,70 @@
+<template>
+	<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
+		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
+			<ElInput maxlength="10" v-model="mainStore.config.devNameValue" placeholder="请输入网卡名"/>
+		</div>
+		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
+		<div class="flex items-center gap-[15px] 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>
+		<ElDivider />
+		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为false，必须与对等节点相同</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
+		<ElDivider />
+		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备，可以使用子网代理访问节点</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
+		<div>
+			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包，即使对等节点不在转发网络白名单内</ElCheckbox>
+		</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/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

@@ -4,14 +4,15 @@
 			<span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span>
 			<ElTable
 				stripe
+				border
 				:data="data.member"
-				v-else
+				v-else>
-			>
 				<ElTableColumn
 					v-for="prop in showTableHeader"
+					sortable
+					:prop="prop[0]"
 					:label="prop[1]"
-					:key="prop[0]"
+					:key="prop[0]">
-				>
 					<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]] }}
@@ -20,8 +21,7 @@
 						<ElTag
 							v-else
 							effect="dark"
-							:type="row[prop[0]] == 'p2p' ? 'success' : 'info'"
+							:type="row[prop[0]] == 'p2p' ? 'success' : 'info'">
-						>
 							{{ row[prop[0]] }}
 						</ElTag>
 					</template>
@@ -33,149 +33,34 @@
 <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: []
+		member: [],
 	});
 
 	const showTableHeader = [
-		["ipv4", "虚拟网IP"],
 		["hostname", "主机名"],
-		["cost", "路由"],
 		["lat_ms", "延迟/ms"],
+		["ipv4", "虚拟网IP"],
+		["cost", "路由"],
 		["loss_rate", "丢包率"],
-		["version", "版本"]
+		["nat_type", "NAT类型"],
+		["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;
+		// console.log(peerInfo);
-		console.log({ member: data.member });
+		data.member = peerInfo;
 	};
 
 	let timer: NodeJS.Timeout | null = null;

pages/tool.vue

@@ -0,0 +1,323 @@
+<template>
+	<div class="h-full overflow-auto">
+		<ElTabs
+			v-model="data.activeTab"
+			@tab-change="handleTabsChange"
+			class="h-full"
+		>
+			<ElTabPane
+				label="联机失败解决办法"
+				name="netcard"
+				class="flex flex-col h-full"
+			>
+				<div>
+					<div>
+						<ElTooltip
+							content="找不到游戏房间时，就开启它后再尝试搜索房间(默认开启)
+                        例如: 一个游戏玩家，有时通过本地局域网联机，有时通过某些联机工具进行联机，但是他只能在其中一个联机方式里看到朋友的游戏房间，而另一个里看不到，这时就可以使用这个工具，让他在两个地方都能看到游戏房间"
+						>
+							<ElText>
+								方案1
+								<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
+							</ElText>
+						</ElTooltip>
+					</div>
+					<ElLink
+						class="!text-[15px] mr-[10px]"
+						type="info"
+						:underline="false"
+						@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
+					>
+						WinIPBroadcast
+					</ElLink>
+					<ElSwitch
+						inline-prompt
+						:model-value="mainStore.winipBcStart"
+						@change="handleWinipBcStart"
+						size="small"
+						label="WinIPBroadcast"
+						active-text="已开启"
+						inactive-text="已关闭"
+					></ElSwitch>
+				</div>
+				<div>
+					<ElTooltip content="设置网卡的跃点，提升网卡优先级，尝试将您联机使用的网卡跃点设置为最小，请先查询网卡信息">
+						<ElText>
+							方案2
+							<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
+						</ElText>
+					</ElTooltip>
+				</div>
+				<div class="flex items-center mt-[5px]">
+					<ElButton
+						@click="initNetCardInfo"
+						size="small"
+						type="primary"
+					>
+						查询网卡信息
+					</ElButton>
+					<div
+						v-if="data.row.name"
+						class="ml-auto flex items-center flex-nowrap gap-[10px]"
+					>
+						<ElTooltip content="跃点越小，网卡优先级越高，范围(1-9999)">
+							<ElInput
+								class="!w-[80px]"
+								autofocus
+								size="small"
+								v-model="data.row.metric"
+								placeholder="请输入跃点"
+							/>
+						</ElTooltip>
+						<ElButton
+							type="success"
+							size="small"
+							@click="handleSaveMetric"
+						>
+							保存
+						</ElButton>
+					</div>
+				</div>
+				<div class="flex-1 overflow-auto mt-[5px]">
+					<ElTable
+						height="100%"
+						empty-text="暂无数据"
+						highlight-current-row
+						:data="data.netcardList"
+						@row-click="handleRowClick"
+						border
+					>
+						<ElTableColumn
+							sortable
+							label="网卡名"
+							prop="name"
+						></ElTableColumn>
+						<ElTableColumn
+							sortable
+							label="跃点"
+							prop="metric"
+						></ElTableColumn>
+					</ElTable>
+				</div>
+			</ElTabPane>
+			<ElTabPane
+				label="防火墙"
+				name="firewall"
+				class="flex flex-col h-full"
+			>
+				<div class="flex flex-col items-center">
+					<div class="mb-[10px]">
+						<ElButton
+							type="warning"
+							size="small"
+						>
+							一键关闭防火墙
+						</ElButton>
+					</div>
+					<div class="mb-[10px]">
+						<ElText class="!mx-[10px]">域防火墙</ElText>
+						<ElTag :type="data.firewallStatus.domain ? 'danger' : 'success'">
+							{{ data.firewallStatus.domain ? "已开启" : "已关闭" }}
+						</ElTag>
+					</div>
+					<div class="mb-[10px]">
+						<ElText class="!mx-[10px]">公用防火墙</ElText>
+						<ElTag :type="data.firewallStatus.public ? 'danger' : 'success'">
+							{{ data.firewallStatus.public ? "已开启" : "已关闭" }}
+						</ElTag>
+					</div>
+					<div>
+						<ElText class="!mx-[10px]">专用防火墙</ElText>
+						<ElTag :type="data.firewallStatus.dedicated ? 'danger' : 'success'">
+							{{ data.firewallStatus.dedicated ? "已开启" : "已关闭" }}
+						</ElTag>
+					</div>
+				</div>
+				<ElDivider>Ping测试</ElDivider>
+				<div class="flex items-center gap-[10px]">
+					<ElInput
+						style="width: 150px"
+						size="small"
+						v-model="data.pingIp"
+						placeholder="请输入IP地址"
+					/>
+					<ElInputNumber
+						controls-position="right"
+						size="small"
+                        :precision="0"
+						v-model="data.pingNum"
+						:min="1"
+						:max="10"
+					>
+						<template #suffix>
+							<span>次</span>
+						</template>
+					</ElInputNumber>
+					<ElButton
+						size="small"
+						@click="handleTestPing"
+					>
+						Ping一下
+					</ElButton>
+				</div>
+				<div class="mt-[5px] flex-1 overflow-auto">
+					<ElInput
+						placeholder="日志信息"
+						type="textarea"
+						:autosize="{ minRows: 9 }"
+						resize="none"
+						v-model="data.pingLog"
+					/>
+				</div>
+			</ElTabPane>
+		</ElTabs>
+	</div>
+</template>
+<script setup lang="ts">
+	import { open, Command } from "@tauri-apps/plugin-shell";
+	import { ElMessage, type TabPaneName } from "element-plus";
+	import { QuestionFilled } from "@element-plus/icons-vue";
+	import { onMounted, reactive } from "vue";
+	import useMainStore from "@/stores/index";
+	import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
+	import { getCurrentWindow } from "@tauri-apps/api/window";
+
+	const mainStore = useMainStore();
+	const data = reactive({
+		activeTab: "netcard",
+		winipBcPid: 0,
+		pingNum: 1,
+		winipBcStart: false,
+		pingIp: "",
+		pingLog: "",
+		firewallStatus: {
+			domain: false,
+			public: false,
+			dedicated: false
+		},
+		row: {
+			name: "",
+			metric: ""
+		},
+		netcardList: []
+	});
+
+	const handleTabsChange = async (tabPaneName: TabPaneName) => {
+		if (tabPaneName === "netcard") {
+			// await initNetCardInfo();
+		} else if (tabPaneName == "firewall") {
+			await initFirewall();
+		}
+	};
+
+	const handleRowClick = async (row: any, column: any, event: Event) => {
+		data.row = { ...row };
+	};
+
+	const handleSaveMetric = async () => {
+		if (data.row.metric && data.row.name) {
+			try {
+				const output = await Command.create("netsh", ["interface", "ipv4", "set", "interface", data.row.name, "metric=", data.row.metric], {
+					encoding: "gb2312"
+				}).execute();
+				ElMessage.success("设置成功");
+				await initNetCardInfo();
+			} catch (err) {
+				console.log(err);
+			}
+		}
+	};
+
+	const handleTestPing = async () => {
+		/^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$/;
+		if (data.pingIp) {
+			data.pingLog = "";
+			try {
+				for (let i = 0; i < data.pingNum; i++) {
+					const output = await Command.create("ping", ["-n", "1", data.pingIp], {
+						encoding: "gb2312"
+					}).execute();
+
+					data.pingLog = data.pingLog.slice(-1000);
+					if (output.stdout) {
+						data.pingLog += output.stdout.split("\n")[2];
+					}
+					if (output.stderr) {
+						data.pingLog += output.stderr;
+					}
+				}
+			} catch (err) {
+				ElMessage.error("Ping发生错误");
+				console.log(err);
+			}
+		}
+	};
+
+	const initNetCardInfo = async () => {
+		try {
+			const output = await Command.create("netsh", ["interface", "ipv4", "show", "interface"], {
+				encoding: "gb2312"
+			}).execute();
+			data.netcardList = output.stdout
+				.split("\n")
+				.map(el => el.trim().replace(/\s+/g, " "))
+				.filter(el => el)
+				.slice(2)
+				.map(el => {
+					const [idx, Met, MTU, status, ...rest] = el.split(" ");
+					return {
+						index: idx,
+						metric: Met,
+						MTU,
+						status,
+						name: rest.join(" ")
+					};
+				}) as any;
+		} catch (err) {
+			ElMessage.error("网卡获取失败");
+			console.log(err);
+		}
+	};
+
+	const initFirewall = async () => {
+		try {
+			const output = await Command.create("netsh", ["advfirewall", "show", "allprofiles", "state"], {
+				encoding: "gb2312"
+			}).execute();
+			const state = output.stdout
+				.trim()
+				.replace(/[\-]+/g, "")
+				.split("\n")
+				.map(el => el.trim())
+				.filter(el => el)
+				.slice(0, -1);
+			for (let idx = 0; idx < state.length; idx += 2) {
+				const status = state[idx + 1].replace(/状态\s+/, "");
+				const matchName = /域|公用|专用/.exec(state[idx]);
+				if (matchName) {
+					const name = matchName[0];
+					if (name == "域") {
+						data.firewallStatus.domain = status != "关闭";
+					} else if (name == "公用") {
+						data.firewallStatus.public = status != "关闭";
+					} else if (name == "专用") {
+						data.firewallStatus.dedicated = status != "关闭";
+					}
+				}
+			}
+		} catch (err) {
+			ElMessage.error("获取防火墙状态失败");
+			console.log(err);
+		}
+	};
+
+	const appWindow = getCurrentWindow();
+	mainStore.$subscribe((...a) => {
+		// console.log("subscribe", a);
+		appWindow.emitTo("main", "config", { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } });
+	});
+
+	onMounted(() => {
+		initStartWinIpBroadcast();
+	});
+</script>

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.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.0.6"
+version = "1.1.6"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -12,31 +12,41 @@ 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-shell = "2"
+tauri-plugin-log = "2.0.1"
+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"
+tauri-plugin-clipboard-manager = "2.0.0-rc"
 # 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

@@ -1,50 +1,91 @@
 {
-	"$schema": "../gen/schemas/desktop-schema.json",
+  "$schema": "../gen/schemas/desktop-schema.json",
-	"identifier": "default",
+  "identifier": "default",
-	"description": "enables the default permissions",
+  "description": "enables the default permissions",
-	"windows": ["main", "log"],
+  "windows": [
-	"permissions": [
+    "main",
-		"core:default",
+    "log",
-		"core:window:allow-minimize",
+    "member",
-		"core:window:allow-hide",
+    "cidr",
-		"core:window:allow-close",
+    "advance",
-		"shell:allow-open",
+    "tool"
-		"core:window:allow-show",
+  ],
-		"core:window:allow-create",
+  "permissions": [
-		"core:window:allow-set-position",
+    "core:default",
-		"core:window:allow-destroy",
+    "core:window:allow-minimize",
-		"core:webview:allow-create-webview-window",
+    "core:window:allow-hide",
-		"core:webview:allow-set-webview-size",
+    "core:window:allow-close",
-		"core:webview:allow-set-webview-position",
+    "shell:allow-open",
-		"core:webview:allow-create-webview",
+    "core:window:allow-show",
-		"core:webview:allow-webview-show",
+    "core:window:allow-create",
-		"core:webview:allow-webview-hide",
+    "core:window:allow-set-position",
-		"core:webview:allow-webview-close",
+    "core:window:allow-destroy",
-		"autostart:allow-enable",
+    "core:webview:allow-create-webview-window",
-		"autostart:allow-disable",
+    "core:webview:allow-set-webview-size",
-		"autostart:allow-is-enabled",
+    "core:webview:allow-set-webview-position",
-		"core:tray:allow-get-by-id",
+    "core:webview:allow-create-webview",
-		"core:tray:allow-set-icon",
+    "core:webview:allow-webview-show",
-		"core:tray:allow-new",
+    "core:webview:allow-webview-hide",
-		{
+    "core:webview:allow-webview-close",
-			"identifier": "shell:allow-spawn",
+    "autostart:default",
-			"allow": [
+    "autostart:allow-enable",
-				{
+    "autostart:allow-disable",
-					"args": ["run"],
+    "autostart:allow-is-enabled",
-					"cmd": "WinIPBroadcast",
+    "core:tray:allow-get-by-id",
-					"name": "WinIPBroadcast"
+    "core:tray:allow-set-icon",
-				}
+    "core:tray:allow-new",
-			]
+    {
-		},
+      "identifier": "shell:allow-spawn",
-		{
+      "allow": [
-			"identifier": "shell:allow-execute",
+        {
-			"allow": [
+          "args": [
-				{
+            "run"
-					"args": ["run"],
+          ],
-					"cmd": "WinIPBroadcast",
+          "cmd": "easytier/tool/WinIPBroadcast",
-					"name": "WinIPBroadcast"
+          "name": "WinIPBroadcast"
-				}
+        }
-			]
+      ]
-		}
+    },
-	]
+    {
-}
+      "identifier": "shell:allow-execute",
+      "allow": [
+        {
+          "args": [
+            "run"
+          ],
+          "cmd": "easytier/tool/WinIPBroadcast",
+          "name": "WinIPBroadcast"
+        },
+        {
+          "args": true,
+          "cmd": "easytier/tool/nssm",
+          "name": "nssm"
+        },
+        {
+          "args": true,
+          "cmd": "explorer",
+          "name": "explorer"
+        },
+        {
+          "args": true,
+          "cmd": "netsh",
+          "name": "netsh"
+        },
+        {
+          "args": true,
+          "cmd": "ping",
+          "name": "ping"
+        }
+      ]
+    },
+    "fs:default",
+    "fs:allow-read-dir",
+    "fs:allow-exists",
+    "fs:allow-open",
+    "fs:allow-resource-read",
+    "fs:allow-resource-read-recursive",
+    "clipboard-manager:allow-clear",
+    "clipboard-manager:allow-read-text",
+    "clipboard-manager:allow-write-text"
+  ]
+}

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,23 @@
+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"

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,155 @@ 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 +507,8 @@ pub fn run() {
     let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆，用于传递给命令
     let context = tauri::generate_context!();
     tauri::Builder::default()
+        .plugin(tauri_plugin_clipboard_manager::init())
+        .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_autostart::init(
             MacosLauncher::LaunchAgent,
             Some(vec![AUTOSTART_ARG]),
@@ -389,7 +558,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.6",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,14 +13,14 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game",
+				"title": "easytier-game 1.1.6",
-				"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,69 @@ 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", //日志等级
+				devName: false, //自定义网卡名
+				devNameValue: "", //自定义网卡名
 			},
+			theme: false, //主题  false light true dark
+			configStartEnable: false, //使用配置文件启动
+			configPath: "", //配置文件路径
+			cidrEnable: false,
+			winipBcPid: 0,
+			winipBcStart: false,
+			winIpBcAutoStart: true,
 			basePeers: ["public.easytier.top:11010"],
 		};
 	},
 	persist: {
 		paths: [
 			"basePeers",
+			"cidrEnable",
+			"theme",
+			"configStartEnable",
+			"configPath",
+			"winIpBcAutoStart",
+			"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.ipv4",
 			"config.dhcp",
+			"config.saveErrorLog",
+			"config.logLevel",
+			"config.devName",
+			"config.devNameValue",
 		],
 	},
 });

tsconfig.json

@@ -6,6 +6,7 @@
 		"components/**/*.ts",
 		"components/**/*.js",
 		"components/**/*.vue",
+		"app.vue",
 		"pages/**/*.ts",
 		"pages/**/*.js",
 		"pages/**/*.vue",

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
+  }

utils/service.ts

@@ -0,0 +1,70 @@
+import useMainStore from "@/stores/index";
+import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
+import { open, Command } from "@tauri-apps/plugin-shell";
+import { invoke } from "@tauri-apps/api/core";
+
+const getExeAbsPath = async () => {
+	const aExePath = (await invoke("get_exe_directory")) as [string, string];
+	return aExePath;
+};
+
+const checkServerOnWindows = async () => {
+	try {
+		const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
+		if (serverStatus.stderr.includes("Can't open service")) {
+			return false;
+		}
+		return true;
+	} catch (err) {
+		return false;
+	}
+};
+
+const handleAutoStartByNssm = async () => {
+    const config = useMainStore().config;
+	const [exeAbsPath, parentDir] = await getExeAbsPath();
+	const isExist = await checkServerOnWindows();
+	if (isExist) {
+		const outputStop = await Command.create("nssm", ["stop", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
+		console.log({ outputStop });
+		const outputRemove = await Command.create("nssm", ["remove", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
+		console.log({ outputRemove });
+	}
+	if (exeAbsPath) {
+		const output = await Command.create("nssm", ["install", import.meta.env.VITE_AUTO_START_SERVICE_NAME, exeAbsPath]).execute();
+		console.log(output);
+		if (output.stdout && output.stdout.includes("installed successfully")) {
+			const outputAppDirectory = await Command.create("nssm", [
+				"set",
+				import.meta.env.VITE_AUTO_START_SERVICE_NAME,
+				"AppDirectory",
+				parentDir
+			]).execute();
+			console.log({ outputAppDirectory });
+			const outputStart = await Command.create("nssm", [
+				"set",
+				import.meta.env.VITE_AUTO_START_SERVICE_NAME,
+				"Start",
+				"SERVICE_AUTO_START"
+			]).execute();
+			console.log({ outputStart });
+			config.autoStart = true;
+		}
+	}
+};
+
+// 兼容autostart插件
+const compatibleAutoStart = async () => {
+    const config = useMainStore().config;
+	const is_enable = await tauriAutoStart.isEnabled();
+	if (is_enable) {
+		try {
+			await tauriAutoStart.disable();
+			config.autoStart = false;
+		} catch (err) {
+			// ElMessage.error(`取消自启失败`);
+		}
+	}
+	const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
+	console.log(serverStatus);
+};