升级tauri为2.1.1

增加ping的延迟1秒一次
fix: 修复分享配置有中文无法分享的问题
2025-05-19 10:27:56 +00:00 · 2024-11-12 15:40:48 +08:00 · 2024-11-12 14:18:55 +08:00 · 2024-11-12 12:12:35 +08:00 · 2024-11-12 11:21:03 +08:00 · 2024-11-12 11:04:21 +08:00
24 changed files with 1293 additions and 515 deletions
@@ -1,10 +1,60 @@
-# EasyiterGame
-基于easytier的简易游戏联机客户端
+# [EasyTier游戏联机启动器](https://github.com/EasyTier/EasytierGame)

-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
@@ -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();
+    }
+};
@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.1.3",
+	"version": "1.1.7",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod"
@@ -40,6 +40,7 @@
 	},
 	"dependencies": {
 		"@tauri-apps/plugin-autostart": "~2",
+		"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
 		"@tauri-apps/plugin-fs": "~2"
 	}
 }
@@ -4,171 +4,187 @@
 		label-position="top"
 		:model="config"
 	>
-		<ElFormItem
-			label="服务器"
-			prop="serverUrl"
-		>
-			<template #label>
-				<div class="flex items-center gap-[0_5px]">
-					<div>服务器</div>
-					<span>-</span>
-					<ElTag
-						effect="dark"
-						:type="data.isSuccessGetIp ? 'success' : 'info'"
-					>
-						{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
-					</ElTag>
-					<ElButton
-						v-if="!data.coreVersion"
-						@click="getCoreVersion(true)"
-					>
-						获取工具版本
-					</ElButton>
-					<ElTag
-						v-else
-						type="info"
-					>
-						{{ data.coreVersion }}
-					</ElTag>
-					<ElButton
-						:disabled="data.isStart"
-						:loading="data.update"
-						type="warning"
-						@click="handleUpdateCore"
-						size="small"
-					>
-						{{ data.coreVersion ? "更新插件" : "下载插件" }}
-					</ElButton>
-				</div>
-			</template>
-			<ElSelect
-				allow-create
-				filterable
-				default-first-option
-				v-model="config.serverUrl"
-				@change="handleServerUrlChange"
-			>
-				<template #prefix>
-					<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
-						<ElSelect
-							placeholder="协议"
-							multiple
-							collapse-tags
-							@click.stop
-							v-model="config.protocol"
-							@change="handleServerUrlChange"
-						>
-							<ElOption
-								v-for="item in protocols"
-								:key="item"
-								:label="item"
-								:value="item"
-							></ElOption>
-						</ElSelect>
-					</div>
-				</template>
-				<ElOption
-					v-for="item in mainStore.basePeers"
-					:key="item"
-					:label="item"
-					:value="item"
-				>
-					<div class="flex items-center justify-between">
-						<span style="float: left">{{ item }}</span>
-						<ElButton
-							@click.stop="handleDeleteServerUrl(item)"
-							round
-							:icon="Delete"
-							type="danger"
-						></ElButton>
-					</div>
-				</ElOption>
-			</ElSelect>
-		</ElFormItem>
-		<div class="flex flex-wrap gap-[0_10px] items-center">
-			<div class="flex-1">
-				<ElFormItem label="网络名">
-					<template #label>
-						<div class="flex items-center">
-							网络名
-							<ElTooltip content="对应命令行参数 --network-name">
-								<ElIcon><QuestionFilled /></ElIcon>
-							</ElTooltip>
-						</div>
-					</template>
-					<ElInput
-						maxlength="100"
-						placeholder="请输入网络名"
-						v-model="config.networkName"
-					></ElInput>
-				</ElFormItem>
-			</div>
-			<div class="flex-1">
-				<ElFormItem label="网络密码">
-					<template #label>
-						<div class="flex items-center">
-							网络密码
-							<ElTooltip content="对应命令行参数 --network-secret">
-								<ElIcon><QuestionFilled /></ElIcon>
-							</ElTooltip>
-						</div>
-					</template>
-					<ElInput
-						show-password
-						maxlength="100"
-						placeholder="请输入网络密码"
-						v-model="config.networkPassword"
-						type="password"
-					></ElInput>
-				</ElFormItem>
-			</div>
-		</div>
-		<div class="flex gap-[0_10px]">
-			<ElFormItem label="主机名">
-				<template #label>
-					<div class="flex items-center">
-						主机名
-						<ElTooltip content="对应命令行参数 --hostname">
-							<ElIcon><QuestionFilled /></ElIcon>
-						</ElTooltip>
-					</div>
-				</template>
-				<ElInput
-					maxlength="100"
-					placeholder="例如: Player1"
-					v-model="config.hostname"
-				></ElInput>
-			</ElFormItem>
+		<!-- element-loading-custom-class="config-start"
+			v-loading="mainStore.configStartEnable"
+			:element-loading-spinner="'<path />'"
+			element-loading-text="-------已经启用配置文件，界面配置不再生效-------" -->
+		<!-- <div> -->
 			<ElFormItem
-				class="w-[70%]"
-				label="局域网IP"
+				label="服务器"
+				prop="serverUrl"
 			>
 				<template #label>
-					<div class="flex items-center h-[20px]">
-						虚拟网IP
-						<ElTooltip content="对应命令行参数 --ipv4">
-							<ElIcon><QuestionFilled /></ElIcon>
-						</ElTooltip>
-						<ElSwitch
-							v-model="config.dhcp"
-							class="ml-[5px]"
-							inline-prompt
-							inactive-text="固定IP"
-							active-text="动态获取IP"
-							size="small"
-						></ElSwitch>
+					<div class="flex items-center gap-[0_5px]">
+						<div>服务器</div>
+						<span>-</span>
+						<ElTag
+							effect="dark"
+							:type="data.isSuccessGetIp ? 'success' : 'info'"
+						>
+							{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
+						</ElTag>
+						<ElButton
+							v-if="!data.coreVersion"
+							@click="getCoreVersion(true)"
+						>
+							获取内核版本
+						</ElButton>
+						<ElTag
+							v-else
+							type="info"
+						>
+							{{ data.coreVersion }}
+						</ElTag>
+						<ElPopconfirm
+							width="325"
+							cancel-button-text="取消"
+							confirm-button-text="继续"
+							title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
+						也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
+							@confirm="handleUpdateCore"
+						>
+							<template #reference>
+								<ElButton
+									:disabled="data.isStart"
+									:loading="data.update"
+									type="warning"
+									size="small"
+								>
+									{{ data.coreVersion ? "更新内核" : "下载内核" }}
+								</ElButton>
+							</template>
+						</ElPopconfirm>
 					</div>
 				</template>
-				<ElInput
-					maxlength="100"
-					:disabled="config.dhcp"
-					:placeholder="data.isStart ? '等待动态分配IP...' : '例如: 10.126.126.1'"
-					v-model="config.ipv4"
-				></ElInput>
+				<ElSelect
+					allow-create
+					filterable
+					default-first-option
+					v-model="config.serverUrl"
+					@change="handleServerUrlChange"
+				>
+					<template #prefix>
+						<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
+							<ElSelect
+								placeholder="协议"
+								multiple
+								collapse-tags
+								@click.stop
+								v-model="config.protocol"
+								@change="handleServerUrlChange"
+							>
+								<ElOption
+									v-for="item in protocols"
+									:key="item"
+									:label="item"
+									:value="item"
+								></ElOption>
+							</ElSelect>
+						</div>
+					</template>
+					<ElOption
+						v-for="item in mainStore.basePeers"
+						:key="item"
+						:label="item"
+						:value="item"
+					>
+						<div class="flex items-center justify-between">
+							<span style="float: left">{{ item }}</span>
+							<ElButton
+								@click.stop="handleDeleteServerUrl(item)"
+								round
+								:icon="Delete"
+								type="danger"
+							></ElButton>
+						</div>
+					</ElOption>
+				</ElSelect>
 			</ElFormItem>
-		</div>
-		<div class="flex items-start gap-[0_10px]">
-			<div class="w-[122px]">
+			<div class="flex flex-wrap gap-[0_10px] items-center">
+				<div class="flex-1">
+					<ElFormItem label="网络名">
+						<template #label>
+							<div class="flex items-center">
+								网络名
+								<ElTooltip content="对应命令行参数 --network-name">
+									<ElIcon><QuestionFilled /></ElIcon>
+								</ElTooltip>
+							</div>
+						</template>
+						<ElInput
+							maxlength="100"
+							placeholder="请输入网络名"
+							v-model="config.networkName"
+						></ElInput>
+					</ElFormItem>
+				</div>
+				<div class="flex-1">
+					<ElFormItem label="网络密码">
+						<template #label>
+							<div class="flex items-center">
+								网络密码
+								<ElTooltip content="对应命令行参数 --network-secret">
+									<ElIcon><QuestionFilled /></ElIcon>
+								</ElTooltip>
+							</div>
+						</template>
+						<ElInput
+							show-password
+							maxlength="100"
+							placeholder="请输入网络密码"
+							v-model="config.networkPassword"
+							type="password"
+						></ElInput>
+					</ElFormItem>
+				</div>
+			</div>
+			<div class="flex gap-[0_10px]">
+				<ElFormItem label="主机名">
+					<template #label>
+						<div class="flex items-center">
+							主机名
+							<ElTooltip content="对应命令行参数 --hostname">
+								<ElIcon><QuestionFilled /></ElIcon>
+							</ElTooltip>
+						</div>
+					</template>
+					<ElInput
+						maxlength="100"
+						placeholder="例如: Player1"
+						v-model="config.hostname"
+					></ElInput>
+				</ElFormItem>
+				<ElFormItem
+					class="w-[70%]"
+					label="局域网IP"
+				>
+					<template #label>
+						<div class="flex items-center h-[20px]">
+							虚拟网IP
+							<ElTooltip content="对应命令行参数 --ipv4">
+								<ElIcon><QuestionFilled /></ElIcon>
+							</ElTooltip>
+							<ElSwitch
+								v-model="config.dhcp"
+								class="ml-[5px]"
+								inline-prompt
+								inactive-text="固定IP"
+								active-text="动态获取IP"
+								size="small"
+							></ElSwitch>
+						</div>
+					</template>
+					<ElInput
+						maxlength="100"
+						:disabled="config.dhcp"
+						:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
+						v-model="config.ipv4"
+					></ElInput>
+				</ElFormItem>
+			</div>
+		<!-- </div> -->
+		<div class="flex items-start">
+			<div>
 				<div>
 					<ElDropdown
 						@command="handleStartCommand"
@@ -182,10 +198,23 @@
 						<template #dropdown>
 							<ElDropdownMenu>
 								<ElDropdownItem
+									command="import_config"
+									:icon="Link"
+								>
+									导入配置
+								</ElDropdownItem>
+								<ElDropdownItem
+									command="share_config"
+									:icon="Share"
+								>
+									分享配置
+								</ElDropdownItem>
+								<ElDropdownItem
+									:icon="Tools"
 									command="toml"
 									:disabled="data.isStart"
 								>
-									配置文件启动
+									使用外部配置文件
 								</ElDropdownItem>
 							</ElDropdownMenu>
 						</template>
@@ -218,7 +247,7 @@
 					</ElTooltip>
 				</div>
 			</div>
-			<div>
+			<div class="ml-auto">
 				<ElCheckbox
 					v-model="config.disbleP2p"
 					size="small"
@@ -248,34 +277,23 @@
 				</div>
 				<div class="flex items-center gap-[0_5px]">
 					<div>
-						<ElLink
-							class="!text-[11px]"
-							type="info"
-							:underline="false"
-							@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
-						>
-							WinIPBroadcast
-							<ElTooltip content="找不到游戏房间时，就开启它后再刷新尝试(默认开启)">
-								<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
-							</ElTooltip>
-						</ElLink>
-						<ElSwitch
-							inline-prompt
-							:model-value="data.winipBcStart"
-							@change="handleWinipBcStart"
+						<ElButton
+							plain
+							type="primary"
 							size="small"
-							label="WinIPBroadcast"
-							active-text="开启"
-							inactive-text="关闭"
-						></ElSwitch>
+							:icon="MagicStick"
+							@click="handleShowToolDialog"
+						>
+							增强工具
+						</ElButton>
 					</div>
 					<ElLink
-						class="!text-[11px] pb-[2px] ml-[15px]"
+						class="!text-[9px] pb-[2px] ml-[8px] truncate"
 						type="info"
 						:underline="false"
 						@click="open('https://github.com/EasyTier/EasytierGame')"
 					>
-						主页
+						EasytierGame主页
 					</ElLink>
 				</div>
 			</div>
@@ -284,6 +302,36 @@
 	<ElDialog
 		width="95%"
 		top="10px"
+		class="!mb-0"
+		v-model="importConfigData.visible"
+		:close-on-press-escape="false"
+		title="导入分享"
+	>
+		<ElInput
+			type="textarea"
+			:rows="6"
+			placeholder="请粘贴分享的配置"
+			v-model="importConfigData.data"
+		></ElInput>
+		<template #footer>
+			<div>
+				<el-text type="danger">导入成功后，您当前的配置将被完全替换</el-text>
+			</div>
+			<div class="text-right">
+				<ElButton
+					size="small"
+					@click="handleStartImport"
+					type="primary"
+				>
+					导入
+				</ElButton>
+			</div>
+		</template>
+	</ElDialog>
+	<ElDialog
+		width="95%"
+		top="30px"
+		class="!mb-0"
 		v-model="configStart.visible"
 		:close-on-press-escape="false"
 		title="配置文件启动"
@@ -323,31 +371,36 @@
 				></ElOption>
 			</ElSelect>
 		</div>
-		<div class="mt-[5px] text-right">
-			<ElButton
-				@click="configStart.visible = false"
-				type="danger"
-			>
-				关闭
-			</ElButton>
-		</div>
+		<template #footer>
+			<div class="text-right">
+				<ElButton
+					size="small"
+					@click="configStart.visible = false"
+					type="danger"
+				>
+					关闭
+				</ElButton>
+			</div>
+		</template>
 	</ElDialog>
 </template>
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
 	import { listen } from "@tauri-apps/api/event";
 	import { open, Command } from "@tauri-apps/plugin-shell";
-	import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight } from "@element-plus/icons-vue";
+	import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools, MagicStick } from "@element-plus/icons-vue";
 	import { reactive, onBeforeUnmount, onMounted } from "vue";
 	import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
