固定窗口高度

- 没有自动保存配置文件启动的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

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();
+    }
+};

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.1.4",
+	"version": "1.1.6",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod"

pages/index.vue

@@ -4,171 +4,187 @@
 		label-position="top"
 		:model="config"
 	>
-		<ElFormItem
+		<!-- element-loading-custom-class="config-start"
-			label="服务器"
+			v-loading="mainStore.configStartEnable"
-			prop="serverUrl"
+			:element-loading-spinner="'<path />'"
-		>
+			element-loading-text="-------已经启用配置文件，界面配置不再生效-------" -->
-			<template #label>
+		<!-- <div> -->
-				<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>
 			<ElFormItem
-				class="w-[70%]"
+				label="服务器"
-				label="局域网IP"
+				prop="serverUrl"
 			>
 				<template #label>
-					<div class="flex items-center h-[20px]">
+					<div class="flex items-center gap-[0_5px]">
-						虚拟网IP
+						<div>服务器</div>
-						<ElTooltip content="对应命令行参数 --ipv4">
+						<span>-</span>
-							<ElIcon><QuestionFilled /></ElIcon>
+						<ElTag
-						</ElTooltip>
+							effect="dark"
-						<ElSwitch
+							:type="data.isSuccessGetIp ? 'success' : 'info'"
-							v-model="config.dhcp"
+						>
-							class="ml-[5px]"
+							{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
-							inline-prompt
+						</ElTag>
-							inactive-text="固定IP"
+						<ElButton
-							active-text="动态获取IP"
+							v-if="!data.coreVersion"
-							size="small"
+							@click="getCoreVersion(true)"
-						></ElSwitch>
+						>
+							获取内核版本
+						</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
+				<ElSelect
-					maxlength="100"
+					allow-create
-					:disabled="config.dhcp"
+					filterable
-					:placeholder="data.isStart ? '等待动态分配IP...' : '例如: 10.126.126.1'"
+					default-first-option
-					v-model="config.ipv4"
+					v-model="config.serverUrl"
-				></ElInput>
+					@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 flex-wrap gap-[0_10px] items-center">
-		<div class="flex items-start gap-[0_10px]">
+				<div class="flex-1">
-			<div class="w-[122px]">
+					<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"
@@ -231,7 +247,7 @@
 					</ElTooltip>
 				</div>
 			</div>
-			<div>
+			<div class="ml-auto">
 				<ElCheckbox
 					v-model="config.disbleP2p"
 					size="small"
@@ -261,34 +277,23 @@
 				</div>
 				<div class="flex items-center gap-[0_5px]">
 					<div>
-						<ElLink
+						<ElButton
-							class="!text-[11px]"
+							plain
-							type="info"
+							type="primary"
-							: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"
 							size="small"
-							label="WinIPBroadcast"
+							:icon="MagicStick"
-							active-text="开启"
+							@click="handleShowToolDialog"
-							inactive-text="关闭"
+						>
-						></ElSwitch>
+							增强工具
+						</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>
@@ -383,9 +388,10 @@
 	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, Link, Tools } 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, ElMessageBox } from "element-plus";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
@@ -412,6 +418,7 @@
 		logVisible: false,
 		cidrVisible: false,
 		advanceVisible: false,
+		toolVisible: false,
 		winipBcPid: 0, //WinIPBroadcast进程id
 		winipBcStart: false,
 		memberVisible: false,
@@ -473,13 +480,13 @@
 		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];
+					let ipv4 = /dhcp ip changed. old: None, new: Some\((\d+\.\d+\.\d+\.\d+).*\)/g.exec(event.payload as string)?.[1];
-					if (config.dhcp) {
+					if (config.dhcp || mainStore.configStartEnable) {
 						if (ipv4) {
 							config.ipv4 = ipv4;
 							await setTrayRunState(tray, true);
@@ -494,8 +501,11 @@
 						}
 					}
 				}
-				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;
 		},
@@ -563,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();
@@ -575,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) {
@@ -809,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();
@@ -901,9 +878,9 @@
 		if (!data.isStart) {
 			return ElMessage.warning("请先开始联机");
 		}
-		if (!mainStore.config.ipv4) {
+		// if (!mainStore.config.ipv4) {
-			return ElMessage.warning("请等待获取IP");
+		// 	return ElMessage.warning("请等待获取IP");
-		}
+		// }
 
 		await etWindows(
 			"member",
@@ -936,7 +913,7 @@
 				data.logVisible = true;
 				logsTimer && clearInterval(logsTimer);
 				logsTimer = setInterval(() => {
-					appWindow.emitTo("log", "logs", data.log ? (data.log as string).split("\n").slice(-1000).join("\n") : "");
+					appWindow.emitTo("log", "logs", data.log);
 				}, 600);
 			},
 			() => {
@@ -982,4 +959,23 @@
 			}
 		);
 	};
+
+	const handleShowToolDialog = async () => {
+		await etWindows(
+			"tool",
+			{
+				title: "增强工具",
+				width: 460,
+				height: 480,
+				resizable: true,
+				url: "#/tool"
+			},
+			(_, appWindow) => {
+				data.toolVisible = true;
+			},
+			() => {
+				data.toolVisible = false;
+			}
+		);
+	};
 </script>

pages/member.vue

@@ -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 }">

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/Cargo.lock

@@ -1236,7 +1236,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.1.4"
+version = "1.1.6"
 dependencies = [
  "log",
  "planif",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.1.4"
+version = "1.1.6"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"

src-tauri/capabilities/default.json

@@ -7,7 +7,8 @@
     "log",
     "member",
     "cidr",
-    "advance"
+    "advance",
+    "tool"
   ],
   "permissions": [
     "core:default",
@@ -64,6 +65,16 @@
           "args": true,
           "cmd": "explorer",
           "name": "explorer"
+        },
+        {
+          "args": true,
+          "cmd": "netsh",
+          "name": "netsh"
+        },
+        {
+          "args": true,
+          "cmd": "ping",
+          "name": "ping"
         }
       ]
     },

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.1.4",
+	"version": "1.1.6",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,10 +13,14 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.1.4",
+				"title": "easytier-game 1.1.6",
-				"width": 335,
+				"minWidth": 340,
+				"width": 340,
 				"height": 305,
-				"resizable": false,
+				"minHeight": 305,
+				"maxHeight": 305,
+				"maxWidth": 360,
+				"resizable": true,
 				"fullscreen": false,
 				"decorations": true,
 				"center": true,

stores/index.ts

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