From cf351b8708046eee15cba0f77572a302fcb765f6 Mon Sep 17 00:00:00 2001
From: leizi97 <leizi97@126.com>
Date: Mon, 4 Nov 2024 21:23:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEwindows?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BD=91=E5=8D=A1=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.vue                   | 15 ++-------------
 composables/theme.ts      | 21 +++++++++++++++++++++
 package.json              |  2 +-
 pages/advance.vue         | 37 ++++++++++++++++++++-----------------
 pages/index.vue           |  3 +++
 src-tauri/Cargo.lock      |  2 +-
 src-tauri/Cargo.toml      |  2 +-
 src-tauri/tauri.conf.json |  4 ++--
 stores/index.ts           |  2 ++
 tsconfig.json             |  1 +
 10 files changed, 54 insertions(+), 35 deletions(-)
 create mode 100644 composables/theme.ts

diff --git a/app.vue b/app.vue
index aea857e..b8ce2cd 100644
--- a/app.vue
+++ b/app.vue
@@ -4,17 +4,6 @@
 	</NuxtLayout>
 </template>
 <script setup lang="ts">
-	import { useDark, useToggle, usePreferredDark } from "@vueuse/core";
-	import { isFunction } from "lodash-es";
-	const isDark = usePreferredDark();
-	const darkConfig = useDark({
-		selector: "html",
-		attribute: "class",
-		valueDark: "dark",
-		valueLight: "",
-	});
-	const toggleDark = useToggle(darkConfig);
-	if (isDark && isFunction(toggleDark)) {
-		toggleDark(isDark);
-	}
+	import { initTheme } from "~/composables/theme";
+	initTheme();
 </script>
diff --git a/composables/theme.ts b/composables/theme.ts
new file mode 100644
index 0000000..f2935b0
--- /dev/null
+++ b/composables/theme.ts
@@ -0,0 +1,21 @@
+import { useDark, useToggle, usePreferredDark } from "@vueuse/core";
+import { isFunction } from "lodash-es";
+const isDark = usePreferredDark();
+const darkConfig = useDark({
+	selector: "html",
+	attribute: "class",
+	valueDark: "dark",
+	valueLight: "",
+});
+const toggleDark = useToggle(darkConfig);
+export const initTheme = () => {
+	if (isDark && isFunction(toggleDark)) {
+		toggleDark(isDark.value);
+	}
+};
+
+export const setTheme = (dark: boolean) => {
+    if (isFunction(toggleDark)) {
+		toggleDark(dark);
+	}
+}
diff --git a/package.json b/package.json
index fcbcc51..69428c7 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"private": true,
 	"author": "leizi97",
 	"description": "A simple network initiator based on Easytier",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"scripts": {
 		"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
 		"build": "nuxt generate --dotenv env/.env.prod"
diff --git a/pages/advance.vue b/pages/advance.vue
index e217bd0..1a39ec1 100644
--- a/pages/advance.vue
+++ b/pages/advance.vue
@@ -1,41 +1,44 @@
 <template>
 	<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
-		<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
 		<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为false，必须与对等节点相同</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备，可以使用子网代理访问节点</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径</ElCheckbox></div>
-		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
-		<div>
-			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包，即使对等节点不在转发网络白名单内</ElCheckbox>
+		<div class="flex items-center gap-[10px]">
+			<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
+			<ElInput maxlength="10" v-model="mainStore.config.devNameValue" placeholder="请输入网卡名"/>
 		</div>
+		<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口，只连接到对等节点</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
 		<div class="flex items-center gap-[15px] flex-nowrap">
 			<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
 			<div class="w-[140px]">
 				<ElSelect
 					v-model="mainStore.config.logLevel"
 					placeholder="请选择日志等级"
-					class="ml-[5px]"
-				>
+					class="ml-[5px]">
 					<ElOption
 						v-for="item in data"
 						:key="item"
 						:label="`level - ${item}`"
-						:value="item"
-					></ElOption>
+						:value="item"></ElOption>
 				</ElSelect>
 			</div>
 			<ElButton
 				@click="openLogDir"
-				size="small"
-			>
+				size="small">
 				打开日志目录
 			</ElButton>
 		</div>
+		<ElDivider />
+		<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为false，必须与对等节点相同</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
+		<ElDivider />
+		<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备，可以使用子网代理访问节点</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
+		<div>
+			<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包，即使对等节点不在转发网络白名单内</ElCheckbox>
+		</div>
 	</div>
 </template>
 <script setup lang="ts">
diff --git a/pages/index.vue b/pages/index.vue
index 965c956..6b7ccfe 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -714,6 +714,9 @@
 		if (config.saveErrorLog) {
 			args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
 		}
+		if(config.devName && config.devNameValue) {
+			args.push("--dev-name", config.devNameValue);
+		}
 		return args;
 	};
 
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 757f272..22b78bd 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1109,7 +1109,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier-game"
-version = "1.1.1"
+version = "1.1.2"
 dependencies = [
  "log",
  "planif",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 9a9572e..65b1f1b 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "easytier-game"
-version = "1.1.1"
+version = "1.1.2"
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasytierGame"
 description = "A simple network initiator based on Easytier"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 5fc8203..d147cbb 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "easytier-game",
-	"version": "1.1.0",
+	"version": "1.1.2",
 	"identifier": "com.tauri.easytier-game",
 
 	"build": {
@@ -13,7 +13,7 @@
 	"app": {
 		"windows": [
 			{
-				"title": "easytier-game 1.1.1",
+				"title": "easytier-game 1.1.2",
 				"width": 335,
 				"height": 305,
 				"resizable": false,
diff --git a/stores/index.ts b/stores/index.ts
index 96f6732..f8f97ec 100644
--- a/stores/index.ts
+++ b/stores/index.ts
@@ -26,6 +26,8 @@ export default defineStore("main", {
 				dhcp: true, // 是否使用DHCP
 				saveErrorLog: true, // 是否保存错误日志
 				logLevel: "error", //日志等级
+				devName: false, //自定义网卡名
+				devNameValue: "", //自定义网卡名
 			},
 			configStartEnable: false, //使用配置文件启动
 			configPath: "", //配置文件路径
diff --git a/tsconfig.json b/tsconfig.json
index b72a8db..bc4e3b1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,6 +6,7 @@
 		"components/**/*.ts",
 		"components/**/*.js",
 		"components/**/*.vue",
+		"app.vue",
 		"pages/**/*.ts",
 		"pages/**/*.js",
 		"pages/**/*.vue",