+	import { initStartWinIpBroadcast } from "~/composables/netcard";
 	import useMainStore from "@/stores/index";
-	import { ElDropdownMenu, ElMessage } from "element-plus";
+	import { ElDropdownMenu, ElMessage, ElMessageBox } from "element-plus";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
 	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";
+	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";

 	let is_close = false;

@@ -365,6 +418,7 @@
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
+		toolVisible: false,
 		winipBcPid: 0, //WinIPBroadcast进程id
 		winipBcStart: false,
 		memberVisible: false,
@@ -374,7 +428,8 @@
 		coreVersion: "",
 		isSuccessGetIp: false,
 		startLoading: false,
-		isStart: false
+		isStart: false,
+		connectionSuccess: false
 	});

 	const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
@@ -383,6 +438,12 @@
 		list: [] //配置文件列表
 	});

+	const importConfigData = reactive<{ data: ""; [key: string]: any }>({
+		visible: false,
+		loading: false,
+		data: ""
+	});
+
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
@@ -419,21 +480,32 @@
 		unListenConfigStart: null,
 		thread_id: null,
 		async listenOutput() {
-			const appWindow = getCurrentWindow();
+			// const appWindow = getCurrentWindow();
 			const unListen = await listen("command-output", async event => {
 				data.isStart = true;
 				if (event.payload) {
 					data.startLoading = false;
-					let ipv4 = /new: Some\((\d+\.\d+\.\d+\.\d+)\/.*\)/g.exec(event.payload as string)?.[1];
-					if (ipv4) {
-						data.isSuccessGetIp = true;
-						await setTrayRunState(tray, true);
-						config.ipv4 = ipv4;
-						await setTrayTooltip(tray, `IP: ${ipv4}`);
+					let ipv4 = /dhcp ip changed. old: None, new: Some\((\d+\.\d+\.\d+\.\d+).*\)/g.exec(event.payload as string)?.[1];
+					if (config.dhcp || mainStore.configStartEnable) {
+						if (ipv4) {
+							config.ipv4 = ipv4;
+							await setTrayRunState(tray, true);
+							data.isSuccessGetIp = true;
+							await setTrayTooltip(tray, `IP: ${ipv4}`);
+						}
+					} else {
+						if ((event.payload as string).includes("new peer connection added")) {
+							await setTrayRunState(tray, true);
+							data.isSuccessGetIp = true;
+							await setTrayTooltip(tray, `IP: ${config.ipv4}`);
+						}
 					}
 				}
-				appWindow.emitTo("log", "logs", data.log);
+				const logArr = data.log.split("\n");
+				const start = logArr.length > 1000 ? logArr.length - 1000 : 0;
+				data.log = logArr.slice(start).join("\n");
 				data.log += (event.payload as string) + "\n";
+
 			});
 			this.unListenOutPut = unListen;
 		},
@@ -474,11 +546,11 @@
 		await getReleaseList();
 		const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
 		if (latestVersionFileName) {
-			console.log(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
+			// console.log(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
 			const latestVersion = /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName)?.[1];
 			const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1];
 			if (latestVersion && currentVersion != latestVersion) {
-				console.log({ currentVersion, latestVersion });
+				// console.log({ currentVersion, latestVersion });
 				ElMessage.success(`更新 -> ${latestVersion}`);
 				const downloadUrl = data.releaseList?.[0]?.[0]?.[2];
 				return [true, downloadUrl, latestVersionFileName];
@@ -501,7 +573,7 @@
 		const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
 		if (isNeedUpdate) {
 			await reset();
-			console.log(downloadUrl);
+			// console.log(downloadUrl);
 			await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName });
 		}
 		await getCoreVersion();
