Compare commits

...
8 Commits
21 changed files with 1167 additions and 881 deletions
+3 -1
View File
@@ -11,4 +11,6 @@ dist
.vscode .vscode
release release
src-tauri/easytier/logs src-tauri/easytier/logs
src-tauri/easytier/tool/ResourcesExtract.exe
src-tauri/easytier/tool/ResourcesExtract.cfg
+1 -1
View File
@@ -1 +1 @@
20.18.1 20.18.3
+7 -10
View File
@@ -14,23 +14,16 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
const { const {
proxyNetworks, proxyNetworks,
autoStart, autoStart,
relayAllPeerrpc,
connectAfterStart, connectAfterStart,
multiThread,
enablExitNode,
useSmoltcp,
saveErrorLog, saveErrorLog,
logLevel,
serverUrl, serverUrl,
port,
enableCustomListener, enableCustomListener,
enablePreventSleep,
customListenerData, customListenerData,
customListenerV6Data, bindDeviceEnable,
enableCustomListenerV6,
...otherConfig ...otherConfig
} = mainStore.config; } = mainStore.config;
let writeServerUrl: Array<string> | string = serverUrl; let writeServerUrl: Array<string> | string = serverUrl;
let writeCustomListenerData: Array<string> = (customListenerData || "").split("\n");
if (isArray) { if (isArray) {
writeServerUrl = intersection( writeServerUrl = intersection(
uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean), uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean),
@@ -43,7 +36,11 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
mainStore.basePeers mainStore.basePeers
).join(","); ).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) { } catch (err) {
console.error(err); console.error(err);
ElMessage.error(`更新config.json失败`); ElMessage.error(`更新config.json失败`);
+33
View File
@@ -0,0 +1,33 @@
import { basename, extname } from "@tauri-apps/api/path";
import { exists } from "@tauri-apps/plugin-fs";
import { Command } from "@tauri-apps/plugin-shell";
export const getIcon = async function (sourcePath: string, icoDirPath: string) {
if(sourcePath.endsWith(".url")) return false;
let res = await Command.create("ResourcesExtract", [
"/Source",
sourcePath,
"/DestFolder",
icoDirPath,
"/ExtractIcons",
"1",
"/ExtractCursors",
"0",
"/OpenDestFolder",
"0",
"/MultiFilesMode",
"1"
]).execute();
if (res.code == 0) {
let icoPath = icoDirPath + "\\" + (await basename(sourcePath));
icoPath = icoPath.replace(`.${await extname(sourcePath)}`, "_1.ico");
if (await exists(icoPath)) {
return icoPath;
} else {
return false;
}
return;
} else {
return false;
}
};
+37 -38
View File
@@ -8,6 +8,7 @@ import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
import { invoke } from "@tauri-apps/api/core"; import { invoke } from "@tauri-apps/api/core";
// import { ElConfirmPrimary } from "~/utils/element"; // import { ElConfirmPrimary } from "~/utils/element";
import { open } from "@tauri-apps/plugin-shell"; import { open } from "@tauri-apps/plugin-shell";
import { computed } from "vue";
const DEFAULT_TRAY_NAME = "main"; const DEFAULT_TRAY_NAME = "main";
@@ -30,13 +31,10 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
tooltip: `EasyTierGame\n${pkg.version}`, tooltip: `EasyTierGame\n${pkg.version}`,
title: `EasyTierGame\n${pkg.version}`, title: `EasyTierGame\n${pkg.version}`,
id: DEFAULT_TRAY_NAME, id: DEFAULT_TRAY_NAME,
menu: await Menu.new({ menu: await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }),
id: "main", action: async e => {
items: await generateMenuItem(beforExit, handleConnection),
}),
action: async (e) => {
toggleVisibility(); toggleVisibility();
}, }
}); });
} }
} catch (error) { } catch (error) {
@@ -47,18 +45,13 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
if (init) { if (init) {
tray.setTooltip(`EasyTierGame\n${pkg.version}`); tray.setTooltip(`EasyTierGame\n${pkg.version}`);
tray.setShowMenuOnLeftClick(false); tray.setShowMenuOnLeftClick(false);
tray.setMenu( tray.setMenu(await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }));
await Menu.new({
id: "main",
items: await generateMenuItem(beforExit, handleConnection),
})
);
} }
return tray; return tray;
} }
export async function generateMenuItem(beforExit: Function, handleConnection:Function) { export async function generateMenuItem(beforExit: Function, handleConnection: Function) {
return [ return [
await MenuItemShow("显示 / 隐藏"), await MenuItemShow("显示 / 隐藏"),
await MenuItemExchangeConnection("联机 / 断开", handleConnection), await MenuItemExchangeConnection("联机 / 断开", handleConnection),
@@ -66,7 +59,7 @@ export async function generateMenuItem(beforExit: Function, handleConnection:Fun
await PredefinedMenuItem.new({ item: "Separator" }), await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemPublicPeers(), await MenuItemPublicPeers(),
await PredefinedMenuItem.new({ item: "Separator" }), await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemExit("退出", beforExit), await MenuItemExit("退出", beforExit)
]; ];
} }
@@ -79,18 +72,17 @@ export async function MenuItemExit(text: string, beforExit: Function) {
await beforExit(); await beforExit();
} }
await getCurrentWindow().close(); await getCurrentWindow().close();
}, }
}); });
} }
export async function MenuItemPublicPeers() { export async function MenuItemPublicPeers() {
return await MenuItem.new({ return await MenuItem.new({
id: "publicPeers", id: "publicPeers",
text: "公共节点", text: "公共节点",
action: async () => { action: async () => {
await open(import.meta.env.VITE_PUBLIC_PEERS_URL) await open(import.meta.env.VITE_PUBLIC_PEERS_URL);
}, }
}); });
} }
@@ -100,17 +92,17 @@ export async function MenuItemShow(text: string) {
text, text,
action: async () => { action: async () => {
await toggleVisibility(); await toggleVisibility();
}, }
}); });
} }
export async function MenuItemExchangeConnection(text: string, handleConnection:Function) { export async function MenuItemExchangeConnection(text: string, handleConnection: Function) {
const menutItem = await MenuItem.new({ const menutItem = await MenuItem.new({
id: "exchangeConnection", id: "exchangeConnection",
text, text,
action: async () => { action: async () => {
const isStart = await handleConnection(); const isStart = await handleConnection();
}, }
}); });
return menutItem; return menutItem;
} }
@@ -121,12 +113,10 @@ export async function MenuItemTheme() {
text: "主题切换", text: "主题切换",
action: async () => { action: async () => {
const mainStore = useMainStore(); const mainStore = useMainStore();
mainStore.$patch({ mainStore.$patch({ theme: !mainStore.theme });
theme: !mainStore.theme
});
// mainStore.$persist(); // mainStore.$persist();
await setTheme(mainStore.theme); await setTheme(mainStore.theme);
}, }
}); });
} }
@@ -159,18 +149,27 @@ export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | n
} }
} }
const versionWeight = (version: string) => {
version = version ? version.trim() : "";
const [major = "0", minor = "0", patch = "0"] = version.split(".");
return parseInt(major) * 10000 + parseInt(minor) * 100 + parseInt(patch);
};
const versionDifference = (current: string, latest: string) => {
const currentVersion = versionWeight(current);
const latestVersion = versionWeight(latest);
return currentVersion - latestVersion;
};
export const checkNewVersion = async () => { export const checkNewVersion = async () => {
const mainStore = useMainStore();
// if(mainStore.latestTagName && mainStore.latestTagName == pkg.version) return;
if (hasNewVersion.value) return;
let [tagName, downloadUrl] = await invoke<string[]>("fetch_game_releases"); let [tagName, downloadUrl] = await invoke<string[]>("fetch_game_releases");
if(tagName && pkg.version !== tagName) { mainStore.latestTagName = tagName;
return true; //有新版 };
// const [err] = await ElConfirmPrimary("有新版本是否下载?", "发现新版本", {
// confirmButtonText: "下载", export const hasNewVersion = computed<boolean>(() => {
// cancelButtonText: "取消", const mainStore = useMainStore();
// }) return !!mainStore.latestTagName && versionDifference(pkg.version, mainStore.latestTagName) < 0 ;
// if(!err) { });
// open(downloadUrl);
// }
}
return false; //没有新版
}
+93 -93
View File
@@ -3,107 +3,107 @@ import path from "path";
import vueJSX from "@vitejs/plugin-vue-jsx"; import vueJSX from "@vitejs/plugin-vue-jsx";
export default defineNuxtConfig({ export default defineNuxtConfig({
ssr: false, ssr: false,
devServer: { devServer: {
port: 5000 port: 5000
}, },
telemetry: false,
imports: { telemetry: false,
autoImport: false
},
css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"], imports: {
modules: [ autoImport: false
"@element-plus/nuxt", },
"@pinia/nuxt",
[
"pinia-plugin-persistedstate/nuxt",
{
key: "__glj_persisted_%id",
storage: "localStorage"
}
],
"@nuxtjs/tailwindcss"
],
alias: { css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
"@": path.resolve(__dirname, "./") modules: [
}, "@element-plus/nuxt",
"@pinia/nuxt",
[
"pinia-plugin-persistedstate/nuxt",
{
key: "__glj_persisted_%id",
storage: "localStorage"
}
],
"@nuxtjs/tailwindcss"
],
experimental: { alias: {
payloadExtraction: false "@": path.resolve(__dirname, "./")
}, },
devtools: { experimental: {
enabled: false payloadExtraction: false
}, },
router: { devtools: {
options: { enabled: false
hashMode: true },
}
},
vite: { router: {
plugins: [vueJSX({})], options: {
envDir: "env", hashMode: true
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"]
}
},
postcss: { vite: {
plugins: { plugins: [vueJSX({})],
tailwindcss: {}, envDir: "env",
autoprefixer: {} 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: { postcss: {
rootId: "__easytier", plugins: {
cdnURL: "./", tailwindcss: {},
buildAssetsDir: "__easytier/", autoprefixer: {}
head: { }
meta: [ },
{
name: "viewport", app: {
content: "width=device-width, initial-scale=1" rootId: "__easytier",
}, cdnURL: "./",
{ buildAssetsDir: "__easytier/",
charset: "utf-8" head: {
} meta: [
], {
title: "easytier-game" name: "viewport",
// link: [], content: "width=device-width, initial-scale=1"
// style: [], },
// script: [], {
// noscript: [] charset: "utf-8"
} }
}, ],
compatibilityDate: "2024-11-12" title: "easytier-game"
// link: [],
// style: [],
// script: [],
// noscript: []
}
},
compatibilityDate: "2024-11-12"
}); });
+9 -9
View File
@@ -3,7 +3,7 @@
"private": true, "private": true,
"author": "leizi97", "author": "leizi97",
"description": "A simple network initiator based on Easytier", "description": "A simple network initiator based on Easytier",
"version": "1.4.0", "version": "1.4.3",
"scripts": { "scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod", "build": "nuxt generate --dotenv env/.env.prod",
@@ -14,28 +14,28 @@
"@element-plus/icons-vue": "^2.3.1", "@element-plus/icons-vue": "^2.3.1",
"@element-plus/nuxt": "^1.1.1", "@element-plus/nuxt": "^1.1.1",
"@nuxtjs/tailwindcss": "6.13.1", "@nuxtjs/tailwindcss": "6.13.1",
"@pinia/nuxt": "0.9.0", "@pinia/nuxt": "0.10.1",
"@tauri-apps/api": "^2.2.0", "@tauri-apps/api": "2.3.0",
"@tauri-apps/cli": "2.2.7", "@tauri-apps/cli": "2.3.0",
"@tauri-apps/plugin-cli": "^2.2.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-dialog": "2.2.0",
"@tauri-apps/plugin-fs": "^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-shell": "^2.2.0",
"@tauri-apps/plugin-window-state": "2.2.1", "@tauri-apps/plugin-window-state": "2.2.1",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@vitejs/plugin-vue-jsx": "^4.1.1", "@vitejs/plugin-vue-jsx": "^4.1.1",
"@vueuse/core": "12.4.0", "@vueuse/core": "12.7.0",
"archiver": "^7.0.1", "archiver": "^7.0.1",
"element-plus": "2.9.4", "element-plus": "2.9.4",
"less": "4.2.1", "less": "4.2.1",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"nuxt": "3.15.4", "nuxt": "3.15.4",
"pinia": "2.3.1", "pinia": "3.0.1",
"pinia-plugin-persistedstate": "^4.2.0", "pinia-plugin-persistedstate": "^4.2.0",
"postcss": "^8.4.38", "postcss": "^8.4.38",
"prettier": "3.4.2", "prettier": "3.5.2",
"prettier-plugin-tailwindcss": "0.6.11" "prettier-plugin-tailwindcss": "0.6.11"
} }
} }
+41 -3
View File
@@ -127,7 +127,8 @@
<div class="flex items-center gap-[10px]"> <div class="flex items-center gap-[10px]">
<ElCheckbox <ElCheckbox
:disabled="mainStore.config.disbleListenner" :disabled="mainStore.config.disbleListenner"
v-model="mainStore.config.enableCustomListenerV6" :model-value="mainStore.config.enableCustomListenerV6"
@change="handleCustomListenerV6Change"
> >
自定义IPV6监听地址 自定义IPV6监听地址
</ElCheckbox> </ElCheckbox>
@@ -140,7 +141,7 @@
placeholder="请输入自定义IPV6监听地址" placeholder="请输入自定义IPV6监听地址"
/> />
</div> </div>
<ElTooltip content="例如:tcp://[::]:11010,如果未设置,将在随机UDP端口上监听"> <ElTooltip content="例如:tcp://[::]:11010,如果未设置,将在随机UDP端口上监听(内核版本2.2.3之后,ipv6监听被移除并合并到'自定义监听')">
<ElIcon><QuestionFilled /></ElIcon> <ElIcon><QuestionFilled /></ElIcon>
</ElTooltip> </ElTooltip>
<CoreVersionWarning version="2.1.0" /> <CoreVersionWarning version="2.1.0" />
@@ -180,6 +181,29 @@
(不使用自定义网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡也可以使用 设置跃点 功能除非你启用了下面的功能) (不使用自定义网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡也可以使用 设置跃点 功能除非你启用了下面的功能)
</ElText> </ElText>
</div> </div>
<div class="flex items-center gap-[5px]">
<div><ElCheckbox v-model="mainStore.config.bindDeviceEnable">绑定设备</ElCheckbox></div>
<!-- <div class="flex items-center gap-[5px]"> -->
<!-- <ElSelect
placeholder="选择设备"
v-model="mainStore.config.bindDevice"
filterable
no-data-text="暂无网卡设备数据请刷新"
>
<ElOption
v-for="guid in guids"
:key="guid[0]"
:label="guid[1]"
:value="guid[0]"
></ElOption>
</ElSelect> -->
<!-- <ElButton @click="getGuids">刷新</ElButton> -->
<ElTooltip content="将连接器的套接字绑定到物理设备以避免路由问题。比如子网代理网段与某节点的网段冲突,绑定物理设备后可以与该节点正常通信">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<!-- </div> -->
<CoreVersionWarning version="2.2.3" />
</div>
<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备(网卡)可以使用子网代理访问节点</ElCheckbox></div> <div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备(网卡)可以使用子网代理访问节点</ElCheckbox></div>
<ElDivider /> <ElDivider />
@@ -269,6 +293,20 @@
listenerDialogData.visible = false; listenerDialogData.visible = false;
}; };
const handleCustomListenerV6Change = async (value: boolean) => {
if (value) {
const [error, _] = await ElConfirmDanger("内核版本2.2.3之后,ipv6监听被移除并合并到'自定义监听',请谨慎使用", "警告", {
confirmButtonText: "继续使用",
cancelButtonText: "取消"
});
if (!error) {
mainStore.config.enableCustomListenerV6 = value;
}
} else {
mainStore.config.enableCustomListenerV6 = value;
}
};
const mainStore = useMainStore(); const mainStore = useMainStore();
const data = ["trace", "debug", "info", "warn", "error", "off"]; const data = ["trace", "debug", "info", "warn", "error", "off"];
const guids = ref<string[][]>([]); const guids = ref<string[][]>([]);
@@ -297,7 +335,7 @@
}; };
// 为bind_device功能增加改方法 // 为bind_device功能增加改方法
const _getGuids = async () => { const getGuids = async () => {
const guidsValue = await invoke<string[][]>("get_network_adapter_guids"); const guidsValue = await invoke<string[][]>("get_network_adapter_guids");
guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : []; guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : [];
}; };
+13 -9
View File
@@ -1,12 +1,18 @@
<template> <template>
<div class="flex h-full flex-col gap-[10px]"> <div class="flex h-full flex-col gap-[10px]">
<ElRadioGroup <div class="flex items-center gap-[10px]">
:disabled="!data.isSwitchEnable" <ElRadioGroup
v-model="mainStore.cidrEnable" :disabled="!data.isSwitchEnable"
> v-model="mainStore.cidrEnable"
<ElRadioButton :value="true">开启</ElRadioButton> >
<ElRadioButton :value="false">关闭</ElRadioButton> <ElRadioButton :value="true">开启</ElRadioButton>
</ElRadioGroup> <ElRadioButton :value="false">关闭</ElRadioButton>
</ElRadioGroup>
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.proxyForwardBySystem">通过系统内核转发子网代理数据包禁用内置NAT</ElCheckbox>
<CoreVersionWarning version="2.2.3" />
</div>
</div>
<div class="flex-1 overflow-auto"> <div class="flex-1 overflow-auto">
<ElInput <ElInput
placeholder="例如: 192.168.1.0/24 一行一个" placeholder="例如: 192.168.1.0/24 一行一个"
@@ -113,6 +119,4 @@
onBeforeUnmount(() => { onBeforeUnmount(() => {
unlistenStart && unlistenStart(); unlistenStart && unlistenStart();
}); });
</script> </script>
+165 -29
View File
@@ -16,14 +16,14 @@
class="mr-[5px]" class="mr-[5px]"
@click="handleCreate" @click="handleCreate"
> >
新增本地游戏 新增游戏
</ElButton> </ElButton>
<ElButton <ElButton
size="small" size="small"
class="mr-[5px]" class="!ml-[0px] mr-[5px]"
@click="openCoverDir" @click="openCoverDir"
> >
打开封面目录 封面目录
</ElButton> </ElButton>
</div> </div>
</div> </div>
@@ -37,7 +37,7 @@
<ElCard> <ElCard>
<template #header> <template #header>
<div class="flex flex-nowrap gap-[0_8px]"> <div class="flex flex-nowrap gap-[0_8px]">
<ElTooltip :content="item.name"> <ElTooltip :content="item.name" placement="top">
<p class="ml-auto flex-1 truncate"> <p class="ml-auto flex-1 truncate">
<ElText <ElText
size="default" size="default"
@@ -56,7 +56,7 @@
/> />
</ElCard> </ElCard>
<div <div
class="absolute left-0 top-0 z-[1] hidden h-full w-full flex-col items-center justify-center rounded-[5px] bg-[var(--el-mask-color)] group-hover/card:flex" class="absolute left-0 top-[61px] z-[1] hidden h-[calc(100%-61px)] w-full flex-col items-center justify-center rounded-[5px] bg-[var(--el-mask-color)] group-hover/card:flex"
> >
<ElButton <ElButton
size="large" size="large"
@@ -92,10 +92,13 @@
@click.stop="handleCreate" @click.stop="handleCreate"
shadow="hover" shadow="hover"
> >
<div class="group/plus flex cursor-pointer items-center justify-center py-[25px]"> <div class="group/plus flex cursor-pointer flex-col items-center justify-center py-[25px]">
<ElIcon class="!text-[80px] transition-all group-hover/plus:text-[color:var(--el-color-primary)]"> <ElIcon class="!text-[80px] transition-all group-hover/plus:text-[color:var(--el-color-primary)]">
<Plus></Plus> <Plus></Plus>
</ElIcon> </ElIcon>
<div>
<ElText>支持从桌面拖放新增</ElText>
</div>
</div> </div>
</ElCard> </ElCard>
</ElTooltip> </ElTooltip>
@@ -148,7 +151,7 @@
</ElFormItem> </ElFormItem>
<ElFormItem <ElFormItem
label="游戏封面" label="游戏封面"
prop="coverImg" prop="showImg"
> >
<ElBadge :hidden="createGameData.form.showImg == defaultPng"> <ElBadge :hidden="createGameData.form.showImg == defaultPng">
<template #content="{ value }"> <template #content="{ value }">
@@ -162,7 +165,7 @@
</div> </div>
</template> </template>
<img <img
@click.stop="handleBrowser('coverImg')" @click.stop="handleBrowser('showImg')"
:src="showImgConvertFileSrc(createGameData.form.showImg)" :src="showImgConvertFileSrc(createGameData.form.showImg)"
class="aspect-[1] w-[120px] cursor-pointer object-cover" class="aspect-[1] w-[120px] cursor-pointer object-cover"
/> />
@@ -191,9 +194,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import { VideoPlay, DeleteFilled, EditPen, Plus, Delete } from "@element-plus/icons-vue"; import { VideoPlay, DeleteFilled, EditPen, Plus, Delete } from "@element-plus/icons-vue";
import { dataSubscribe } from "~/composables/windows"; import { dataSubscribe } from "~/composables/windows";
import { BaseDirectory, resourceDir as getResourceDir, join } from "@tauri-apps/api/path"; import { BaseDirectory, basename, extname, resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
import { convertFileSrc } from "@tauri-apps/api/core"; import { convertFileSrc, Resource } from "@tauri-apps/api/core";
import { computed, nextTick, reactive, ref, useTemplateRef } from "vue"; import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, useTemplateRef } from "vue";
import useMainStore from "@/stores/index"; import useMainStore from "@/stores/index";
import { uniqueId } from "lodash-es"; import { uniqueId } from "lodash-es";
import { open as dialogOpen } from "@tauri-apps/plugin-dialog"; import { open as dialogOpen } from "@tauri-apps/plugin-dialog";
@@ -202,6 +205,8 @@
import { ElConfirmDanger } from "~/utils/element"; import { ElConfirmDanger } from "~/utils/element";
import { copyFile, exists, mkdir, readDir, remove } from "@tauri-apps/plugin-fs"; import { copyFile, exists, mkdir, readDir, remove } from "@tauri-apps/plugin-fs";
import { Command, open } from "@tauri-apps/plugin-shell"; import { Command, open } from "@tauri-apps/plugin-shell";
import { listen, type UnlistenFn } from "@tauri-apps/api/event";
const resourceDir = await getResourceDir(); const resourceDir = await getResourceDir();
const gameListResourceDir = await join(resourceDir, import.meta.env.VITE_GAME_LIST_PATH); const gameListResourceDir = await join(resourceDir, import.meta.env.VITE_GAME_LIST_PATH);
// const defaultLocalIconPath = await join(configPath, "icon.png"); // const defaultLocalIconPath = await join(configPath, "icon.png");
@@ -211,7 +216,7 @@
const searchValue = ref(""); const searchValue = ref("");
const defaultPng = "/default.png"; const defaultPng = "/default.png";
// const b = bounce(600); // const b = bounce(600);
type gameItemType = { name: string; exePath: string; coverImg: string; id: string; showImg: string }; type gameItemType = { name: string; exePath: string; id: string; showImg: string };
const createGameData = reactive({ const createGameData = reactive({
visible: false, visible: false,
isEdit: false, isEdit: false,
@@ -219,7 +224,6 @@
id: "", id: "",
name: "", name: "",
exePath: "", exePath: "",
coverImg: "",
showImg: defaultPng showImg: defaultPng
}, },
rules: { rules: {
@@ -241,29 +245,27 @@
id: "", id: "",
name: "", name: "",
exePath: "", exePath: "",
coverImg: "",
showImg: defaultPng showImg: defaultPng
}; };
await nextTick(); await nextTick();
createGameData.visible = true; createGameData.visible = true;
}; };
const handleBrowser = async (type: "coverImg" | "exePath") => { const handleBrowser = async (type: "showImg" | "exePath") => {
const filters = type === "coverImg" ? [{ name: "", extensions: ["png", "jpg", "jpeg"] }] : [{ name: "", extensions: ["exe"] }]; const filters = type === "showImg" ? [{ name: "", extensions: ["png", "jpg", "jpeg"] }] : [{ name: "", extensions: ["exe"] }];
const file = await dialogOpen({ const file = await dialogOpen({
multiple: false, multiple: false,
directory: false, directory: false,
filters filters
}); });
if (file) { if (file) {
if (type === "coverImg") { if (type === "showImg") {
createGameData.form.coverImg = file; if (file) {
if (createGameData.form.coverImg) {
if (!createGameData.form.id) { if (!createGameData.form.id) {
const time = new Date().getTime(); const time = new Date().getTime();
createGameData.form.id = uniqueId(`${time}`); createGameData.form.id = uniqueId(`${time}`);
} }
let coverImg = createGameData.form.coverImg; let showImg = file;
const game_list_path = import.meta.env.VITE_GAME_LIST_PATH; const game_list_path = import.meta.env.VITE_GAME_LIST_PATH;
const isExists = await exists(game_list_path, { baseDir: BaseDirectory.Resource }); const isExists = await exists(game_list_path, { baseDir: BaseDirectory.Resource });
if (!isExists) { if (!isExists) {
@@ -272,14 +274,16 @@
} catch (err) {} } catch (err) {}
} }
const toPath = await join(gameListResourceDir, createGameData.form.id); const toPath = await join(gameListResourceDir, createGameData.form.id);
const suffix = coverImg.split(".").pop(); const suffix = showImg.split(".").pop();
const toPathFileName = `${toPath}.${suffix}`; const toPathFileName = `${toPath}.${suffix}`;
if (coverImg != toPathFileName) { if (showImg != toPathFileName) {
await copyFile(coverImg, toPathFileName); await copyFile(showImg, toPathFileName);
} }
// console.log(toPathFileName);
const isExistsToPath = await exists(toPathFileName); const isExistsToPath = await exists(toPathFileName);
if (isExistsToPath) { if (isExistsToPath) {
createGameData.form = { ...createGameData.form, showImg: `${toPathFileName}` }; // 如果复制正确,那就存储文件名即可 const baseName = await basename(toPathFileName);
createGameData.form = { ...createGameData.form, showImg: `${baseName}` }; // 如果复制正确,那就存储文件名即可
} }
} }
} }
@@ -308,7 +312,6 @@
if (createGameData.form.showImg == defaultPng) { if (createGameData.form.showImg == defaultPng) {
//删除本地封面图 //删除本地封面图
// const toPath = await join(gameListResourceDir, createGameData.form.id); // const toPath = await join(gameListResourceDir, createGameData.form.id);
// const suffix = coverImg.split(".").pop();
// const imgPath = `${toPath}.${suffix}`; // const imgPath = `${toPath}.${suffix}`;
// await remove(imgPath); // await remove(imgPath);
} }
@@ -333,23 +336,27 @@
const handleBadgeDeleteCover = async () => { const handleBadgeDeleteCover = async () => {
await removeFileById(createGameData.form.id); await removeFileById(createGameData.form.id);
createGameData.form = { ...createGameData.form, coverImg: "", showImg: defaultPng }; createGameData.form = { ...createGameData.form, showImg: defaultPng };
}; };
const removeFileById = async (id: string) => { const removeFileById = async (id: string) => {
if (!id) return; if (!id) return;
const isExists = await exists(gameListResourceDir);
if (!isExists) return;
const entries = await readDir(gameListResourceDir); const entries = await readDir(gameListResourceDir);
if (entries.length > 0) { if (entries.length > 0) {
for (const entry of entries) { for (const entry of entries) {
if (entry.name.includes(id + ".")) { if (entry.name.includes(id + ".")) {
const imgPath = await join(gameListResourceDir, entry.name); const imgPath = await join(gameListResourceDir, entry.name);
const isExists = await exists(imgPath);
if (!isExists) continue;
await remove(imgPath); await remove(imgPath);
} }
} }
} }
}; };
const handleDeleteItem = async ({ coverImg, id }: gameItemType) => { const handleDeleteItem = async ({ id }: gameItemType) => {
if (id) { if (id) {
const [error, _] = await ElConfirmDanger("确定要删除吗?"); const [error, _] = await ElConfirmDanger("确定要删除吗?");
if (!error) { if (!error) {
@@ -383,7 +390,6 @@
const handleImgError = (item: gameItemType, idx: number) => { const handleImgError = (item: gameItemType, idx: number) => {
item.showImg = defaultPng; item.showImg = defaultPng;
item.coverImg = "";
mainStore.gameList[idx] = { ...item }; mainStore.gameList[idx] = { ...item };
mainStore.$patch({ mainStore.$patch({
gameList: [...mainStore.gameList] gameList: [...mainStore.gameList]
@@ -391,7 +397,137 @@
}; };
const showImgConvertFileSrc = (showImg: string) => { const showImgConvertFileSrc = (showImg: string) => {
return showImg != defaultPng ? `${convertFileSrc(showImg)}?${new Date().getTime()}` : defaultPng; if (showImg == defaultPng) return defaultPng;
showImg = /^[a-z]\:/g.test(showImg.toLowerCase())
? `${convertFileSrc(showImg)}?${new Date().getTime()}`
: `${convertFileSrc(`${gameListResourceDir}\\${showImg}`)}?${new Date().getTime()}`;
return showImg;
}; };
let unlistenDragDrop: UnlistenFn | null = null;
const listenDragDrop = async () => {
unlistenDragDrop = await listen<{ paths: string[]; position: { x: number; y: number } }>("tauri://drag-drop", async e => {
const AllFiles = e.payload.paths;
let result: Array<gameItemType> = [];
const date = new Date().getTime();
const showImg = defaultPng;
const extUrls = [];
const lnkFiles = [];
for (const item of AllFiles) {
if (item.endsWith(".url")) {
extUrls.push(item);
} else {
lnkFiles.push(item);
}
}
if (lnkFiles.length > 0) {
// console.log(lnkFiles)
let lnkFilesstr = "$lnkFiles = @(";
for (let i = 0; i < lnkFiles.length; i++) {
lnkFilesstr = lnkFilesstr + `\"${lnkFiles[i]}\"`;
if (i == lnkFiles.length - 1) {
lnkFilesstr = lnkFilesstr + ");";
} else {
lnkFilesstr = lnkFilesstr + ",";
}
}
let forstr =
lnkFilesstr +
`
$shell = New-Object -ComObject WScript.Shell;
$results = @();
foreach ($lnkFile in $lnkFiles) {
$shortcut = $shell.CreateShortcut($lnkFile);
$targetPath = $shortcut.TargetPath;
$iconLocation = $shortcut.IconLocation;
$results += [PSCustomObject]@{
TargetPath = $targetPath
LinkFile = $lnkFile
};
};
$results | ConvertTo-Json
`;
let outputtarget = await Command.create("powershell", [`${forstr}`], {
encoding: "GBK"
}).execute();
let res: {
TargetPath: string;
LinkFile: string;
}[] = JSON.parse(outputtarget.stdout);
if (res && !Array.isArray(res)) {
res = [res];
}
if (res.length > 0) {
for (const idx in res) {
const item = res[idx];
// console.log(item);
const id = `${date}-${idx}`;
const exePath = item.TargetPath || item.LinkFile;
const namePath = item.LinkFile || item.TargetPath;
const allName = await basename(namePath);
const extName = await extname(namePath);
result.push({
exePath: exePath,
name: allName.replace(`.${extName}`, ""),
id,
showImg
});
}
}
}
if (extUrls.length > 0) {
for (const idx in extUrls) {
const TargetPath = extUrls[idx];
const id = `${date}-${idx}-url`;
const allName = await basename(TargetPath);
const extName = await extname(TargetPath);
result.push({
exePath: TargetPath,
name: allName.replace(`.${extName}`, ""),
id,
showImg
});
}
}
if (result.length > 0) {
mainStore.$patch({
gameList: [...mainStore.gameList, ...result]
});
}
});
};
// 兼容新的存储方式
const compatibleGameList = async () => {
const gameList = [...mainStore.gameList];
if(gameList.length <= 0) return;
const newGameList = [];
for(const item of gameList) {
const newItem = {...item}
if(newItem.showImg != defaultPng && /^[a-z]\:/g.test(newItem.showImg.toLowerCase())) {
newItem.showImg = await basename(item.showImg);
if(Reflect.has(newItem, "coverImg")) {
delete newItem['coverImg'];
}
}
newGameList.push(newItem);
}
mainStore.$patch({
gameList: newGameList
})
}
onMounted(async () => {
await compatibleGameList();
listenDragDrop(); //监听拖放
});
onBeforeUnmount(() =>{
unlistenDragDrop && unlistenDragDrop();
})
dataSubscribe(); dataSubscribe();
</script> </script>
+72 -11
View File
@@ -407,7 +407,7 @@
<ElBadge <ElBadge
badge-class="!text-[9px] cursor-pointer" badge-class="!text-[9px] cursor-pointer"
:hidden="!data.hasNewVersion" :hidden="!hasNewVersion"
:offset="[6, 7]" :offset="[6, 7]"
value="N" value="N"
> >
@@ -437,8 +437,11 @@
> >
<div> <div>
<ElText>当前版本: {{ data.coreVersion || "-" }}</ElText> <ElText>当前版本: {{ data.coreVersion || "-" }}</ElText>
<div v-if="data.update">
<ElProgress :percentage="progress"></ElProgress>
</div>
</div> </div>
<div class="mt-[10px] pb-[5px]"> <div class="mt-[5px] pb-[5px]">
<ElText class="!mr-[10px]">选择一个内核版本安装</ElText> <ElText class="!mr-[10px]">选择一个内核版本安装</ElText>
<ElButton <ElButton
:loading="coreManagementData.loading" :loading="coreManagementData.loading"
@@ -481,7 +484,13 @@
<ElInput <ElInput
v-model="mainStore.githubFastUrl" v-model="mainStore.githubFastUrl"
placeholder="请输入github加速地址" placeholder="请输入github加速地址"
></ElInput> >
<template #append>
<ElTooltip content="github加速链接的发布地址,当前地址失效后,访问它获取最新的地址">
<ElButton @click="open('https://ghproxy.link/')">发布地址</ElButton>
</ElTooltip>
</template>
</ElInput>
<template #footer> <template #footer>
<div class="text-right"> <div class="text-right">
<ElButton <ElButton
@@ -682,7 +691,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { invoke } from "@tauri-apps/api/core"; import { invoke } from "@tauri-apps/api/core";
import { listen } from "@tauri-apps/api/event"; import { listen, type UnlistenFn } from "@tauri-apps/api/event";
import { open, Command } from "@tauri-apps/plugin-shell"; import { open, Command } from "@tauri-apps/plugin-shell";
import { import {
QuestionFilled, QuestionFilled,
@@ -702,7 +711,7 @@
SwitchFilled SwitchFilled
} from "@element-plus/icons-vue"; } from "@element-plus/icons-vue";
import { reactive, onBeforeUnmount, onMounted, ref, toRaw, computed } from "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 { getMatches } from "@tauri-apps/plugin-cli";
import { initStartWinIpBroadcast } from "~/composables/netcard"; import { initStartWinIpBroadcast } from "~/composables/netcard";
import useMainStore from "@/stores/index"; import useMainStore from "@/stores/index";
@@ -741,7 +750,7 @@
// console.error(config); // console.error(config);
const protocols = supportProtocols(); const protocols = supportProtocols();
const data = reactive({ const data = reactive({
hasNewVersion: false, //easytierGame有没有新版 //easytierGame有没有新版
logVisible: false, logVisible: false,
cidrVisible: false, cidrVisible: false,
advanceVisible: false, advanceVisible: false,
@@ -1024,11 +1033,17 @@
// await getReleaseList(); // await getReleaseList();
}; };
let unlistenDownload: UnlistenFn | null = null;
let unlistenDownloadError: UnlistenFn | null = null;
let progress = ref<number>(0);
let size = 0;
const handleInstallCore = async () => { const handleInstallCore = async () => {
try { try {
if (!coreManagementData.data) { if (!coreManagementData.data) {
return ElMessage.error("请选择一个内核"); return ElMessage.error("请选择一个内核");
} }
progress.value = 0;
size = 0;
data.update = true; data.update = true;
await getCoreVersion(); await getCoreVersion();
const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate(); const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
@@ -1036,6 +1051,22 @@
if (isNeedUpdate) { if (isNeedUpdate) {
await reset(); await reset();
// console.error(downloadUrl); // console.error(downloadUrl);
if (unlistenDownload) {
await unlistenDownload();
}
if (unlistenDownloadError) {
await unlistenDownloadError();
}
unlistenDownload = await listen<[number, number]>("download_core_progress", ({ payload }) => {
size += payload[0];
progress.value = Math.round((size / payload[1]) * 100);
});
unlistenDownloadError = await listen("download_core_progress_error", () => {
data.update = false;
progress.value = 0;
size = 0;
ElMessage.error("发生错误,请重试");
});
await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName }); await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName });
} }
await getCoreVersion(); await getCoreVersion();
@@ -1060,6 +1091,7 @@
}; };
const handleAutoStartByTask = async () => { const handleAutoStartByTask = async () => {
if (import.meta.env.DEV) return ElMessage.warning("开发环境不支持开机自启");
await invoke("spawn_autostart", { enabled: !config.autoStart }); await invoke("spawn_autostart", { enabled: !config.autoStart });
const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean; const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
config.autoStart = is_enable_by_task; config.autoStart = is_enable_by_task;
@@ -1070,6 +1102,7 @@
let is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean; let is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
if (is_enable_by_task) { if (is_enable_by_task) {
// 每次打开Exe重新加载一次开机自启,因为可能路径变了 // 每次打开Exe重新加载一次开机自启,因为可能路径变了
if (import.meta.env.DEV) return ElMessage.warning("开发环境不支持开机自启");
await invoke("spawn_autostart", { enabled: false }); await invoke("spawn_autostart", { enabled: false });
await invoke("spawn_autostart", { enabled: true }); await invoke("spawn_autostart", { enabled: true });
} }
@@ -1083,6 +1116,24 @@
} }
}; };
const compatibleIpv6Listener = async () => {
// ipv6监听在后续版本合并到customListenner里了,这里做兼容处理
if (config.enableCustomListenerV6 && config.customListenerV6Data) {
const customListener = config.customListenerV6Data.trim();
if (customListener) {
const customListenerV4 = config.customListenerData
.trim()
.split("\n")
.map(el => el.trim())
.filter(el => el);
if (!customListenerV4.includes(customListener)) {
config.customListenerData += `\n${customListener}`;
}
}
}
config.enableCustomListenerV6 = false;
};
const initConnectAfterStart = async () => { const initConnectAfterStart = async () => {
if (config.connectAfterStart && data.coreVersion) { if (config.connectAfterStart && data.coreVersion) {
await reset(); await reset();
@@ -1099,10 +1150,12 @@
try { try {
const decoder = new TextDecoder("utf-8"); const decoder = new TextDecoder("utf-8");
const guiJsonStr = decoder.decode(guiJsonStrUint8); const guiJsonStr = decoder.decode(guiJsonStrUint8);
const regex = /^(\s*\/\/.*)/gm; // console.log(guiJsonStr);
const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm; // const regex = /^(\s*\/\/.*)/gm;
const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1"); // const regex2 = /(,?)\s*\/\/.*(?=\n|$|\r\n)/gm;
const guiJson = JSON.parse(resultStr); // const resultStr = guiJsonStr.replace(regex, "").replace(regex2, "$1");
// console.log(resultStr);
const guiJson = JSON.parse(guiJsonStr);
let saveServerUrl = ""; let saveServerUrl = "";
if (guiJson.serverUrl) { if (guiJson.serverUrl) {
if (Array.isArray(guiJson.serverUrl)) { if (Array.isArray(guiJson.serverUrl)) {
@@ -1120,6 +1173,7 @@
config: { config: {
...mainStore.config, ...mainStore.config,
...guiJson, ...guiJson,
customListenerData: guiJson?.customListenerData.join("\n") || "",
serverUrl: saveServerUrl serverUrl: saveServerUrl
} }
}); });
@@ -1177,6 +1231,7 @@
await compatibleInitAutoStart(); await compatibleInitAutoStart();
// await initAutoStart(); // await initAutoStart();
await initStartWinIpBroadcast(); await initStartWinIpBroadcast();
await compatibleIpv6Listener();
await getCoreVersion(); await getCoreVersion();
await listenObj.listenThreadId(); await listenObj.listenThreadId();
await listenObj.listenServerThreadId(); await listenObj.listenServerThreadId();
@@ -1187,7 +1242,6 @@
initPreventSleep(); initPreventSleep();
mountedShow(); // 不需要await mountedShow(); // 不需要await
closePrevent(); closePrevent();
data.hasNewVersion = await checkNewVersion();
dataSubscribe(async () => { dataSubscribe(async () => {
if (mainStore.createConfigInEasytier) { if (mainStore.createConfigInEasytier) {
b(async () => { b(async () => {
@@ -1196,6 +1250,7 @@
} }
}); });
getReleaseList(); getReleaseList();
checkNewVersion();
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
@@ -1339,6 +1394,12 @@
if (config.disableKcpInput) { if (config.disableKcpInput) {
args.push("--disable-kcp-input"); args.push("--disable-kcp-input");
} }
if (config.bindDeviceEnable) {
args.push("--bind-device", "true");
}
if (mainStore.proxyForwardBySystem) {
args.push("--proxy-forward-by-system");
}
return args; return args;
}; };
+153 -301
View File
@@ -18,20 +18,20 @@ importers:
specifier: 6.13.1 specifier: 6.13.1
version: 6.13.1(magicast@0.3.5)(rollup@4.27.4) version: 6.13.1(magicast@0.3.5)(rollup@4.27.4)
'@pinia/nuxt': '@pinia/nuxt':
specifier: 0.9.0 specifier: 0.10.1
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) 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': '@tauri-apps/api':
specifier: ^2.2.0 specifier: 2.3.0
version: 2.2.0 version: 2.3.0
'@tauri-apps/cli': '@tauri-apps/cli':
specifier: 2.2.7 specifier: 2.3.0
version: 2.2.7 version: 2.3.0
'@tauri-apps/plugin-cli': '@tauri-apps/plugin-cli':
specifier: ^2.2.0 specifier: ^2.2.0
version: 2.2.0 version: 2.2.0
'@tauri-apps/plugin-clipboard-manager': '@tauri-apps/plugin-clipboard-manager':
specifier: 2.2.0 specifier: 2.2.1
version: 2.2.0 version: 2.2.1
'@tauri-apps/plugin-dialog': '@tauri-apps/plugin-dialog':
specifier: 2.2.0 specifier: 2.2.0
version: 2.2.0 version: 2.2.0
@@ -39,8 +39,8 @@ importers:
specifier: ^2.2.0 specifier: ^2.2.0
version: 2.2.0 version: 2.2.0
'@tauri-apps/plugin-log': '@tauri-apps/plugin-log':
specifier: 2.2.1 specifier: 2.2.2
version: 2.2.1 version: 2.2.2
'@tauri-apps/plugin-shell': '@tauri-apps/plugin-shell':
specifier: ^2.2.0 specifier: ^2.2.0
version: 2.2.0 version: 2.2.0
@@ -54,8 +54,8 @@ importers:
specifier: ^4.1.1 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)) 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': '@vueuse/core':
specifier: 12.4.0 specifier: 12.7.0
version: 12.4.0(typescript@5.6.3) version: 12.7.0(typescript@5.6.3)
archiver: archiver:
specifier: ^7.0.1 specifier: ^7.0.1
version: 7.0.1 version: 7.0.1
@@ -72,20 +72,20 @@ importers:
specifier: 3.15.4 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) 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: pinia:
specifier: 2.3.1 specifier: 3.0.1
version: 2.3.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)) version: 3.0.1(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
pinia-plugin-persistedstate: pinia-plugin-persistedstate:
specifier: ^4.2.0 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: postcss:
specifier: ^8.4.38 specifier: ^8.4.38
version: 8.4.49 version: 8.4.49
prettier: prettier:
specifier: 3.4.2 specifier: 3.5.2
version: 3.4.2 version: 3.5.2
prettier-plugin-tailwindcss: prettier-plugin-tailwindcss:
specifier: 0.6.11 specifier: 0.6.11
version: 0.6.11(prettier@3.4.2) version: 0.6.11(prettier@3.5.2)
packages: packages:
@@ -229,10 +229,6 @@ packages:
peerDependencies: peerDependencies:
'@babel/core': ^7.0.0-0 '@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': '@babel/standalone@7.26.4':
resolution: {integrity: sha512-SF+g7S2mhTT1b7CHyfNjDkPU1corxg4LPYsyP0x5KuCl+EbtBQHRLqr9N3q7e7+x7NQ5LYxQf8mJ2PmzebLr0A==} resolution: {integrity: sha512-SF+g7S2mhTT1b7CHyfNjDkPU1corxg4LPYsyP0x5KuCl+EbtBQHRLqr9N3q7e7+x7NQ5LYxQf8mJ2PmzebLr0A==}
engines: {node: '>=6.9.0'} engines: {node: '>=6.9.0'}
@@ -245,10 +241,6 @@ packages:
resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==} resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==}
engines: {node: '>=6.9.0'} 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': '@babel/types@7.26.3':
resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==} resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==}
engines: {node: '>=6.9.0'} engines: {node: '>=6.9.0'}
@@ -536,10 +528,6 @@ packages:
peerDependencies: peerDependencies:
vite: '*' vite: '*'
'@nuxt/kit@3.14.1592':
resolution: {integrity: sha512-r9r8bISBBisvfcNgNL3dSIQHSBe0v5YkX5zwNblIC2T0CIEgxEVoM5rq9O5wqgb5OEydsHTtT2hL57vdv6VT2w==}
engines: {node: ^14.18.0 || >=16.10.0}
'@nuxt/kit@3.15.0': '@nuxt/kit@3.15.0':
resolution: {integrity: sha512-Q7k11wDTLIbBgoTfRYNrciK7PvjKklewrKd5PRMJCpn9Lmuqkq59HErNfJXFrBKHsE3Ld0DB6WUtpPGOvWJZoQ==} resolution: {integrity: sha512-Q7k11wDTLIbBgoTfRYNrciK7PvjKklewrKd5PRMJCpn9Lmuqkq59HErNfJXFrBKHsE3Ld0DB6WUtpPGOvWJZoQ==}
engines: {node: '>=18.20.5'} engines: {node: '>=18.20.5'}
@@ -552,10 +540,6 @@ packages:
resolution: {integrity: sha512-dr7I7eZOoRLl4uxdxeL2dQsH0OrbEiVPIyBHnBpA4co24CBnoJoF+JINuP9l3PAM3IhUzc5JIVq3/YY3lEc3Hw==} resolution: {integrity: sha512-dr7I7eZOoRLl4uxdxeL2dQsH0OrbEiVPIyBHnBpA4co24CBnoJoF+JINuP9l3PAM3IhUzc5JIVq3/YY3lEc3Hw==}
engines: {node: '>=18.12.0'} 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': '@nuxt/schema@3.15.0':
resolution: {integrity: sha512-sAgLgSOj/SZxUmlJ/Q3TLRwIAqmiiZ5gCBrT+eq9CowIj7bgxX92pT720pDLEDs4wlXiTTsqC8nyqXQis8pPyA==} resolution: {integrity: sha512-sAgLgSOj/SZxUmlJ/Q3TLRwIAqmiiZ5gCBrT+eq9CowIj7bgxX92pT720pDLEDs4wlXiTTsqC8nyqXQis8pPyA==}
engines: {node: ^14.18.0 || >=16.10.0} engines: {node: ^14.18.0 || >=16.10.0}
@@ -676,10 +660,10 @@ packages:
resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==} resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==}
engines: {node: '>= 10.0.0'} engines: {node: '>= 10.0.0'}
'@pinia/nuxt@0.9.0': '@pinia/nuxt@0.10.1':
resolution: {integrity: sha512-2yeRo7LeyCF68AbNeL3xu2h6uw0617RkcsYxmA8DJM0R0PMdz5wQHnc44KeENQxR/Mrq8T910XVT6buosqsjBQ==} resolution: {integrity: sha512-xrpkKZHSmshPK6kQzboJ+TZiZ5zj73gBCI5SfiUaJkKKS9gx4B1hLEzJIjxZl0/HS5jRWrIvQ+u9ulvIRlNiow==}
peerDependencies: peerDependencies:
pinia: ^2.3.0 pinia: ^3.0.1
'@pkgjs/parseargs@0.11.0': '@pkgjs/parseargs@0.11.0':
resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
@@ -889,83 +873,83 @@ packages:
'@sxzz/popperjs-es@2.11.7': '@sxzz/popperjs-es@2.11.7':
resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==} resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==}
'@tauri-apps/api@2.2.0': '@tauri-apps/api@2.3.0':
resolution: {integrity: sha512-R8epOeZl1eJEl603aUMIGb4RXlhPjpgxbGVEaqY+0G5JG9vzV/clNlzTeqc+NLYXVqXcn8mb4c5b9pJIUDEyAg==} resolution: {integrity: sha512-33Z+0lX2wgZbx1SPFfqvzI6su63hCBkbzv+5NexeYjIx7WA9htdOKoRR7Dh3dJyltqS5/J8vQFyybiRoaL0hlA==}
'@tauri-apps/cli-darwin-arm64@2.2.7': '@tauri-apps/cli-darwin-arm64@2.3.0':
resolution: {integrity: sha512-54kcpxZ3X1Rq+pPTzk3iIcjEVY4yv493uRx/80rLoAA95vAC0c//31Whz75UVddDjJfZvXlXZ3uSZ+bnCOnt0A==} resolution: {integrity: sha512-VUbFezxCxSdVq8BTFZKDoVqf7jb9i928kLQ2cqYAe5TBM2Cg5IgMtJupbKMXtCwD+pOVcs6DqcPbhcmgPEFp0w==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
'@tauri-apps/cli-darwin-x64@2.2.7': '@tauri-apps/cli-darwin-x64@2.3.0':
resolution: {integrity: sha512-Vgu2XtBWemLnarB+6LqQeLanDlRj7CeFN//H8bVVdjbNzxcSxsvbLYMBP8+3boa7eBnjDrqMImRySSgL6IrwTw==} resolution: {integrity: sha512-PZBH25qsou45+l+SCHaB+x7KKn/9/kItGTyIjgE3E0J3hJKb/zKkolHFE97XlR99CVJVvp6lM3f9ZJ8tZ+GJfA==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
'@tauri-apps/cli-linux-arm-gnueabihf@2.2.7': '@tauri-apps/cli-linux-arm-gnueabihf@2.3.0':
resolution: {integrity: sha512-+Clha2iQAiK9zoY/KKW0KLHkR0k36O78YLx5Sl98tWkwI3OBZFg5H5WT1plH/4sbZIS2aLFN6dw58/JlY9Bu/g==} resolution: {integrity: sha512-3udhBTCJTlmTBFagqp2dXII6ckDvXvdP00erEt5IUVuFwNOrRHgHh8BGkR81MgGXEjpSzwKiE0LrmXsjLJ8+pA==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
'@tauri-apps/cli-linux-arm64-gnu@2.2.7': '@tauri-apps/cli-linux-arm64-gnu@2.3.0':
resolution: {integrity: sha512-Z/Lp4SQe6BUEOays9BQAEum2pvZF4w9igyXijP+WbkOejZx4cDvarFJ5qXrqSLmBh7vxrdZcLwoLk9U//+yQrg==} resolution: {integrity: sha512-FddbVf/0aLnbDUJvKWWdREku174VVJkR2MW8QJMZMlZxeW8spL6YEeZD4OaMEdVzy+H5Xlc/CLerI8MF3I/bug==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc] libc: [glibc]
'@tauri-apps/cli-linux-arm64-musl@2.2.7': '@tauri-apps/cli-linux-arm64-musl@2.3.0':
resolution: {integrity: sha512-+8HZ+txff/Y3YjAh80XcLXcX8kpGXVdr1P8AfjLHxHdS6QD4Md+acSxGTTNbplmHuBaSHJvuTvZf9tU1eDCTDg==} resolution: {integrity: sha512-PZbNAartalTMPWmFsx+a+XrFN0FULpibvVNPmyCNuCnv7ZGVIZa+GGfS9NYN0XE43Mhq2/qYmxoLTTeBMSDzxQ==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [musl] libc: [musl]
'@tauri-apps/cli-linux-x64-gnu@2.2.7': '@tauri-apps/cli-linux-x64-gnu@2.3.0':
resolution: {integrity: sha512-ahlSnuCnUntblp9dG7/w5ZWZOdzRFi3zl0oScgt7GF4KNAOEa7duADsxPA4/FT2hLRa0SvpqtD4IYFvCxoVv3Q==} resolution: {integrity: sha512-vgsXG/ZHK6z43Vkjr3bnYcsu6mvvK4WUu+S9ohqQO8PsZqsbwThy5ibn9Nb5OEYiEuVQgXye6YHS+uZSI54hkw==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc] libc: [glibc]
'@tauri-apps/cli-linux-x64-musl@2.2.7': '@tauri-apps/cli-linux-x64-musl@2.3.0':
resolution: {integrity: sha512-+qKAWnJRSX+pjjRbKAQgTdFY8ecdcu8UdJ69i7wn3ZcRn2nMMzOO2LOMOTQV42B7/Q64D1pIpmZj9yblTMvadA==} resolution: {integrity: sha512-Ba/ILQ9JknrFYVdc0YKB9br6n+OJBi2Ospc0/J75IC/dTsbkcPkhSbbCY531hUxOqk+hQi08/ZeSq1al3Yhk9A==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [musl] libc: [musl]
'@tauri-apps/cli-win32-arm64-msvc@2.2.7': '@tauri-apps/cli-win32-arm64-msvc@2.3.0':
resolution: {integrity: sha512-aa86nRnrwT04u9D9fhf5JVssuAZlUCCc8AjqQjqODQjMd4BMA2+d4K9qBMpEG/1kVh95vZaNsLogjEaqSTTw4A==} resolution: {integrity: sha512-i3hrzUzx8UJAfOBgufh2ArUh20SgPe44+VhVcMAsPk/R5M8tPL/Ke9Z40nUZRuOrJbY9rGhXmf+0v65nD5GnRw==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
'@tauri-apps/cli-win32-ia32-msvc@2.2.7': '@tauri-apps/cli-win32-ia32-msvc@2.3.0':
resolution: {integrity: sha512-EiJ5/25tLSQOSGvv+t6o3ZBfOTKB5S3vb+hHQuKbfmKdRF0XQu2YPdIi1CQw1DU97ZAE0Dq4frvnyYEKWgMzVQ==} resolution: {integrity: sha512-UEi/QzCdNVYPH43A/GufiWOb34HZpju9f4WjTTcT6frZIPnNy82WTGgOxWfsj2OIkroF0T+kRGbwua+JGnrnUg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [ia32] cpu: [ia32]
os: [win32] os: [win32]
'@tauri-apps/cli-win32-x64-msvc@2.2.7': '@tauri-apps/cli-win32-x64-msvc@2.3.0':
resolution: {integrity: sha512-ZB8Kw90j8Ld+9tCWyD2fWCYfIrzbQohJ4DJSidNwbnehlZzP7wAz6Z3xjsvUdKtQ3ibtfoeTqVInzCCEpI+pWg==} resolution: {integrity: sha512-QsNeaG123T2L2QWaEIZ9d65jwNQ5Uf+BmV3x7vEajbQHd/XBDJDL0Q21veMWIOjmMQHdtmFLJP0wamCLTkXZXQ==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
'@tauri-apps/cli@2.2.7': '@tauri-apps/cli@2.3.0':
resolution: {integrity: sha512-ZnsS2B4BplwXP37celanNANiIy8TCYhvg5RT09n72uR/o+navFZtGpFSqljV8fy1Y4ixIPds8FrGSXJCN2BerA==} resolution: {integrity: sha512-OU0+bwIz10DgQMZZJ20NdU+x+K8PYob4tzB7nYCV6BbKWrUYINdGHAXlunzMP+hi63SClPDyVf8CYxwgznIfbw==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
hasBin: true hasBin: true
'@tauri-apps/plugin-cli@2.2.0': '@tauri-apps/plugin-cli@2.2.0':
resolution: {integrity: sha512-rvNhMog9rHr01Xk+trBFKJ0eZICIvPkm9GX6ogB89/0hROU/lf+a/sb4vC0wtSeR7zrJuCSxwxYuvHCZheaYFA==} resolution: {integrity: sha512-rvNhMog9rHr01Xk+trBFKJ0eZICIvPkm9GX6ogB89/0hROU/lf+a/sb4vC0wtSeR7zrJuCSxwxYuvHCZheaYFA==}
'@tauri-apps/plugin-clipboard-manager@2.2.0': '@tauri-apps/plugin-clipboard-manager@2.2.1':
resolution: {integrity: sha512-sIBrW/HioKq2vqomwwcU/Y8ygAv3DlS32yKPBX5XijCc0IyQKiDxYpGqmvE9DC5Y0lNJ/G53dfS961B31wjJ1g==} resolution: {integrity: sha512-+7YDULB9Bk4fejxYrVNBQcxs3KsjPA3A3r53wwn7K8zOQvxjNBSYBRx/FW1OUBPGzm8BrreJFBkPVzQZSF2R4A==}
'@tauri-apps/plugin-dialog@2.2.0': '@tauri-apps/plugin-dialog@2.2.0':
resolution: {integrity: sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==} resolution: {integrity: sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==}
@@ -973,8 +957,8 @@ packages:
'@tauri-apps/plugin-fs@2.2.0': '@tauri-apps/plugin-fs@2.2.0':
resolution: {integrity: sha512-+08mApuONKI8/sCNEZ6AR8vf5vI9DXD4YfrQ9NQmhRxYKMLVhRW164vdW5BSLmMpuevftpQ2FVoL9EFkfG9Z+g==} resolution: {integrity: sha512-+08mApuONKI8/sCNEZ6AR8vf5vI9DXD4YfrQ9NQmhRxYKMLVhRW164vdW5BSLmMpuevftpQ2FVoL9EFkfG9Z+g==}
'@tauri-apps/plugin-log@2.2.1': '@tauri-apps/plugin-log@2.2.2':
resolution: {integrity: sha512-bOz9w0hhlXLGLc1ZR37GqkXvTqkykl4A3GEKLjRIs0dq3n0BzLyoRDMPcpt7PdUHqaq6WISME+zEX2bqjSbJ2A==} resolution: {integrity: sha512-XEb7NKVOnsG+b10c8JkNNkAADe7BELEvl+NJtFRPw7OUEb4w8NWwmaj+EQXvDnMIcFUkmsbxijUeNJ0Mwog4nQ==}
'@tauri-apps/plugin-shell@2.2.0': '@tauri-apps/plugin-shell@2.2.0':
resolution: {integrity: sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==} resolution: {integrity: sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==}
@@ -1089,6 +1073,9 @@ packages:
'@vue/devtools-api@6.6.4': '@vue/devtools-api@6.6.4':
resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==} resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
'@vue/devtools-api@7.7.2':
resolution: {integrity: sha512-1syn558KhyN+chO5SjlZIwJ8bV/bQ1nOVTG66t2RbG66ZGekyiYNmRO7X9BJCXQqPsFHlnksqvPhce2qpzxFnA==}
'@vue/devtools-core@7.6.8': '@vue/devtools-core@7.6.8':
resolution: {integrity: sha512-8X4roysTwzQ94o7IobjVcOd1aZF5iunikrMrHPI2uUdigZCi2kFTQc7ffYiFiTNaLElCpjOhCnM7bo7aK1yU7A==} resolution: {integrity: sha512-8X4roysTwzQ94o7IobjVcOd1aZF5iunikrMrHPI2uUdigZCi2kFTQc7ffYiFiTNaLElCpjOhCnM7bo7aK1yU7A==}
peerDependencies: peerDependencies:
@@ -1097,9 +1084,15 @@ packages:
'@vue/devtools-kit@7.6.8': '@vue/devtools-kit@7.6.8':
resolution: {integrity: sha512-JhJ8M3sPU+v0P2iZBF2DkdmR9L0dnT5RXJabJqX6o8KtFs3tebdvfoXV2Dm3BFuqeECuMJIfF1aCzSt+WQ4wrw==} 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': '@vue/devtools-shared@7.6.8':
resolution: {integrity: sha512-9MBPO5Z3X1nYGFqTJyohl6Gmf/J7UNN1oicHdyzBVZP4jnhZ4c20MgtaHDIzWmHDHCMYVS5bwKxT3jxh7gOOKA==} resolution: {integrity: sha512-9MBPO5Z3X1nYGFqTJyohl6Gmf/J7UNN1oicHdyzBVZP4jnhZ4c20MgtaHDIzWmHDHCMYVS5bwKxT3jxh7gOOKA==}
'@vue/devtools-shared@7.7.2':
resolution: {integrity: sha512-uBFxnp8gwW2vD6FrJB8JZLUzVb6PNRG0B0jBnHsOH8uKyva2qINY8PTF5Te4QlTbMDqU5K6qtJDr6cNsKWhbOA==}
'@vue/reactivity@3.5.13': '@vue/reactivity@3.5.13':
resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==} resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==}
@@ -1117,20 +1110,20 @@ packages:
'@vue/shared@3.5.13': '@vue/shared@3.5.13':
resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
'@vueuse/core@12.4.0': '@vueuse/core@12.7.0':
resolution: {integrity: sha512-XnjQYcJwCsyXyIafyA6SvyN/OBtfPnjvJmbxNxQjCcyWD198urwm5TYvIUUyAxEAN0K7HJggOgT15cOlWFyLeA==} resolution: {integrity: sha512-jtK5B7YjZXmkGNHjviyGO4s3ZtEhbzSgrbX+s5o+Lr8i2nYqNyHuPVOeTdM1/hZ5Tkxg/KktAuAVDDiHMraMVA==}
'@vueuse/core@9.13.0': '@vueuse/core@9.13.0':
resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==} resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
'@vueuse/metadata@12.4.0': '@vueuse/metadata@12.7.0':
resolution: {integrity: sha512-AhPuHs/qtYrKHUlEoNO6zCXufu8OgbR8S/n2oMw1OQuBQJ3+HOLQ+EpvXs+feOlZMa0p8QVvDWNlmcJJY8rW2g==} resolution: {integrity: sha512-4VvTH9mrjXqFN5LYa5YfqHVRI6j7R00Vy4995Rw7PQxyCL3z0Lli86iN4UemWqixxEvYfRjG+hF9wL8oLOn+3g==}
'@vueuse/metadata@9.13.0': '@vueuse/metadata@9.13.0':
resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==} resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
'@vueuse/shared@12.4.0': '@vueuse/shared@12.7.0':
resolution: {integrity: sha512-9yLgbHVIF12OSCojnjTIoZL1+UA10+O4E1aD6Hpfo/DKVm5o3SZIwz6CupqGy3+IcKI8d6Jnl26EQj/YucnW0Q==} resolution: {integrity: sha512-coLlUw2HHKsm7rPN6WqHJQr18WymN4wkA/3ThFaJ4v4gWGWAQQGK+MJxLuJTBs4mojQiazlVWAKNJNpUWGRkNw==}
'@vueuse/shared@9.13.0': '@vueuse/shared@9.13.0':
resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==} resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
@@ -1418,10 +1411,6 @@ packages:
confbox@0.1.8: confbox@0.1.8:
resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} 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: consola@3.3.3:
resolution: {integrity: sha512-Qil5KwghMzlqd51UXM0b6fyaGHtOC22scxrwrz4A2882LyUMwQjnvaedN1HAeXzphspQ6CpHkzMAWxBTUruDLg==} resolution: {integrity: sha512-Qil5KwghMzlqd51UXM0b6fyaGHtOC22scxrwrz4A2882LyUMwQjnvaedN1HAeXzphspQ6CpHkzMAWxBTUruDLg==}
engines: {node: ^14.18.0 || >=16.10.0} engines: {node: ^14.18.0 || >=16.10.0}
@@ -1961,9 +1950,6 @@ packages:
has-unicode@2.0.1: has-unicode@2.0.1:
resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} 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: hasown@2.0.2:
resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
@@ -2028,10 +2014,6 @@ packages:
resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
engines: {node: '>= 4'} engines: {node: '>= 4'}
ignore@6.0.2:
resolution: {integrity: sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==}
engines: {node: '>= 4'}
ignore@7.0.0: ignore@7.0.0:
resolution: {integrity: sha512-lcX8PNQygAa22u/0BysEY8VhaFRzlOkvdlKczDPnJvrkJD1EuqzEky5VYYKM2iySIuaVIDv9N190DfSreSLw2A==} resolution: {integrity: sha512-lcX8PNQygAa22u/0BysEY8VhaFRzlOkvdlKczDPnJvrkJD1EuqzEky5VYYKM2iySIuaVIDv9N190DfSreSLw2A==}
engines: {node: '>= 4'} engines: {node: '>= 4'}
@@ -2179,10 +2161,6 @@ packages:
resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
hasBin: true hasBin: true
jiti@2.4.0:
resolution: {integrity: sha512-H5UpaUI+aHOqZXlYOaFP/8AzKsg+guWu+Pr3Y8i7+Y3zr1aXAvCvTAQ1RxSc6oVD8R8c7brgNtTVP91E7upH/g==}
hasBin: true
jiti@2.4.2: jiti@2.4.2:
resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==} resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==}
hasBin: true hasBin: true
@@ -2194,9 +2172,6 @@ packages:
js-tokens@4.0.0: js-tokens@4.0.0:
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
js-tokens@9.0.0:
resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==}
js-tokens@9.0.1: js-tokens@9.0.1:
resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==} resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==}
@@ -2232,9 +2207,6 @@ packages:
resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==} resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==}
engines: {node: '>= 8'} engines: {node: '>= 8'}
knitwork@1.1.0:
resolution: {integrity: sha512-oHnmiBUVHz1V+URE77PNot2lv3QiYU2zQf1JjOVkMt3YDKGbu8NAFr+c4mcNOhdsGrB/VpVbRwPwhiXrPhxQbw==}
knitwork@1.2.0: knitwork@1.2.0:
resolution: {integrity: sha512-xYSH7AvuQ6nXkq42x0v5S8/Iry+cfulBz/DJQzhIyESdLD7425jXsPy4vn5cCXU+HhRN2kVw51Vd1K6/By4BQg==} resolution: {integrity: sha512-xYSH7AvuQ6nXkq42x0v5S8/Iry+cfulBz/DJQzhIyESdLD7425jXsPy4vn5cCXU+HhRN2kVw51Vd1K6/By4BQg==}
@@ -2451,10 +2423,6 @@ packages:
mlly@1.7.4: mlly@1.7.4:
resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==} 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: mrmime@2.0.0:
resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==} resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
engines: {node: '>=10'} engines: {node: '>=10'}
@@ -2739,8 +2707,8 @@ packages:
pinia: pinia:
optional: true optional: true
pinia@2.3.1: pinia@3.0.1:
resolution: {integrity: sha512-khUlZSwt9xXCaTbbxFYBKDc/bWAGWJjOgvxETwkTN7KRm66EeT1ZdZj6i2ceh9sP2Pzqsbc704r2yngBrxBVug==} resolution: {integrity: sha512-WXglsDzztOTH6IfcJ99ltYZin2mY8XZCXujkYWVIJlBjqsP6ST7zw+Aarh63E1cDVYeyUcPCxPHzJpEOmzB6Wg==}
peerDependencies: peerDependencies:
typescript: '>=4.4.4' typescript: '>=4.4.4'
vue: ^2.7.0 || ^3.5.11 vue: ^2.7.0 || ^3.5.11
@@ -2752,9 +2720,6 @@ packages:
resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
engines: {node: '>= 6'} engines: {node: '>= 6'}
pkg-types@1.2.1:
resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==}
pkg-types@1.3.0: pkg-types@1.3.0:
resolution: {integrity: sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==} resolution: {integrity: sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==}
@@ -3041,8 +3006,8 @@ packages:
prettier-plugin-svelte: prettier-plugin-svelte:
optional: true optional: true
prettier@3.4.2: prettier@3.5.2:
resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==} resolution: {integrity: sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==}
engines: {node: '>=14'} engines: {node: '>=14'}
hasBin: true hasBin: true
@@ -3329,9 +3294,6 @@ packages:
resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
engines: {node: '>=12'} engines: {node: '>=12'}
strip-literal@2.1.0:
resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==}
strip-literal@2.1.1: strip-literal@2.1.1:
resolution: {integrity: sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==} resolution: {integrity: sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==}
@@ -3476,9 +3438,6 @@ packages:
uncrypto@0.1.3: uncrypto@0.1.3:
resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==} resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==}
unctx@2.3.1:
resolution: {integrity: sha512-PhKke8ZYauiqh3FEMVNm7ljvzQiph0Mt3GBRve03IJm7ukfaON2OBK795tLwhbyfzknuRRkW0+Ze+CQUmzOZ+A==}
unctx@2.4.1: unctx@2.4.1:
resolution: {integrity: sha512-AbaYw0Nm4mK4qjhns67C+kgxR2YWiwlDBPzxrN8h8C6VtAdCgditAY5Dezu3IJy4XVqAnbrXt9oQJvsn3fyozg==} resolution: {integrity: sha512-AbaYw0Nm4mK4qjhns67C+kgxR2YWiwlDBPzxrN8h8C6VtAdCgditAY5Dezu3IJy4XVqAnbrXt9oQJvsn3fyozg==}
@@ -3495,9 +3454,6 @@ packages:
resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
engines: {node: '>=18'} engines: {node: '>=18'}
unimport@3.13.3:
resolution: {integrity: sha512-dr7sjOoRFCSDlnARFPAMB8OmjIMc6j14qd749VmB1yiqFEYFbi+1jWPTuc22JoFs/t1kHJXT3vQNiwCy3ZvsTA==}
unimport@3.14.5: unimport@3.14.5:
resolution: {integrity: sha512-tn890SwFFZxqaJSKQPPd+yygfKSATbM8BZWW1aCR2TJBTs1SDrmLamBueaFtYsGjHtQaRgqEbQflOjN2iW12gA==} resolution: {integrity: sha512-tn890SwFFZxqaJSKQPPd+yygfKSATbM8BZWW1aCR2TJBTs1SDrmLamBueaFtYsGjHtQaRgqEbQflOjN2iW12gA==}
@@ -3595,10 +3551,6 @@ packages:
resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==} resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==}
hasBin: true hasBin: true
untyped@1.5.1:
resolution: {integrity: sha512-reBOnkJBFfBZ8pCKaeHgfZLcehXtM6UTxc+vqs1JvCps0c4amLNp3fhdGBZwYp+VLyoY9n3X5KOP7lCyWBUX9A==}
hasBin: true
untyped@1.5.2: untyped@1.5.2:
resolution: {integrity: sha512-eL/8PlhLcMmlMDtNPKhyyz9kEBDS3Uk4yMu/ewlkT2WFbtzScjHWPJLdQLmaGPUKjXzwe9MumOtOgc4Fro96Kg==} resolution: {integrity: sha512-eL/8PlhLcMmlMDtNPKhyyz9kEBDS3Uk4yMu/ewlkT2WFbtzScjHWPJLdQLmaGPUKjXzwe9MumOtOgc4Fro96Kg==}
hasBin: true hasBin: true
@@ -4049,8 +4001,6 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@babel/standalone@7.26.2': {}
'@babel/standalone@7.26.4': {} '@babel/standalone@7.26.4': {}
'@babel/template@7.25.9': '@babel/template@7.25.9':
@@ -4071,11 +4021,6 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - 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': '@babel/types@7.26.3':
dependencies: dependencies:
'@babel/helper-string-parser': 7.25.9 '@babel/helper-string-parser': 7.25.9
@@ -4392,54 +4337,27 @@ snapshots:
- utf-8-validate - utf-8-validate
- vue - 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)': '@nuxt/kit@3.15.0(magicast@0.3.5)(rollup@4.27.4)':
dependencies: dependencies:
'@nuxt/schema': 3.15.0(magicast@0.3.5)(rollup@4.27.4) '@nuxt/schema': 3.15.0(magicast@0.3.5)(rollup@4.27.4)
c12: 2.0.1(magicast@0.3.5) c12: 2.0.1(magicast@0.3.5)
consola: 3.3.3 consola: 3.4.0
defu: 6.1.4 defu: 6.1.4
destr: 2.0.3 destr: 2.0.3
globby: 14.0.2 globby: 14.0.2
ignore: 7.0.0 ignore: 7.0.3
jiti: 2.4.2 jiti: 2.4.2
klona: 2.0.6 klona: 2.0.6
knitwork: 1.2.0 knitwork: 1.2.0
mlly: 1.7.3 mlly: 1.7.4
ohash: 1.1.4 ohash: 1.1.4
pathe: 1.1.2 pathe: 1.1.2
pkg-types: 1.2.1 pkg-types: 1.3.1
scule: 1.3.0 scule: 1.3.0
semver: 7.6.3 semver: 7.6.3
ufo: 1.5.4 ufo: 1.5.4
unctx: 2.4.1 unctx: 2.4.1
unimport: 3.14.5(rollup@4.27.4) unimport: 3.14.6(rollup@4.27.4)
untyped: 1.5.2 untyped: 1.5.2
transitivePeerDependencies: transitivePeerDependencies:
- magicast - magicast
@@ -4500,40 +4418,20 @@ snapshots:
- rollup - rollup
- supports-color - 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)': '@nuxt/schema@3.15.0(magicast@0.3.5)(rollup@4.27.4)':
dependencies: dependencies:
c12: 2.0.1(magicast@0.3.5) c12: 2.0.1(magicast@0.3.5)
compatx: 0.1.8 compatx: 0.1.8
consola: 3.3.3 consola: 3.4.0
defu: 6.1.4 defu: 6.1.4
hookable: 5.5.3 hookable: 5.5.3
pathe: 1.1.2 pathe: 1.1.2
pkg-types: 1.2.1 pkg-types: 1.3.1
scule: 1.3.0 scule: 1.3.0
std-env: 3.8.0 std-env: 3.8.0
ufo: 1.5.4 ufo: 1.5.4
uncrypto: 0.1.3 uncrypto: 0.1.3
unimport: 3.14.5(rollup@4.27.4) unimport: 3.14.6(rollup@4.27.4)
untyped: 1.5.2 untyped: 1.5.2
transitivePeerDependencies: transitivePeerDependencies:
- magicast - magicast
@@ -4542,9 +4440,9 @@ snapshots:
'@nuxt/schema@3.15.1': '@nuxt/schema@3.15.1':
dependencies: dependencies:
consola: 3.3.3 consola: 3.4.0
defu: 6.1.4 defu: 6.1.4
pathe: 2.0.1 pathe: 2.0.2
std-env: 3.8.0 std-env: 3.8.0
'@nuxt/schema@3.15.4': '@nuxt/schema@3.15.4':
@@ -4720,10 +4618,10 @@ snapshots:
'@parcel/watcher-win32-ia32': 2.5.0 '@parcel/watcher-win32-ia32': 2.5.0
'@parcel/watcher-win32-x64': 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: dependencies:
'@nuxt/kit': 3.14.1592(magicast@0.3.5)(rollup@4.27.4) '@nuxt/kit': 3.15.4(magicast@0.3.5)(rollup@4.27.4)
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))
transitivePeerDependencies: transitivePeerDependencies:
- magicast - magicast
- rollup - rollup
@@ -4894,78 +4792,78 @@ snapshots:
'@sxzz/popperjs-es@2.11.7': {} '@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 optional: true
'@tauri-apps/cli-darwin-x64@2.2.7': '@tauri-apps/cli-darwin-x64@2.3.0':
optional: true optional: true
'@tauri-apps/cli-linux-arm-gnueabihf@2.2.7': '@tauri-apps/cli-linux-arm-gnueabihf@2.3.0':
optional: true optional: true
'@tauri-apps/cli-linux-arm64-gnu@2.2.7': '@tauri-apps/cli-linux-arm64-gnu@2.3.0':
optional: true optional: true
'@tauri-apps/cli-linux-arm64-musl@2.2.7': '@tauri-apps/cli-linux-arm64-musl@2.3.0':
optional: true optional: true
'@tauri-apps/cli-linux-x64-gnu@2.2.7': '@tauri-apps/cli-linux-x64-gnu@2.3.0':
optional: true optional: true
'@tauri-apps/cli-linux-x64-musl@2.2.7': '@tauri-apps/cli-linux-x64-musl@2.3.0':
optional: true optional: true
'@tauri-apps/cli-win32-arm64-msvc@2.2.7': '@tauri-apps/cli-win32-arm64-msvc@2.3.0':
optional: true optional: true
'@tauri-apps/cli-win32-ia32-msvc@2.2.7': '@tauri-apps/cli-win32-ia32-msvc@2.3.0':
optional: true optional: true
'@tauri-apps/cli-win32-x64-msvc@2.2.7': '@tauri-apps/cli-win32-x64-msvc@2.3.0':
optional: true optional: true
'@tauri-apps/cli@2.2.7': '@tauri-apps/cli@2.3.0':
optionalDependencies: optionalDependencies:
'@tauri-apps/cli-darwin-arm64': 2.2.7 '@tauri-apps/cli-darwin-arm64': 2.3.0
'@tauri-apps/cli-darwin-x64': 2.2.7 '@tauri-apps/cli-darwin-x64': 2.3.0
'@tauri-apps/cli-linux-arm-gnueabihf': 2.2.7 '@tauri-apps/cli-linux-arm-gnueabihf': 2.3.0
'@tauri-apps/cli-linux-arm64-gnu': 2.2.7 '@tauri-apps/cli-linux-arm64-gnu': 2.3.0
'@tauri-apps/cli-linux-arm64-musl': 2.2.7 '@tauri-apps/cli-linux-arm64-musl': 2.3.0
'@tauri-apps/cli-linux-x64-gnu': 2.2.7 '@tauri-apps/cli-linux-x64-gnu': 2.3.0
'@tauri-apps/cli-linux-x64-musl': 2.2.7 '@tauri-apps/cli-linux-x64-musl': 2.3.0
'@tauri-apps/cli-win32-arm64-msvc': 2.2.7 '@tauri-apps/cli-win32-arm64-msvc': 2.3.0
'@tauri-apps/cli-win32-ia32-msvc': 2.2.7 '@tauri-apps/cli-win32-ia32-msvc': 2.3.0
'@tauri-apps/cli-win32-x64-msvc': 2.2.7 '@tauri-apps/cli-win32-x64-msvc': 2.3.0
'@tauri-apps/plugin-cli@2.2.0': '@tauri-apps/plugin-cli@2.2.0':
dependencies: 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: dependencies:
'@tauri-apps/api': 2.2.0 '@tauri-apps/api': 2.3.0
'@tauri-apps/plugin-dialog@2.2.0': '@tauri-apps/plugin-dialog@2.2.0':
dependencies: dependencies:
'@tauri-apps/api': 2.2.0 '@tauri-apps/api': 2.3.0
'@tauri-apps/plugin-fs@2.2.0': '@tauri-apps/plugin-fs@2.2.0':
dependencies: 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: dependencies:
'@tauri-apps/api': 2.2.0 '@tauri-apps/api': 2.3.0
'@tauri-apps/plugin-shell@2.2.0': '@tauri-apps/plugin-shell@2.2.0':
dependencies: dependencies:
'@tauri-apps/api': 2.2.0 '@tauri-apps/api': 2.3.0
'@tauri-apps/plugin-window-state@2.2.1': '@tauri-apps/plugin-window-state@2.2.1':
dependencies: dependencies:
'@tauri-apps/api': 2.2.0 '@tauri-apps/api': 2.3.0
'@trysound/sax@0.2.0': {} '@trysound/sax@0.2.0': {}
@@ -5127,6 +5025,10 @@ snapshots:
'@vue/devtools-api@6.6.4': {} '@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))': '@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: dependencies:
'@vue/devtools-kit': 7.6.8 '@vue/devtools-kit': 7.6.8
@@ -5149,10 +5051,24 @@ snapshots:
speakingurl: 14.0.1 speakingurl: 14.0.1
superjson: 2.2.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': '@vue/devtools-shared@7.6.8':
dependencies: dependencies:
rfdc: 1.4.1 rfdc: 1.4.1
'@vue/devtools-shared@7.7.2':
dependencies:
rfdc: 1.4.1
'@vue/reactivity@3.5.13': '@vue/reactivity@3.5.13':
dependencies: dependencies:
'@vue/shared': 3.5.13 '@vue/shared': 3.5.13
@@ -5177,11 +5093,11 @@ snapshots:
'@vue/shared@3.5.13': {} '@vue/shared@3.5.13': {}
'@vueuse/core@12.4.0(typescript@5.6.3)': '@vueuse/core@12.7.0(typescript@5.6.3)':
dependencies: dependencies:
'@types/web-bluetooth': 0.0.20 '@types/web-bluetooth': 0.0.20
'@vueuse/metadata': 12.4.0 '@vueuse/metadata': 12.7.0
'@vueuse/shared': 12.4.0(typescript@5.6.3) '@vueuse/shared': 12.7.0(typescript@5.6.3)
vue: 3.5.13(typescript@5.6.3) vue: 3.5.13(typescript@5.6.3)
transitivePeerDependencies: transitivePeerDependencies:
- typescript - typescript
@@ -5196,11 +5112,11 @@ snapshots:
- '@vue/composition-api' - '@vue/composition-api'
- vue - vue
'@vueuse/metadata@12.4.0': {} '@vueuse/metadata@12.7.0': {}
'@vueuse/metadata@9.13.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: dependencies:
vue: 3.5.13(typescript@5.6.3) vue: 3.5.13(typescript@5.6.3)
transitivePeerDependencies: transitivePeerDependencies:
@@ -5452,7 +5368,7 @@ snapshots:
citty@0.1.6: citty@0.1.6:
dependencies: dependencies:
consola: 3.3.3 consola: 3.4.0
clipboardy@4.0.0: clipboardy@4.0.0:
dependencies: dependencies:
@@ -5508,8 +5424,6 @@ snapshots:
confbox@0.1.8: {} confbox@0.1.8: {}
consola@3.2.3: {}
consola@3.3.3: {} consola@3.3.3: {}
consola@3.4.0: {} consola@3.4.0: {}
@@ -5961,7 +5875,7 @@ snapshots:
giget@1.2.3: giget@1.2.3:
dependencies: dependencies:
citty: 0.1.6 citty: 0.1.6
consola: 3.3.3 consola: 3.4.0
defu: 6.1.4 defu: 6.1.4
node-fetch-native: 1.6.4 node-fetch-native: 1.6.4
nypm: 0.3.12 nypm: 0.3.12
@@ -6074,8 +5988,6 @@ snapshots:
has-unicode@2.0.1: {} has-unicode@2.0.1: {}
hash-sum@2.0.0: {}
hasown@2.0.2: hasown@2.0.2:
dependencies: dependencies:
function-bind: 1.1.2 function-bind: 1.1.2
@@ -6145,8 +6057,6 @@ snapshots:
ignore@5.3.2: {} ignore@5.3.2: {}
ignore@6.0.2: {}
ignore@7.0.0: {} ignore@7.0.0: {}
ignore@7.0.3: {} ignore@7.0.3: {}
@@ -6276,16 +6186,12 @@ snapshots:
jiti@1.21.6: {} jiti@1.21.6: {}
jiti@2.4.0: {}
jiti@2.4.2: {} jiti@2.4.2: {}
js-levenshtein@1.1.6: {} js-levenshtein@1.1.6: {}
js-tokens@4.0.0: {} js-tokens@4.0.0: {}
js-tokens@9.0.0: {}
js-tokens@9.0.1: {} js-tokens@9.0.1: {}
js-yaml@4.1.0: js-yaml@4.1.0:
@@ -6312,8 +6218,6 @@ snapshots:
klona@2.0.6: {} klona@2.0.6: {}
knitwork@1.1.0: {}
knitwork@1.2.0: {} knitwork@1.2.0: {}
koa-compose@4.1.0: {} koa-compose@4.1.0: {}
@@ -6418,8 +6322,8 @@ snapshots:
local-pkg@0.5.1: local-pkg@0.5.1:
dependencies: dependencies:
mlly: 1.7.3 mlly: 1.7.4
pkg-types: 1.3.0 pkg-types: 1.3.1
local-pkg@1.0.0: local-pkg@1.0.0:
dependencies: dependencies:
@@ -6552,7 +6456,7 @@ snapshots:
dependencies: dependencies:
acorn: 8.14.0 acorn: 8.14.0
pathe: 1.1.2 pathe: 1.1.2
pkg-types: 1.3.0 pkg-types: 1.3.1
ufo: 1.5.4 ufo: 1.5.4
mlly@1.7.4: mlly@1.7.4:
@@ -6562,8 +6466,6 @@ snapshots:
pkg-types: 1.3.1 pkg-types: 1.3.1
ufo: 1.5.4 ufo: 1.5.4
mri@1.2.0: {}
mrmime@2.0.0: {} mrmime@2.0.0: {}
ms@2.0.0: {} ms@2.0.0: {}
@@ -6858,10 +6760,10 @@ snapshots:
nypm@0.3.12: nypm@0.3.12:
dependencies: dependencies:
citty: 0.1.6 citty: 0.1.6
consola: 3.3.3 consola: 3.4.0
execa: 8.0.1 execa: 8.0.1
pathe: 1.1.2 pathe: 1.1.2
pkg-types: 1.3.0 pkg-types: 1.3.1
ufo: 1.5.4 ufo: 1.5.4
nypm@0.4.1: nypm@0.4.1:
@@ -7004,42 +6906,33 @@ snapshots:
pify@4.0.1: pify@4.0.1:
optional: true 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: dependencies:
'@nuxt/kit': 3.15.0(magicast@0.3.5)(rollup@4.27.4) '@nuxt/kit': 3.15.0(magicast@0.3.5)(rollup@4.27.4)
deep-pick-omit: 1.2.1 deep-pick-omit: 1.2.1
defu: 6.1.4 defu: 6.1.4
destr: 2.0.3 destr: 2.0.3
optionalDependencies: 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/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: 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))
transitivePeerDependencies: transitivePeerDependencies:
- magicast - magicast
- rollup - rollup
- supports-color - 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: dependencies:
'@vue/devtools-api': 6.6.4 '@vue/devtools-api': 7.7.2
vue: 3.5.13(typescript@5.6.3) vue: 3.5.13(typescript@5.6.3)
vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3))
optionalDependencies: optionalDependencies:
typescript: 5.6.3 typescript: 5.6.3
transitivePeerDependencies:
- '@vue/composition-api'
pirates@4.0.6: {} 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: pkg-types@1.3.0:
dependencies: dependencies:
confbox: 0.1.8 confbox: 0.1.8
mlly: 1.7.3 mlly: 1.7.4
pathe: 1.1.2 pathe: 1.1.2
pkg-types@1.3.1: pkg-types@1.3.1:
@@ -7262,11 +7155,11 @@ snapshots:
picocolors: 1.1.1 picocolors: 1.1.1
source-map-js: 1.2.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: dependencies:
prettier: 3.4.2 prettier: 3.5.2
prettier@3.4.2: {} prettier@3.5.2: {}
pretty-bytes@6.1.1: {} pretty-bytes@6.1.1: {}
@@ -7566,10 +7459,6 @@ snapshots:
strip-final-newline@3.0.0: {} strip-final-newline@3.0.0: {}
strip-literal@2.1.0:
dependencies:
js-tokens: 9.0.0
strip-literal@2.1.1: strip-literal@2.1.1:
dependencies: dependencies:
js-tokens: 9.0.1 js-tokens: 9.0.1
@@ -7737,13 +7626,6 @@ snapshots:
uncrypto@0.1.3: {} 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: unctx@2.4.1:
dependencies: dependencies:
acorn: 8.14.0 acorn: 8.14.0
@@ -7770,24 +7652,6 @@ snapshots:
unicorn-magic@0.1.0: {} 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): unimport@3.14.5(rollup@4.27.4):
dependencies: dependencies:
'@rollup/pluginutils': 5.1.3(rollup@4.27.4) '@rollup/pluginutils': 5.1.3(rollup@4.27.4)
@@ -7797,10 +7661,10 @@ snapshots:
fast-glob: 3.3.2 fast-glob: 3.3.2
local-pkg: 0.5.1 local-pkg: 0.5.1
magic-string: 0.30.17 magic-string: 0.30.17
mlly: 1.7.3 mlly: 1.7.4
pathe: 1.1.2 pathe: 1.1.2
picomatch: 4.0.2 picomatch: 4.0.2
pkg-types: 1.2.1 pkg-types: 1.3.1
scule: 1.3.0 scule: 1.3.0
strip-literal: 2.1.1 strip-literal: 2.1.1
unplugin: 1.16.0 unplugin: 1.16.0
@@ -7904,18 +7768,6 @@ snapshots:
consola: 3.4.0 consola: 3.4.0
pathe: 1.1.2 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: untyped@1.5.2:
dependencies: dependencies:
'@babel/core': 7.26.0 '@babel/core': 7.26.0
+453 -324
View File
File diff suppressed because it is too large Load Diff
+11 -11
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "easytier-game" name = "easytier-game"
version = "1.4.0" version = "1.4.3"
homepage = "https://github.com/EasyTier/EasyTier" homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame" repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier" description = "A simple network initiator based on Easytier"
@@ -18,41 +18,41 @@ name = "app_lib"
crate-type = ["staticlib", "cdylib", "rlib"] crate-type = ["staticlib", "cdylib", "rlib"]
[build-dependencies] [build-dependencies]
tauri-build = { version = "2.0.5", features = [] } tauri-build = { version = "2.0.6", features = [] }
# prost-build = "0.13.2" # prost-build = "0.13.2"
[dependencies] [dependencies]
serde_json = "1.0.137" serde_json = "1.0.137"
serde = { version = "1.0.217", features = ["derive"] } serde = { version = "1.0.217", features = ["derive"] }
log = "0.4.25" log = "0.4.26"
tauri = { version = "2.2.5", features = [ "protocol-asset", tauri = { version = "2.3.0", features = [ "protocol-asset",
"tray-icon", "tray-icon",
"image-png", "image-png",
"image-ico", "image-ico"
"devtools"
] } ] }
tauri-plugin-log = "2.2.1" tauri-plugin-log = "2.2.2"
tauri-plugin-shell = "2.2.0" tauri-plugin-shell = "2.2.0"
reqwest = { version = "0.12.12", features = ["json"] } reqwest = { version = "0.12.12", features = ["json"] }
zip = "2.2.2" zip = "2.2.3"
sysinfo = '0.33.1' sysinfo = '0.33.1'
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" } planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
whoami = "1.5.2" whoami = "1.5.2"
tauri-plugin-fs = "2.2.0" tauri-plugin-fs = "2.2.0"
tauri-plugin-clipboard-manager = "2.2.1" tauri-plugin-clipboard-manager = "2.2.1"
rand = "0.8.5" rand = "0.9.0"
tokio = { version = "1.43.0", features = ["process"] } tokio = { version = "1.43.0", features = ["process"] }
tauri-plugin-dialog = "2.2.0" tauri-plugin-dialog = "2.2.0"
# prost = "0.13" # prost = "0.13"
# prost-types = "0.13" # prost-types = "0.13"
hashbrown = "0.15.2" hashbrown = "0.15.2"
# futures-util = "0.3"
[dependencies.windows] [dependencies.windows]
version = "0.58.0" 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] [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
tauri-plugin-cli = "2.2.0" 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" tauri-plugin-window-state = "2.2.1"
+9 -1
View File
@@ -88,11 +88,19 @@
"args": true, "args": true,
"cmd": "ping", "cmd": "ping",
"name": "ping" "name": "ping"
},
{
"args": true,
"cmd": "powershell",
"name": "powershell"
} }
] ]
}, },
"fs:default", "fs:default",
"fs:allow-read-dir", {
"identifier": "fs:allow-read-dir",
"allow": [{ "path": "$DESKTOP" }, { "path": "$DESKTOP/*" }, { "path": "**/*" }, { "path": "**" }]
},
"fs:allow-exists", "fs:allow-exists",
"fs:allow-open", "fs:allow-open",
"fs:allow-resource-read", "fs:allow-resource-read",
+29 -19
View File
@@ -4,27 +4,37 @@
"tcp", "tcp",
"udp" "udp"
], // 协议类型 ], // 协议类型
// easytier服务地址 - 可填写多个 方式1,逗号分隔,"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] (默认选中第一个) // easytier服务地址 - 可填写多个 方式1,逗号分隔,"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] (默认选中第一个)
"serverUrl": "public.easytier.top:11010", "serverUrl": "public.easytier.top:11010",
"networkName": "", // 网络名 "enableCustomListener": true,
"networkPassword": "", // 网络密码 "customListenerData": [
"hostname": "configTest", // 主机名 "tcp://0.0.0.0:11010",
"ipv4": "10.126.126.1", // IP地址(选填,下面有dhcp) "udp://0.0.0.0:11010",
"disableIpv6": false, // 禁用ipv6 "tcp://[::]:11010"
"disbleListenner": true, // 禁用端口监听 ],
"networkName": "", //房间名
"networkPassword": "", //房间密码
"hostname": "", //主机名
"ipv4": "", // 虚拟IP地址
"disableIpv6": false, // 禁用ipv6
"enableCustomListenerV6": true, // 启用ipv6监听
"customListenerV6Data": "udp://[::]:11010", // ipv6监听地址
"disbleListenner": false, // 禁用监听
"disableEncryption": false, // 禁用加密 "disableEncryption": false, // 禁用加密
"enablExitNode": false, // 启用出口节点
"noTun": false, // 禁用tun "noTun": false, // 禁用tun
"latencyfirst": false, // 延迟优先 "latencyfirst": false, // 延迟优先
"disableUdpHolePunching": false, // 禁用udp打洞 "disableUdpHolePunching": false, // 禁用udp打洞
"disbleP2p": false, // 禁用p2p, 强制中转 "disbleP2p": false, // 禁用p2p 强制中转
"dhcp": false, // 动态分配IP "dhcp": true, // 启用dhcp,动态获取IP
"devName": false, // 是否启用自定义网卡名 "devName": true, // 启用自定义网卡名
"devNameValue": "", // 网卡名(启用devName之后才生效) "devNameValue": "etgame", // 自定义网卡名
"enableCustonProtocol": false, // 是否启用自定义协议 "enableCustomProtocol": true, // 自定义p2p时默认协议
"customProtocol": "tcp", // 自定义协议类型 "customProtocol": "tcp", // 自定义p2p时使用的协议类型
"enableNetCardMetric": false, // 自定义easytier每次生成的网卡跃点 "enableNetCardMetric": true, // 启用自定义网卡跃点
"netCardMetricValue": 1, // 网卡跃点数量(1-9999) "netCardMetricValue": 1, // 网卡跃点
"enableKcpProxy": false, // 启用kcp代理 "enablePreventSleep": false, // 启用防止睡眠
"disableKcpInput": false //禁用kcp输入 "compression": "none", // 压缩算法
"enableKcpProxy": true, // 启用kcp代理
"disableKcpInput": false // 禁用kcp输入
} }
Binary file not shown.
Binary file not shown.
+23 -13
View File
@@ -3,6 +3,7 @@ use planif::schedule::TaskScheduler as planIfTaskScheduler;
use planif::schedule_builder::{Action, ScheduleBuilder}; use planif::schedule_builder::{Action, ScheduleBuilder};
use planif::settings::{Duration, LogonType, PrincipalSettings, RunLevel}; use planif::settings::{Duration, LogonType, PrincipalSettings, RunLevel};
use reqwest::{Client, Error}; use reqwest::{Client, Error};
// use futures_util::StreamExt;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::collections::HashMap;
use std::fs::{self, File}; use std::fs::{self, File};
@@ -91,13 +92,13 @@ fn generate_random_user_agent() -> String {
"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:{version}) Gecko/20100101 Firefox/{version}", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:{version}) Gecko/20100101 Firefox/{version}",
]; ];
let mut rng = rand::thread_rng(); let mut rng = rand::rng();
let template = user_agents[rng.gen_range(0..user_agents.len())]; let template = user_agents[rng.random_range(0..user_agents.len())];
// 生成随机版本号 // 生成随机版本号
let version_major: u8 = rng.gen_range(70..90); let version_major: u8 = rng.random_range(70..90);
let version_minor: u8 = rng.gen_range(0..10); let version_minor: u8 = rng.random_range(0..10);
let version_patch: u8 = rng.gen_range(0..10); let version_patch: u8 = rng.random_range(0..10);
let version = format!("{}.{}.{}", version_major, version_minor, version_patch); let version = format!("{}.{}.{}", version_major, version_minor, version_patch);
// 替换模板中的版本号占位符 // 替换模板中的版本号占位符
@@ -325,7 +326,7 @@ async fn get_route_by_cli() -> String {
} }
#[tauri::command(rename_all = "snake_case")] #[tauri::command(rename_all = "snake_case")]
async fn download_easytier_zip(download_url: String, file_name: String) { async fn download_easytier_zip(app_handle: tauri::AppHandle ,download_url: String, file_name: String) {
let cache_dir_path = get_tool_exe_path("\\easytier\\cache"); let cache_dir_path = get_tool_exe_path("\\easytier\\cache");
let cache_file_name = format!("{}\\{}", cache_dir_path, file_name); let cache_file_name = format!("{}\\{}", cache_dir_path, file_name);
let cache_file_name_path = path::Path::new(&cache_file_name); let cache_file_name_path = path::Path::new(&cache_file_name);
@@ -335,12 +336,12 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
} }
let target = format!("{}", download_url); let target = format!("{}", download_url);
let response = reqwest::get(target) let mut response = reqwest::get(target)
.await .await
.expect("error to download easytier url"); .expect("error to download easytier url");
let easytier_path = get_tool_exe_path("\\easytier"); let easytier_path = get_tool_exe_path("\\easytier");
let file_path = format!("{}\\{}", easytier_path, file_name); let file_path = format!("{}\\{}", easytier_path, file_name);
println!("download easytier to {}", file_path); // println!("download easytier to {}", file_path);
let easytier_dir = path::Path::new(&easytier_path); let easytier_dir = path::Path::new(&easytier_path);
if !easytier_dir.exists() { if !easytier_dir.exists() {
@@ -354,11 +355,20 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
Err(why) => panic!("couldn't create {}", why), Err(why) => panic!("couldn't create {}", why),
Ok(file) => file, Ok(file) => file,
}; };
let context_size: u64 = response.content_length().unwrap();
let content = response.bytes().await.expect("error to bytes easytier"); while let Some(item) = response.chunk().await.unwrap() {
println!("下载完成,开始写入"); match file.write_all(&item) {
file.write_all(&content).expect("error to write easytier"); Ok(_) => {
println!("写入完成"); app_handle.emit("download_core_progress", [item.len() as u64, context_size]).expect("error to emit download_core_progress");
},Err(why) => {
log::error!("error to write file: {}", why);
app_handle.emit("download_core_progress_error", why.to_string()).expect("error to emit download_core_progress_error");
return
}
};
}
println!("下载完成");
unzip(path); unzip(path);
let cache_dir_path = path::Path::new(&cache_dir_path); let cache_dir_path = path::Path::new(&cache_dir_path);
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game", "productName": "easytier-game",
"version": "1.4.0", "version": "1.4.3",
"identifier": "com.tauri.easytier-game", "identifier": "com.tauri.easytier-game",
"build": { "build": {
@@ -12,7 +12,7 @@
"app": { "app": {
"windows": [ "windows": [
{ {
"title": "easytier-game 1.4.0", "title": "easytier-game 1.4.3",
"label": "main", "label": "main",
"minWidth": 340, "minWidth": 340,
"width": 340, "width": 340,
+13 -6
View File
@@ -15,8 +15,8 @@ const store = defineStore("main", {
disableIpv6: false, // 是否禁用IPv6 disableIpv6: false, // 是否禁用IPv6
port: "11010", // 监听端口号 port: "11010", // 监听端口号
enableCustomListener: true, // 是否自定义监听 enableCustomListener: true, // 是否自定义监听
customListenerV6Data: "udp://[::]:11010", //自定义ipv6监听 enableCustomListenerV6: true, // 是否自定义IPV6监听
enableCustomListenerV6: true, // 是否自定义监听 customListenerV6Data: "udp://[::]:11010", //自定义ipv6监
customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址 customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
disbleListenner: false, // 是否禁用监听 disbleListenner: false, // 是否禁用监听
disableEncryption: false, // 是否禁用加密 disableEncryption: false, // 是否禁用加密
@@ -41,6 +41,7 @@ const store = defineStore("main", {
compression: "none", //加密算法 compression: "none", //加密算法
enableKcpProxy: true, //启用kcp代理 默认开启 enableKcpProxy: true, //启用kcp代理 默认开启
disableKcpInput: false, //禁用kcp输入 disableKcpInput: false, //禁用kcp输入
bindDeviceEnable: false, //是否绑定设备
}, },
serverConfig: { serverConfig: {
enableWhiteList: true, // 是否启用白名单 enableWhiteList: true, // 是否启用白名单
@@ -51,7 +52,8 @@ const store = defineStore("main", {
port: "11010" // 服务器端口 port: "11010" // 服务器端口
}, },
cidrEnable: false, cidrEnable: false,
basePeers: ["public.easytier.top:11010","public.easytier.net:11010"], proxyForwardBySystem: false, // 是否通过系统内核转发子网代理数据包,禁用内置NAT
basePeers: ["public.easytier.top:11010", "public.easytier.net:11010"],
theme: false, //主题 false light true dark theme: false, //主题 false light true dark
configStartEnable: false, //使用配置文件启动 configStartEnable: false, //使用配置文件启动
configPath: "", //配置文件路径 configPath: "", //配置文件路径
@@ -67,8 +69,9 @@ const store = defineStore("main", {
winipBcPid: 0, winipBcPid: 0,
winipBcStart: false, 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: { persist: {
@@ -101,7 +104,7 @@ const store = defineStore("main", {
"config.enableNetCardMetric", "config.enableNetCardMetric",
"config.netCardMetricValue", "config.netCardMetricValue",
"config.port", "config.port",
"config.disbleListenner", "config.disbleListenner",
"config.enableCustomListener", "config.enableCustomListener",
"config.customListenerData", "config.customListenerData",
@@ -116,6 +119,8 @@ const store = defineStore("main", {
"config.enableKcpProxy", "config.enableKcpProxy",
"config.disableKcpInput", "config.disableKcpInput",
"config.bindDeviceEnable",
"serverConfig.autoStart", "serverConfig.autoStart",
// 'serverConfig.enableListener', // 'serverConfig.enableListener',
"serverConfig.enableWhiteList", "serverConfig.enableWhiteList",
@@ -124,6 +129,7 @@ const store = defineStore("main", {
"serverConfig.port", "serverConfig.port",
"cidrEnable", "cidrEnable",
"proxyForwardBySystem",
"basePeers", "basePeers",
"theme", "theme",
"configStartEnable", "configStartEnable",
@@ -136,7 +142,8 @@ const store = defineStore("main", {
"delayInjectDll", "delayInjectDll",
"forceBindInput", "forceBindInput",
"forceBindFile", "forceBindFile",
"latestTagName",
"gameList" "gameList"
] ]
// // 除了这些,其他都要存下来 // // 除了这些,其他都要存下来