Compare commits

..
2 Commits
Author SHA1 Message Date
黑先森 ef172e4d4c 增加base64编码分享和导入 界面配置 #1
优化是否联机成功的判断,优化本地存储日志数量
2024-11-05 18:30:08 +08:00
leizi97 1a5d2cc8fc 托盘图标增加主题切换功能,调整成员列表延迟至前方,增加nat类型查看,修复自定义网卡无法保存信息的问题 2024-11-04 22:38:53 +08:00
14 changed files with 873 additions and 147 deletions
+5 -2
View File
@@ -4,6 +4,9 @@
</NuxtLayout>
</template>
<script setup lang="ts">
import { initTheme } from "~/composables/theme";
initTheme();
import useMainStore from "@/stores/index";
import { initTheme } from "@/composables/theme";
const mainStore = useMainStore();
// console.log(mainStore.theme)
initTheme(mainStore.theme);
</script>
+3 -3
View File
@@ -1,6 +1,6 @@
import { useDark, useToggle, usePreferredDark } from "@vueuse/core";
import { isFunction } from "lodash-es";
const isDark = usePreferredDark();
// const isDark = usePreferredDark();
const darkConfig = useDark({
selector: "html",
attribute: "class",
@@ -8,9 +8,9 @@ const darkConfig = useDark({
valueLight: "",
});
const toggleDark = useToggle(darkConfig);
export const initTheme = () => {
export const initTheme = (isDark: boolean) => {
if (isDark && isFunction(toggleDark)) {
toggleDark(isDark.value);
toggleDark(isDark);
}
};
+27 -6
View File
@@ -2,6 +2,8 @@ import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
import { TrayIcon } from "@tauri-apps/api/tray";
import { getCurrentWindow } from "@tauri-apps/api/window";
import pkg from "@/package.json";
import { setTheme } from "~/composables/theme";
import useMainStore from "@/stores/index";
const DEFAULT_TRAY_NAME = "main";
@@ -20,8 +22,8 @@ export async function useTray(init: boolean = false, beforExit: Function) {
tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
if (!tray) {
tray = await TrayIcon.new({
tooltip: `EasyTier\n${pkg.version}`,
title: `EasyTier\n${pkg.version}`,
tooltip: `EasyTierGame\n${pkg.version}`,
title: `EasyTierGame\n${pkg.version}`,
id: DEFAULT_TRAY_NAME,
menu: await Menu.new({
id: "main",
@@ -38,7 +40,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
}
if (init) {
tray.setTooltip(`EasyTier\n${pkg.version}`);
tray.setTooltip(`EasyTierGame\n${pkg.version}`);
tray.setMenuOnLeftClick(false);
tray.setMenu(
await Menu.new({
@@ -52,7 +54,12 @@ export async function useTray(init: boolean = false, beforExit: Function) {
}
export async function generateMenuItem(beforExit: Function) {
return [await MenuItemShow("显示 / 隐藏"), await PredefinedMenuItem.new({ item: "Separator" }), await MenuItemExit("退出", beforExit)];
return [
await MenuItemShow("显示 / 隐藏"),
await MenuItemTheme(),
await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemExit("退出", beforExit),
];
}
export async function MenuItemExit(text: string, beforExit: Function) {
@@ -78,6 +85,20 @@ export async function MenuItemShow(text: string) {
});
}
export async function MenuItemTheme() {
return await MenuItem.new({
id: "theme",
text: "主题切换",
action: async () => {
const mainStore = useMainStore();
mainStore.theme = !mainStore.theme;
// const appWindow = getCurrentWindow();
// appWindow.emitTo("main", "config", { theme: mainStore.theme });
await setTheme(mainStore.theme);
},
});
}
// export async function setTrayMenu(items: (MenuItem | PredefinedMenuItem)[] | undefined = undefined) {
// // const tray = await useTray()
// const tray = await TrayIcon.getById(DEFAULT_TRAY_NAME)
@@ -98,8 +119,8 @@ export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean
export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) {
if (!tray) return;
if (tooltip) {
await tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`);
await tray.setTooltip(`EasyTierGame\n${pkg.version}\n${tooltip}`);
} else {
await tray.setTooltip(`EasyTier\n${pkg.version}`);
await tray.setTooltip(`EasyTierGame\n${pkg.version}`);
}
}
+2 -1
View File
@@ -3,7 +3,7 @@
"private": true,
"author": "leizi97",
"description": "A simple network initiator based on Easytier",
"version": "1.1.2",
"version": "1.1.4",
"scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod"
@@ -40,6 +40,7 @@
},
"dependencies": {
"@tauri-apps/plugin-autostart": "~2",
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
"@tauri-apps/plugin-fs": "~2"
}
}
+114 -22
View File
@@ -182,10 +182,23 @@
<template #dropdown>
<ElDropdownMenu>
<ElDropdownItem
command="import_config"
:icon="Link"
>
导入配置
</ElDropdownItem>
<ElDropdownItem
command="share_config"
:icon="Share"
>
分享配置
</ElDropdownItem>
<ElDropdownItem
:icon="Tools"
command="toml"
:disabled="data.isStart"
>
配置文件启动
使用外部配置文件
</ElDropdownItem>
</ElDropdownMenu>
</template>
@@ -284,6 +297,36 @@
<ElDialog
width="95%"
top="10px"
class="!mb-0"
v-model="importConfigData.visible"
:close-on-press-escape="false"
title="导入分享"
>
<ElInput
type="textarea"
:rows="6"
placeholder="请粘贴分享的配置"
v-model="importConfigData.data"
></ElInput>
<template #footer>
<div>
<el-text type="danger">导入成功后您当前的配置将被完全替换</el-text>
</div>
<div class="text-right">
<ElButton
size="small"
@click="handleStartImport"
type="primary"
>
导入
</ElButton>
</div>
</template>
</ElDialog>
<ElDialog
width="95%"
top="30px"
class="!mb-0"
v-model="configStart.visible"
:close-on-press-escape="false"
title="配置文件启动"
@@ -323,31 +366,35 @@
></ElOption>
</ElSelect>
</div>
<div class="mt-[5px] text-right">
<ElButton
@click="configStart.visible = false"
type="danger"
>
关闭
</ElButton>
</div>
<template #footer>
<div class="text-right">
<ElButton
size="small"
@click="configStart.visible = false"
type="danger"
>
关闭
</ElButton>
</div>
</template>
</ElDialog>
</template>
<script setup lang="ts">
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 } from "@element-plus/icons-vue";
import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools } from "@element-plus/icons-vue";
import { reactive, onBeforeUnmount, onMounted } from "vue";
import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
import useMainStore from "@/stores/index";
import { ElDropdownMenu, ElMessage } from "element-plus";
import { ElDropdownMenu, ElMessage, ElMessageBox } from "element-plus";
import { getCurrentWindow } 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";
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
import { readDir, exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
let is_close = false;
@@ -374,7 +421,8 @@
coreVersion: "",
isSuccessGetIp: false,
startLoading: false,
isStart: false
isStart: false,
connectionSuccess: false
});
const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
@@ -383,6 +431,12 @@
list: [] //配置文件列表
});
const importConfigData = reactive<{ data: ""; [key: string]: any }>({
visible: false,
loading: false,
data: ""
});
const closePrevent = async () => {
const appWindow = getCurrentWindow();
if (appWindow.label == "main") {
@@ -425,11 +479,19 @@
if (event.payload) {
data.startLoading = false;
let ipv4 = /new: Some\((\d+\.\d+\.\d+\.\d+)\/.*\)/g.exec(event.payload as string)?.[1];
if (ipv4) {
data.isSuccessGetIp = true;
await setTrayRunState(tray, true);
config.ipv4 = ipv4;
await setTrayTooltip(tray, `IP: ${ipv4}`);
if (config.dhcp) {
if (ipv4) {
config.ipv4 = ipv4;
await setTrayRunState(tray, true);
data.isSuccessGetIp = true;
await setTrayTooltip(tray, `IP: ${ipv4}`);
}
} else {
if ((event.payload as string).includes("new peer connection added")) {
await setTrayRunState(tray, true);
data.isSuccessGetIp = true;
await setTrayTooltip(tray, `IP: ${config.ipv4}`);
}
}
}
appWindow.emitTo("log", "logs", data.log);
@@ -474,11 +536,11 @@
await getReleaseList();
const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
if (latestVersionFileName) {
console.log(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
// console.log(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
const latestVersion = /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName)?.[1];
const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1];
if (latestVersion && currentVersion != latestVersion) {
console.log({ currentVersion, latestVersion });
// console.log({ currentVersion, latestVersion });
ElMessage.success(`更新 -> ${latestVersion}`);
const downloadUrl = data.releaseList?.[0]?.[0]?.[2];
return [true, downloadUrl, latestVersionFileName];
@@ -714,7 +776,7 @@
if (config.saveErrorLog) {
args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
}
if(config.devName && config.devNameValue) {
if (config.devName && config.devNameValue) {
args.push("--dev-name", config.devNameValue);
}
return args;
@@ -784,6 +846,36 @@
} catch (err) {}
}
}
if (command === "share_config") {
try {
await writeText(btoa(JSON.stringify({ config: mainStore.config })));
ElMessage.success("配置已复制");
} catch (err) {
ElMessage.error("分享失败");
}
}
if (command === "import_config") {
importConfigData.data = "";
importConfigData.visible = true;
}
};
const handleStartImport = async () => {
try {
await ElMessageBox.confirm("确定导入?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消"
});
const payload = JSON.parse(atob(importConfigData.data));
mainStore.$patch(payload);
ElMessage.success("导入成功");
importConfigData.visible = false;
mainStore.basePeers = [...new Set([config.serverUrl, ...mainStore.basePeers])];
} catch (err) {
if (err !== "cancel") {
ElMessage.error("导入失败");
}
}
};
const initConfigDir = async () => {
@@ -801,7 +893,7 @@
const openConfigDir = async () => {
const resourceDir = await getResourceDir();
const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_PATH);
console.log(configPath);
// console.log(configPath);
await Command.create("explorer", [configPath]).execute();
};
@@ -844,7 +936,7 @@
data.logVisible = true;
logsTimer && clearInterval(logsTimer);
logsTimer = setInterval(() => {
appWindow.emitTo("log", "logs", data.log);
appWindow.emitTo("log", "logs", data.log ? (data.log as string).split("\n").slice(-1000).join("\n") : "");
}, 600);
},
() => {
+10 -11
View File
@@ -5,13 +5,11 @@
<ElTable
stripe
:data="data.member"
v-else
>
v-else>
<ElTableColumn
v-for="prop in showTableHeader"
:label="prop[1]"
:key="prop[0]"
>
:key="prop[0]">
<template #default="{ row }">
<span v-if="prop[0] == 'loss_rate'">
{{ row[prop[0]] && row[prop[0]] != "-" ? Number(row[prop[0]] * 100).toFixed(2) + "%" : row[prop[0]] }}
@@ -20,8 +18,7 @@
<ElTag
v-else
effect="dark"
:type="row[prop[0]] == 'p2p' ? 'success' : 'info'"
>
:type="row[prop[0]] == 'p2p' ? 'success' : 'info'">
{{ row[prop[0]] }}
</ElTag>
</template>
@@ -35,22 +32,23 @@
import { reactive, onMounted, onBeforeUnmount } from "vue";
import { parsePeerInfo } from "@/utils";
const data = reactive<{ member: any[] }>({
member: []
member: [],
});
const showTableHeader = [
["ipv4", "虚拟网IP"],
["hostname", "主机名"],
["cost", "路由"],
["lat_ms", "延迟/ms"],
["ipv4", "虚拟网IP"],
["cost", "路由"],
["loss_rate", "丢包率"],
["version", "版本"]
["nat_type", "NAT类型"],
["version", "版本"],
];
const listenOutput = async () => {
const member = await invoke("get_members_by_cli");
const peerInfo = parsePeerInfo(member as string);
peerInfo.forEach(value => {
peerInfo.forEach((value) => {
if (value.cost === "Local") {
value.cost = "本机";
}
@@ -58,6 +56,7 @@
value.ipv4 = value.ipv4.split("/")[0];
}
});
// console.log(peerInfo);
data.member = peerInfo;
};
+10
View File
@@ -11,6 +11,9 @@ importers:
'@tauri-apps/plugin-autostart':
specifier: ~2
version: 2.0.0
'@tauri-apps/plugin-clipboard-manager':
specifier: ^2.0.0
version: 2.0.0
'@tauri-apps/plugin-fs':
specifier: ~2
version: 2.0.1
@@ -1014,6 +1017,9 @@ packages:
'@tauri-apps/plugin-cli@2.0.0':
resolution: {integrity: sha512-glQmlL1IiCGEa1FHYa/PTPSeYhfu56omLRgHXWlJECDt6DbJyRuJWVgtkQfUxtqnVdYnnU+DGIGeiInoEqtjLw==}
'@tauri-apps/plugin-clipboard-manager@2.0.0':
resolution: {integrity: sha512-V1sXmbjnwfXt/r48RJMwfUmDMSaP/8/YbH4CLNxt+/sf1eHlIP8PRFdFDQwLN0cNQKu2rqQVbG/Wc/Ps6cDUhw==}
'@tauri-apps/plugin-fs@2.0.1':
resolution: {integrity: sha512-PkeZG2WAob9Xpmr66aPvj+McDVgFjV2a7YBzYVZjiCvbGeMs6Yk09tlXhCe3EyZdT/pwWMSi8lXUace+hlsjsw==}
@@ -5392,6 +5398,10 @@ snapshots:
dependencies:
'@tauri-apps/api': 2.0.2
'@tauri-apps/plugin-clipboard-manager@2.0.0':
dependencies:
'@tauri-apps/api': 2.0.2
'@tauri-apps/plugin-fs@2.0.1':
dependencies:
'@tauri-apps/api': 2.0.2
+529 -10
View File
@@ -48,6 +48,12 @@ dependencies = [
"memchr",
]
[[package]]
name = "aligned-vec"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
[[package]]
name = "alloc-no-stdlib"
version = "2.0.4"
@@ -110,6 +116,35 @@ dependencies = [
"derive_arbitrary",
]
[[package]]
name = "arboard"
version = "3.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
dependencies = [
"clipboard-win",
"core-graphics 0.23.2",
"image",
"log",
"objc2",
"objc2-app-kit",
"objc2-foundation",
"parking_lot",
"windows-sys 0.48.0",
"x11rb",
]
[[package]]
name = "arg_enum_proc_macro"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.79",
]
[[package]]
name = "arrayvec"
version = "0.7.6"
@@ -305,6 +340,29 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "av1-grain"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
dependencies = [
"anyhow",
"arrayvec",
"log",
"nom",
"num-rational",
"v_frame",
]
[[package]]
name = "avif-serialize"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62"
dependencies = [
"arrayvec",
]
[[package]]
name = "backtrace"
version = "0.3.74"
@@ -332,6 +390,12 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bit_field"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -347,6 +411,12 @@ dependencies = [
"serde",
]
[[package]]
name = "bitstream-io"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
[[package]]
name = "bitvec"
version = "1.0.1"
@@ -441,6 +511,12 @@ dependencies = [
"alloc-stdlib",
]
[[package]]
name = "built"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
[[package]]
name = "bumpalo"
version = "3.16.0"
@@ -492,6 +568,12 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "byteorder-lite"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]]
name = "bytes"
version = "1.7.2"
@@ -668,6 +750,15 @@ dependencies = [
"inout",
]
[[package]]
name = "clipboard-win"
version = "5.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
dependencies = [
"error-code",
]
[[package]]
name = "cocoa"
version = "0.26.0"
@@ -678,7 +769,7 @@ dependencies = [
"block",
"cocoa-foundation",
"core-foundation 0.10.0",
"core-graphics",
"core-graphics 0.24.0",
"foreign-types 0.5.0",
"libc",
"objc",
@@ -693,11 +784,17 @@ dependencies = [
"bitflags 2.6.0",
"block",
"core-foundation 0.10.0",
"core-graphics-types",
"core-graphics-types 0.2.0",
"libc",
"objc",
]
[[package]]
name = "color_quant"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "combine"
version = "4.6.7"
@@ -755,6 +852,19 @@ version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "core-graphics"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [
"bitflags 1.3.2",
"core-foundation 0.9.4",
"core-graphics-types 0.1.3",
"foreign-types 0.5.0",
"libc",
]
[[package]]
name = "core-graphics"
version = "0.24.0"
@@ -763,11 +873,22 @@ checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
dependencies = [
"bitflags 2.6.0",
"core-foundation 0.10.0",
"core-graphics-types",
"core-graphics-types 0.2.0",
"foreign-types 0.5.0",
"libc",
]
[[package]]
name = "core-graphics-types"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
dependencies = [
"bitflags 1.3.2",
"core-foundation 0.9.4",
"libc",
]
[[package]]
name = "core-graphics-types"
version = "0.2.0"
@@ -846,6 +967,12 @@ version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "crunchy"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-common"
version = "0.1.6"
@@ -1109,7 +1236,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]]
name = "easytier-game"
version = "1.1.2"
version = "1.1.4"
dependencies = [
"log",
"planif",
@@ -1120,6 +1247,7 @@ dependencies = [
"tauri",
"tauri-build",
"tauri-plugin-autostart",
"tauri-plugin-clipboard-manager",
"tauri-plugin-fs",
"tauri-plugin-log",
"tauri-plugin-shell",
@@ -1227,6 +1355,12 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "error-code"
version = "3.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
[[package]]
name = "event-listener"
version = "5.3.1"
@@ -1248,6 +1382,21 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "exr"
version = "1.73.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
dependencies = [
"bit_field",
"half",
"lebe",
"miniz_oxide",
"rayon-core",
"smallvec",
"zune-inflate",
]
[[package]]
name = "fastrand"
version = "2.1.1"
@@ -1577,6 +1726,16 @@ dependencies = [
"version_check",
]
[[package]]
name = "gethostname"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
dependencies = [
"libc",
"windows-targets 0.48.5",
]
[[package]]
name = "getrandom"
version = "0.1.16"
@@ -1599,6 +1758,16 @@ dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
name = "gif"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
dependencies = [
"color_quant",
"weezl",
]
[[package]]
name = "gimli"
version = "0.31.1"
@@ -1772,6 +1941,16 @@ dependencies = [
"tracing",
]
[[package]]
name = "half"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
dependencies = [
"cfg-if",
"crunchy",
]
[[package]]
name = "hashbrown"
version = "0.12.3"
@@ -2003,16 +2182,43 @@ dependencies = [
[[package]]
name = "image"
version = "0.25.1"
version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
dependencies = [
"bytemuck",
"byteorder",
"byteorder-lite",
"color_quant",
"exr",
"gif",
"image-webp",
"num-traits",
"png",
"qoi",
"ravif",
"rayon",
"rgb",
"tiff",
"zune-core",
"zune-jpeg",
]
[[package]]
name = "image-webp"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
dependencies = [
"byteorder-lite",
"quick-error",
]
[[package]]
name = "imgref"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -2062,6 +2268,17 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "interpolate_name"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.79",
]
[[package]]
name = "ipnet"
version = "2.10.1"
@@ -2087,6 +2304,15 @@ dependencies = [
"once_cell",
]
[[package]]
name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "0.4.8"
@@ -2153,6 +2379,12 @@ dependencies = [
"libc",
]
[[package]]
name = "jpeg-decoder"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
[[package]]
name = "js-sys"
version = "0.3.70"
@@ -2237,6 +2469,12 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "lebe"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]]
name = "libappindicator"
version = "0.9.0"
@@ -2267,6 +2505,17 @@ version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libfuzzer-sys"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
dependencies = [
"arbitrary",
"cc",
"once_cell",
]
[[package]]
name = "libloading"
version = "0.7.4"
@@ -2318,6 +2567,15 @@ dependencies = [
"value-bag",
]
[[package]]
name = "loop9"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
dependencies = [
"imgref",
]
[[package]]
name = "lzma-rs"
version = "0.3.0"
@@ -2363,6 +2621,15 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "maybe-rayon"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
dependencies = [
"cfg-if",
]
[[package]]
name = "memchr"
version = "2.7.4"
@@ -2384,6 +2651,12 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
version = "0.8.0"
@@ -2497,6 +2770,22 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "nom"
version = "7.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
dependencies = [
"memchr",
"minimal-lexical",
]
[[package]]
name = "noop_proc_macro"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
[[package]]
name = "ntapi"
version = "0.4.1"
@@ -2506,12 +2795,53 @@ dependencies = [
"winapi",
]
[[package]]
name = "num-bigint"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
dependencies = [
"num-integer",
"num-traits",
]
[[package]]
name = "num-conv"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
name = "num-derive"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.79",
]
[[package]]
name = "num-integer"
version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
dependencies = [
"num-traits",
]
[[package]]
name = "num-rational"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
dependencies = [
"num-bigint",
"num-integer",
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.19"
@@ -2928,6 +3258,12 @@ dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "paste"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "pathdiff"
version = "0.2.2"
@@ -3242,6 +3578,25 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "profiling"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
dependencies = [
"profiling-procmacros",
]
[[package]]
name = "profiling-procmacros"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
dependencies = [
"quote",
"syn 2.0.79",
]
[[package]]
name = "ptr_meta"
version = "0.1.4"
@@ -3262,6 +3617,21 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "qoi"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
dependencies = [
"bytemuck",
]
[[package]]
name = "quick-error"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quick-xml"
version = "0.32.0"
@@ -3367,6 +3737,55 @@ dependencies = [
"rand_core 0.5.1",
]
[[package]]
name = "rav1e"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9"
dependencies = [
"arbitrary",
"arg_enum_proc_macro",
"arrayvec",
"av1-grain",
"bitstream-io",
"built",
"cfg-if",
"interpolate_name",
"itertools",
"libc",
"libfuzzer-sys",
"log",
"maybe-rayon",
"new_debug_unreachable",
"noop_proc_macro",
"num-derive",
"num-traits",
"once_cell",
"paste",
"profiling",
"rand 0.8.5",
"rand_chacha 0.3.1",
"simd_helpers",
"system-deps",
"thiserror",
"v_frame",
"wasm-bindgen",
]
[[package]]
name = "ravif"
version = "0.11.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2413fd96bd0ea5cdeeb37eaf446a22e6ed7b981d792828721e74ded1980a45c6"
dependencies = [
"avif-serialize",
"imgref",
"loop9",
"quick-error",
"rav1e",
"rgb",
]
[[package]]
name = "raw-window-handle"
version = "0.6.2"
@@ -3496,6 +3915,12 @@ dependencies = [
"windows-registry",
]
[[package]]
name = "rgb"
version = "0.8.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
[[package]]
name = "ring"
version = "0.17.8"
@@ -3939,6 +4364,15 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
[[package]]
name = "simd_helpers"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
dependencies = [
"quote",
]
[[package]]
name = "simdutf8"
version = "0.1.5"
@@ -3984,7 +4418,7 @@ checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
dependencies = [
"bytemuck",
"cfg_aliases 0.2.1",
"core-graphics",
"core-graphics 0.24.0",
"foreign-types 0.5.0",
"js-sys",
"log",
@@ -4191,7 +4625,7 @@ dependencies = [
"bitflags 2.6.0",
"cocoa",
"core-foundation 0.10.0",
"core-graphics",
"core-graphics 0.24.0",
"crossbeam-channel",
"dispatch",
"dlopen2",
@@ -4390,6 +4824,22 @@ dependencies = [
"thiserror",
]
[[package]]
name = "tauri-plugin-clipboard-manager"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b7d556886c15849198c0948fd7f4c880492f0461539176da0a8a70272e2904"
dependencies = [
"arboard",
"image",
"log",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
"thiserror",
]
[[package]]
name = "tauri-plugin-fs"
version = "2.0.3"
@@ -4610,6 +5060,17 @@ dependencies = [
"syn 2.0.79",
]
[[package]]
name = "tiff"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
dependencies = [
"flate2",
"jpeg-decoder",
"weezl",
]
[[package]]
name = "time"
version = "0.3.36"
@@ -4809,7 +5270,7 @@ version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f"
dependencies = [
"core-graphics",
"core-graphics 0.24.0",
"crossbeam-channel",
"dirs 5.0.1",
"libappindicator",
@@ -4973,6 +5434,17 @@ dependencies = [
"serde",
]
[[package]]
name = "v_frame"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
dependencies = [
"aligned-vec",
"num-traits",
"wasm-bindgen",
]
[[package]]
name = "value-bag"
version = "1.9.0"
@@ -5224,6 +5696,12 @@ dependencies = [
"windows-core 0.58.0",
]
[[package]]
name = "weezl"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]]
name = "whoami"
version = "1.5.2"
@@ -5748,6 +6226,23 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "x11rb"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
dependencies = [
"gethostname",
"rustix",
"x11rb-protocol",
]
[[package]]
name = "x11rb-protocol"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
[[package]]
name = "xdg-home"
version = "1.3.0"
@@ -5934,6 +6429,30 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "zune-core"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
[[package]]
name = "zune-inflate"
version = "0.2.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
dependencies = [
"simd-adler32",
]
[[package]]
name = "zune-jpeg"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
dependencies = [
"zune-core",
]
[[package]]
name = "zvariant"
version = "4.0.0"
+3 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.1.2"
version = "1.1.4"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier"
@@ -30,6 +30,7 @@ tauri = { version = "2.0.6", features = [
"image-png",
"image-ico",
] }
tauri-plugin-log = "2.0.1"
tauri-plugin-shell = "2.0.2"
reqwest = { version = "0.12", features = ["json"] }
@@ -38,6 +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"
# prost = "0.13"
# prost-types = "0.13"
+79 -66
View File
@@ -1,67 +1,80 @@
{
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "enables the default permissions",
"windows": ["main", "log", "member", "cidr", "advance"],
"permissions": [
"core:default",
"core:window:allow-minimize",
"core:window:allow-hide",
"core:window:allow-close",
"shell:allow-open",
"core:window:allow-show",
"core:window:allow-create",
"core:window:allow-set-position",
"core:window:allow-destroy",
"core:webview:allow-create-webview-window",
"core:webview:allow-set-webview-size",
"core:webview:allow-set-webview-position",
"core:webview:allow-create-webview",
"core:webview:allow-webview-show",
"core:webview:allow-webview-hide",
"core:webview:allow-webview-close",
"autostart:default",
"autostart:allow-enable",
"autostart:allow-disable",
"autostart:allow-is-enabled",
"core:tray:allow-get-by-id",
"core:tray:allow-set-icon",
"core:tray:allow-new",
{
"identifier": "shell:allow-spawn",
"allow": [
{
"args": ["run"],
"cmd": "easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
}
]
},
{
"identifier": "shell:allow-execute",
"allow": [
{
"args": ["run"],
"cmd": "easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
},
{
"args": true,
"cmd": "easytier/tool/nssm",
"name": "nssm"
},
{
"args": true,
"cmd": "explorer",
"name": "explorer"
}
]
},
"fs:default",
"fs:allow-read-dir",
"fs:allow-exists",
"fs:allow-open",
"fs:allow-resource-read",
"fs:allow-resource-read-recursive"
]
}
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "enables the default permissions",
"windows": [
"main",
"log",
"member",
"cidr",
"advance"
],
"permissions": [
"core:default",
"core:window:allow-minimize",
"core:window:allow-hide",
"core:window:allow-close",
"shell:allow-open",
"core:window:allow-show",
"core:window:allow-create",
"core:window:allow-set-position",
"core:window:allow-destroy",
"core:webview:allow-create-webview-window",
"core:webview:allow-set-webview-size",
"core:webview:allow-set-webview-position",
"core:webview:allow-create-webview",
"core:webview:allow-webview-show",
"core:webview:allow-webview-hide",
"core:webview:allow-webview-close",
"autostart:default",
"autostart:allow-enable",
"autostart:allow-disable",
"autostart:allow-is-enabled",
"core:tray:allow-get-by-id",
"core:tray:allow-set-icon",
"core:tray:allow-new",
{
"identifier": "shell:allow-spawn",
"allow": [
{
"args": [
"run"
],
"cmd": "easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
}
]
},
{
"identifier": "shell:allow-execute",
"allow": [
{
"args": [
"run"
],
"cmd": "easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
},
{
"args": true,
"cmd": "easytier/tool/nssm",
"name": "nssm"
},
{
"args": true,
"cmd": "explorer",
"name": "explorer"
}
]
},
"fs:default",
"fs:allow-read-dir",
"fs:allow-exists",
"fs:allow-open",
"fs:allow-resource-read",
"fs:allow-resource-read-recursive",
"clipboard-manager:allow-clear",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text"
]
}
+13 -22
View File
@@ -394,14 +394,12 @@ fn spawn_autostart(enabled: bool) {
fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
unsafe {
let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
task_service
.Connect(
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
)
?;
task_service.Connect(
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
)?;
// 指定要删除的任务文件夹路径
let folder_path = BSTR::from("\\easytierGame");
@@ -411,20 +409,12 @@ fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
let bool_ptr: *mut VARIANT_BOOL = &mut penabled;
// 获取任务文件夹F
let task_folder: ITaskFolder = task_service
.GetFolder(&folder_path)
?;
let task = task_folder
.GetTask(&task_name)
?;
task.Definition()
?
.Triggers()
?
.get_Item(1)
?
.Enabled(bool_ptr)
?;
let task_folder: ITaskFolder = task_service.GetFolder(&folder_path)?;
let task = task_folder.GetTask(&task_name)?;
task.Definition()?
.Triggers()?
.get_Item(1)?
.Enabled(bool_ptr)?;
// 释放 COM 库
CoUninitialize();
// return penabled.as_bool();
@@ -517,6 +507,7 @@ pub fn run() {
let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆,用于传递给命令
let context = tauri::generate_context!();
tauri::Builder::default()
.plugin(tauri_plugin_clipboard_manager::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_autostart::init(
MacosLauncher::LaunchAgent,
+2 -2
View File
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.1.2",
"version": "1.1.4",
"identifier": "com.tauri.easytier-game",
"build": {
@@ -13,7 +13,7 @@
"app": {
"windows": [
{
"title": "easytier-game 1.1.2",
"title": "easytier-game 1.1.4",
"width": 335,
"height": 305,
"resizable": false,
+6 -1
View File
@@ -29,6 +29,7 @@ export default defineStore("main", {
devName: false, //自定义网卡名
devNameValue: "", //自定义网卡名
},
theme: false, //主题 false light true dark
configStartEnable: false, //使用配置文件启动
configPath: "", //配置文件路径
cidrEnable: false,
@@ -39,6 +40,7 @@ export default defineStore("main", {
paths: [
"basePeers",
"cidrEnable",
"theme",
"config.proxyNetworks",
"config.serverUrl",
"config.networkName",
@@ -58,9 +60,12 @@ export default defineStore("main", {
"config.disableUdpHolePunching",
"config.relayAllPeerrpc",
"config.hostname",
"config.ipv4",
"config.dhcp",
"config.saveErrorLog",
"config.logLevel"
"config.logLevel",
"config.devName",
"config.devNameValue",
],
},
});
+70
View File
@@ -0,0 +1,70 @@
import useMainStore from "@/stores/index";
import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
import { open, Command } from "@tauri-apps/plugin-shell";
import { invoke } from "@tauri-apps/api/core";
const getExeAbsPath = async () => {
const aExePath = (await invoke("get_exe_directory")) as [string, string];
return aExePath;
};
const checkServerOnWindows = async () => {
try {
const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
if (serverStatus.stderr.includes("Can't open service")) {
return false;
}
return true;
} catch (err) {
return false;
}
};
const handleAutoStartByNssm = async () => {
const config = useMainStore().config;
const [exeAbsPath, parentDir] = await getExeAbsPath();
const isExist = await checkServerOnWindows();
if (isExist) {
const outputStop = await Command.create("nssm", ["stop", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
console.log({ outputStop });
const outputRemove = await Command.create("nssm", ["remove", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
console.log({ outputRemove });
}
if (exeAbsPath) {
const output = await Command.create("nssm", ["install", import.meta.env.VITE_AUTO_START_SERVICE_NAME, exeAbsPath]).execute();
console.log(output);
if (output.stdout && output.stdout.includes("installed successfully")) {
const outputAppDirectory = await Command.create("nssm", [
"set",
import.meta.env.VITE_AUTO_START_SERVICE_NAME,
"AppDirectory",
parentDir
]).execute();
console.log({ outputAppDirectory });
const outputStart = await Command.create("nssm", [
"set",
import.meta.env.VITE_AUTO_START_SERVICE_NAME,
"Start",
"SERVICE_AUTO_START"
]).execute();
console.log({ outputStart });
config.autoStart = true;
}
}
};
// 兼容autostart插件
const compatibleAutoStart = async () => {
const config = useMainStore().config;
const is_enable = await tauriAutoStart.isEnabled();
if (is_enable) {
try {
await tauriAutoStart.disable();
config.autoStart = false;
} catch (err) {
// ElMessage.error(`取消自启失败`);
}
}
const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
console.log(serverStatus);
};