升级tauri为2.1.1

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

package.json

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

pages/index.vue

@@ -4,181 +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>
-					<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>
-			<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"
@@ -241,7 +247,7 @@
 					</ElTooltip>
 				</div>
 			</div>
-			<div>
+			<div class="ml-auto">
 				<ElCheckbox
 					v-model="config.disbleP2p"
 					size="small"
@@ -282,7 +288,7 @@
 						</ElButton>
 					</div>
 					<ElLink
-						class="!text-[10px] pb-[2px] ml-[8px]"
+						class="!text-[9px] pb-[2px] ml-[8px] truncate"
 						type="info"
 						:underline="false"
 						@click="open('https://github.com/EasyTier/EasytierGame')"
@@ -474,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];
-					if (config.dhcp) {
+					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);
@@ -495,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;
 		},
@@ -772,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();
@@ -811,9 +825,11 @@
 		}
 		if (command === "share_config") {
 			try {
-				await writeText(btoa(JSON.stringify({ config: mainStore.config })));
+				const WT = btoa(encodeURIComponent(JSON.stringify({ config: mainStore.config })))
+				await writeText(WT);
 				ElMessage.success("配置已复制");
 			} catch (err) {
+				console.log(err);
 				ElMessage.error("分享失败");
 			}
 		}
@@ -829,7 +845,7 @@
 				confirmButtonText: "确定",
 				cancelButtonText: "取消"
 			});
-			const payload = JSON.parse(atob(importConfigData.data));
+			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
 			mainStore.$patch(payload);
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
@@ -864,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",
@@ -899,7 +915,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);
 			},
 			() => {

pages/tool.vue

@@ -144,7 +144,7 @@
 					<ElInputNumber
 						controls-position="right"
 						size="small"
-                        :precision="0"
+						:precision="0"
 						v-model="data.pingNum"
 						:min="1"
 						:max="10"
@@ -155,6 +155,7 @@
 					</ElInputNumber>
 					<ElButton
 						size="small"
+						:disabled="data.isPing"
 						@click="handleTestPing"
 					>
 						Ping一下
@@ -181,6 +182,7 @@
 	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({
@@ -189,6 +191,7 @@
 		pingNum: 1,
 		winipBcStart: false,
 		pingIp: "",
+		isPing: false,
 		pingLog: "",
 		firewallStatus: {
 			domain: false,
@@ -228,28 +231,41 @@
 		}
 	};
 
+	const awaitTime = (time: number) => {
+		return new Promise(res => {
+			setTimeout(res, time);
+		});
+	};
+
 	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]))?$/;
+		// 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();
-
-					data.pingLog = data.pingLog.slice(-1000);
 					if (output.stdout) {
-						data.pingLog += output.stdout.split("\n")[2];
+						data.pingLog += `${i + 1} - ${output.stdout.split("\n")[2]}`;
 					}
 					if (output.stderr) {
-						data.pingLog += 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");
 		}
 	};
 
@@ -306,6 +322,7 @@
 				}
 			}
 		} catch (err) {
+			// netsh advfirewall firewall add rule name="EXE名称" dir=out action=allow program="EXE绝对路径"
 			ElMessage.error("获取防火墙状态失败");
 			console.log(err);
 		}
@@ -318,6 +335,7 @@
 	});
 
 	onMounted(() => {
+		data.pingIp = mainStore.config.ipv4;
 		initStartWinIpBroadcast();
 	});
 </script>

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.1.5"
+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,20 +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"
@@ -39,7 +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.0-rc"
+tauri-plugin-clipboard-manager = "2.0.2"
 # prost = "0.13"
 # prost-types = "0.13"
 

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.1.5",
+	"version": "1.1.7",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,10 +13,14 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.1.5",
-				"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,

stores/index.ts

@@ -44,6 +44,8 @@ export default defineStore("main", {
 			"basePeers",
 			"cidrEnable",
 			"theme",
+			"configStartEnable",
+			"configPath",
 			"winIpBcAutoStart",
 			"config.proxyNetworks",
 			"config.serverUrl",

utils/index.ts

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