@@ -513,44 +585,6 @@
 		data.releaseList = list as never[];
 	};

-	const getWinIpBroadcastPid = async () => {
-		const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
-		data.winipBcPid = (pid as number) || 0;
-		if (data.winipBcPid && data.winipBcPid > 0) {
-			data.winipBcStart = true;
-		} else {
-			data.winipBcStart = false;
-		}
-	};
-
-	const handleWinipBcStart = async () => {
-		if (!data.winipBcStart) {
-			try {
-				await invoke("stop_command", { child_id: data.winipBcPid || 0 });
-				const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
-				data.winipBcPid = child.pid || 0;
-				if (data.winipBcPid) {
-					data.winipBcStart = true;
-				} else {
-					ElMessage.error(`启动失败`);
-				}
-			} catch (err) {
-				ElMessage.error(`启动失败`);
-				console.log(err);
-			}
-		} else {
-			await invoke("stop_command", { child_id: data.winipBcPid || 0 });
-			await getWinIpBroadcastPid();
-		}
-	};
-
-	const initStartWinIpBroadcast = async () => {
-		await getWinIpBroadcastPid();
-		if (!data.winipBcStart) {
-			await handleWinipBcStart();
-		}
-	};
-
 	const handleAutoStart = async () => {
 		let is_enable = await tauriAutoStart.isEnabled();
 		if (!config.autoStart && !is_enable) {
@@ -714,7 +748,7 @@
 		if (config.saveErrorLog) {
 			args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
 		}
-		if(config.devName && config.devNameValue) {
+		if (config.devName && config.devNameValue) {
 			args.push("--dev-name", config.devNameValue);
 		}
 		return args;
@@ -747,10 +781,15 @@
 			await reset();
 		} else {
 			const args = await getArgs();
-
 			if (!args || args.length <= 0) {
 				return ElMessage.error("无配置");
 			}
+			if(args[0] === "-c") {
+				ElMessage.warning({
+					message: "使用配置文件中.",
+					duration: 5000,
+				});
+			}
 			data.log = ""; //清空日志
 			data.startLoading = true;
 			await unListenAll();
@@ -784,6 +823,38 @@
 				} catch (err) {}
 			}
 		}
