封装二级弹窗方法，新增子网代理和高级配置按钮，新增子网代理页面

composables/windows.ts

@@ -0,0 +1,53 @@
+import { type UnlistenFn } from "@tauri-apps/api/event";
+import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window } from "@tauri-apps/api/window";
+import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
+import type { WebviewLabel, WebviewOptions, } from "@tauri-apps/api/webview";
+export default async (
+	label: WebviewLabel,
+	options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
+	afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
+	beforeCloseFunc?: () => void | null
+) => {
+    let defaultOpts = {
+		parent: undefined,
+		closable: true,
+		resizable: true,
+		decorations: true,
+		maximizable: false,
+		minimizable: false,
+        x: 0,
+        y: 0
+	};
+	const appWindow = getCurrentWindow();
+	if (appWindow) {
+		const appSize = await appWindow.outerSize();
+		const factor = await appWindow.scaleFactor();
+		const appPosition = await appWindow.outerPosition();
+		const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
+        defaultOpts.parent = appWindow as any;
+        defaultOpts.x = logicalPosition.x;
+        defaultOpts.y = logicalPosition.y;
+	}
+	let unListenlogClose: UnlistenFn | null = null;
+	let unlistenLogCreated: UnlistenFn | null = null;
+	let dialog = await WebviewWindow.getByLabel(label);
+	if (!dialog) {
+		dialog = new WebviewWindow(label, {...defaultOpts, ...options});
+		unlistenLogCreated = await dialog.once("tauri://webview-created", async () => {
+			if (dialog) {
+				afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
+				await dialog.show();
+			}
+		});
+		unListenlogClose = await dialog.onCloseRequested(async () => {
+			beforeCloseFunc && (await beforeCloseFunc());
+			unListenlogClose && (await unListenlogClose());
+		});
+	} else {
+		const visible = await dialog.isVisible();
+		if (visible) {
+			await dialog.close();
+			unlistenLogCreated && (await (unlistenLogCreated as Function)());
+		}
+	}
+};

pages/cidr.vue

@@ -0,0 +1,6 @@
+<template>
+    test
+</template>
+<script setup lang="ts">
+    
+</script>

pages/index.vue

@@ -16,7 +16,7 @@
 						effect="dark"
 						:type="data.isSuccessGetIp ? 'success' : 'info'"
 					>
