From db3acd0c3255c4f485f7d1d56183956bc03ba5a7 Mon Sep 17 00:00:00 2001 From: heixiansen Date: Thu, 27 Feb 2025 17:32:30 +0800 Subject: [PATCH] =?UTF-8?q?config.json=E7=95=8C=E9=9D=A2=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AE=8C=E5=96=84,=E5=A2=9E=E5=8A=A0config=5Ftemplate.json?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E8=AF=B4=E6=98=8E=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=90=AF=E5=8A=A8=E5=99=A8=E6=9C=80=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=A4=E6=96=AD=EF=BC=8C=E5=87=8F=E5=B0=91=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=8F=91=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + tauri升级为最新版 + 包体统一升级更新 --- composables/configJson.ts | 16 +- composables/tray.ts | 23 +- nuxt.config.ts | 186 +++--- package.json | 18 +- pages/index.vue | 20 +- pnpm-lock.yaml | 454 +++++--------- src-tauri/Cargo.lock | 777 ++++++++++++++---------- src-tauri/Cargo.toml | 21 +- src-tauri/easytier/config_template.json | 48 +- src-tauri/src/lib.rs | 10 +- src-tauri/tauri.conf.json | 2 +- stores/index.ts | 16 +- 12 files changed, 790 insertions(+), 801 deletions(-) diff --git a/composables/configJson.ts b/composables/configJson.ts index cc05955..a929dc4 100644 --- a/composables/configJson.ts +++ b/composables/configJson.ts @@ -14,23 +14,15 @@ export const updateConfigJson = async (configJsonSeverUrl: Array | strin const { proxyNetworks, autoStart, - relayAllPeerrpc, connectAfterStart, - multiThread, - enablExitNode, - useSmoltcp, saveErrorLog, - logLevel, serverUrl, - port, enableCustomListener, - enablePreventSleep, customListenerData, - customListenerV6Data, - enableCustomListenerV6, ...otherConfig } = mainStore.config; let writeServerUrl: Array | string = serverUrl; + let writeCustomListenerData: Array = (customListenerData || "").split("\n"); if (isArray) { writeServerUrl = intersection( uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean), @@ -43,7 +35,11 @@ export const updateConfigJson = async (configJsonSeverUrl: Array | strin mainStore.basePeers ).join(","); } - await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource }); + await writeTextFile( + path, + JSON.stringify({ serverUrl: writeServerUrl, enableCustomListener, customListenerData: writeCustomListenerData, ...otherConfig }, null, 4), + { baseDir: BaseDirectory.Resource } + ); } catch (err) { console.error(err); ElMessage.error(`更新config.json失败`); diff --git a/composables/tray.ts b/composables/tray.ts index 8fc5631..48d1c15 100644 --- a/composables/tray.ts +++ b/composables/tray.ts @@ -8,6 +8,7 @@ import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path"; import { invoke } from "@tauri-apps/api/core"; // import { ElConfirmPrimary } from "~/utils/element"; import { open } from "@tauri-apps/plugin-shell"; +import { computed } from "vue"; const DEFAULT_TRAY_NAME = "main"; @@ -161,16 +162,14 @@ export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | n export const checkNewVersion = async () => { + const mainStore = useMainStore(); + // if(mainStore.latestTagName && mainStore.latestTagName == pkg.version) return; + if (hasNewVersion.value) return; let [tagName, downloadUrl] = await invoke("fetch_game_releases"); - if(tagName && pkg.version !== tagName) { - return true; //有新版 - // const [err] = await ElConfirmPrimary("有新版本是否下载?", "发现新版本", { - // confirmButtonText: "下载", - // cancelButtonText: "取消", - // }) - // if(!err) { - // open(downloadUrl); - // } - } - return false; //没有新版 -} \ No newline at end of file + mainStore.latestTagName = tagName; +} + +export const hasNewVersion = computed(() => { + const mainStore = useMainStore(); + return !!mainStore.latestTagName && mainStore.latestTagName != pkg.version; +}) \ No newline at end of file diff --git a/nuxt.config.ts b/nuxt.config.ts index e40e5d9..8e371f1 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -3,107 +3,107 @@ import path from "path"; import vueJSX from "@vitejs/plugin-vue-jsx"; export default defineNuxtConfig({ - ssr: false, + ssr: false, - devServer: { - port: 5000 - }, - - telemetry: false, + devServer: { + port: 5000 + }, - imports: { - autoImport: false - }, + telemetry: false, - css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"], - modules: [ - "@element-plus/nuxt", - "@pinia/nuxt", - [ - "pinia-plugin-persistedstate/nuxt", - { - key: "__glj_persisted_%id", - storage: "localStorage" - } - ], - "@nuxtjs/tailwindcss" - ], + imports: { + autoImport: false + }, - alias: { - "@": path.resolve(__dirname, "./") - }, + css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"], + modules: [ + "@element-plus/nuxt", + "@pinia/nuxt", + [ + "pinia-plugin-persistedstate/nuxt", + { + key: "__glj_persisted_%id", + storage: "localStorage" + } + ], + "@nuxtjs/tailwindcss" + ], - experimental: { - payloadExtraction: false - }, + alias: { + "@": path.resolve(__dirname, "./") + }, - devtools: { - enabled: false - }, + experimental: { + payloadExtraction: false + }, - router: { - options: { - hashMode: true - } - }, + devtools: { + enabled: false + }, - vite: { - plugins: [vueJSX({})], - envDir: "env", - optimizeDeps: { - // include: [...optimizeDepsElementPlusIncludes] - }, - // prevent vite from obscuring rust errors - clearScreen: false, - // Tauri expects a fixed port, fail if that port is not available - server: { - strictPort: true - }, - // to access the Tauri environment variables set by the CLI with information about the current target - envPrefix: ["VITE_", "TAURI_"], - build: { - // minify: "esbuild", - chunkSizeWarningLimit: 1500, - // Tauri uses Chromium on Windows and WebKit on macOS and Linux - target: process.env.TAURI_PLATFORM == "windows" ? "chrome105" : "safari13", - // don't minify for debug builds - minify: !process.env.TAURI_DEBUG ? "esbuild" : false, - // 为调试构建生成源代码映射 (sourcemap) - sourcemap: !!process.env.TAURI_DEBUG - }, - esbuild: { - // pure: ["console.log"], - drop: ["debugger"] - } - }, + router: { + options: { + hashMode: true + } + }, - postcss: { - plugins: { - tailwindcss: {}, - autoprefixer: {} - } - }, + vite: { + plugins: [vueJSX({})], + envDir: "env", + optimizeDeps: { + // include: [...optimizeDepsElementPlusIncludes] + }, + // prevent vite from obscuring rust errors + clearScreen: false, + // Tauri expects a fixed port, fail if that port is not available + server: { + strictPort: true + }, + // to access the Tauri environment variables set by the CLI with information about the current target + envPrefix: ["VITE_", "TAURI_"], + build: { + // minify: "esbuild", + chunkSizeWarningLimit: 1500, + // Tauri uses Chromium on Windows and WebKit on macOS and Linux + target: process.env.TAURI_PLATFORM == "windows" ? "chrome105" : "safari13", + // don't minify for debug builds + minify: !process.env.TAURI_DEBUG ? "esbuild" : false, + // 为调试构建生成源代码映射 (sourcemap) + sourcemap: !!process.env.TAURI_DEBUG + }, + esbuild: { + // pure: ["console.log"], + drop: ["debugger"] + } + }, - app: { - rootId: "__easytier", - cdnURL: "./", - buildAssetsDir: "__easytier/", - head: { - meta: [ - { - name: "viewport", - content: "width=device-width, initial-scale=1" - }, - { - charset: "utf-8" - } - ], - title: "easytier-game" - // link: [], - // style: [], - // script: [], - // noscript: [] - } - }, - compatibilityDate: "2024-11-12" + postcss: { + plugins: { + tailwindcss: {}, + autoprefixer: {} + } + }, + + app: { + rootId: "__easytier", + cdnURL: "./", + buildAssetsDir: "__easytier/", + head: { + meta: [ + { + name: "viewport", + content: "width=device-width, initial-scale=1" + }, + { + charset: "utf-8" + } + ], + title: "easytier-game" + // link: [], + // style: [], + // script: [], + // noscript: [] + } + }, + compatibilityDate: "2024-11-12" }); diff --git a/package.json b/package.json index 293defb..934ce76 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.4.1", + "version": "1.4.2", "scripts": { "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "build": "nuxt generate --dotenv env/.env.prod", @@ -14,28 +14,28 @@ "@element-plus/icons-vue": "^2.3.1", "@element-plus/nuxt": "^1.1.1", "@nuxtjs/tailwindcss": "6.13.1", - "@pinia/nuxt": "0.9.0", - "@tauri-apps/api": "^2.2.0", - "@tauri-apps/cli": "2.2.7", + "@pinia/nuxt": "0.10.1", + "@tauri-apps/api": "2.3.0", + "@tauri-apps/cli": "2.3.0", "@tauri-apps/plugin-cli": "^2.2.0", - "@tauri-apps/plugin-clipboard-manager": "2.2.0", + "@tauri-apps/plugin-clipboard-manager": "2.2.1", "@tauri-apps/plugin-dialog": "2.2.0", "@tauri-apps/plugin-fs": "^2.2.0", - "@tauri-apps/plugin-log": "2.2.1", + "@tauri-apps/plugin-log": "2.2.2", "@tauri-apps/plugin-shell": "^2.2.0", "@tauri-apps/plugin-window-state": "2.2.1", "@types/lodash-es": "^4.17.12", "@vitejs/plugin-vue-jsx": "^4.1.1", - "@vueuse/core": "12.4.0", + "@vueuse/core": "12.7.0", "archiver": "^7.0.1", "element-plus": "2.9.4", "less": "4.2.1", "lodash-es": "^4.17.21", "nuxt": "3.15.4", - "pinia": "2.3.1", + "pinia": "3.0.1", "pinia-plugin-persistedstate": "^4.2.0", "postcss": "^8.4.38", - "prettier": "3.4.2", + "prettier": "3.5.2", "prettier-plugin-tailwindcss": "0.6.11" } } diff --git a/pages/index.vue b/pages/index.vue index 89c728f..66e5b03 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -407,7 +407,7 @@ @@ -711,7 +711,7 @@ SwitchFilled } from "@element-plus/icons-vue"; import { reactive, onBeforeUnmount, onMounted, ref, toRaw, computed } from "vue"; - import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } from "~/composables/tray"; + import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion, hasNewVersion } from "~/composables/tray"; import { getMatches } from "@tauri-apps/plugin-cli"; import { initStartWinIpBroadcast } from "~/composables/netcard"; import useMainStore from "@/stores/index"; @@ -749,8 +749,7 @@ const config = mainStore.config; // console.error(config); const protocols = supportProtocols(); - const data = reactive({ - hasNewVersion: false, //easytierGame有没有新版 + const data = reactive({ //easytierGame有没有新版 logVisible: false, cidrVisible: false, advanceVisible: false, @@ -1132,10 +1131,12 @@ try { const decoder = new TextDecoder("utf-8"); const guiJsonStr = decoder.decode(guiJsonStrUint8); - const regex = /^(\s*\/\/.*)/gm; - const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm; - const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1"); - const guiJson = JSON.parse(resultStr); + // console.log(guiJsonStr); + // const regex = /^(\s*\/\/.*)/gm; + // const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm; + // const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1"); + // console.log(resultStr); + const guiJson = JSON.parse(guiJsonStr); let saveServerUrl = ""; if (guiJson.serverUrl) { if (Array.isArray(guiJson.serverUrl)) { @@ -1153,6 +1154,7 @@ config: { ...mainStore.config, ...guiJson, + customListenerData: guiJson?.customListenerData.join("\n") || "", serverUrl: saveServerUrl } }); @@ -1220,7 +1222,6 @@ initPreventSleep(); mountedShow(); // 不需要await closePrevent(); - data.hasNewVersion = await checkNewVersion(); dataSubscribe(async () => { if (mainStore.createConfigInEasytier) { b(async () => { @@ -1229,6 +1230,7 @@ } }); getReleaseList(); + checkNewVersion(); }); onBeforeUnmount(() => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 103163a..533b1ee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,20 +18,20 @@ importers: specifier: 6.13.1 version: 6.13.1(magicast@0.3.5)(rollup@4.27.4) '@pinia/nuxt': - specifier: 0.9.0 - version: 0.9.0(magicast@0.3.5)(pinia@2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4) + specifier: 0.10.1 + version: 0.10.1(magicast@0.3.5)(pinia@3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4) '@tauri-apps/api': - specifier: ^2.2.0 - version: 2.2.0 + specifier: 2.3.0 + version: 2.3.0 '@tauri-apps/cli': - specifier: 2.2.7 - version: 2.2.7 + specifier: 2.3.0 + version: 2.3.0 '@tauri-apps/plugin-cli': specifier: ^2.2.0 version: 2.2.0 '@tauri-apps/plugin-clipboard-manager': - specifier: 2.2.0 - version: 2.2.0 + specifier: 2.2.1 + version: 2.2.1 '@tauri-apps/plugin-dialog': specifier: 2.2.0 version: 2.2.0 @@ -39,8 +39,8 @@ importers: specifier: ^2.2.0 version: 2.2.0 '@tauri-apps/plugin-log': - specifier: 2.2.1 - version: 2.2.1 + specifier: 2.2.2 + version: 2.2.2 '@tauri-apps/plugin-shell': specifier: ^2.2.0 version: 2.2.0 @@ -54,8 +54,8 @@ importers: specifier: ^4.1.1 version: 4.1.1(vite@6.0.11(@types/node@22.9.0)(jiti@2.4.2)(less@4.2.1)(terser@5.36.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.6.3)) '@vueuse/core': - specifier: 12.4.0 - version: 12.4.0(typescript@5.6.3) + specifier: 12.7.0 + version: 12.7.0(typescript@5.6.3) archiver: specifier: ^7.0.1 version: 7.0.1 @@ -72,20 +72,20 @@ importers: specifier: 3.15.4 version: 3.15.4(@parcel/watcher@2.5.0)(@types/node@22.9.0)(db0@0.2.1)(ioredis@5.4.1)(less@4.2.1)(magicast@0.3.5)(rollup@4.27.4)(terser@5.36.0)(typescript@5.6.3)(vite@6.0.11(@types/node@22.9.0)(jiti@2.4.2)(less@4.2.1)(terser@5.36.0)(yaml@2.7.0))(yaml@2.7.0) pinia: - specifier: 2.3.1 - version: 2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)) + specifier: 3.0.1 + version: 3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)) pinia-plugin-persistedstate: specifier: ^4.2.0 - version: 4.2.0(@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4))(magicast@0.3.5)(pinia@2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4) + version: 4.2.0(@pinia/nuxt@0.10.1(magicast@0.3.5)(pinia@3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4))(magicast@0.3.5)(pinia@3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4) postcss: specifier: ^8.4.38 version: 8.4.49 prettier: - specifier: 3.4.2 - version: 3.4.2 + specifier: 3.5.2 + version: 3.5.2 prettier-plugin-tailwindcss: specifier: 0.6.11 - version: 0.6.11(prettier@3.4.2) + version: 0.6.11(prettier@3.5.2) packages: @@ -229,10 +229,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/standalone@7.26.2': - resolution: {integrity: sha512-i2VbegsRfwa9yq3xmfDX3tG2yh9K0cCqwpSyVG2nPxifh0EOnucAZUeO/g4lW2Zfg03aPJNtPfxQbDHzXc7H+w==} - engines: {node: '>=6.9.0'} - '@babel/standalone@7.26.4': resolution: {integrity: sha512-SF+g7S2mhTT1b7CHyfNjDkPU1corxg4LPYsyP0x5KuCl+EbtBQHRLqr9N3q7e7+x7NQ5LYxQf8mJ2PmzebLr0A==} engines: {node: '>=6.9.0'} @@ -245,10 +241,6 @@ packages: resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==} engines: {node: '>=6.9.0'} - '@babel/types@7.26.0': - resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==} - engines: {node: '>=6.9.0'} - '@babel/types@7.26.3': resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==} engines: {node: '>=6.9.0'} @@ -536,10 +528,6 @@ packages: peerDependencies: vite: '*' - '@nuxt/kit@3.14.1592': - resolution: {integrity: sha512-r9r8bISBBisvfcNgNL3dSIQHSBe0v5YkX5zwNblIC2T0CIEgxEVoM5rq9O5wqgb5OEydsHTtT2hL57vdv6VT2w==} - engines: {node: ^14.18.0 || >=16.10.0} - '@nuxt/kit@3.15.0': resolution: {integrity: sha512-Q7k11wDTLIbBgoTfRYNrciK7PvjKklewrKd5PRMJCpn9Lmuqkq59HErNfJXFrBKHsE3Ld0DB6WUtpPGOvWJZoQ==} engines: {node: '>=18.20.5'} @@ -552,10 +540,6 @@ packages: resolution: {integrity: sha512-dr7I7eZOoRLl4uxdxeL2dQsH0OrbEiVPIyBHnBpA4co24CBnoJoF+JINuP9l3PAM3IhUzc5JIVq3/YY3lEc3Hw==} engines: {node: '>=18.12.0'} - '@nuxt/schema@3.14.1592': - resolution: {integrity: sha512-A1d/08ueX8stTXNkvGqnr1eEXZgvKn+vj6s7jXhZNWApUSqMgItU4VK28vrrdpKbjIPwq2SwhnGOHUYvN9HwCQ==} - engines: {node: ^14.18.0 || >=16.10.0} - '@nuxt/schema@3.15.0': resolution: {integrity: sha512-sAgLgSOj/SZxUmlJ/Q3TLRwIAqmiiZ5gCBrT+eq9CowIj7bgxX92pT720pDLEDs4wlXiTTsqC8nyqXQis8pPyA==} engines: {node: ^14.18.0 || >=16.10.0} @@ -676,10 +660,10 @@ packages: resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==} engines: {node: '>= 10.0.0'} - '@pinia/nuxt@0.9.0': - resolution: {integrity: sha512-2yeRo7LeyCF68AbNeL3xu2h6uw0617RkcsYxmA8DJM0R0PMdz5wQHnc44KeENQxR/Mrq8T910XVT6buosqsjBQ==} + '@pinia/nuxt@0.10.1': + resolution: {integrity: sha512-xrpkKZHSmshPK6kQzboJ+TZiZ5zj73gBCI5SfiUaJkKKS9gx4B1hLEzJIjxZl0/HS5jRWrIvQ+u9ulvIRlNiow==} peerDependencies: - pinia: ^2.3.0 + pinia: ^3.0.1 '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} @@ -889,83 +873,83 @@ packages: '@sxzz/popperjs-es@2.11.7': resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==} - '@tauri-apps/api@2.2.0': - resolution: {integrity: sha512-R8epOeZl1eJEl603aUMIGb4RXlhPjpgxbGVEaqY+0G5JG9vzV/clNlzTeqc+NLYXVqXcn8mb4c5b9pJIUDEyAg==} + '@tauri-apps/api@2.3.0': + resolution: {integrity: sha512-33Z+0lX2wgZbx1SPFfqvzI6su63hCBkbzv+5NexeYjIx7WA9htdOKoRR7Dh3dJyltqS5/J8vQFyybiRoaL0hlA==} - '@tauri-apps/cli-darwin-arm64@2.2.7': - resolution: {integrity: sha512-54kcpxZ3X1Rq+pPTzk3iIcjEVY4yv493uRx/80rLoAA95vAC0c//31Whz75UVddDjJfZvXlXZ3uSZ+bnCOnt0A==} + '@tauri-apps/cli-darwin-arm64@2.3.0': + resolution: {integrity: sha512-VUbFezxCxSdVq8BTFZKDoVqf7jb9i928kLQ2cqYAe5TBM2Cg5IgMtJupbKMXtCwD+pOVcs6DqcPbhcmgPEFp0w==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.2.7': - resolution: {integrity: sha512-Vgu2XtBWemLnarB+6LqQeLanDlRj7CeFN//H8bVVdjbNzxcSxsvbLYMBP8+3boa7eBnjDrqMImRySSgL6IrwTw==} + '@tauri-apps/cli-darwin-x64@2.3.0': + resolution: {integrity: sha512-PZBH25qsou45+l+SCHaB+x7KKn/9/kItGTyIjgE3E0J3hJKb/zKkolHFE97XlR99CVJVvp6lM3f9ZJ8tZ+GJfA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.2.7': - resolution: {integrity: sha512-+Clha2iQAiK9zoY/KKW0KLHkR0k36O78YLx5Sl98tWkwI3OBZFg5H5WT1plH/4sbZIS2aLFN6dw58/JlY9Bu/g==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.3.0': + resolution: {integrity: sha512-3udhBTCJTlmTBFagqp2dXII6ckDvXvdP00erEt5IUVuFwNOrRHgHh8BGkR81MgGXEjpSzwKiE0LrmXsjLJ8+pA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.2.7': - resolution: {integrity: sha512-Z/Lp4SQe6BUEOays9BQAEum2pvZF4w9igyXijP+WbkOejZx4cDvarFJ5qXrqSLmBh7vxrdZcLwoLk9U//+yQrg==} + '@tauri-apps/cli-linux-arm64-gnu@2.3.0': + resolution: {integrity: sha512-FddbVf/0aLnbDUJvKWWdREku174VVJkR2MW8QJMZMlZxeW8spL6YEeZD4OaMEdVzy+H5Xlc/CLerI8MF3I/bug==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] libc: [glibc] - '@tauri-apps/cli-linux-arm64-musl@2.2.7': - resolution: {integrity: sha512-+8HZ+txff/Y3YjAh80XcLXcX8kpGXVdr1P8AfjLHxHdS6QD4Md+acSxGTTNbplmHuBaSHJvuTvZf9tU1eDCTDg==} + '@tauri-apps/cli-linux-arm64-musl@2.3.0': + resolution: {integrity: sha512-PZbNAartalTMPWmFsx+a+XrFN0FULpibvVNPmyCNuCnv7ZGVIZa+GGfS9NYN0XE43Mhq2/qYmxoLTTeBMSDzxQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] libc: [musl] - '@tauri-apps/cli-linux-x64-gnu@2.2.7': - resolution: {integrity: sha512-ahlSnuCnUntblp9dG7/w5ZWZOdzRFi3zl0oScgt7GF4KNAOEa7duADsxPA4/FT2hLRa0SvpqtD4IYFvCxoVv3Q==} + '@tauri-apps/cli-linux-x64-gnu@2.3.0': + resolution: {integrity: sha512-vgsXG/ZHK6z43Vkjr3bnYcsu6mvvK4WUu+S9ohqQO8PsZqsbwThy5ibn9Nb5OEYiEuVQgXye6YHS+uZSI54hkw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] libc: [glibc] - '@tauri-apps/cli-linux-x64-musl@2.2.7': - resolution: {integrity: sha512-+qKAWnJRSX+pjjRbKAQgTdFY8ecdcu8UdJ69i7wn3ZcRn2nMMzOO2LOMOTQV42B7/Q64D1pIpmZj9yblTMvadA==} + '@tauri-apps/cli-linux-x64-musl@2.3.0': + resolution: {integrity: sha512-Ba/ILQ9JknrFYVdc0YKB9br6n+OJBi2Ospc0/J75IC/dTsbkcPkhSbbCY531hUxOqk+hQi08/ZeSq1al3Yhk9A==} engines: {node: '>= 10'} cpu: [x64] os: [linux] libc: [musl] - '@tauri-apps/cli-win32-arm64-msvc@2.2.7': - resolution: {integrity: sha512-aa86nRnrwT04u9D9fhf5JVssuAZlUCCc8AjqQjqODQjMd4BMA2+d4K9qBMpEG/1kVh95vZaNsLogjEaqSTTw4A==} + '@tauri-apps/cli-win32-arm64-msvc@2.3.0': + resolution: {integrity: sha512-i3hrzUzx8UJAfOBgufh2ArUh20SgPe44+VhVcMAsPk/R5M8tPL/Ke9Z40nUZRuOrJbY9rGhXmf+0v65nD5GnRw==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.2.7': - resolution: {integrity: sha512-EiJ5/25tLSQOSGvv+t6o3ZBfOTKB5S3vb+hHQuKbfmKdRF0XQu2YPdIi1CQw1DU97ZAE0Dq4frvnyYEKWgMzVQ==} + '@tauri-apps/cli-win32-ia32-msvc@2.3.0': + resolution: {integrity: sha512-UEi/QzCdNVYPH43A/GufiWOb34HZpju9f4WjTTcT6frZIPnNy82WTGgOxWfsj2OIkroF0T+kRGbwua+JGnrnUg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.2.7': - resolution: {integrity: sha512-ZB8Kw90j8Ld+9tCWyD2fWCYfIrzbQohJ4DJSidNwbnehlZzP7wAz6Z3xjsvUdKtQ3ibtfoeTqVInzCCEpI+pWg==} + '@tauri-apps/cli-win32-x64-msvc@2.3.0': + resolution: {integrity: sha512-QsNeaG123T2L2QWaEIZ9d65jwNQ5Uf+BmV3x7vEajbQHd/XBDJDL0Q21veMWIOjmMQHdtmFLJP0wamCLTkXZXQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.2.7': - resolution: {integrity: sha512-ZnsS2B4BplwXP37celanNANiIy8TCYhvg5RT09n72uR/o+navFZtGpFSqljV8fy1Y4ixIPds8FrGSXJCN2BerA==} + '@tauri-apps/cli@2.3.0': + resolution: {integrity: sha512-OU0+bwIz10DgQMZZJ20NdU+x+K8PYob4tzB7nYCV6BbKWrUYINdGHAXlunzMP+hi63SClPDyVf8CYxwgznIfbw==} engines: {node: '>= 10'} hasBin: true '@tauri-apps/plugin-cli@2.2.0': resolution: {integrity: sha512-rvNhMog9rHr01Xk+trBFKJ0eZICIvPkm9GX6ogB89/0hROU/lf+a/sb4vC0wtSeR7zrJuCSxwxYuvHCZheaYFA==} - '@tauri-apps/plugin-clipboard-manager@2.2.0': - resolution: {integrity: sha512-sIBrW/HioKq2vqomwwcU/Y8ygAv3DlS32yKPBX5XijCc0IyQKiDxYpGqmvE9DC5Y0lNJ/G53dfS961B31wjJ1g==} + '@tauri-apps/plugin-clipboard-manager@2.2.1': + resolution: {integrity: sha512-+7YDULB9Bk4fejxYrVNBQcxs3KsjPA3A3r53wwn7K8zOQvxjNBSYBRx/FW1OUBPGzm8BrreJFBkPVzQZSF2R4A==} '@tauri-apps/plugin-dialog@2.2.0': resolution: {integrity: sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==} @@ -973,8 +957,8 @@ packages: '@tauri-apps/plugin-fs@2.2.0': resolution: {integrity: sha512-+08mApuONKI8/sCNEZ6AR8vf5vI9DXD4YfrQ9NQmhRxYKMLVhRW164vdW5BSLmMpuevftpQ2FVoL9EFkfG9Z+g==} - '@tauri-apps/plugin-log@2.2.1': - resolution: {integrity: sha512-bOz9w0hhlXLGLc1ZR37GqkXvTqkykl4A3GEKLjRIs0dq3n0BzLyoRDMPcpt7PdUHqaq6WISME+zEX2bqjSbJ2A==} + '@tauri-apps/plugin-log@2.2.2': + resolution: {integrity: sha512-XEb7NKVOnsG+b10c8JkNNkAADe7BELEvl+NJtFRPw7OUEb4w8NWwmaj+EQXvDnMIcFUkmsbxijUeNJ0Mwog4nQ==} '@tauri-apps/plugin-shell@2.2.0': resolution: {integrity: sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==} @@ -1089,6 +1073,9 @@ packages: '@vue/devtools-api@6.6.4': resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==} + '@vue/devtools-api@7.7.2': + resolution: {integrity: sha512-1syn558KhyN+chO5SjlZIwJ8bV/bQ1nOVTG66t2RbG66ZGekyiYNmRO7X9BJCXQqPsFHlnksqvPhce2qpzxFnA==} + '@vue/devtools-core@7.6.8': resolution: {integrity: sha512-8X4roysTwzQ94o7IobjVcOd1aZF5iunikrMrHPI2uUdigZCi2kFTQc7ffYiFiTNaLElCpjOhCnM7bo7aK1yU7A==} peerDependencies: @@ -1097,9 +1084,15 @@ packages: '@vue/devtools-kit@7.6.8': resolution: {integrity: sha512-JhJ8M3sPU+v0P2iZBF2DkdmR9L0dnT5RXJabJqX6o8KtFs3tebdvfoXV2Dm3BFuqeECuMJIfF1aCzSt+WQ4wrw==} + '@vue/devtools-kit@7.7.2': + resolution: {integrity: sha512-CY0I1JH3Z8PECbn6k3TqM1Bk9ASWxeMtTCvZr7vb+CHi+X/QwQm5F1/fPagraamKMAHVfuuCbdcnNg1A4CYVWQ==} + '@vue/devtools-shared@7.6.8': resolution: {integrity: sha512-9MBPO5Z3X1nYGFqTJyohl6Gmf/J7UNN1oicHdyzBVZP4jnhZ4c20MgtaHDIzWmHDHCMYVS5bwKxT3jxh7gOOKA==} + '@vue/devtools-shared@7.7.2': + resolution: {integrity: sha512-uBFxnp8gwW2vD6FrJB8JZLUzVb6PNRG0B0jBnHsOH8uKyva2qINY8PTF5Te4QlTbMDqU5K6qtJDr6cNsKWhbOA==} + '@vue/reactivity@3.5.13': resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==} @@ -1117,20 +1110,20 @@ packages: '@vue/shared@3.5.13': resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} - '@vueuse/core@12.4.0': - resolution: {integrity: sha512-XnjQYcJwCsyXyIafyA6SvyN/OBtfPnjvJmbxNxQjCcyWD198urwm5TYvIUUyAxEAN0K7HJggOgT15cOlWFyLeA==} + '@vueuse/core@12.7.0': + resolution: {integrity: sha512-jtK5B7YjZXmkGNHjviyGO4s3ZtEhbzSgrbX+s5o+Lr8i2nYqNyHuPVOeTdM1/hZ5Tkxg/KktAuAVDDiHMraMVA==} '@vueuse/core@9.13.0': resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==} - '@vueuse/metadata@12.4.0': - resolution: {integrity: sha512-AhPuHs/qtYrKHUlEoNO6zCXufu8OgbR8S/n2oMw1OQuBQJ3+HOLQ+EpvXs+feOlZMa0p8QVvDWNlmcJJY8rW2g==} + '@vueuse/metadata@12.7.0': + resolution: {integrity: sha512-4VvTH9mrjXqFN5LYa5YfqHVRI6j7R00Vy4995Rw7PQxyCL3z0Lli86iN4UemWqixxEvYfRjG+hF9wL8oLOn+3g==} '@vueuse/metadata@9.13.0': resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==} - '@vueuse/shared@12.4.0': - resolution: {integrity: sha512-9yLgbHVIF12OSCojnjTIoZL1+UA10+O4E1aD6Hpfo/DKVm5o3SZIwz6CupqGy3+IcKI8d6Jnl26EQj/YucnW0Q==} + '@vueuse/shared@12.7.0': + resolution: {integrity: sha512-coLlUw2HHKsm7rPN6WqHJQr18WymN4wkA/3ThFaJ4v4gWGWAQQGK+MJxLuJTBs4mojQiazlVWAKNJNpUWGRkNw==} '@vueuse/shared@9.13.0': resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==} @@ -1418,10 +1411,6 @@ packages: confbox@0.1.8: resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} - consola@3.2.3: - resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} - engines: {node: ^14.18.0 || >=16.10.0} - consola@3.3.3: resolution: {integrity: sha512-Qil5KwghMzlqd51UXM0b6fyaGHtOC22scxrwrz4A2882LyUMwQjnvaedN1HAeXzphspQ6CpHkzMAWxBTUruDLg==} engines: {node: ^14.18.0 || >=16.10.0} @@ -1961,9 +1950,6 @@ packages: has-unicode@2.0.1: resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} - hash-sum@2.0.0: - resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==} - hasown@2.0.2: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} @@ -2028,10 +2014,6 @@ packages: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} - ignore@6.0.2: - resolution: {integrity: sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==} - engines: {node: '>= 4'} - ignore@7.0.0: resolution: {integrity: sha512-lcX8PNQygAa22u/0BysEY8VhaFRzlOkvdlKczDPnJvrkJD1EuqzEky5VYYKM2iySIuaVIDv9N190DfSreSLw2A==} engines: {node: '>= 4'} @@ -2179,10 +2161,6 @@ packages: resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} hasBin: true - jiti@2.4.0: - resolution: {integrity: sha512-H5UpaUI+aHOqZXlYOaFP/8AzKsg+guWu+Pr3Y8i7+Y3zr1aXAvCvTAQ1RxSc6oVD8R8c7brgNtTVP91E7upH/g==} - hasBin: true - jiti@2.4.2: resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==} hasBin: true @@ -2194,9 +2172,6 @@ packages: js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - js-tokens@9.0.0: - resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==} - js-tokens@9.0.1: resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==} @@ -2232,9 +2207,6 @@ packages: resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==} engines: {node: '>= 8'} - knitwork@1.1.0: - resolution: {integrity: sha512-oHnmiBUVHz1V+URE77PNot2lv3QiYU2zQf1JjOVkMt3YDKGbu8NAFr+c4mcNOhdsGrB/VpVbRwPwhiXrPhxQbw==} - knitwork@1.2.0: resolution: {integrity: sha512-xYSH7AvuQ6nXkq42x0v5S8/Iry+cfulBz/DJQzhIyESdLD7425jXsPy4vn5cCXU+HhRN2kVw51Vd1K6/By4BQg==} @@ -2451,10 +2423,6 @@ packages: mlly@1.7.4: resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==} - mri@1.2.0: - resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} - engines: {node: '>=4'} - mrmime@2.0.0: resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==} engines: {node: '>=10'} @@ -2739,8 +2707,8 @@ packages: pinia: optional: true - pinia@2.3.1: - resolution: {integrity: sha512-khUlZSwt9xXCaTbbxFYBKDc/bWAGWJjOgvxETwkTN7KRm66EeT1ZdZj6i2ceh9sP2Pzqsbc704r2yngBrxBVug==} + pinia@3.0.1: + resolution: {integrity: sha512-WXglsDzztOTH6IfcJ99ltYZin2mY8XZCXujkYWVIJlBjqsP6ST7zw+Aarh63E1cDVYeyUcPCxPHzJpEOmzB6Wg==} peerDependencies: typescript: '>=4.4.4' vue: ^2.7.0 || ^3.5.11 @@ -2752,9 +2720,6 @@ packages: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} - pkg-types@1.2.1: - resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==} - pkg-types@1.3.0: resolution: {integrity: sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==} @@ -3041,8 +3006,8 @@ packages: prettier-plugin-svelte: optional: true - prettier@3.4.2: - resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==} + prettier@3.5.2: + resolution: {integrity: sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==} engines: {node: '>=14'} hasBin: true @@ -3329,9 +3294,6 @@ packages: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} - strip-literal@2.1.0: - resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==} - strip-literal@2.1.1: resolution: {integrity: sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==} @@ -3476,9 +3438,6 @@ packages: uncrypto@0.1.3: resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==} - unctx@2.3.1: - resolution: {integrity: sha512-PhKke8ZYauiqh3FEMVNm7ljvzQiph0Mt3GBRve03IJm7ukfaON2OBK795tLwhbyfzknuRRkW0+Ze+CQUmzOZ+A==} - unctx@2.4.1: resolution: {integrity: sha512-AbaYw0Nm4mK4qjhns67C+kgxR2YWiwlDBPzxrN8h8C6VtAdCgditAY5Dezu3IJy4XVqAnbrXt9oQJvsn3fyozg==} @@ -3495,9 +3454,6 @@ packages: resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} engines: {node: '>=18'} - unimport@3.13.3: - resolution: {integrity: sha512-dr7sjOoRFCSDlnARFPAMB8OmjIMc6j14qd749VmB1yiqFEYFbi+1jWPTuc22JoFs/t1kHJXT3vQNiwCy3ZvsTA==} - unimport@3.14.5: resolution: {integrity: sha512-tn890SwFFZxqaJSKQPPd+yygfKSATbM8BZWW1aCR2TJBTs1SDrmLamBueaFtYsGjHtQaRgqEbQflOjN2iW12gA==} @@ -3595,10 +3551,6 @@ packages: resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==} hasBin: true - untyped@1.5.1: - resolution: {integrity: sha512-reBOnkJBFfBZ8pCKaeHgfZLcehXtM6UTxc+vqs1JvCps0c4amLNp3fhdGBZwYp+VLyoY9n3X5KOP7lCyWBUX9A==} - hasBin: true - untyped@1.5.2: resolution: {integrity: sha512-eL/8PlhLcMmlMDtNPKhyyz9kEBDS3Uk4yMu/ewlkT2WFbtzScjHWPJLdQLmaGPUKjXzwe9MumOtOgc4Fro96Kg==} hasBin: true @@ -4049,8 +4001,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/standalone@7.26.2': {} - '@babel/standalone@7.26.4': {} '@babel/template@7.25.9': @@ -4071,11 +4021,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/types@7.26.0': - dependencies: - '@babel/helper-string-parser': 7.25.9 - '@babel/helper-validator-identifier': 7.25.9 - '@babel/types@7.26.3': dependencies: '@babel/helper-string-parser': 7.25.9 @@ -4392,54 +4337,27 @@ snapshots: - utf-8-validate - vue - '@nuxt/kit@3.14.1592(magicast@0.3.5)(rollup@4.27.4)': - dependencies: - '@nuxt/schema': 3.14.1592(magicast@0.3.5)(rollup@4.27.4) - c12: 2.0.1(magicast@0.3.5) - consola: 3.2.3 - defu: 6.1.4 - destr: 2.0.3 - globby: 14.0.2 - hash-sum: 2.0.0 - ignore: 6.0.2 - jiti: 2.4.0 - klona: 2.0.6 - knitwork: 1.1.0 - mlly: 1.7.3 - pathe: 1.1.2 - pkg-types: 1.2.1 - scule: 1.3.0 - semver: 7.6.3 - ufo: 1.5.4 - unctx: 2.3.1 - unimport: 3.13.3(rollup@4.27.4) - untyped: 1.5.1 - transitivePeerDependencies: - - magicast - - rollup - - supports-color - '@nuxt/kit@3.15.0(magicast@0.3.5)(rollup@4.27.4)': dependencies: '@nuxt/schema': 3.15.0(magicast@0.3.5)(rollup@4.27.4) c12: 2.0.1(magicast@0.3.5) - consola: 3.3.3 + consola: 3.4.0 defu: 6.1.4 destr: 2.0.3 globby: 14.0.2 - ignore: 7.0.0 + ignore: 7.0.3 jiti: 2.4.2 klona: 2.0.6 knitwork: 1.2.0 - mlly: 1.7.3 + mlly: 1.7.4 ohash: 1.1.4 pathe: 1.1.2 - pkg-types: 1.2.1 + pkg-types: 1.3.1 scule: 1.3.0 semver: 7.6.3 ufo: 1.5.4 unctx: 2.4.1 - unimport: 3.14.5(rollup@4.27.4) + unimport: 3.14.6(rollup@4.27.4) untyped: 1.5.2 transitivePeerDependencies: - magicast @@ -4500,40 +4418,20 @@ snapshots: - rollup - supports-color - '@nuxt/schema@3.14.1592(magicast@0.3.5)(rollup@4.27.4)': - dependencies: - c12: 2.0.1(magicast@0.3.5) - compatx: 0.1.8 - consola: 3.3.3 - defu: 6.1.4 - hookable: 5.5.3 - pathe: 1.1.2 - pkg-types: 1.2.1 - scule: 1.3.0 - std-env: 3.8.0 - ufo: 1.5.4 - uncrypto: 0.1.3 - unimport: 3.13.3(rollup@4.27.4) - untyped: 1.5.1 - transitivePeerDependencies: - - magicast - - rollup - - supports-color - '@nuxt/schema@3.15.0(magicast@0.3.5)(rollup@4.27.4)': dependencies: c12: 2.0.1(magicast@0.3.5) compatx: 0.1.8 - consola: 3.3.3 + consola: 3.4.0 defu: 6.1.4 hookable: 5.5.3 pathe: 1.1.2 - pkg-types: 1.2.1 + pkg-types: 1.3.1 scule: 1.3.0 std-env: 3.8.0 ufo: 1.5.4 uncrypto: 0.1.3 - unimport: 3.14.5(rollup@4.27.4) + unimport: 3.14.6(rollup@4.27.4) untyped: 1.5.2 transitivePeerDependencies: - magicast @@ -4542,9 +4440,9 @@ snapshots: '@nuxt/schema@3.15.1': dependencies: - consola: 3.3.3 + consola: 3.4.0 defu: 6.1.4 - pathe: 2.0.1 + pathe: 2.0.2 std-env: 3.8.0 '@nuxt/schema@3.15.4': @@ -4720,10 +4618,10 @@ snapshots: '@parcel/watcher-win32-ia32': 2.5.0 '@parcel/watcher-win32-x64': 2.5.0 - '@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4)': + '@pinia/nuxt@0.10.1(magicast@0.3.5)(pinia@3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4)': dependencies: - '@nuxt/kit': 3.14.1592(magicast@0.3.5)(rollup@4.27.4) - pinia: 2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)) + '@nuxt/kit': 3.15.4(magicast@0.3.5)(rollup@4.27.4) + pinia: 3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)) transitivePeerDependencies: - magicast - rollup @@ -4894,78 +4792,78 @@ snapshots: '@sxzz/popperjs-es@2.11.7': {} - '@tauri-apps/api@2.2.0': {} + '@tauri-apps/api@2.3.0': {} - '@tauri-apps/cli-darwin-arm64@2.2.7': + '@tauri-apps/cli-darwin-arm64@2.3.0': optional: true - '@tauri-apps/cli-darwin-x64@2.2.7': + '@tauri-apps/cli-darwin-x64@2.3.0': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.2.7': + '@tauri-apps/cli-linux-arm-gnueabihf@2.3.0': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.2.7': + '@tauri-apps/cli-linux-arm64-gnu@2.3.0': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.2.7': + '@tauri-apps/cli-linux-arm64-musl@2.3.0': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.2.7': + '@tauri-apps/cli-linux-x64-gnu@2.3.0': optional: true - '@tauri-apps/cli-linux-x64-musl@2.2.7': + '@tauri-apps/cli-linux-x64-musl@2.3.0': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.2.7': + '@tauri-apps/cli-win32-arm64-msvc@2.3.0': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.2.7': + '@tauri-apps/cli-win32-ia32-msvc@2.3.0': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.2.7': + '@tauri-apps/cli-win32-x64-msvc@2.3.0': optional: true - '@tauri-apps/cli@2.2.7': + '@tauri-apps/cli@2.3.0': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.2.7 - '@tauri-apps/cli-darwin-x64': 2.2.7 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.2.7 - '@tauri-apps/cli-linux-arm64-gnu': 2.2.7 - '@tauri-apps/cli-linux-arm64-musl': 2.2.7 - '@tauri-apps/cli-linux-x64-gnu': 2.2.7 - '@tauri-apps/cli-linux-x64-musl': 2.2.7 - '@tauri-apps/cli-win32-arm64-msvc': 2.2.7 - '@tauri-apps/cli-win32-ia32-msvc': 2.2.7 - '@tauri-apps/cli-win32-x64-msvc': 2.2.7 + '@tauri-apps/cli-darwin-arm64': 2.3.0 + '@tauri-apps/cli-darwin-x64': 2.3.0 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.3.0 + '@tauri-apps/cli-linux-arm64-gnu': 2.3.0 + '@tauri-apps/cli-linux-arm64-musl': 2.3.0 + '@tauri-apps/cli-linux-x64-gnu': 2.3.0 + '@tauri-apps/cli-linux-x64-musl': 2.3.0 + '@tauri-apps/cli-win32-arm64-msvc': 2.3.0 + '@tauri-apps/cli-win32-ia32-msvc': 2.3.0 + '@tauri-apps/cli-win32-x64-msvc': 2.3.0 '@tauri-apps/plugin-cli@2.2.0': dependencies: - '@tauri-apps/api': 2.2.0 + '@tauri-apps/api': 2.3.0 - '@tauri-apps/plugin-clipboard-manager@2.2.0': + '@tauri-apps/plugin-clipboard-manager@2.2.1': dependencies: - '@tauri-apps/api': 2.2.0 + '@tauri-apps/api': 2.3.0 '@tauri-apps/plugin-dialog@2.2.0': dependencies: - '@tauri-apps/api': 2.2.0 + '@tauri-apps/api': 2.3.0 '@tauri-apps/plugin-fs@2.2.0': dependencies: - '@tauri-apps/api': 2.2.0 + '@tauri-apps/api': 2.3.0 - '@tauri-apps/plugin-log@2.2.1': + '@tauri-apps/plugin-log@2.2.2': dependencies: - '@tauri-apps/api': 2.2.0 + '@tauri-apps/api': 2.3.0 '@tauri-apps/plugin-shell@2.2.0': dependencies: - '@tauri-apps/api': 2.2.0 + '@tauri-apps/api': 2.3.0 '@tauri-apps/plugin-window-state@2.2.1': dependencies: - '@tauri-apps/api': 2.2.0 + '@tauri-apps/api': 2.3.0 '@trysound/sax@0.2.0': {} @@ -5127,6 +5025,10 @@ snapshots: '@vue/devtools-api@6.6.4': {} + '@vue/devtools-api@7.7.2': + dependencies: + '@vue/devtools-kit': 7.7.2 + '@vue/devtools-core@7.6.8(vite@6.0.11(@types/node@22.9.0)(jiti@2.4.2)(less@4.2.1)(terser@5.36.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.6.3))': dependencies: '@vue/devtools-kit': 7.6.8 @@ -5149,10 +5051,24 @@ snapshots: speakingurl: 14.0.1 superjson: 2.2.1 + '@vue/devtools-kit@7.7.2': + dependencies: + '@vue/devtools-shared': 7.7.2 + birpc: 0.2.19 + hookable: 5.5.3 + mitt: 3.0.1 + perfect-debounce: 1.0.0 + speakingurl: 14.0.1 + superjson: 2.2.1 + '@vue/devtools-shared@7.6.8': dependencies: rfdc: 1.4.1 + '@vue/devtools-shared@7.7.2': + dependencies: + rfdc: 1.4.1 + '@vue/reactivity@3.5.13': dependencies: '@vue/shared': 3.5.13 @@ -5177,11 +5093,11 @@ snapshots: '@vue/shared@3.5.13': {} - '@vueuse/core@12.4.0(typescript@5.6.3)': + '@vueuse/core@12.7.0(typescript@5.6.3)': dependencies: '@types/web-bluetooth': 0.0.20 - '@vueuse/metadata': 12.4.0 - '@vueuse/shared': 12.4.0(typescript@5.6.3) + '@vueuse/metadata': 12.7.0 + '@vueuse/shared': 12.7.0(typescript@5.6.3) vue: 3.5.13(typescript@5.6.3) transitivePeerDependencies: - typescript @@ -5196,11 +5112,11 @@ snapshots: - '@vue/composition-api' - vue - '@vueuse/metadata@12.4.0': {} + '@vueuse/metadata@12.7.0': {} '@vueuse/metadata@9.13.0': {} - '@vueuse/shared@12.4.0(typescript@5.6.3)': + '@vueuse/shared@12.7.0(typescript@5.6.3)': dependencies: vue: 3.5.13(typescript@5.6.3) transitivePeerDependencies: @@ -5452,7 +5368,7 @@ snapshots: citty@0.1.6: dependencies: - consola: 3.3.3 + consola: 3.4.0 clipboardy@4.0.0: dependencies: @@ -5508,8 +5424,6 @@ snapshots: confbox@0.1.8: {} - consola@3.2.3: {} - consola@3.3.3: {} consola@3.4.0: {} @@ -5961,7 +5875,7 @@ snapshots: giget@1.2.3: dependencies: citty: 0.1.6 - consola: 3.3.3 + consola: 3.4.0 defu: 6.1.4 node-fetch-native: 1.6.4 nypm: 0.3.12 @@ -6074,8 +5988,6 @@ snapshots: has-unicode@2.0.1: {} - hash-sum@2.0.0: {} - hasown@2.0.2: dependencies: function-bind: 1.1.2 @@ -6145,8 +6057,6 @@ snapshots: ignore@5.3.2: {} - ignore@6.0.2: {} - ignore@7.0.0: {} ignore@7.0.3: {} @@ -6276,16 +6186,12 @@ snapshots: jiti@1.21.6: {} - jiti@2.4.0: {} - jiti@2.4.2: {} js-levenshtein@1.1.6: {} js-tokens@4.0.0: {} - js-tokens@9.0.0: {} - js-tokens@9.0.1: {} js-yaml@4.1.0: @@ -6312,8 +6218,6 @@ snapshots: klona@2.0.6: {} - knitwork@1.1.0: {} - knitwork@1.2.0: {} koa-compose@4.1.0: {} @@ -6418,8 +6322,8 @@ snapshots: local-pkg@0.5.1: dependencies: - mlly: 1.7.3 - pkg-types: 1.3.0 + mlly: 1.7.4 + pkg-types: 1.3.1 local-pkg@1.0.0: dependencies: @@ -6552,7 +6456,7 @@ snapshots: dependencies: acorn: 8.14.0 pathe: 1.1.2 - pkg-types: 1.3.0 + pkg-types: 1.3.1 ufo: 1.5.4 mlly@1.7.4: @@ -6562,8 +6466,6 @@ snapshots: pkg-types: 1.3.1 ufo: 1.5.4 - mri@1.2.0: {} - mrmime@2.0.0: {} ms@2.0.0: {} @@ -6858,10 +6760,10 @@ snapshots: nypm@0.3.12: dependencies: citty: 0.1.6 - consola: 3.3.3 + consola: 3.4.0 execa: 8.0.1 pathe: 1.1.2 - pkg-types: 1.3.0 + pkg-types: 1.3.1 ufo: 1.5.4 nypm@0.4.1: @@ -7004,42 +6906,33 @@ snapshots: pify@4.0.1: optional: true - pinia-plugin-persistedstate@4.2.0(@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4))(magicast@0.3.5)(pinia@2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4): + pinia-plugin-persistedstate@4.2.0(@pinia/nuxt@0.10.1(magicast@0.3.5)(pinia@3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4))(magicast@0.3.5)(pinia@3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4): dependencies: '@nuxt/kit': 3.15.0(magicast@0.3.5)(rollup@4.27.4) deep-pick-omit: 1.2.1 defu: 6.1.4 destr: 2.0.3 optionalDependencies: - '@pinia/nuxt': 0.9.0(magicast@0.3.5)(pinia@2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4) - pinia: 2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)) + '@pinia/nuxt': 0.10.1(magicast@0.3.5)(pinia@3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.27.4) + pinia: 3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)) transitivePeerDependencies: - magicast - rollup - supports-color - pinia@2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)): + pinia@3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)): dependencies: - '@vue/devtools-api': 6.6.4 + '@vue/devtools-api': 7.7.2 vue: 3.5.13(typescript@5.6.3) - vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3)) optionalDependencies: typescript: 5.6.3 - transitivePeerDependencies: - - '@vue/composition-api' pirates@4.0.6: {} - pkg-types@1.2.1: - dependencies: - confbox: 0.1.8 - mlly: 1.7.3 - pathe: 1.1.2 - pkg-types@1.3.0: dependencies: confbox: 0.1.8 - mlly: 1.7.3 + mlly: 1.7.4 pathe: 1.1.2 pkg-types@1.3.1: @@ -7262,11 +7155,11 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 - prettier-plugin-tailwindcss@0.6.11(prettier@3.4.2): + prettier-plugin-tailwindcss@0.6.11(prettier@3.5.2): dependencies: - prettier: 3.4.2 + prettier: 3.5.2 - prettier@3.4.2: {} + prettier@3.5.2: {} pretty-bytes@6.1.1: {} @@ -7566,10 +7459,6 @@ snapshots: strip-final-newline@3.0.0: {} - strip-literal@2.1.0: - dependencies: - js-tokens: 9.0.0 - strip-literal@2.1.1: dependencies: js-tokens: 9.0.1 @@ -7737,13 +7626,6 @@ snapshots: uncrypto@0.1.3: {} - unctx@2.3.1: - dependencies: - acorn: 8.14.0 - estree-walker: 3.0.3 - magic-string: 0.30.17 - unplugin: 1.16.0 - unctx@2.4.1: dependencies: acorn: 8.14.0 @@ -7770,24 +7652,6 @@ snapshots: unicorn-magic@0.1.0: {} - unimport@3.13.3(rollup@4.27.4): - dependencies: - '@rollup/pluginutils': 5.1.3(rollup@4.27.4) - acorn: 8.14.0 - escape-string-regexp: 5.0.0 - estree-walker: 3.0.3 - fast-glob: 3.3.2 - local-pkg: 0.5.1 - magic-string: 0.30.17 - mlly: 1.7.3 - pathe: 1.1.2 - pkg-types: 1.2.1 - scule: 1.3.0 - strip-literal: 2.1.0 - unplugin: 1.16.0 - transitivePeerDependencies: - - rollup - unimport@3.14.5(rollup@4.27.4): dependencies: '@rollup/pluginutils': 5.1.3(rollup@4.27.4) @@ -7797,10 +7661,10 @@ snapshots: fast-glob: 3.3.2 local-pkg: 0.5.1 magic-string: 0.30.17 - mlly: 1.7.3 + mlly: 1.7.4 pathe: 1.1.2 picomatch: 4.0.2 - pkg-types: 1.2.1 + pkg-types: 1.3.1 scule: 1.3.0 strip-literal: 2.1.1 unplugin: 1.16.0 @@ -7904,18 +7768,6 @@ snapshots: consola: 3.4.0 pathe: 1.1.2 - untyped@1.5.1: - dependencies: - '@babel/core': 7.26.0 - '@babel/standalone': 7.26.2 - '@babel/types': 7.26.0 - defu: 6.1.4 - jiti: 2.4.0 - mri: 1.2.0 - scule: 1.3.0 - transitivePeerDependencies: - - supports-color - untyped@1.5.2: dependencies: '@babel/core': 7.26.0 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 9b96de9..247bdb2 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -175,9 +175,9 @@ dependencies = [ "core-graphics 0.23.2", "image", "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.5.2", + "objc2-app-kit 0.2.2", + "objc2-foundation 0.2.2", "parking_lot", "windows-sys 0.48.0", "x11rb", @@ -442,12 +442,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - [[package]] name = "block-buffer" version = "0.10.4" @@ -463,7 +457,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "objc2", + "objc2 0.5.2", +] + +[[package]] +name = "block2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d59b4c170e16f0405a2e95aff44432a0d41aa97675f3d52623effe95792a037" +dependencies = [ + "objc2 0.6.0", ] [[package]] @@ -592,19 +595,18 @@ dependencies = [ [[package]] name = "bzip2" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +checksum = "75b89e7c29231c673a61a46e722602bcd138298f6b9e81e71119693534585f5c" dependencies = [ "bzip2-sys", - "libc", ] [[package]] name = "bzip2-sys" -version = "0.1.11+1.0.8" +version = "0.1.12+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +checksum = "72ebc2f1a417f01e1da30ef264ee86ae31d2dcd2d603ea283d3c244a883ca2a9" dependencies = [ "cc", "libc", @@ -675,7 +677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fbd1fe9db3ebf71b89060adaf7b0504c2d6a425cf061313099547e382c2e472" dependencies = [ "serde", - "toml 0.8.19", + "toml", ] [[package]] @@ -793,36 +795,6 @@ dependencies = [ "error-code", ] -[[package]] -name = "cocoa" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" -dependencies = [ - "bitflags 2.7.0", - "block", - "cocoa-foundation", - "core-foundation 0.10.0", - "core-graphics 0.24.0", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" -dependencies = [ - "bitflags 2.7.0", - "block", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "libc", - "objc", -] - [[package]] name = "colorchoice" version = "1.0.3" @@ -1155,34 +1127,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - [[package]] name = "dirs" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "dirs-sys 0.5.0", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.4.6", - "windows-sys 0.48.0", + "dirs-sys", ] [[package]] @@ -1193,7 +1144,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users 0.5.0", + "redox_users", "windows-sys 0.59.0", ] @@ -1290,12 +1241,12 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "easytier-game" -version = "1.4.1" +version = "1.4.2" dependencies = [ "hashbrown 0.15.2", "log", "planif", - "rand 0.8.5", + "rand 0.9.0", "reqwest", "serde", "serde_json", @@ -1324,14 +1275,14 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embed-resource" -version = "2.5.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68b6f9f63a0b6a38bc447d4ce84e2b388f3ec95c99c641c8ff0dd3ef89a6379" +checksum = "4762ce03154ba57ebaeee60cc631901ceae4f18219cbb874e464347471594742" dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.8.19", + "toml", "vswhom", "winreg", ] @@ -1801,6 +1752,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", +] + [[package]] name = "gimli" version = "0.31.1" @@ -2185,9 +2148,9 @@ dependencies = [ [[package]] name = "ico" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" dependencies = [ "byteorder", "png", @@ -2375,9 +2338,9 @@ dependencies = [ [[package]] name = "infer" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" +checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" dependencies = [ "cfb", ] @@ -2646,9 +2609,9 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" [[package]] name = "log" -version = "0.4.25" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" dependencies = [ "value-bag", ] @@ -2669,15 +2632,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - [[package]] name = "markup5ever" version = "0.11.0" @@ -2742,21 +2696,22 @@ dependencies = [ [[package]] name = "muda" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdae9c00e61cc0579bcac625e8ad22104c60548a025bfc972dc83868a28e1484" +checksum = "89fed9ce3e5c01700e3a129d3d74619bbf468645b58274b420885107e496ecff" dependencies = [ "crossbeam-channel", "dpi", "gtk", "keyboard-types", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.0", + "objc2-app-kit 0.3.0", + "objc2-core-foundation", + "objc2-foundation 0.3.0", "once_cell", "png", "serde", - "thiserror 1.0.69", + "thiserror 2.0.10", "windows-sys 0.59.0", ] @@ -2898,23 +2853,11 @@ dependencies = [ "libc", ] -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - [[package]] name = "objc-sys" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" -dependencies = [ - "cc", -] [[package]] name = "objc2" @@ -2926,6 +2869,16 @@ dependencies = [ "objc2-encode", ] +[[package]] +name = "objc2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3531f65190d9cff863b77a99857e74c314dd16bf56c538c4b57c7cbc3f3a6e59" +dependencies = [ + "objc2-encode", + "objc2-exception-helper", +] + [[package]] name = "objc2-app-kit" version = "0.2.2" @@ -2933,37 +2886,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ "bitflags 2.7.0", - "block2", + "block2 0.5.1", "libc", - "objc2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", + "objc2 0.5.2", + "objc2-core-data 0.2.2", + "objc2-core-image 0.2.2", + "objc2-foundation 0.2.2", + "objc2-quartz-core 0.2.2", +] + +[[package]] +name = "objc2-app-kit" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5906f93257178e2f7ae069efb89fbd6ee94f0592740b5f8a1512ca498814d0fb" +dependencies = [ + "bitflags 2.7.0", + "block2 0.6.0", + "libc", + "objc2 0.6.0", + "objc2-cloud-kit", + "objc2-core-data 0.3.0", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-image 0.3.0", + "objc2-foundation 0.3.0", + "objc2-quartz-core 0.3.0", ] [[package]] name = "objc2-cloud-kit" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +checksum = "6c1948a9be5f469deadbd6bcb86ad7ff9e47b4f632380139722f7d9840c0d42c" dependencies = [ "bitflags 2.7.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", -] - -[[package]] -name = "objc2-contacts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", + "objc2 0.6.0", + "objc2-foundation 0.3.0", ] [[package]] @@ -2973,9 +2932,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ "bitflags 2.7.0", - "block2", - "objc2", - "objc2-foundation", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-core-data" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f860f8e841f6d32f754836f51e6bc7777cd7e7053cf18528233f6811d3eceb4" +dependencies = [ + "bitflags 2.7.0", + "objc2 0.6.0", + "objc2-foundation 0.3.0", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daeaf60f25471d26948a1c2f840e3f7d86f4109e3af4e8e4b5cd70c39690d925" +dependencies = [ + "bitflags 2.7.0", + "objc2 0.6.0", +] + +[[package]] +name = "objc2-core-graphics" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dca602628b65356b6513290a21a6405b4d4027b8b250f0b98dddbb28b7de02" +dependencies = [ + "bitflags 2.7.0", + "objc2 0.6.0", + "objc2-core-foundation", + "objc2-io-surface", ] [[package]] @@ -2984,29 +2976,36 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" dependencies = [ - "block2", - "objc2", - "objc2-foundation", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", "objc2-metal", ] [[package]] -name = "objc2-core-location" -version = "0.2.2" +name = "objc2-core-image" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +checksum = "6ffa6bea72bf42c78b0b34e89c0bafac877d5f80bf91e159a5d96ea7f693ca56" dependencies = [ - "block2", - "objc2", - "objc2-contacts", - "objc2-foundation", + "objc2 0.6.0", + "objc2-foundation 0.3.0", ] [[package]] name = "objc2-encode" -version = "4.0.3" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "objc2-exception-helper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a" +dependencies = [ + "cc", +] [[package]] name = "objc2-foundation" @@ -3015,22 +3014,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.7.0", - "block2", + "block2 0.5.1", "dispatch", "libc", - "objc2", + "objc2 0.5.2", ] [[package]] -name = "objc2-link-presentation" -version = "0.2.2" +name = "objc2-foundation" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +checksum = "3a21c6c9014b82c39515db5b396f91645182611c97d24637cf56ac01e5f8d998" dependencies = [ - "block2", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "bitflags 2.7.0", + "block2 0.6.0", + "libc", + "objc2 0.6.0", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-io-surface" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161a8b87e32610086e1a7a9e9ec39f84459db7b3a0881c1f16ca5a2605581c19" +dependencies = [ + "bitflags 2.7.0", + "objc2 0.6.0", + "objc2-core-foundation", ] [[package]] @@ -3040,9 +3051,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ "bitflags 2.7.0", - "block2", - "objc2", - "objc2-foundation", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", ] [[package]] @@ -3052,78 +3063,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ "bitflags 2.7.0", - "block2", - "objc2", - "objc2-foundation", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", "objc2-metal", ] [[package]] -name = "objc2-symbols" -version = "0.2.2" +name = "objc2-quartz-core" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +checksum = "6fb3794501bb1bee12f08dcad8c61f2a5875791ad1c6f47faa71a0f033f20071" dependencies = [ - "objc2", - "objc2-foundation", + "bitflags 2.7.0", + "objc2 0.6.0", + "objc2-foundation 0.3.0", ] [[package]] name = "objc2-ui-kit" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +checksum = "777a571be14a42a3990d4ebedaeb8b54cd17377ec21b92e8200ac03797b3bee1" dependencies = [ "bitflags 2.7.0", - "block2", - "objc2", - "objc2-cloud-kit", - "objc2-core-data", - "objc2-core-image", - "objc2-core-location", - "objc2-foundation", - "objc2-link-presentation", - "objc2-quartz-core", - "objc2-symbols", - "objc2-uniform-type-identifiers", - "objc2-user-notifications", -] - -[[package]] -name = "objc2-uniform-type-identifiers" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-user-notifications" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" -dependencies = [ - "bitflags 2.7.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", + "objc2 0.6.0", + "objc2-core-foundation", + "objc2-foundation 0.3.0", ] [[package]] name = "objc2-web-kit" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bc69301064cebefc6c4c90ce9cba69225239e4b8ff99d445a2b5563797da65" +checksum = "b717127e4014b0f9f3e8bba3d3f2acec81f1bde01f656823036e823ed2c94dce" dependencies = [ "bitflags 2.7.0", - "block2", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "block2 0.6.0", + "objc2 0.6.0", + "objc2-app-kit 0.3.0", + "objc2-core-foundation", + "objc2-foundation 0.3.0", ] [[package]] @@ -3523,7 +3503,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -3729,6 +3709,17 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.2", + "zerocopy 0.8.20", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -3749,6 +3740,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.2", +] + [[package]] name = "rand_core" version = "0.5.1" @@ -3767,6 +3768,16 @@ dependencies = [ "getrandom 0.2.15", ] +[[package]] +name = "rand_core" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a509b1a2ffbe92afab0e55c8fd99dea1c280e8171bd2d88682bb20bc41cbc2c" +dependencies = [ + "getrandom 0.3.1", + "zerocopy 0.8.20", +] + [[package]] name = "rand_hc" version = "0.2.0" @@ -3820,17 +3831,6 @@ dependencies = [ "bitflags 2.7.0", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.15", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "redox_users" version = "0.5.0" @@ -3938,15 +3938,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e" dependencies = [ "ashpd", - "block2", + "block2 0.5.1", "glib-sys", "gobject-sys", "gtk-sys", "js-sys", "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.5.2", + "objc2-app-kit 0.2.2", + "objc2-foundation 0.2.2", "raw-window-handle", "wasm-bindgen", "wasm-bindgen-futures", @@ -4468,9 +4468,9 @@ dependencies = [ "foreign-types 0.5.0", "js-sys", "log", - "objc2", - "objc2-foundation", - "objc2-quartz-core", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-quartz-core 0.2.2", "raw-window-handle", "redox_syscall", "wasm-bindgen", @@ -4669,18 +4669,17 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.19", + "toml", "version-compare", ] [[package]] name = "tao" -version = "0.31.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3731d04d4ac210cd5f344087733943b9bfb1a32654387dad4d1c70de21aee2c9" +checksum = "3d8f5e5fe19612f3dd187ac3928d48f5ad23d3edd9821806d05b0c3beb6537bd" dependencies = [ "bitflags 2.7.0", - "cocoa", "core-foundation 0.10.0", "core-graphics 0.24.0", "crossbeam-channel", @@ -4697,7 +4696,9 @@ dependencies = [ "ndk", "ndk-context", "ndk-sys", - "objc", + "objc2 0.6.0", + "objc2-app-kit 0.3.0", + "objc2-foundation 0.3.0", "once_cell", "parking_lot", "raw-window-handle", @@ -4705,8 +4706,8 @@ dependencies = [ "tao-macros", "unicode-segmentation", "url", - "windows 0.58.0", - "windows-core 0.58.0", + "windows 0.60.0", + "windows-core 0.60.1", "windows-version", "x11-dl", ] @@ -4736,13 +4737,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.2.5" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58a998b6be84104ca05c7e9a21f2180ddec020c8b84ea59a8fc8530a2a19588d" +checksum = "0f32eadd4a507f1b61e4fd1f792d0ed4184127a3241ff5bcb1848b9a574a58d6" dependencies = [ "anyhow", "bytes", - "dirs 6.0.0", + "dirs", "dunce", "embed_plist", "futures-util", @@ -4758,9 +4759,9 @@ dependencies = [ "log", "mime", "muda", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.0", + "objc2-app-kit 0.3.0", + "objc2-foundation 0.3.0", "percent-encoding", "plist", "raw-window-handle", @@ -4783,18 +4784,18 @@ dependencies = [ "webkit2gtk", "webview2-com", "window-vibrancy", - "windows 0.58.0", + "windows 0.60.0", ] [[package]] name = "tauri-build" -version = "2.0.5" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e950124f6779c6cf98e3260c7a6c8488a74aa6350dd54c6950fdaa349bca2df" +checksum = "51a2e96f3c0baa0581656bb58e6fdd0f7c9c31eaf6721a0c08689d938fe85f2d" dependencies = [ "anyhow", "cargo_toml", - "dirs 5.0.1", + "dirs", "glob", "heck 0.5.0", "json-patch", @@ -4804,15 +4805,15 @@ dependencies = [ "serde_json", "tauri-utils", "tauri-winres", - "toml 0.8.19", + "toml", "walkdir", ] [[package]] name = "tauri-codegen" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77894f9ddb5cb6c04fcfe8c8869ebe0aded4dabf19917118d48be4a95599ab5" +checksum = "e357ec3daf8faad1029bc7109e7f5b308ceb63b6073d110d7388923a4cce5e55" dependencies = [ "base64 0.22.1", "brotli", @@ -4837,9 +4838,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3240a5caed760a532e8f687be6f05b2c7d11a1d791fb53ccc08cfeb3e5308736" +checksum = "447ee4dd94690d77f1422f2b57e783c654ba75c535ad6f6e727887330804fff2" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -4862,7 +4863,7 @@ dependencies = [ "serde", "serde_json", "tauri-utils", - "toml 0.8.19", + "toml", "walkdir", ] @@ -4932,23 +4933,23 @@ dependencies = [ "tauri-plugin", "tauri-utils", "thiserror 2.0.10", - "toml 0.8.19", + "toml", "url", "uuid", ] [[package]] name = "tauri-plugin-log" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367a28a5e0ca39eac98005699466e8906edc4a2a8f8e13a5f1a71dc0bea6c677" +checksum = "4e106ce75445f592879022757789ccd41c6d2829cd3043f2bf24379b52dc8710" dependencies = [ "android_logger", "byte-unit", "fern", "log", - "objc2", - "objc2-foundation", + "objc2 0.5.2", + "objc2-foundation 0.2.2", "serde", "serde_json", "serde_repr", @@ -4982,9 +4983,9 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c387d4d96690131dc46d1d2827df5c222b896a2bfeb15a16267229a55c50b5" +checksum = "25bbc73eed15bba8ad290a52614f2711280df4bf575b36ce78f64367074b90b7" dependencies = [ "serde", "serde_json", @@ -5012,9 +5013,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2274ef891ccc0a8d318deffa9d70053f947664d12d58b9c0d1ae5e89237e01f7" +checksum = "e758a405ab39e25f4d1235c5f06fe563f44b01ee18bbe38ddec5356d4f581908" dependencies = [ "dpi", "gtk", @@ -5026,22 +5027,22 @@ dependencies = [ "tauri-utils", "thiserror 2.0.10", "url", - "windows 0.58.0", + "windows 0.60.0", ] [[package]] name = "tauri-runtime-wry" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3707b40711d3b9f6519150869e358ffbde7c57567fb9b5a8b51150606939b2a0" +checksum = "5ef46e0c9c30d3524990cb10556f82cde0aa2281e9600e7ed2f499842db8b080" dependencies = [ "gtk", "http", "jni", "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.0", + "objc2-app-kit 0.3.0", + "objc2-foundation 0.3.0", "percent-encoding", "raw-window-handle", "softbuffer", @@ -5051,15 +5052,15 @@ dependencies = [ "url", "webkit2gtk", "webview2-com", - "windows 0.58.0", + "windows 0.60.0", "wry", ] [[package]] name = "tauri-utils" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fb10e7cc97456b2d5b9c03e335b5de5da982039a303a20d10006885e4523a0" +checksum = "107a959dbd5ff53d89a98f6f2e3e987c611334141a43630caae1d80e79446dd6" dependencies = [ "brotli", "cargo_metadata", @@ -5085,7 +5086,7 @@ dependencies = [ "serde_with", "swift-rs", "thiserror 2.0.10", - "toml 0.8.19", + "toml", "url", "urlpattern", "uuid", @@ -5094,12 +5095,12 @@ dependencies = [ [[package]] name = "tauri-winres" -version = "0.1.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +checksum = "56eaa45f707bedf34d19312c26d350bc0f3c59a47e58e8adbeecdc850d2c13a0" dependencies = [ "embed-resource", - "toml 0.7.8", + "toml", ] [[package]] @@ -5292,18 +5293,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - [[package]] name = "toml" version = "0.8.19" @@ -5332,8 +5321,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.7.0", - "serde", - "serde_spanned", "toml_datetime", "winnow 0.5.40", ] @@ -5422,22 +5409,23 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b" +checksum = "d433764348e7084bad2c5ea22c96c71b61b17afe3a11645710f533bd72b6a2b5" dependencies = [ - "core-graphics 0.24.0", "crossbeam-channel", - "dirs 5.0.1", + "dirs", "libappindicator", "muda", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.0", + "objc2-app-kit 0.3.0", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.0", "once_cell", "png", "serde", - "thiserror 1.0.69", + "thiserror 2.0.10", "windows-sys 0.59.0", ] @@ -5668,6 +5656,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasite" version = "0.1.0" @@ -5889,16 +5886,16 @@ dependencies = [ [[package]] name = "webview2-com" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "823e7ebcfaea51e78f72c87fc3b65a1e602c321f407a0b36dbb327d7bb7cd921" +checksum = "b0d606f600e5272b514dbb66539dd068211cc20155be8d3958201b4b5bd79ed3" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.58.0", - "windows-core 0.58.0", - "windows-implement 0.58.0", - "windows-interface 0.58.0", + "windows 0.60.0", + "windows-core 0.60.1", + "windows-implement 0.59.0", + "windows-interface 0.59.0", ] [[package]] @@ -5914,13 +5911,13 @@ dependencies = [ [[package]] name = "webview2-com-sys" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a82bce72db6e5ee83c68b5de1e2cd6ea195b9fbff91cb37df5884cbe3222df4" +checksum = "bfb27fccd3c27f68e9a6af1bcf48c2d82534b8675b83608a4d81446d095a17ac" dependencies = [ - "thiserror 1.0.69", - "windows 0.58.0", - "windows-core 0.58.0", + "thiserror 2.0.10", + "windows 0.60.0", + "windows-core 0.60.1", ] [[package]] @@ -5973,13 +5970,14 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window-vibrancy" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea403deff7b51fff19e261330f71608ff2cdef5721d72b64180bb95be7c4150" +checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" dependencies = [ - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.0", + "objc2-app-kit 0.3.0", + "objc2-core-foundation", + "objc2-foundation 0.3.0", "raw-window-handle", "windows-sys 0.59.0", "windows-version", @@ -6014,6 +6012,28 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529" +dependencies = [ + "windows-collections", + "windows-core 0.60.1", + "windows-future", + "windows-link", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5467f79cc1ba3f52ebb2ed41dbb459b8e7db636cc3429458d9a852e15bc24dec" +dependencies = [ + "windows-core 0.60.1", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -6044,10 +6064,33 @@ dependencies = [ "windows-implement 0.58.0", "windows-interface 0.58.0", "windows-result 0.2.0", - "windows-strings", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.60.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247" +dependencies = [ + "windows-implement 0.59.0", + "windows-interface 0.59.0", + "windows-link", + "windows-result 0.3.1", + "windows-strings 0.3.1", +] + +[[package]] +name = "windows-future" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a787db4595e7eb80239b74ce8babfb1363d8e343ab072f2ffe901400c03349f0" +dependencies = [ + "windows-core 0.60.1", + "windows-link", +] + [[package]] name = "windows-implement" version = "0.57.0" @@ -6070,6 +6113,17 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "windows-implement" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "windows-interface" version = "0.57.0" @@ -6092,6 +6146,33 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "windows-interface" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "windows-link" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" + +[[package]] +name = "windows-numerics" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005dea54e2f6499f2cee279b8f703b3cf3b5734a2d8d21867c8f44003182eeed" +dependencies = [ + "windows-core 0.60.1", + "windows-link", +] + [[package]] name = "windows-registry" version = "0.2.0" @@ -6099,7 +6180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ "windows-result 0.2.0", - "windows-strings", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] @@ -6121,6 +6202,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-strings" version = "0.1.0" @@ -6131,6 +6221,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-strings" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -6446,6 +6545,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.7.0", +] + [[package]] name = "write16" version = "1.0.0" @@ -6460,12 +6568,12 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wry" -version = "0.48.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e644bf458e27b11b0ecafc9e5633d1304fdae82baca1d42185669752fe6ca4f" +checksum = "2a5eabce267929af61619166232d5221aeec2d7af8712bc33cf54a78416ad711" dependencies = [ "base64 0.22.1", - "block2", + "block2 0.6.0", "cookie", "crossbeam-channel", "dpi", @@ -6479,9 +6587,10 @@ dependencies = [ "kuchikiki", "libc", "ndk", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.0", + "objc2-app-kit 0.3.0", + "objc2-core-foundation", + "objc2-foundation 0.3.0", "objc2-ui-kit", "objc2-web-kit", "once_cell", @@ -6495,8 +6604,8 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.58.0", - "windows-core 0.58.0", + "windows 0.60.0", + "windows-core 0.60.1", "windows-version", "x11-dl", ] @@ -6711,7 +6820,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c" +dependencies = [ + "zerocopy-derive 0.8.20", ] [[package]] @@ -6725,6 +6843,17 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "zerocopy-derive" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "zerofrom" version = "0.1.5" @@ -6790,9 +6919,9 @@ dependencies = [ [[package]] name = "zip" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9c1ea7b3a5e1f4b922ff856a129881167511563dc219869afe3787fc0c1a45" +checksum = "b280484c454e74e5fff658bbf7df8fdbe7a07c6b2de4a53def232c15ef138f3a" dependencies = [ "aes", "arbitrary", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index cd12557..8f810ed 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "easytier-game" -version = "1.4.1" +version = "1.4.2" homepage = "https://github.com/EasyTier/EasyTier" repository = "https://github.com/EasyTier/EasytierGame" description = "A simple network initiator based on Easytier" @@ -18,30 +18,29 @@ name = "app_lib" crate-type = ["staticlib", "cdylib", "rlib"] [build-dependencies] -tauri-build = { version = "2.0.5", features = [] } +tauri-build = { version = "2.0.6", features = [] } # prost-build = "0.13.2" [dependencies] serde_json = "1.0.137" serde = { version = "1.0.217", features = ["derive"] } -log = "0.4.25" -tauri = { version = "2.2.5", features = [ "protocol-asset", +log = "0.4.26" +tauri = { version = "2.3.0", features = [ "protocol-asset", "tray-icon", "image-png", - "image-ico", - "devtools" + "image-ico" ] } -tauri-plugin-log = "2.2.1" +tauri-plugin-log = "2.2.2" tauri-plugin-shell = "2.2.0" reqwest = { version = "0.12.12", features = ["json"] } -zip = "2.2.2" +zip = "2.2.3" sysinfo = '0.33.1' planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" } whoami = "1.5.2" tauri-plugin-fs = "2.2.0" tauri-plugin-clipboard-manager = "2.2.1" -rand = "0.8.5" +rand = "0.9.0" tokio = { version = "1.43.0", features = ["process"] } tauri-plugin-dialog = "2.2.0" # prost = "0.13" @@ -51,9 +50,9 @@ hashbrown = "0.15.2" [dependencies.windows] version = "0.58.0" -features = ["Win32_System_TaskScheduler", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"] +features = ["Win32_System_TaskScheduler", "Win32_System_Com", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"] [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies] tauri-plugin-cli = "2.2.0" -tauri-plugin-single-instance = "2.2.1" +tauri-plugin-single-instance = "2.2.2" tauri-plugin-window-state = "2.2.1" diff --git a/src-tauri/easytier/config_template.json b/src-tauri/easytier/config_template.json index 1b84d69..5a97f9a 100644 --- a/src-tauri/easytier/config_template.json +++ b/src-tauri/easytier/config_template.json @@ -4,27 +4,37 @@ "tcp", "udp" ], // 协议类型 - // easytier服务地址 - 可填写多个 方式1，逗号分隔，"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] （默认选中第一个） - "serverUrl": "public.easytier.top:11010", - "networkName": "", // 网络名 - "networkPassword": "", // 网络密码 - "hostname": "configTest", // 主机名 - "ipv4": "10.126.126.1", // IP地址(选填，下面有dhcp) - "disableIpv6": false, // 禁用ipv6 - "disbleListenner": true, // 禁用端口监听 + "serverUrl": "public.easytier.top:11010", + "enableCustomListener": true, + "customListenerData": [ + "tcp://0.0.0.0:11010", + "udp://0.0.0.0:11010", + "tcp://[::]:11010" + ], + "networkName": "", //房间名 + "networkPassword": "", //房间密码 + "hostname": "", //主机名 + "ipv4": "", // 虚拟IP地址 + "disableIpv6": false, // 禁用ipv6 + "enableCustomListenerV6": true, // 启用ipv6监听 + "customListenerV6Data": "udp://[::]:11010", // ipv6监听地址 + "disbleListenner": false, // 禁用监听 "disableEncryption": false, // 禁用加密 + "enablExitNode": false, // 启用出口节点 "noTun": false, // 禁用tun "latencyfirst": false, // 延迟优先 - "disableUdpHolePunching": false, // 禁用udp打洞 - "disbleP2p": false, // 禁用p2p, 强制中转 - "dhcp": false, // 动态分配IP - "devName": false, // 是否启用自定义网卡名 - "devNameValue": "", // 网卡名(启用devName之后才生效) - "enableCustonProtocol": false, // 是否启用自定义协议 - "customProtocol": "tcp", // 自定义协议类型 - "enableNetCardMetric": false, // 自定义easytier每次生成的网卡跃点 - "netCardMetricValue": 1, // 网卡跃点数量(1-9999) - "enableKcpProxy": false, // 启用kcp代理 - "disableKcpInput": false //禁用kcp输入 + "disableUdpHolePunching": false, // 禁用udp打洞 + "disbleP2p": false, // 禁用p2p 强制中转 + "dhcp": true, // 启用dhcp,动态获取IP + "devName": true, // 启用自定义网卡名 + "devNameValue": "etgame", // 自定义网卡名 + "enableCustomProtocol": true, // 自定义p2p时默认协议 + "customProtocol": "tcp", // 自定义p2p时使用的协议类型 + "enableNetCardMetric": true, // 启用自定义网卡跃点 + "netCardMetricValue": 1, // 网卡跃点 + "enablePreventSleep": false, // 启用防止睡眠 + "compression": "none", // 压缩算法 + "enableKcpProxy": true, // 启用kcp代理 + "disableKcpInput": false // 禁用kcp输入 } \ No newline at end of file diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index c287e52..17e1bce 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -92,13 +92,13 @@ fn generate_random_user_agent() -> String { "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:{version}) Gecko/20100101 Firefox/{version}", ]; - let mut rng = rand::thread_rng(); - let template = user_agents[rng.gen_range(0..user_agents.len())]; + let mut rng = rand::rng(); + let template = user_agents[rng.random_range(0..user_agents.len())]; // 生成随机版本号 - let version_major: u8 = rng.gen_range(70..90); - let version_minor: u8 = rng.gen_range(0..10); - let version_patch: u8 = rng.gen_range(0..10); + let version_major: u8 = rng.random_range(70..90); + let version_minor: u8 = rng.random_range(0..10); + let version_patch: u8 = rng.random_range(0..10); let version = format!("{}.{}.{}", version_major, version_minor, version_patch); // 替换模板中的版本号占位符 diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7099adf..e975dae 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.4.1", + "version": "1.4.2", "identifier": "com.tauri.easytier-game", "build": { diff --git a/stores/index.ts b/stores/index.ts index 3ee7d72..086c0d2 100644 --- a/stores/index.ts +++ b/stores/index.ts @@ -15,8 +15,8 @@ const store = defineStore("main", { disableIpv6: false, // 是否禁用IPv6 port: "11010", // 监听端口号 enableCustomListener: true, // 是否自定义监听 - customListenerV6Data: "udp://[::]:11010", //自定义ipv6监听 - enableCustomListenerV6: true, // 是否自定义监听 + enableCustomListenerV6: true, // 是否自定义IPV6监听 + customListenerV6Data: "udp://[::]:11010", //自定义ipv6监 customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址 disbleListenner: false, // 是否禁用监听 disableEncryption: false, // 是否禁用加密 @@ -40,7 +40,7 @@ const store = defineStore("main", { enablePreventSleep: false, //组织系统休眠 compression: "none", //加密算法 enableKcpProxy: true, //启用kcp代理 默认开启 - disableKcpInput: false, //禁用kcp输入 + disableKcpInput: false //禁用kcp输入 }, serverConfig: { enableWhiteList: true, // 是否启用白名单 @@ -51,7 +51,7 @@ const store = defineStore("main", { port: "11010" // 服务器端口 }, cidrEnable: false, - basePeers: ["public.easytier.top:11010","public.easytier.net:11010"], + basePeers: ["public.easytier.top:11010", "public.easytier.net:11010"], theme: false, //主题 false light true dark configStartEnable: false, //使用配置文件启动 configPath: "", //配置文件路径 @@ -67,8 +67,9 @@ const store = defineStore("main", { winipBcPid: 0, winipBcStart: false, + latestTagName: "", - gameList: [] as Array<{name: string, exePath: string, id: string, coverImg?: string; showImg: string}>, // 游戏列表 + gameList: [] as Array<{ name: string; exePath: string; id: string; coverImg?: string; showImg: string }> // 游戏列表 }; }, persist: { @@ -101,7 +102,7 @@ const store = defineStore("main", { "config.enableNetCardMetric", "config.netCardMetricValue", "config.port", - + "config.disbleListenner", "config.enableCustomListener", "config.customListenerData", @@ -136,7 +137,8 @@ const store = defineStore("main", { "delayInjectDll", "forceBindInput", "forceBindFile", - + "latestTagName", + "gameList" ] // // 除了这些，其他都要存下来