+		if (command === "share_config") {
+			try {
+				const WT = btoa(encodeURIComponent(JSON.stringify({ config: mainStore.config })))
+				await writeText(WT);
+				ElMessage.success("配置已复制");
+			} catch (err) {
+				console.log(err);
+				ElMessage.error("分享失败");
+			}
+		}
+		if (command === "import_config") {
+			importConfigData.data = "";
+			importConfigData.visible = true;
+		}
+	};
+
+	const handleStartImport = async () => {
+		try {
+			await ElMessageBox.confirm("确定导入?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消"
+			});
+			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
+			mainStore.$patch(payload);
+			ElMessage.success("导入成功");
+			importConfigData.visible = false;
+			mainStore.basePeers = [...new Set([config.serverUrl, ...mainStore.basePeers])];
+		} catch (err) {
+			if (err !== "cancel") {
+				ElMessage.error("导入失败");
+			}
+		}
 	};

 	const initConfigDir = async () => {
@@ -801,7 +872,7 @@
 	const openConfigDir = async () => {
 		const resourceDir = await getResourceDir();
 		const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_PATH);
-		console.log(configPath);
+		// console.log(configPath);
 		await Command.create("explorer", [configPath]).execute();
 	};

@@ -809,9 +880,9 @@
 		if (!data.isStart) {
 			return ElMessage.warning("请先开始联机");
 		}