-						{{ data.isSuccessGetIp ? "联机成功" : "联机中" }}
+						{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
 					</ElTag>
 					<ElButton
 						v-if="!data.coreVersion"
@@ -179,10 +179,11 @@
 						{{ !data.isStart ? "启动联机" : "停止联机" }}
 					</ElButton>
 				</div>
-				<div class="mt-[6px]">
+				<div class="mt-[6px] pl-[2px]">
+					<!-- <ElButtonGroup> -->
 					<ElTooltip
-						placement="right"
-						:content="data.logVisible ? '关闭日志' : '打开日志'"
+						placement="left"
+						content="日志"
 					>
 						<ElButton
 							:type="!data.logVisible ? 'info' : 'warning'"
@@ -194,7 +195,7 @@
 					</ElTooltip>
 					<ElTooltip
 						placement="left"
-						content="成员信息"
+						content="成员"
 					>
 						<ElButton
 							@click="handleShowMemberDialog"
@@ -204,6 +205,7 @@
 							size="small"
 						></ElButton>
 					</ElTooltip>
+					<!-- </ElButtonGroup> -->
 				</div>
 			</div>
 			<div>
@@ -211,14 +213,14 @@
 					v-model="config.disbleP2p"
 					size="small"
 				>
-					禁用p2p
+					强制中转
 				</ElCheckbox>
-				<ElCheckbox
+				<!-- <ElCheckbox
 					v-model="config.disableIpv6"
 					size="small"
 				>
 					禁用ipv6
-				</ElCheckbox>
+				</ElCheckbox> -->
 				<ElCheckbox
 					@change="handleAutoStart"
 					:model-value="config.autoStart"
@@ -226,12 +228,16 @@
 				>
 					开机自启
 				</ElCheckbox>
-				<ElCheckbox
+				<!-- <ElCheckbox
 					v-model="config.disbleListenner"
 					size="small"
 				>
 					禁用端口监听
-				</ElCheckbox>
+				</ElCheckbox> -->
+				<div>
+					<ElButton @click="handleShowCidrDialog" :icon="Share">子网代理</ElButton>
+					<ElButton :icon="Setting">高级配置</ElButton>
+				</div>
 				<div class="flex items-center gap-[0_5px]">
 					<div>
 						<ElLink
@@ -270,15 +276,16 @@
 </template>
 <script setup lang="ts">
 	import { invoke } from "@tauri-apps/api/core";
-	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
+	import { listen } from "@tauri-apps/api/event";
 	import { open, Command } from "@tauri-apps/plugin-shell";
-	import { QuestionFilled, Delete, List, UserFilled } from "@element-plus/icons-vue";
+	import { QuestionFilled, Delete, List, UserFilled, Setting, Share } from "@element-plus/icons-vue";
 	import { reactive, onBeforeUnmount, onMounted } from "vue";
 	import { useTray, setTrayRunState } from "~/composables/tray";
 	import useMainStore from "@/stores/index";
 	import { ElMessage } from "element-plus";
-	import { getCurrentWindow, LogicalPosition, PhysicalPosition } from "@tauri-apps/api/window";
-	import { WebviewWindow, getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
+	import { getCurrentWindow, PhysicalPosition } 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";
 
 	let is_close = false;
@@ -294,6 +301,7 @@
 	const protocols = ["tcp", "udp", "ws", "wss", "wg"];
 	const data = reactive({
 		logVisible: false,
+		cidrVisible: false,
 		winipBcPid: 0, //WinIPBroadcast进程id
 		winipBcStart: false,
 		memberVisible: false,
@@ -583,8 +591,6 @@
 		}
 	};
 
-	let unListenMemberClose: UnlistenFn | null = null;
-	let unlistenMemberCreated: UnlistenFn | null = null;
 	const handleShowMemberDialog = async () => {
 		if (!data.isStart) {
 			return ElMessage.warning("请先开始联机");
@@ -592,96 +598,63 @@
 		if (!mainStore.config.ipv4) {
 			return ElMessage.warning("请等待获取IP");
 		}
-		const appWindow = getCurrentWindow();
-		if (appWindow) {
-			const appSize = await appWindow.outerSize();
-			const factor = await appWindow.scaleFactor();
-			const appPosition = await appWindow.outerPosition();
-			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
-			let memberDialog = await WebviewWindow.getByLabel("member");
-			if (!memberDialog) {
-				memberDialog = new WebviewWindow("member", {
-					title: "成员列表",
-					width: 470,
-					height: 380,
-					parent: appWindow,
-					closable: true,
-					resizable: true,
-					decorations: true,
-					maximizable: false,
-					minimizable: false,
-					x: logicalPosition.x,
-					y: logicalPosition.y,
-					url: "#/member"
-				});
-				unlistenMemberCreated = await memberDialog.once("tauri://webview-created", async () => {
-					if (memberDialog) {
-						data.logVisible = true;
-						await memberDialog.show();
-					}
-				});
-				unListenMemberClose = await memberDialog.onCloseRequested(() => {
-					data.logVisible = false;
-					unListenMemberClose && unListenMemberClose();
-				});
-			} else {
-				const visible = await memberDialog.isVisible();
-				if (visible) {
-					data.memberVisible = false;
-					await memberDialog.close();
-					unlistenMemberCreated && unlistenMemberCreated();
-				}
+
+		await etWindows(
+			"member",
+			{
+				title: "成员列表",
+				width: 470,
+				height: 380,
+				url: "#/member"
+			},
+			() => {
+				data.memberVisible = true;
+			},
+			() => {
+				data.memberVisible = false;
 			}
-		}
+		);
 	};
 
-	let unListenlogClose: UnlistenFn | null = null;
-	let unlistenLogCreated: UnlistenFn | null = null;
 	const handleShowLogDialog = async () => {
-		logsTimer && clearInterval(logsTimer);
-		const appWindow = getCurrentWindow();
-		if (appWindow) {
-			const appSize = await appWindow.outerSize();
-			const factor = await appWindow.scaleFactor();
-			const appPosition = await appWindow.outerPosition();
-			const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
-			let infoDialog = await WebviewWindow.getByLabel("log");
-			if (!infoDialog) {
-				infoDialog = new WebviewWindow("log", {
-					title: "日志",
-					width: 600,
-					height: 380,
-					parent: appWindow,
-					closable: true,
-					resizable: false,
-					decorations: true,
-					maximizable: false,
-					minimizable: false,
-					x: logicalPosition.x,
-					y: logicalPosition.y,
-					url: "#/log"
-				});
-				unlistenLogCreated = await infoDialog.once("tauri://webview-created", async () => {
-					if (infoDialog) {
-						data.logVisible = true;
-						logsTimer = setInterval(() => {
-							appWindow.emitTo("log", "logs", data.log);
-						}, 3000);
-						await infoDialog.show();
-					}
-				});
-				unListenlogClose = await infoDialog.onCloseRequested(() => {
-					data.logVisible = false;
-					unListenlogClose && unListenlogClose();
-				});
-			} else {
-				const visible = await infoDialog.isVisible();
-				if (visible) {
-					data.logVisible = false;
-					await infoDialog.close();
-					unlistenLogCreated && unlistenLogCreated();
-				}
+		await etWindows(
+			"log",
+			{
+				title: "日志",
+				width: 600,
+				height: 380,
+				resizable: false,
+				url: "#/log"
+			},
+			(_, appWindow) => {
+				data.logVisible = true;
+				logsTimer && clearInterval(logsTimer);
+				logsTimer = setInterval(() => {
+					appWindow.emitTo("log", "logs", data.log);
+				}, 3000);
+			},
+			() => {
+				data.logVisible = false;
 			}
-		}
+		);
+	};
+
+	const handleShowCidrDialog = async () => {
+		await etWindows(
+			"cidr",
+			{
+				title: "子网代理",
+				width: 600,
+				height: 380,
+				resizable: false,
+				url: "#/cidr"
+			},
+			(_, appWindow) => {
+				data.cidrVisible = true;
+			},
+			() => {
+				data.cidrVisible = false;
+			}
+		);
 	};
 </script>

pages/log.vue

@@ -1,7 +1,7 @@
 <template>
 	<ElInput
 		type="textarea"
-		rows="17"
+		:rows="17"
 		v-model="data.log"
 		resize="none"
 		readonly

pages/member.vue

@@ -69,7 +69,7 @@
 		for (let idx = 0; idx < length; idx++) {
 			let headersIdx = idx % headers.length;
 			if (headersIdx === 0) {
-				console.log(idx, [...data]);
+				// console.log(idx, [...data]);
 				obj = {};
 				result.push(obj);
 			}
@@ -175,7 +175,7 @@
 		}
 		const result = formatData(memberData);
 		data.member = result;
-		console.log({ member: data.member });
+		// console.log({ member: data.member });
 	};
 
 	let timer: NodeJS.Timeout | null = null;

src-tauri/Cargo.lock

@@ -422,9 +422,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "6.0.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -1112,6 +1112,7 @@ name = "easytier-game"
 version = "1.0.6"
 dependencies = [
  "log",
+ "planif",
  "reqwest",
  "serde",
  "serde_json",
@@ -2164,7 +2165,19 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
 dependencies = [
- "jsonptr",
+ "jsonptr 0.4.7",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "json-patch"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
+dependencies = [
+ "jsonptr 0.6.3",
  "serde",
  "serde_json",
  "thiserror",
@@ -2181,6 +2194,16 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "jsonptr"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "keyboard-types"
 version = "0.7.0"
@@ -3087,6 +3110,14 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
+[[package]]
+name = "planif"
+version = "1.0.0"
+source = "git+https://github.com/mattrobineau/planif?tag=1.0.1#90e228e2bc0f142b16a0ba415ec242e1c836cc35"
+dependencies = [
+ "windows 0.48.0",
+]
+
 [[package]]
 name = "plist"
 version = "1.7.0"
@@ -4212,9 +4243,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce2818e803ce3097987296623ed8c0d9f65ed93b4137ff9a83e168bdbf62932"
+checksum = "d3889b392db6d32a105d3757230ea0220090b8f94c90d3e60b6c5eb91178ab1b"
 dependencies = [
  "anyhow",
  "bytes",
@@ -4263,16 +4294,16 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "935f9b3c49b22b3e2e485a57f46d61cd1ae07b1cbb2ba87387a387caf2d8c4e7"
+checksum = "9f96827ccfb1aa40d55d0ded79562d18ba18566657a553f992a982d755148376"
 dependencies = [
  "anyhow",
  "cargo_toml",
  "dirs 5.0.1",
  "glob",
  "heck 0.5.0",
- "json-patch",
+ "json-patch 3.0.1",
  "schemars",
  "semver",
  "serde",
@@ -4285,14 +4316,14 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e"
+checksum = "8947f16f47becd9e9cd39b74ee337fd1981574d78819be18e4384d85e5a0b82f"
 dependencies = [
  "base64 0.22.1",
  "brotli",
  "ico",
- "json-patch",
+ "json-patch 2.0.0",
  "plist",
  "png",
  "proc-macro2",
@@ -4312,9 +4343,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d2c0963ccfc3f5194415f2cce7acc975942a8797fbabfb0aa1ed6f59326ae7f"
+checksum = "8bd1c8d4a66799d3438747c3a79705cd665a95d6f24cb5f315413ff7a981fe2a"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -4416,9 +4447,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8f437293d6f5e5dce829250f4dbdce4e0b52905e297a6689cc2963eb53ac728"
+checksum = "a1ef7363e7229ac8d04e8a5d405670dbd43dde8fc4bc3bc56105c35452d03784"
 dependencies = [
  "dpi",
  "gtk",
@@ -4435,9 +4466,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1431602bcc71f2f840ad623915c9842ecc32999b867c4a787d975a17a9625cc6"
+checksum = "62fa2068e8498ad007b54d5773d03d57c3ff6dd96f8c8ce58beff44d0d5e0d30"
 dependencies = [
  "gtk",
  "http",
@@ -4461,9 +4492,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045"
+checksum = "1fc65d6f5c54e56b66258948a6d9e47a82ea41f4b5a7612bfbdd1634c2913ed0"
 dependencies = [
  "brotli",
  "cargo_metadata",
@@ -4472,7 +4503,7 @@ dependencies = [
  "glob",
  "html5ever",
  "infer",
- "json-patch",
+ "json-patch 2.0.0",
  "kuchikiki",
  "log",
  "memchr",
@@ -5208,6 +5239,15 @@ dependencies = [
  "windows-version",
 ]
 
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows"
 version = "0.57.0"

src-tauri/Cargo.toml

@@ -18,14 +18,14 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.0.1", features = [] }
+tauri-build = { version = "2.0.2", features = [] }
 # prost-build = "0.13.2"
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.0.2", features = [
+tauri = { version = "2.0.6", features = [
     "tray-icon",
     "image-png",
     "image-ico",
@@ -35,6 +35,7 @@ tauri-plugin-shell = "2.0.2"
 reqwest = { version = "0.12", features = ["json"] }
 zip = "2.2.0"
 sysinfo = '0.32.0'
+planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
 # prost = "0.13"
 # prost-types = "0.13"