增加处于联机状态切换自建服务器时的确认

+ 升级vue -> 3.5.13
+ 升级nuxt -> 3.14.1592

package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.2.5",
+	"version": "1.2.6",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod",
@@ -31,7 +31,7 @@
 		"element-plus": "^2.8.7",
 		"less": "^4.2.0",
 		"lodash-es": "^4.17.21",
-		"nuxt": "^3.13.2",
+		"nuxt": "^3.14.1592",
 		"pinia": "^2.2.6",
 		"pinia-plugin-persistedstate": "^4.1.3",
 		"postcss": "^8.4.38",

pages/index.vue

@@ -289,6 +289,11 @@
 							>
 								分享联机相关配置
 							</ElDropdownItem>
+							<ElDropdownItem
+								disabled
+							>
+								<ElDivider class="!h-[2px] !m-0" />
+							</ElDropdownItem>
 							<ElDropdownItem
 								:icon="SetUp"
 								command="create_server"
@@ -573,6 +578,7 @@
 	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
 	import { sortedUniq, uniq } from "lodash-es";
 	import { bounce, addQQGroup } from "~/utils";
+	import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
 
 	let is_close = false;
 
@@ -1015,15 +1021,20 @@
 			if (config.relayAllPeerrpc) {
 				args.push("--relay-all-peer-rpc");
 			}
-			const whiteList = mainStore.ServerWhiteList.trim().split("\n").map(el => el.trim()).filter(el => el).join(" ");
-			if(whiteList && mainStore.enableWhiteList) {
+			const whiteList = mainStore.ServerWhiteList.trim()
+				.split("\n")
+				.map(el => el.trim())
+				.filter(el => el)
+				.join(" ");
+			if (whiteList && mainStore.enableWhiteList) {
 				args.push("--relay-network-whitelist", whiteList);
-			}if(!whiteList && mainStore.enableWhiteList) {
+			}
+			if (!whiteList && mainStore.enableWhiteList) {
 				args.push("--relay-network-whitelist");
 			}
-			return args
+			return args;
 		}
-		
+
 		if (config.dhcp) {
 			args.push("-d");
 		}
@@ -1194,25 +1205,31 @@
 			importConfigData.visible = true;
 		}
 		if (command === "create_server") {
+			if (data.isStart) {
+				const [error] = await ElConfirmDanger("切换会停止{action}，是否继续?", "提示", {
+					action: "`联机/服务`",
+					confirmButtonText: "继续",
+					cancelButtonText: "取消"
+				});
+				if (!error) await reset();
+			}
 			mainStore.enableCreateServer = !mainStore.enableCreateServer;
 			if (mainStore.config.relayAllPeerrpc && !mainStore.enableCreateServer) {
-				try {
-					await ElMessageBox.confirm("是否关闭RPC流量转发?", "提示", {
-						confirmButtonText: "关闭",
-						cancelButtonText: "取消"
-					});
-					mainStore.config.relayAllPeerrpc = false;
-				} catch (err) {}
+				const [error] = await ElConfirmPrimary("是否关闭RPC流量转发?", "提示", {
+					confirmButtonText: "关闭",
+					cancelButtonText: "取消"
+				});
+				if (!error) mainStore.config.relayAllPeerrpc = false;
 			}
 		}
 	};
 
 	const handleStartImport = async () => {
-		try {
-			await ElMessageBox.confirm("确定导入?", "提示", {
-				confirmButtonText: "确定",
-				cancelButtonText: "取消"
-			});
+		const [err] = await ElConfirmPrimary("确定导入?", "提示", {
+			confirmButtonText: "确定",
+			cancelButtonText: "取消"
+		});
+		if (!err) {
 			const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
 			mainStore.$patch({
 				config: {
@@ -1223,7 +1240,7 @@
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
 			mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
-		} catch (err) {
+		} else {
 			console.error(err);
 			if (err !== "cancel") {
 				ElMessage.error("导入失败");

src-tauri/Cargo.lock

@@ -1176,7 +1176,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.2.5"
+version = "1.2.6"
 dependencies = [
  "log",
  "planif",

src-tauri/Cargo.toml

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

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.2.5",
+	"version": "1.2.6",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.2.5",
+				"title": "easytier-game 1.2.6",
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,

zip.js

@@ -1,10 +1,14 @@
+/**
+ * 生成 release 发布包 zip 文件
+ */
+
 const releaseDir = "./src-tauri/target/release";
 const releaseDirEasytier = `${releaseDir}/easytier/`;
 const releaseExe = `${releaseDir}/easytier-game.exe`;
 const releaseHelp = `${releaseDir}/帮助.txt`;
 const deleteEasytierFiles = ["logs/", "guiLogs/"];
 const pkg = require("./package.json");
-const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`;
+const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
 const releaseZipDir = "./release";
 const releaseZip = `${releaseZipDir}/${fileName}`;