-		if (!mainStore.config.ipv4) {
-			return ElMessage.warning("请等待获取IP");
-		}
+		// if (!mainStore.config.ipv4) {
+		// 	return ElMessage.warning("请等待获取IP");
+		// }

 		await etWindows(
 			"member",
@@ -890,4 +961,23 @@
 			}
 		);
 	};
+
+	const handleShowToolDialog = async () => {
+		await etWindows(
+			"tool",
+			{
+				title: "增强工具",
+				width: 460,
+				height: 480,
+				resizable: true,
+				url: "#/tool"
+			},
+			(_, appWindow) => {
+				data.toolVisible = true;
+			},
+			() => {
+				data.toolVisible = false;
+			}
+		);
+	};
 </script>
@@ -4,10 +4,13 @@
 			<span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span>
 			<ElTable
 				stripe
+				border
 				:data="data.member"
 				v-else>
 				<ElTableColumn
 					v-for="prop in showTableHeader"
+					sortable
+					:prop="prop[0]"
 					:label="prop[1]"
 					:key="prop[0]">
 					<template #default="{ row }">
@@ -56,7 +59,7 @@
 				value.ipv4 = value.ipv4.split("/")[0];
 			}
 		});
-		console.log(peerInfo);
+		// console.log(peerInfo);
 		data.member = peerInfo;
 	};

@@ -0,0 +1,341 @@
+<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"
+						:disabled="data.isPing"
+						@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";
+	import { isValidIP } from "~/utils";
+
+	const mainStore = useMainStore();
+	const data = reactive({
+		activeTab: "netcard",
+		winipBcPid: 0,
+		pingNum: 1,
+		winipBcStart: false,
+		pingIp: "",
+		isPing: false,
+		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 awaitTime = (time: number) => {
+		return new Promise(res => {
+			setTimeout(res, time);
+		});
+	};
+
+	const handleTestPing = async () => {
+		// const is = isValidIP(data.pingIp);
+		if (data.pingIp) {
+			data.pingLog = "";
+			data.isPing = true;
+			try {
+				for (let i = 0; i < data.pingNum; i++) {
+					const output = await Command.create("ping", ["-n", "1", data.pingIp], {
+						encoding: "gb2312"
+					}).execute();
+					if (output.stdout) {
+						data.pingLog += `${i + 1} - ${output.stdout.split("\n")[2]}`;
+					}
+					if (output.stderr) {
+						data.pingLog += `${i + 1}error - ${output.stderr}`;
+					}
+					if(i != data.pingNum - 1) {
+						await awaitTime(1000);
+					}
+				}
+				data.pingLog += '完毕'
+			} catch (err) {
+				ElMessage.error("Ping发生错误");
+				console.log(err);
+			} finally {
+				data.isPing = false;
+			}
+		}else {
+			ElMessage.error("请输入正确的IP");
+		}
+	};
+
+	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) {
+			// netsh advfirewall firewall add rule name="EXE名称" dir=out action=allow program="EXE绝对路径"
+			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(() => {
+		data.pingIp = mainStore.config.ipv4;
+		initStartWinIpBroadcast();
+	});
+</script>
@@ -11,6 +11,9 @@ importers:
      '@tauri-apps/plugin-autostart':
        specifier: ~2
        version: 2.0.0
+      '@tauri-apps/plugin-clipboard-manager':
+        specifier: ^2.0.0
+        version: 2.0.0
      '@tauri-apps/plugin-fs':
        specifier: ~2
        version: 2.0.1
@@ -1014,6 +1017,9 @@ packages:
  '@tauri-apps/plugin-cli@2.0.0':
    resolution: {integrity: sha512-glQmlL1IiCGEa1FHYa/PTPSeYhfu56omLRgHXWlJECDt6DbJyRuJWVgtkQfUxtqnVdYnnU+DGIGeiInoEqtjLw==}

+  '@tauri-apps/plugin-clipboard-manager@2.0.0':
+    resolution: {integrity: sha512-V1sXmbjnwfXt/r48RJMwfUmDMSaP/8/YbH4CLNxt+/sf1eHlIP8PRFdFDQwLN0cNQKu2rqQVbG/Wc/Ps6cDUhw==}
+
  '@tauri-apps/plugin-fs@2.0.1':
    resolution: {integrity: sha512-PkeZG2WAob9Xpmr66aPvj+McDVgFjV2a7YBzYVZjiCvbGeMs6Yk09tlXhCe3EyZdT/pwWMSi8lXUace+hlsjsw==}

@@ -5392,6 +5398,10 @@ snapshots:
    dependencies:
      '@tauri-apps/api': 2.0.2

+  '@tauri-apps/plugin-clipboard-manager@2.0.0':
+    dependencies:
+      '@tauri-apps/api': 2.0.2
+
  '@tauri-apps/plugin-fs@2.0.1':
    dependencies:
      '@tauri-apps/api': 2.0.2
@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.1.3"
+version = "1.1.7"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
@@ -18,19 +18,20 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]

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

 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.0.6", features = [
+tauri = { version = "2.1.1", features = [
    "tray-icon",
    "image-png",
    "image-ico",
 ] }
-tauri-plugin-log = "2.0.1"
+
+tauri-plugin-log = "2.0.2"
 tauri-plugin-shell = "2.0.2"
 reqwest = { version = "0.12", features = ["json"] }
 zip = "2.2.0"
@@ -38,6 +39,7 @@ 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.2"
 # prost = "0.13"
 # prost-types = "0.13"

@@ -1,67 +1,91 @@
 {
-	"$schema": "../gen/schemas/desktop-schema.json",
-	"identifier": "default",
-	"description": "enables the default permissions",
-	"windows": ["main", "log", "member", "cidr", "advance"],
-	"permissions": [
-		"core:default",
-		"core:window:allow-minimize",
-		"core:window:allow-hide",
-		"core:window:allow-close",
-		"shell:allow-open",
-		"core:window:allow-show",
-		"core:window:allow-create",
-		"core:window:allow-set-position",
-		"core:window:allow-destroy",
-		"core:webview:allow-create-webview-window",
-		"core:webview:allow-set-webview-size",
-		"core:webview:allow-set-webview-position",
-		"core:webview:allow-create-webview",
-		"core:webview:allow-webview-show",
-		"core:webview:allow-webview-hide",
-		"core:webview:allow-webview-close",
-		"autostart:default",
-		"autostart:allow-enable",
-		"autostart:allow-disable",
-		"autostart:allow-is-enabled",
-		"core:tray:allow-get-by-id",
-		"core:tray:allow-set-icon",
-		"core:tray:allow-new",
-		{
-			"identifier": "shell:allow-spawn",
-			"allow": [
-				{
-					"args": ["run"],
-					"cmd": "easytier/tool/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"
-				}
-			]
-		},
-		"fs:default",
-		"fs:allow-read-dir",
-		"fs:allow-exists",
-		"fs:allow-open",
-		"fs:allow-resource-read",
-		"fs:allow-resource-read-recursive"
-	]
-}
+  "$schema": "../gen/schemas/desktop-schema.json",
+  "identifier": "default",
+  "description": "enables the default permissions",
+  "windows": [
+    "main",
+    "log",
+    "member",
+    "cidr",
+    "advance",
+    "tool"
+  ],
+  "permissions": [
+    "core:default",
+    "core:window:allow-minimize",
+    "core:window:allow-hide",
+    "core:window:allow-close",
+    "shell:allow-open",
+    "core:window:allow-show",
+    "core:window:allow-create",
+    "core:window:allow-set-position",
+    "core:window:allow-destroy",
+    "core:webview:allow-create-webview-window",
+    "core:webview:allow-set-webview-size",
+    "core:webview:allow-set-webview-position",
+    "core:webview:allow-create-webview",
+    "core:webview:allow-webview-show",
+    "core:webview:allow-webview-hide",
+    "core:webview:allow-webview-close",
+    "autostart:default",
+    "autostart:allow-enable",
+    "autostart:allow-disable",
+    "autostart:allow-is-enabled",
+    "core:tray:allow-get-by-id",
+    "core:tray:allow-set-icon",
+    "core:tray:allow-new",
+    {
+      "identifier": "shell:allow-spawn",
+      "allow": [
+        {
+          "args": [
+            "run"
+          ],
+          "cmd": "easytier/tool/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"
+  ]
+}
@@ -394,14 +394,12 @@ fn spawn_autostart(enabled: bool) {
 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(),
-            )
-            ?;
+        task_service.Connect(
+            &VARIANT::default(),
+            &VARIANT::default(),
+            &VARIANT::default(),
+            &VARIANT::default(),
+        )?;

        // 指定要删除的任务文件夹路径
        let folder_path = BSTR::from("\\easytierGame");
@@ -411,20 +409,12 @@ fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
        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)
-            ?;
+        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();
@@ -517,6 +507,7 @@ 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,
@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.1.3",
+	"version": "1.1.7",
 	"identifier": "com.tauri.easytier-game",

 	"build": {
@@ -13,10 +13,14 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.1.3",
-				"width": 335,
+				"title": "easytier-game 1.1.7",
+				"minWidth": 340,
+				"width": 340,
 				"height": 305,
-				"resizable": false,
+				"minHeight": 305,
+				"maxHeight": 305,
+				"maxWidth": 360,
+				"resizable": true,
 				"fullscreen": false,
 				"decorations": true,
 				"center": true,
@@ -33,6 +33,9 @@ export default defineStore("main", {
 			configStartEnable: false, //使用配置文件启动
 			configPath: "", //配置文件路径
 			cidrEnable: false,
+			winipBcPid: 0,
+			winipBcStart: false,
+			winIpBcAutoStart: true,
 			basePeers: ["public.easytier.top:11010"],
 		};
 	},
@@ -41,6 +44,9 @@ export default defineStore("main", {
 			"basePeers",
 			"cidrEnable",
 			"theme",
+			"configStartEnable",
+			"configPath",
+			"winIpBcAutoStart",
 			"config.proxyNetworks",
 			"config.serverUrl",
 			"config.networkName",
@@ -60,6 +66,7 @@ export default defineStore("main", {
 			"config.disableUdpHolePunching",
 			"config.relayAllPeerrpc",
 			"config.hostname",
+			"config.ipv4",
 			"config.dhcp",
 			"config.saveErrorLog",
 			"config.logLevel",
@@ -1,4 +1,3 @@
-
 import { ElMessage } from "element-plus";
 import Clipboard from "vue-clipboard3";

@@ -79,36 +78,43 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi

 export const parsePeerInfo = (content: string) => {
 	// 将表格字符串分割成行
-	const lines = content.split('\n')
-  
+	const lines = content.split("\n");
+
 	// 提取表头（keys）
 	const headers = lines[1]
-	  .split('│')
-	  .slice(1, -1)
-	  .map((h) => h.trim())
-  
+		.split("│")
+		.slice(1, -1)
+		.map(h => h.trim());
+
 	// 初始化结果数组
-	const result: any[] = []
-  
+	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)
+		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
-  }
+
+	return result;
+};
+
+export function isValidIP(ip: string) {
+	const ipv4Pattern =
+		/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+	const ipv6Pattern = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$/;
+	return ipv4Pattern.test(ip) || ipv6Pattern.test(ip);
+}
@@ -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);
+};
Author	SHA1	Message	Date
黑先森	44183b1ad2	升级tauri为2.1.1	2024-11-12 15:40:48 +08:00
黑先森	fe1bc6f89e	增加ping的延迟1秒一次	2024-11-12 14:18:55 +08:00
黑先森	be59e56bd1	fix: 修复分享配置有中文无法分享的问题	2024-11-12 12:12:35 +08:00
黑先森	f556e17f85	固定窗口高度	2024-11-12 11:21:03 +08:00
黑先森	c7170967ec	给予一定的宽度可变调整	2024-11-12 11:04:21 +08:00
黑先森	1801082601	修复与优化 - 没有自动保存配置文件启动的bug - 修复配置文件启动无法打开成员列表的bug - 修复动态ipv4获取后，没有正确赋值到界面上的bug - 增加使用配置文件启动时的提示	2024-11-11 18:19:28 +08:00
黑先森	189f3467c3	Merge branch 'dev_1.1.5' # Conflicts: # README.md	2024-11-11 16:56:48 +08:00
黑先森	bf1403bf07	修复winIp无法自启的bug	2024-11-11 16:50:18 +08:00
黑先森	7a181200f3	增加下载内核的提示	2024-11-11 16:28:23 +08:00
黑先森	9413449c8e	合并内核外工具到增强工具窗口，新增防火墙关闭跃点修改 ping测试功能	2024-11-11 16:01:41 +08:00
黑先森	2eb69352f7	优化readme	2024-11-08 12:17:38 +08:00
黑先森	9ea0eea0ac	Merge branch 'dev_1.1.4'	2024-11-05 18:30:29 +08:00
黑先森	ef172e4d4c	增加base64编码分享和导入界面配置 #1 优化是否联机成功的判断，优化本地存储日志数量	2024-11-05 18:30:08 +08:00
leizi97	c572925a0d	Merge branch 'dev_1.1.3'	2024-11-04 22:46:28 +08:00
leizi97	e4fbaa921c	Merge branch 'dev_1.1.2'	2024-11-04 21:29:29 +08:00
leizi97	76d29cbeeb	Merge branch 'dev_1.1.1'	2024-11-03 23:13:43 +08:00
leizi97	6f57a866a4	Merge branch 'dev_1.1.0'	2024-11-03 22:09:58 +08:00
leizi97	fe9f1c01b7	Merge branch 'dev_1.0.9'	2024-10-29 23:32:48 +08:00
leizi97	43d681e888	Merge branch 'dev_1.0.9'	2024-10-29 22:51:34 +08:00
黑先森	d402f107b0	Merge branch 'dev_1.0.8'	2024-10-25 18:42:52 +08:00
leizi97	74fbfed7be	Merge branch 'dev_1.0.7'	2024-10-23 22:04:58 +08:00
黑先森	5b9eed9520	Merge branch 'dev_1.0.6'	2024-10-17 19:35:37 +08:00
黑先森andGitHub	1ae122ab2a	Update README.md	2024-10-16 17:41:44 +08:00
黑先森	3db962f3dc	#improvement 增加说明图	2024-10-16 17:35:24 +08:00
黑先森	a7f1292067	Merge branch 'dev_1.0.5'	2024-10-16 17:22:00 +08:00
黑先森	022e71de01	Merge branch 'dev_1.0.5'	2024-10-16 16:41:30 +08:00
黑先森	5350af87ed	Merge branch 'dev_1.0.4'	2024-10-16 09:52:35 +08:00
leizi97	5d6b7bdf13	Merge branch 'main' of https://github.com/EasyTier/EasytierGame	2024-10-13 21:37:27 +08:00
黑先森andGitHub	5740bd08c1	Update README.md	2024-10-13 21:28:41 +08:00