mirror of
https://github.com/EasyTier/EasytierGame.git
synced 2025-05-19 10:27:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3fdcb2c642 | ||
|
|
436c265e95 | ||
|
|
01d475860b | ||
|
|
4564cf994b | ||
|
|
c1bcee32ab | ||
|
|
073bc59e59 | ||
|
|
affce1125b | ||
|
|
2b87747fe5 | ||
|
|
423d3ba243 | ||
|
|
0ce2595833 | ||
|
|
9eb0e5b7ac | ||
|
|
6fde1c2236 |
+19
-4
@@ -10,7 +10,7 @@
|
|||||||
}
|
}
|
||||||
} */
|
} */
|
||||||
html {
|
html {
|
||||||
font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
|
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
|
||||||
}
|
}
|
||||||
html,
|
html,
|
||||||
body {
|
body {
|
||||||
@@ -51,9 +51,24 @@ html.dark body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.el-table {
|
.el-table {
|
||||||
font-size: 12px!important;
|
font-size: 12px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-select-dropdown__wrap {
|
.el-select-dropdown__wrap {
|
||||||
max-height: 150px!important;
|
max-height: 138px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.el-popper:not(.is-pure) {
|
||||||
|
font-size: 10px !important;
|
||||||
|
line-height: 1.2em !important;
|
||||||
|
padding: 5px !important;
|
||||||
|
font-weight: lighter !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-message-box__content + .el-message-box__btns {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: flex-start;
|
||||||
|
flex-direction: row-reverse;
|
||||||
|
gap: 0 10px;
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
pnpm run build
|
||||||
|
rustup default nightly
|
||||||
|
rem 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录
|
||||||
|
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
|
||||||
|
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
|
||||||
|
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
|
||||||
|
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
|
||||||
|
pnpm tauri build -- -Z build-std --target x86_64-win7-windows-msvc
|
||||||
|
rustup default stable
|
||||||
|
pnpm tauri build
|
||||||
|
pnpm run release
|
||||||
|
pnpm run release-win7
|
||||||
+6
-5
@@ -46,7 +46,7 @@ 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.setMenuOnLeftClick(false);
|
tray.setShowMenuOnLeftClick(false);
|
||||||
tray.setMenu(
|
tray.setMenu(
|
||||||
await Menu.new({
|
await Menu.new({
|
||||||
id: "main",
|
id: "main",
|
||||||
@@ -89,7 +89,7 @@ export async function MenuItemPublicPeers() {
|
|||||||
id: "publicPeers",
|
id: "publicPeers",
|
||||||
text: "公共节点",
|
text: "公共节点",
|
||||||
action: async () => {
|
action: async () => {
|
||||||
await open("https://easytier.gd.nkbpal.cn/status/easytier")
|
await open(import.meta.env.VITE_PUBLIC_PEERS_URL)
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -121,9 +121,10 @@ export async function MenuItemTheme() {
|
|||||||
text: "主题切换",
|
text: "主题切换",
|
||||||
action: async () => {
|
action: async () => {
|
||||||
const mainStore = useMainStore();
|
const mainStore = useMainStore();
|
||||||
mainStore.theme = !mainStore.theme;
|
mainStore.$patch({
|
||||||
// const appWindow = getCurrentWindow();
|
theme: !mainStore.theme
|
||||||
// appWindow.emitTo("main", "config", { theme: mainStore.theme });
|
});
|
||||||
|
// mainStore.$persist();
|
||||||
await setTheme(mainStore.theme);
|
await setTheme(mainStore.theme);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
+12
-17
@@ -67,21 +67,16 @@ export default async (
|
|||||||
export const dataSubscribe = async (cb?: (...args: any) => any) => {
|
export const dataSubscribe = async (cb?: (...args: any) => any) => {
|
||||||
if (!cb) return;
|
if (!cb) return;
|
||||||
const mainStore = useMainStore();
|
const mainStore = useMainStore();
|
||||||
const currentWindow = getCurrentWindow();
|
const abort = new AbortController();
|
||||||
let removeSubscribe = mainStore.$subscribe(async (...args) => {
|
window.addEventListener("storage", async () => {
|
||||||
const emitData = await cb(args);
|
mainStore.$hydrate();
|
||||||
await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
|
if (cb && cb instanceof Function) {
|
||||||
});
|
await cb();
|
||||||
const unlisten = currentWindow.listen<any>("global-main-store", event => {
|
}
|
||||||
removeSubscribe && removeSubscribe();
|
}, {
|
||||||
mainStore.$patch({ ...event.payload.store }); // 更新全局状态
|
signal: abort.signal
|
||||||
removeSubscribe = mainStore.$subscribe(async (...args) => {
|
})
|
||||||
const emitData = await cb(args);
|
onBeforeUnmount(() => {
|
||||||
await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
|
abort?.abort();
|
||||||
});
|
})
|
||||||
});
|
|
||||||
onBeforeUnmount(async () => {
|
|
||||||
unlisten && (await unlisten)();
|
|
||||||
removeSubscribe && removeSubscribe();
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|||||||
Vendored
+3
@@ -1,5 +1,8 @@
|
|||||||
VITE_CONFIG_PATH=easytier/config/
|
VITE_CONFIG_PATH=easytier/config/
|
||||||
|
VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
|
||||||
VITE_CONFIG_FILE_NAME=easytier/config.json
|
VITE_CONFIG_FILE_NAME=easytier/config.json
|
||||||
VITE_LOG_PATH=easytier/logs/
|
VITE_LOG_PATH=easytier/logs/
|
||||||
VITE_CACHE_PATH=easytier/cache/
|
VITE_CACHE_PATH=easytier/cache/
|
||||||
|
VITE_GAME_LIST_PATH=easytier/gameList/
|
||||||
|
VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
|
||||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||||
Vendored
+3
@@ -1,5 +1,8 @@
|
|||||||
VITE_CONFIG_PATH=easytier/config/
|
VITE_CONFIG_PATH=easytier/config/
|
||||||
|
VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
|
||||||
VITE_CONFIG_FILE_NAME=easytier/config.json
|
VITE_CONFIG_FILE_NAME=easytier/config.json
|
||||||
VITE_LOG_PATH=easytier/logs/
|
VITE_LOG_PATH=easytier/logs/
|
||||||
VITE_CACHE_PATH=easytier/cache/
|
VITE_CACHE_PATH=easytier/cache/
|
||||||
|
VITE_GAME_LIST_PATH=easytier/gameList/
|
||||||
|
VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
|
||||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||||
+93
-93
@@ -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,
|
telemetry: false,
|
||||||
|
|
||||||
imports: {
|
imports: {
|
||||||
autoImport: false
|
autoImport: false
|
||||||
},
|
},
|
||||||
|
|
||||||
css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
|
css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
|
||||||
modules: [
|
modules: [
|
||||||
"@element-plus/nuxt",
|
"@element-plus/nuxt",
|
||||||
"@pinia/nuxt",
|
"@pinia/nuxt",
|
||||||
[
|
[
|
||||||
"pinia-plugin-persistedstate/nuxt",
|
"pinia-plugin-persistedstate/nuxt",
|
||||||
{
|
{
|
||||||
key: "__glj_persisted_%id",
|
key: "__glj_persisted_%id",
|
||||||
storage: "localStorage"
|
storage: "localStorage"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"@nuxtjs/tailwindcss"
|
"@nuxtjs/tailwindcss"
|
||||||
],
|
],
|
||||||
|
|
||||||
alias: {
|
alias: {
|
||||||
"@": path.resolve(__dirname, "./")
|
"@": path.resolve(__dirname, "./")
|
||||||
},
|
},
|
||||||
|
|
||||||
experimental: {
|
experimental: {
|
||||||
payloadExtraction: false
|
payloadExtraction: false
|
||||||
},
|
},
|
||||||
|
|
||||||
devtools: {
|
devtools: {
|
||||||
enabled: false
|
enabled: false
|
||||||
},
|
},
|
||||||
|
|
||||||
router: {
|
router: {
|
||||||
options: {
|
options: {
|
||||||
hashMode: true
|
hashMode: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
vite: {
|
vite: {
|
||||||
plugins: [vueJSX({})],
|
plugins: [vueJSX({})],
|
||||||
envDir: "env",
|
envDir: "env",
|
||||||
optimizeDeps: {
|
optimizeDeps: {
|
||||||
// include: [...optimizeDepsElementPlusIncludes]
|
// include: [...optimizeDepsElementPlusIncludes]
|
||||||
},
|
},
|
||||||
// prevent vite from obscuring rust errors
|
// prevent vite from obscuring rust errors
|
||||||
clearScreen: false,
|
clearScreen: false,
|
||||||
// Tauri expects a fixed port, fail if that port is not available
|
// Tauri expects a fixed port, fail if that port is not available
|
||||||
server: {
|
server: {
|
||||||
strictPort: true
|
strictPort: true
|
||||||
},
|
},
|
||||||
// to access the Tauri environment variables set by the CLI with information about the current target
|
// to access the Tauri environment variables set by the CLI with information about the current target
|
||||||
envPrefix: ["VITE_", "TAURI_"],
|
envPrefix: ["VITE_", "TAURI_"],
|
||||||
build: {
|
build: {
|
||||||
// minify: "esbuild",
|
// minify: "esbuild",
|
||||||
chunkSizeWarningLimit: 1500,
|
chunkSizeWarningLimit: 1500,
|
||||||
// Tauri uses Chromium on Windows and WebKit on macOS and Linux
|
// Tauri uses Chromium on Windows and WebKit on macOS and Linux
|
||||||
target: process.env.TAURI_PLATFORM == "windows" ? "chrome105" : "safari13",
|
target: process.env.TAURI_PLATFORM == "windows" ? "chrome105" : "safari13",
|
||||||
// don't minify for debug builds
|
// don't minify for debug builds
|
||||||
minify: !process.env.TAURI_DEBUG ? "esbuild" : false,
|
minify: !process.env.TAURI_DEBUG ? "esbuild" : false,
|
||||||
// 为调试构建生成源代码映射 (sourcemap)
|
// 为调试构建生成源代码映射 (sourcemap)
|
||||||
sourcemap: !!process.env.TAURI_DEBUG
|
sourcemap: !!process.env.TAURI_DEBUG
|
||||||
},
|
},
|
||||||
esbuild: {
|
esbuild: {
|
||||||
// pure: ["console.log"],
|
// pure: ["console.log"],
|
||||||
drop: ["debugger"]
|
drop: ["debugger"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
postcss: {
|
postcss: {
|
||||||
plugins: {
|
plugins: {
|
||||||
tailwindcss: {},
|
tailwindcss: {},
|
||||||
autoprefixer: {}
|
autoprefixer: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
app: {
|
app: {
|
||||||
rootId: "__easytier",
|
rootId: "__easytier",
|
||||||
cdnURL: "./",
|
cdnURL: "./",
|
||||||
buildAssetsDir: "__easytier/",
|
buildAssetsDir: "__easytier/",
|
||||||
head: {
|
head: {
|
||||||
meta: [
|
meta: [
|
||||||
{
|
{
|
||||||
name: "viewport",
|
name: "viewport",
|
||||||
content: "width=device-width, initial-scale=1"
|
content: "width=device-width, initial-scale=1"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
charset: "utf-8"
|
charset: "utf-8"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
title: "easytier-game"
|
title: "easytier-game"
|
||||||
// link: [],
|
// link: [],
|
||||||
// style: [],
|
// style: [],
|
||||||
// script: [],
|
// script: [],
|
||||||
// noscript: []
|
// noscript: []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
compatibilityDate: "2024-11-12"
|
compatibilityDate: "2024-11-12"
|
||||||
});
|
});
|
||||||
|
|||||||
+17
-17
@@ -3,39 +3,39 @@
|
|||||||
"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.3.6",
|
"version": "1.4.0",
|
||||||
"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",
|
||||||
"release": "node zip.js"
|
"release": "node zip.js",
|
||||||
|
"release-win7": "node zip.js win7"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@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.12.2",
|
"@nuxtjs/tailwindcss": "6.13.1",
|
||||||
"@pinia/nuxt": "0.9.0",
|
"@pinia/nuxt": "0.9.0",
|
||||||
"@tauri-apps/api": "^2.2.0",
|
"@tauri-apps/api": "^2.2.0",
|
||||||
"@tauri-apps/cli": "^2.2.2",
|
"@tauri-apps/cli": "2.2.7",
|
||||||
"@tauri-apps/plugin-cli": "^2.2.0",
|
"@tauri-apps/plugin-cli": "^2.2.0",
|
||||||
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
|
"@tauri-apps/plugin-clipboard-manager": "2.2.0",
|
||||||
"@tauri-apps/plugin-fs": "^2.2.0",
|
|
||||||
"@tauri-apps/plugin-log": "^2.2.0",
|
|
||||||
"@tauri-apps/plugin-shell": "^2.2.0",
|
|
||||||
"@tauri-apps/plugin-window-state": "^2.2.0",
|
|
||||||
"@tauri-apps/plugin-dialog": "2.2.0",
|
"@tauri-apps/plugin-dialog": "2.2.0",
|
||||||
|
"@tauri-apps/plugin-fs": "^2.2.0",
|
||||||
|
"@tauri-apps/plugin-log": "2.2.1",
|
||||||
|
"@tauri-apps/plugin-shell": "^2.2.0",
|
||||||
|
"@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.2.0",
|
"@vueuse/core": "12.4.0",
|
||||||
"archiver": "^7.0.1",
|
"archiver": "^7.0.1",
|
||||||
"element-plus": "2.9.2",
|
"element-plus": "2.9.4",
|
||||||
"less": "^4.2.0",
|
"less": "4.2.1",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"nuxt": "3.15.1",
|
"nuxt": "3.15.4",
|
||||||
"pinia": "^2.3.0",
|
"pinia": "2.3.1",
|
||||||
"pinia-plugin-persistedstate": "^4.2.0",
|
"pinia-plugin-persistedstate": "^4.2.0",
|
||||||
"postcss": "^8.4.38",
|
"postcss": "^8.4.38",
|
||||||
"prettier": "^3.4.1",
|
"prettier": "3.4.2",
|
||||||
"prettier-plugin-tailwindcss": "^0.6.9",
|
"prettier-plugin-tailwindcss": "0.6.11"
|
||||||
"vue-clipboard3": "^2.0.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+32
-8
@@ -43,6 +43,21 @@
|
|||||||
<ElIcon><QuestionFilled /></ElIcon>
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||||
|
<ElCheckbox v-model="mainStore.config.enableKcpProxy">启用KCP代理</ElCheckbox>
|
||||||
|
<ElTooltip content="将TCP流量转为KCP流量,降低传输延迟,提升传输速度">
|
||||||
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
|
</ElTooltip>
|
||||||
|
<CoreVersionWarning version="2.2.0" />
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||||
|
<ElCheckbox v-model="mainStore.config.disableKcpInput">禁用KCP输入</ElCheckbox>
|
||||||
|
<ElTooltip content="禁用KCP入站流量,其他开启KCP代理的节点无法连接到本节点">
|
||||||
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
|
</ElTooltip>
|
||||||
|
<CoreVersionWarning version="2.2.0" />
|
||||||
|
</div>
|
||||||
|
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
|
||||||
<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
|
<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
|
||||||
<ElDivider />
|
<ElDivider />
|
||||||
<div class="flex items-center gap-[10px]">
|
<div class="flex items-center gap-[10px]">
|
||||||
@@ -194,8 +209,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<ElDivider />
|
<ElDivider />
|
||||||
|
|
||||||
<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
|
<div class="flex items-center gap-[10px]">
|
||||||
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
|
<ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox>
|
||||||
|
<ElTooltip content="使用用户态TCP/IP协议栈smoltcp,避免操作系统防火墙问题导致无法子网代理">
|
||||||
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
|
</ElTooltip>
|
||||||
|
</div>
|
||||||
<div class="flex flex-nowrap items-center gap-[15px]">
|
<div class="flex flex-nowrap items-center gap-[15px]">
|
||||||
<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
|
<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
|
||||||
<div class="w-[140px]">
|
<div class="w-[140px]">
|
||||||
@@ -229,11 +248,12 @@
|
|||||||
import { Command } from "@tauri-apps/plugin-shell";
|
import { Command } from "@tauri-apps/plugin-shell";
|
||||||
import { exists, mkdir, BaseDirectory, remove } from "@tauri-apps/plugin-fs";
|
import { exists, mkdir, BaseDirectory, remove } from "@tauri-apps/plugin-fs";
|
||||||
import { ElMessage } from "element-plus";
|
import { ElMessage } from "element-plus";
|
||||||
import { reactive } from "vue";
|
import { reactive, ref } from "vue";
|
||||||
import { dataSubscribe } from "@/composables/windows";
|
import { dataSubscribe } from "@/composables/windows";
|
||||||
import { ATJ, supportProtocols } from "~/utils";
|
import { ATJ, supportProtocols } from "~/utils";
|
||||||
import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
|
import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
|
||||||
import { ElConfirmDanger } from "~/utils/element";
|
import { ElConfirmDanger } from "~/utils/element";
|
||||||
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
|
|
||||||
const protocols = supportProtocols();
|
const protocols = supportProtocols();
|
||||||
const listenerDialogData = reactive<{ [key: string]: any }>({
|
const listenerDialogData = reactive<{ [key: string]: any }>({
|
||||||
@@ -251,6 +271,7 @@
|
|||||||
|
|
||||||
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 openLogDir = async () => {
|
const openLogDir = async () => {
|
||||||
const resourceDir = await getResourceDir();
|
const resourceDir = await getResourceDir();
|
||||||
const logPath = import.meta.env.VITE_LOG_PATH;
|
const logPath = import.meta.env.VITE_LOG_PATH;
|
||||||
@@ -263,6 +284,7 @@
|
|||||||
}
|
}
|
||||||
await Command.create("explorer", [logDirPath]).execute();
|
await Command.create("explorer", [logDirPath]).execute();
|
||||||
};
|
};
|
||||||
|
|
||||||
const openConfigJsonDir = async () => {
|
const openConfigJsonDir = async () => {
|
||||||
const resourceDir = await getResourceDir();
|
const resourceDir = await getResourceDir();
|
||||||
const easytierDir = await join(resourceDir, "easytier/");
|
const easytierDir = await join(resourceDir, "easytier/");
|
||||||
@@ -274,7 +296,13 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
dataSubscribe(async (...a) => {
|
// 为bind_device功能增加改方法
|
||||||
|
const _getGuids = async () => {
|
||||||
|
const guidsValue = await invoke<string[][]>("get_network_adapter_guids");
|
||||||
|
guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : [];
|
||||||
|
};
|
||||||
|
|
||||||
|
dataSubscribe(async () => {
|
||||||
if (!mainStore.createConfigInEasytier) {
|
if (!mainStore.createConfigInEasytier) {
|
||||||
// 考虑删除本地config.json文件
|
// 考虑删除本地config.json文件
|
||||||
const configJsonPath = import.meta.env.VITE_CONFIG_FILE_NAME;
|
const configJsonPath = import.meta.env.VITE_CONFIG_FILE_NAME;
|
||||||
@@ -294,9 +322,5 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
|
||||||
config: { ...mainStore.config },
|
|
||||||
createConfigInEasytier: mainStore.createConfigInEasytier
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
+2
-3
@@ -107,13 +107,12 @@
|
|||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
unlistenStart = await listenStart();
|
unlistenStart = await listenStart();
|
||||||
|
dataSubscribe();
|
||||||
});
|
});
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
unlistenStart && unlistenStart();
|
unlistenStart && unlistenStart();
|
||||||
});
|
});
|
||||||
|
|
||||||
dataSubscribe(async (...a) => {
|
|
||||||
return { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } };
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -0,0 +1,397 @@
|
|||||||
|
<template>
|
||||||
|
<div class="relative flex h-full flex-col flex-wrap gap-[0] overflow-hidden">
|
||||||
|
<div class="flex h-[40px] w-full flex-nowrap items-center gap-[0_5px]">
|
||||||
|
<div class="ml-[5px] mr-auto flex flex-1">
|
||||||
|
<ElInput
|
||||||
|
size="small"
|
||||||
|
v-model="searchValue"
|
||||||
|
placeholder="请输入游戏名进行查询"
|
||||||
|
></ElInput>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<ElButton
|
||||||
|
:icon="Plus"
|
||||||
|
size="small"
|
||||||
|
type="primary"
|
||||||
|
class="mr-[5px]"
|
||||||
|
@click="handleCreate"
|
||||||
|
>
|
||||||
|
新增本地游戏
|
||||||
|
</ElButton>
|
||||||
|
<ElButton
|
||||||
|
size="small"
|
||||||
|
class="mr-[5px]"
|
||||||
|
@click="openCoverDir"
|
||||||
|
>
|
||||||
|
打开封面目录
|
||||||
|
</ElButton>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-1 flex-wrap gap-[0] overflow-auto">
|
||||||
|
<div
|
||||||
|
v-for="(item, idx) in computedGameList"
|
||||||
|
:key="item.id"
|
||||||
|
class="w-[25%] p-[4px]"
|
||||||
|
>
|
||||||
|
<div class="group/card relative">
|
||||||
|
<ElCard>
|
||||||
|
<template #header>
|
||||||
|
<div class="flex flex-nowrap gap-[0_8px]">
|
||||||
|
<ElTooltip :content="item.name">
|
||||||
|
<p class="ml-auto flex-1 truncate">
|
||||||
|
<ElText
|
||||||
|
size="default"
|
||||||
|
type="info"
|
||||||
|
>
|
||||||
|
{{ item.name }}
|
||||||
|
</ElText>
|
||||||
|
</p>
|
||||||
|
</ElTooltip>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<img
|
||||||
|
:src="showImgConvertFileSrc(item.showImg)"
|
||||||
|
@error="handleImgError(item, idx)"
|
||||||
|
class="aspect-[1] w-full object-cover"
|
||||||
|
/>
|
||||||
|
</ElCard>
|
||||||
|
<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"
|
||||||
|
>
|
||||||
|
<ElButton
|
||||||
|
size="large"
|
||||||
|
type="success"
|
||||||
|
:icon="VideoPlay"
|
||||||
|
@click.stop="handleStartGame(item)"
|
||||||
|
>
|
||||||
|
启动游戏
|
||||||
|
</ElButton>
|
||||||
|
<div class="pt-[5px]">
|
||||||
|
<ElButton
|
||||||
|
size="small"
|
||||||
|
type="info"
|
||||||
|
:icon="EditPen"
|
||||||
|
title="修改"
|
||||||
|
@click.stop="handleEditItem(item)"
|
||||||
|
/>
|
||||||
|
<ElButton
|
||||||
|
size="small"
|
||||||
|
type="danger"
|
||||||
|
:icon="DeleteFilled"
|
||||||
|
title="删除"
|
||||||
|
@click.stop="handleDeleteItem(item)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="w-[25%] p-[4px]">
|
||||||
|
<ElTooltip content="新增本地游戏">
|
||||||
|
<ElCard
|
||||||
|
@click.stop="handleCreate"
|
||||||
|
shadow="hover"
|
||||||
|
>
|
||||||
|
<div class="group/plus flex cursor-pointer items-center justify-center py-[25px]">
|
||||||
|
<ElIcon class="!text-[80px] transition-all group-hover/plus:text-[color:var(--el-color-primary)]">
|
||||||
|
<Plus></Plus>
|
||||||
|
</ElIcon>
|
||||||
|
</div>
|
||||||
|
</ElCard>
|
||||||
|
</ElTooltip>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<ElDialog
|
||||||
|
width="95%"
|
||||||
|
top="30px"
|
||||||
|
append-to-body
|
||||||
|
:z-index="10"
|
||||||
|
class="!mb-0"
|
||||||
|
v-model="createGameData.visible"
|
||||||
|
:close-on-press-escape="false"
|
||||||
|
:title="`${createGameData.isEdit ? '编辑' : '新建'}本地游戏`"
|
||||||
|
>
|
||||||
|
<ElForm
|
||||||
|
hide-required-asterisk
|
||||||
|
label-position="left"
|
||||||
|
:model="createGameData.form"
|
||||||
|
:rules="createGameData.rules"
|
||||||
|
ref="formRef"
|
||||||
|
>
|
||||||
|
<ElFormItem
|
||||||
|
label="游戏名字"
|
||||||
|
prop="name"
|
||||||
|
>
|
||||||
|
<ElInput
|
||||||
|
v-model="createGameData.form.name"
|
||||||
|
placeholder="请输入游戏名字"
|
||||||
|
></ElInput>
|
||||||
|
</ElFormItem>
|
||||||
|
<ElFormItem
|
||||||
|
label="执行文件"
|
||||||
|
prop="exePath"
|
||||||
|
>
|
||||||
|
<ElInput
|
||||||
|
v-model="createGameData.form.exePath"
|
||||||
|
placeholder="请选择游戏执行文件"
|
||||||
|
>
|
||||||
|
<template #append>
|
||||||
|
<ElButton
|
||||||
|
size="small"
|
||||||
|
type="primary"
|
||||||
|
@click.stop="handleBrowser('exePath')"
|
||||||
|
>
|
||||||
|
浏览
|
||||||
|
</ElButton>
|
||||||
|
</template>
|
||||||
|
</ElInput>
|
||||||
|
</ElFormItem>
|
||||||
|
<ElFormItem
|
||||||
|
label="游戏封面"
|
||||||
|
prop="coverImg"
|
||||||
|
>
|
||||||
|
<ElBadge :hidden="createGameData.form.showImg == defaultPng">
|
||||||
|
<template #content="{ value }">
|
||||||
|
<div
|
||||||
|
class="cursor-pointer"
|
||||||
|
@click.stop="handleBadgeDeleteCover"
|
||||||
|
>
|
||||||
|
<ElIcon>
|
||||||
|
<DeleteFilled />
|
||||||
|
</ElIcon>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<img
|
||||||
|
@click.stop="handleBrowser('coverImg')"
|
||||||
|
:src="showImgConvertFileSrc(createGameData.form.showImg)"
|
||||||
|
class="aspect-[1] w-[120px] cursor-pointer object-cover"
|
||||||
|
/>
|
||||||
|
</ElBadge>
|
||||||
|
</ElFormItem>
|
||||||
|
</ElForm>
|
||||||
|
<template #footer>
|
||||||
|
<div><ElText type="warning">除了默认封面以外,自定义封面会集中保存在封面目录里</ElText></div>
|
||||||
|
<ElButton
|
||||||
|
size="default"
|
||||||
|
type="primary"
|
||||||
|
@click="handleSave"
|
||||||
|
>
|
||||||
|
保存
|
||||||
|
</ElButton>
|
||||||
|
<ElButton
|
||||||
|
size="default"
|
||||||
|
@click="createGameData.visible = false"
|
||||||
|
>
|
||||||
|
关闭
|
||||||
|
</ElButton>
|
||||||
|
</template>
|
||||||
|
</ElDialog>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { VideoPlay, DeleteFilled, EditPen, Plus, Delete } from "@element-plus/icons-vue";
|
||||||
|
import { dataSubscribe } from "~/composables/windows";
|
||||||
|
import { BaseDirectory, resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
||||||
|
import { convertFileSrc } from "@tauri-apps/api/core";
|
||||||
|
import { computed, nextTick, reactive, ref, useTemplateRef } from "vue";
|
||||||
|
import useMainStore from "@/stores/index";
|
||||||
|
import { uniqueId } from "lodash-es";
|
||||||
|
import { open as dialogOpen } from "@tauri-apps/plugin-dialog";
|
||||||
|
import { ElMessage, type FormInstance } from "element-plus";
|
||||||
|
import { ATJ, bounce } from "~/utils";
|
||||||
|
import { ElConfirmDanger } from "~/utils/element";
|
||||||
|
import { copyFile, exists, mkdir, readDir, remove } from "@tauri-apps/plugin-fs";
|
||||||
|
import { Command, open } from "@tauri-apps/plugin-shell";
|
||||||
|
const resourceDir = await getResourceDir();
|
||||||
|
const gameListResourceDir = await join(resourceDir, import.meta.env.VITE_GAME_LIST_PATH);
|
||||||
|
// const defaultLocalIconPath = await join(configPath, "icon.png");
|
||||||
|
// const tauriPath = convertFileSrc(defaultLocalIconPath);
|
||||||
|
const mainStore = useMainStore();
|
||||||
|
const formEl = useTemplateRef<FormInstance>("formRef");
|
||||||
|
const searchValue = ref("");
|
||||||
|
const defaultPng = "/default.png";
|
||||||
|
// const b = bounce(600);
|
||||||
|
type gameItemType = { name: string; exePath: string; coverImg: string; id: string; showImg: string };
|
||||||
|
const createGameData = reactive({
|
||||||
|
visible: false,
|
||||||
|
isEdit: false,
|
||||||
|
form: {
|
||||||
|
id: "",
|
||||||
|
name: "",
|
||||||
|
exePath: "",
|
||||||
|
coverImg: "",
|
||||||
|
showImg: defaultPng
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
name: [{ required: true, message: "请输入游戏名", trigger: "blur" }],
|
||||||
|
exePath: [{ required: true, message: "请选择游戏执行文件", trigger: "blur" }]
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const computedGameList = computed(() => {
|
||||||
|
if (!searchValue.value.trim()) return mainStore.gameList;
|
||||||
|
return mainStore.gameList.filter(item => {
|
||||||
|
return item.name.includes(searchValue.value); // 过滤
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleCreate = async () => {
|
||||||
|
createGameData.isEdit = false;
|
||||||
|
createGameData.form = {
|
||||||
|
id: "",
|
||||||
|
name: "",
|
||||||
|
exePath: "",
|
||||||
|
coverImg: "",
|
||||||
|
showImg: defaultPng
|
||||||
|
};
|
||||||
|
await nextTick();
|
||||||
|
createGameData.visible = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBrowser = async (type: "coverImg" | "exePath") => {
|
||||||
|
const filters = type === "coverImg" ? [{ name: "", extensions: ["png", "jpg", "jpeg"] }] : [{ name: "", extensions: ["exe"] }];
|
||||||
|
const file = await dialogOpen({
|
||||||
|
multiple: false,
|
||||||
|
directory: false,
|
||||||
|
filters
|
||||||
|
});
|
||||||
|
if (file) {
|
||||||
|
if (type === "coverImg") {
|
||||||
|
createGameData.form.coverImg = file;
|
||||||
|
if (createGameData.form.coverImg) {
|
||||||
|
if (!createGameData.form.id) {
|
||||||
|
const time = new Date().getTime();
|
||||||
|
createGameData.form.id = uniqueId(`${time}`);
|
||||||
|
}
|
||||||
|
let coverImg = createGameData.form.coverImg;
|
||||||
|
const game_list_path = import.meta.env.VITE_GAME_LIST_PATH;
|
||||||
|
const isExists = await exists(game_list_path, { baseDir: BaseDirectory.Resource });
|
||||||
|
if (!isExists) {
|
||||||
|
try {
|
||||||
|
await mkdir(game_list_path, { baseDir: BaseDirectory.Resource });
|
||||||
|
} catch (err) {}
|
||||||
|
}
|
||||||
|
const toPath = await join(gameListResourceDir, createGameData.form.id);
|
||||||
|
const suffix = coverImg.split(".").pop();
|
||||||
|
const toPathFileName = `${toPath}.${suffix}`;
|
||||||
|
if (coverImg != toPathFileName) {
|
||||||
|
await copyFile(coverImg, toPathFileName);
|
||||||
|
}
|
||||||
|
const isExistsToPath = await exists(toPathFileName);
|
||||||
|
if (isExistsToPath) {
|
||||||
|
createGameData.form = { ...createGameData.form, showImg: `${toPathFileName}` }; // 如果复制正确,那就存储文件名即可
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (type === "exePath") {
|
||||||
|
createGameData.form.exePath = file;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ElMessage.error("获取文件路径失败");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const openCoverDir = async () => {
|
||||||
|
const game_list_path = import.meta.env.VITE_GAME_LIST_PATH;
|
||||||
|
const isExists = await exists(game_list_path, { baseDir: BaseDirectory.Resource });
|
||||||
|
if (!isExists) {
|
||||||
|
try {
|
||||||
|
await mkdir(game_list_path, { baseDir: BaseDirectory.Resource });
|
||||||
|
} catch (err) {}
|
||||||
|
}
|
||||||
|
await Command.create("explorer", [gameListResourceDir]).execute();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSave = async () => {
|
||||||
|
const [error, _] = await ATJ(formEl.value?.validate() as Promise<boolean>);
|
||||||
|
if (!error) {
|
||||||
|
if (createGameData.form.showImg == defaultPng) {
|
||||||
|
//删除本地封面图
|
||||||
|
// const toPath = await join(gameListResourceDir, createGameData.form.id);
|
||||||
|
// const suffix = coverImg.split(".").pop();
|
||||||
|
// const imgPath = `${toPath}.${suffix}`;
|
||||||
|
// await remove(imgPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
const idx = mainStore.gameList.findIndex(i => i.id == createGameData.form.id);
|
||||||
|
if (idx >= 0) {
|
||||||
|
mainStore.gameList[idx] = { ...createGameData.form };
|
||||||
|
mainStore.$patch({
|
||||||
|
gameList: [...mainStore.gameList]
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
mainStore.$patch({
|
||||||
|
gameList: [...mainStore.gameList, createGameData.form]
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ElMessage.success("保存成功");
|
||||||
|
createGameData.visible = false;
|
||||||
|
// await Command.create("explorer", [gameListResourceDir]).execute();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBadgeDeleteCover = async () => {
|
||||||
|
await removeFileById(createGameData.form.id);
|
||||||
|
createGameData.form = { ...createGameData.form, coverImg: "", showImg: defaultPng };
|
||||||
|
};
|
||||||
|
|
||||||
|
const removeFileById = async (id: string) => {
|
||||||
|
if (!id) return;
|
||||||
|
const entries = await readDir(gameListResourceDir);
|
||||||
|
if (entries.length > 0) {
|
||||||
|
for (const entry of entries) {
|
||||||
|
if (entry.name.includes(id + ".")) {
|
||||||
|
const imgPath = await join(gameListResourceDir, entry.name);
|
||||||
|
await remove(imgPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDeleteItem = async ({ coverImg, id }: gameItemType) => {
|
||||||
|
if (id) {
|
||||||
|
const [error, _] = await ElConfirmDanger("确定要删除吗?");
|
||||||
|
if (!error) {
|
||||||
|
await removeFileById(id);
|
||||||
|
mainStore.$patch({
|
||||||
|
gameList: mainStore.gameList.filter(i => i.id !== id)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleEditItem = async (item: gameItemType) => {
|
||||||
|
createGameData.isEdit = true;
|
||||||
|
createGameData.form = { ...item };
|
||||||
|
createGameData.visible = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleStartGame = async (item: gameItemType) => {
|
||||||
|
try {
|
||||||
|
const isExists = await exists(item.exePath);
|
||||||
|
if (!isExists) {
|
||||||
|
return ElMessage.error("执行文件不存在");
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
return ElMessage.error("执行文件不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
ElMessage.info("正在启动游戏,请稍后...");
|
||||||
|
const _child = await open(item.exePath);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleImgError = (item: gameItemType, idx: number) => {
|
||||||
|
item.showImg = defaultPng;
|
||||||
|
item.coverImg = "";
|
||||||
|
mainStore.gameList[idx] = { ...item };
|
||||||
|
mainStore.$patch({
|
||||||
|
gameList: [...mainStore.gameList]
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const showImgConvertFileSrc = (showImg: string) => {
|
||||||
|
return showImg != defaultPng ? `${convertFileSrc(showImg)}?${new Date().getTime()}` : defaultPng;
|
||||||
|
};
|
||||||
|
dataSubscribe();
|
||||||
|
</script>
|
||||||
+419
-124
@@ -17,7 +17,7 @@
|
|||||||
<ElIcon><QuestionFilled /></ElIcon>
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
</div>
|
</div>
|
||||||
<span>-</span>
|
<div class="h-[fit-content]">-</div>
|
||||||
<ElTag
|
<ElTag
|
||||||
effect="dark"
|
effect="dark"
|
||||||
:type="data.isSuccessGetIp ? 'success' : 'info'"
|
:type="data.isSuccessGetIp ? 'success' : 'info'"
|
||||||
@@ -32,25 +32,36 @@
|
|||||||
</ElButton>
|
</ElButton>
|
||||||
<div
|
<div
|
||||||
v-else
|
v-else
|
||||||
class="flex-1 truncate"
|
class="flex-1 truncate !leading-[1em]"
|
||||||
>
|
>
|
||||||
<ElTooltip :content="`内核版本:${data.coreVersion}(不是软件的版本)`">
|
<ElTooltip :content="`内核版本:${data.coreVersion}(不是软件的版本)`">
|
||||||
<ElTag type="info">
|
<ElTag
|
||||||
|
size="small"
|
||||||
|
type="info"
|
||||||
|
>
|
||||||
{{ data.coreVersion }}
|
{{ data.coreVersion }}
|
||||||
</ElTag>
|
</ElTag>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
</div>
|
</div>
|
||||||
<ElTooltip content="请先停止自建服务和联机后再使用,否则内核被占用的情况下,无法进行内核更换">
|
<ElTooltip content="请先停止自建服务和联机后再使用,否则内核被占用的情况下,无法进行内核更换">
|
||||||
<ElButton
|
<ElBadge
|
||||||
class="ml-auto"
|
badge-class="!text-[9px] cursor-pointer"
|
||||||
:disabled="data.isStart || listenObj.server_thread_id.value"
|
:hidden="!haveNewCoreVersion"
|
||||||
@click="handleCoreManagement"
|
:offset="[-5, 6]"
|
||||||
:loading="data.update"
|
@click.stop="handleCoreManagement"
|
||||||
type="primary"
|
value="N"
|
||||||
size="small"
|
|
||||||
>
|
>
|
||||||
内核管理
|
<ElButton
|
||||||
</ElButton>
|
class="ml-auto mr-[3px]"
|
||||||
|
:disabled="data.isStart || listenObj.server_thread_id.value"
|
||||||
|
@click.stop="handleCoreManagement"
|
||||||
|
:loading="data.update"
|
||||||
|
type="primary"
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
内核管理
|
||||||
|
</ElButton>
|
||||||
|
</ElBadge>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -82,6 +93,18 @@
|
|||||||
</ElSelect>
|
</ElSelect>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
<template #footer>
|
||||||
|
<div class="text-center">
|
||||||
|
<ElLink
|
||||||
|
type="primary"
|
||||||
|
size="small"
|
||||||
|
:underline="false"
|
||||||
|
@click.stop="open(publicPeersLink)"
|
||||||
|
>
|
||||||
|
其他公共服务器
|
||||||
|
</ElLink>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
<ElOption
|
<ElOption
|
||||||
v-for="item in mainStore.basePeers"
|
v-for="item in mainStore.basePeers"
|
||||||
:key="item"
|
:key="item"
|
||||||
@@ -104,7 +127,7 @@
|
|||||||
</p>
|
</p>
|
||||||
<div class="ml-auto flex-shrink-0">
|
<div class="ml-auto flex-shrink-0">
|
||||||
<ElButton
|
<ElButton
|
||||||
@click.stop="copyServerUrl(item)"
|
@click.stop="copyText(item)"
|
||||||
circle
|
circle
|
||||||
size="small"
|
size="small"
|
||||||
title="复制"
|
title="复制"
|
||||||
@@ -130,9 +153,9 @@
|
|||||||
<template #label>
|
<template #label>
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
房间名
|
房间名
|
||||||
<ElTooltip content="对应命令行参数 --network-name">
|
<!-- <ElTooltip content="对应命令行参数 --network-name">
|
||||||
<ElIcon><QuestionFilled /></ElIcon>
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
</ElTooltip>
|
</ElTooltip> -->
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<ElInput
|
<ElInput
|
||||||
@@ -147,9 +170,9 @@
|
|||||||
<template #label>
|
<template #label>
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
房间密码
|
房间密码
|
||||||
<ElTooltip content="对应命令行参数 --network-secret">
|
<!-- <ElTooltip content="对应命令行参数 --network-secret">
|
||||||
<ElIcon><QuestionFilled /></ElIcon>
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
</ElTooltip>
|
</ElTooltip> -->
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<ElInput
|
<ElInput
|
||||||
@@ -167,9 +190,9 @@
|
|||||||
<template #label>
|
<template #label>
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
成员名
|
成员名
|
||||||
<ElTooltip content="对应命令行参数 --hostname">
|
<!-- <ElTooltip content="对应命令行参数 --hostname">
|
||||||
<ElIcon><QuestionFilled /></ElIcon>
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
</ElTooltip>
|
</ElTooltip> -->
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<ElInput
|
<ElInput
|
||||||
@@ -183,38 +206,61 @@
|
|||||||
label="局域网IP"
|
label="局域网IP"
|
||||||
>
|
>
|
||||||
<template #label>
|
<template #label>
|
||||||
<div class="flex h-[20px] items-center">
|
<div class="flex h-[20px] items-center gap-[3px]">
|
||||||
虚拟网IP
|
虚拟网IP
|
||||||
<ElTooltip content="对应命令行参数 --ipv4">
|
<ElButton
|
||||||
<ElIcon><QuestionFilled /></ElIcon>
|
@click.stop="handleCopyIp"
|
||||||
</ElTooltip>
|
type="primary"
|
||||||
|
text
|
||||||
|
size="small"
|
||||||
|
title="复制IP"
|
||||||
|
:icon="CopyDocument"
|
||||||
|
></ElButton>
|
||||||
<ElSwitch
|
<ElSwitch
|
||||||
v-model="config.dhcp"
|
v-model="config.dhcp"
|
||||||
class="ml-[5px]"
|
|
||||||
inline-prompt
|
inline-prompt
|
||||||
inactive-text="固定IP"
|
inactive-text="固定IP"
|
||||||
active-text="动态获取IP"
|
active-text="动态获取"
|
||||||
size="small"
|
size="small"
|
||||||
></ElSwitch>
|
></ElSwitch>
|
||||||
|
<!-- <ElTooltip content="对应命令行参数 --ipv4">
|
||||||
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
|
</ElTooltip> -->
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<ElInput
|
<ElInput
|
||||||
maxlength="100"
|
maxlength="100"
|
||||||
:disabled="config.dhcp"
|
:readonly="config.dhcp"
|
||||||
:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
|
:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
|
||||||
v-model="config.ipv4"
|
v-model="config.ipv4"
|
||||||
></ElInput>
|
>
|
||||||
|
<template #prefix>
|
||||||
|
<ElTooltip
|
||||||
|
class="!text-[10px]"
|
||||||
|
placement="top-end"
|
||||||
|
:content="config.dhcp ? '动态获取无法手动填写' : '固定IP可以手动填写'"
|
||||||
|
>
|
||||||
|
<ElTag
|
||||||
|
size="small"
|
||||||
|
:type="config.dhcp ? 'info' : 'success'"
|
||||||
|
>
|
||||||
|
{{ config.dhcp ? "只读" : "可填" }}
|
||||||
|
</ElTag>
|
||||||
|
</ElTooltip>
|
||||||
|
</template>
|
||||||
|
</ElInput>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
</div>
|
</div>
|
||||||
</ElForm>
|
</ElForm>
|
||||||
<div class="mt-auto flex items-start">
|
<div class="mt-auto flex items-start">
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div class="pt-[4px]">
|
||||||
<ElDropdown
|
<ElDropdown
|
||||||
@command="handleStartCommand"
|
@command="handleStartCommand"
|
||||||
split-button
|
split-button
|
||||||
trigger="click"
|
trigger="click"
|
||||||
size="default"
|
size="default"
|
||||||
|
placement="right-end"
|
||||||
:type="!data.isStart ? 'primary' : 'danger'"
|
:type="!data.isStart ? 'primary' : 'danger'"
|
||||||
:disabled="data.startLoading || !data.coreVersion || data.update"
|
:disabled="data.startLoading || !data.coreVersion || data.update"
|
||||||
@click="handleConnection"
|
@click="handleConnection"
|
||||||
@@ -226,13 +272,13 @@
|
|||||||
command="import_config"
|
command="import_config"
|
||||||
:icon="Link"
|
:icon="Link"
|
||||||
>
|
>
|
||||||
导入配置
|
导入联机配置
|
||||||
</ElDropdownItem>
|
</ElDropdownItem>
|
||||||
<ElDropdownItem
|
<ElDropdownItem
|
||||||
command="share_config"
|
command="share_config"
|
||||||
:icon="Share"
|
:icon="Share"
|
||||||
>
|
>
|
||||||
分享联机相关配置
|
分享联机配置
|
||||||
</ElDropdownItem>
|
</ElDropdownItem>
|
||||||
<ElDropdownItem disabled>
|
<ElDropdownItem disabled>
|
||||||
<ElDivider class="!m-0 !h-[2px]" />
|
<ElDivider class="!m-0 !h-[2px]" />
|
||||||
@@ -257,11 +303,32 @@
|
|||||||
>
|
>
|
||||||
使用外部配置文件
|
使用外部配置文件
|
||||||
</ElDropdownItem>
|
</ElDropdownItem>
|
||||||
|
<ElDropdownItem disabled>
|
||||||
|
<ElDivider class="!m-0 !h-[2px]" />
|
||||||
|
</ElDropdownItem>
|
||||||
|
<ElDropdownItem
|
||||||
|
command="config_admin"
|
||||||
|
:icon="Platform"
|
||||||
|
>
|
||||||
|
房间配置管理
|
||||||
|
</ElDropdownItem>
|
||||||
|
<ElDropdownItem
|
||||||
|
command="save_config_admin"
|
||||||
|
:icon="CirclePlusFilled"
|
||||||
|
>
|
||||||
|
保存当前房间配置
|
||||||
|
</ElDropdownItem>
|
||||||
|
<ElDropdownItem
|
||||||
|
command="game_start_config"
|
||||||
|
:icon="SwitchFilled"
|
||||||
|
>
|
||||||
|
本地游戏列表
|
||||||
|
</ElDropdownItem>
|
||||||
</ElDropdownMenu>
|
</ElDropdownMenu>
|
||||||
</template>
|
</template>
|
||||||
</ElDropdown>
|
</ElDropdown>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-[6px] pl-[2px]">
|
<div class="mt-[10px] pl-[2px]">
|
||||||
<ElTooltip
|
<ElTooltip
|
||||||
placement="left"
|
placement="left"
|
||||||
content="日志"
|
content="日志"
|
||||||
@@ -278,13 +345,15 @@
|
|||||||
placement="left"
|
placement="left"
|
||||||
content="房间信息"
|
content="房间信息"
|
||||||
> -->
|
> -->
|
||||||
<ElButton
|
<ElButton
|
||||||
class="!ml-[7px]"
|
class="!ml-[7px]"
|
||||||
@click="handleShowMemberDialog"
|
@click="handleShowMemberDialog"
|
||||||
plain
|
plain
|
||||||
type="success"
|
type="success"
|
||||||
size="small"
|
size="small"
|
||||||
>房间信息</ElButton>
|
>
|
||||||
|
房间信息
|
||||||
|
</ElButton>
|
||||||
<!-- </ElTooltip> -->
|
<!-- </ElTooltip> -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -490,7 +559,7 @@
|
|||||||
@click="openConfigDir"
|
@click="openConfigDir"
|
||||||
size="small"
|
size="small"
|
||||||
>
|
>
|
||||||
打开配置目录
|
打开存储目录
|
||||||
</ElButton>
|
</ElButton>
|
||||||
<ElButton
|
<ElButton
|
||||||
@click="handleStartCommand('toml')"
|
@click="handleStartCommand('toml')"
|
||||||
@@ -528,6 +597,88 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</ElDialog>
|
</ElDialog>
|
||||||
|
<ElDialog
|
||||||
|
width="95%"
|
||||||
|
top="30px"
|
||||||
|
append-to-body
|
||||||
|
:z-index="10"
|
||||||
|
class="!mb-0"
|
||||||
|
v-model="configAdminData.visible"
|
||||||
|
:close-on-press-escape="false"
|
||||||
|
title="房间配置管理"
|
||||||
|
>
|
||||||
|
<div class="flex items-center">
|
||||||
|
<ElButton
|
||||||
|
@click="openConfigAdminDir"
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
打开存储目录
|
||||||
|
</ElButton>
|
||||||
|
<ElButton
|
||||||
|
@click="handleStartCommand('config_admin')"
|
||||||
|
type="primary"
|
||||||
|
:icon="RefreshRight"
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
刷新
|
||||||
|
</ElButton>
|
||||||
|
<ElTooltip
|
||||||
|
placement="top-start"
|
||||||
|
:offset="2"
|
||||||
|
:show-arrow="false"
|
||||||
|
content="删除选中配置"
|
||||||
|
>
|
||||||
|
<ElButton
|
||||||
|
class="!ml-auto"
|
||||||
|
:icon="Delete"
|
||||||
|
@click="handleDeleteAdminConfig"
|
||||||
|
type="danger"
|
||||||
|
size="small"
|
||||||
|
></ElButton>
|
||||||
|
</ElTooltip>
|
||||||
|
</div>
|
||||||
|
<div class="mt-[5px]">
|
||||||
|
<ElSelect
|
||||||
|
v-model="configAdminData.fileName"
|
||||||
|
no-data-text="目录没有配置文件"
|
||||||
|
placeholder="选择配置文件"
|
||||||
|
filterable
|
||||||
|
>
|
||||||
|
<ElOption
|
||||||
|
v-for="item in configAdminData.list"
|
||||||
|
:key="item.path"
|
||||||
|
:value="item.path"
|
||||||
|
:label="item.name"
|
||||||
|
></ElOption>
|
||||||
|
</ElSelect>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<div class="text-right">
|
||||||
|
<div class="mb-[5px]">
|
||||||
|
<ElAlert
|
||||||
|
show-icon
|
||||||
|
type="warning"
|
||||||
|
title="打开目录删除文件即可删除配置"
|
||||||
|
></ElAlert>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ElButton
|
||||||
|
size="small"
|
||||||
|
@click="handleExchangeAdminConfig"
|
||||||
|
type="primary"
|
||||||
|
>
|
||||||
|
切换选中配置
|
||||||
|
</ElButton>
|
||||||
|
<ElButton
|
||||||
|
size="small"
|
||||||
|
@click="configAdminData.visible = false"
|
||||||
|
plain
|
||||||
|
>
|
||||||
|
关闭
|
||||||
|
</ElButton>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</ElDialog>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { invoke } from "@tauri-apps/api/core";
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
@@ -537,7 +688,7 @@
|
|||||||
QuestionFilled,
|
QuestionFilled,
|
||||||
Delete,
|
Delete,
|
||||||
List,
|
List,
|
||||||
UserFilled,
|
CirclePlusFilled,
|
||||||
Setting,
|
Setting,
|
||||||
Share,
|
Share,
|
||||||
RefreshRight,
|
RefreshRight,
|
||||||
@@ -546,9 +697,11 @@
|
|||||||
MagicStick,
|
MagicStick,
|
||||||
SetUp,
|
SetUp,
|
||||||
Folder,
|
Folder,
|
||||||
CopyDocument
|
CopyDocument,
|
||||||
|
Platform,
|
||||||
|
SwitchFilled
|
||||||
} from "@element-plus/icons-vue";
|
} from "@element-plus/icons-vue";
|
||||||
import { reactive, onBeforeUnmount, onMounted, ref, toRaw } from "vue";
|
import { reactive, onBeforeUnmount, onMounted, ref, toRaw, computed } from "vue";
|
||||||
import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } from "~/composables/tray";
|
import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } 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";
|
||||||
@@ -556,18 +709,18 @@
|
|||||||
import { ElMessage, ElMessageBox, ElTooltip } from "element-plus";
|
import { ElMessage, ElMessageBox, ElTooltip } from "element-plus";
|
||||||
import { getCurrentWindow, type Window } from "@tauri-apps/api/window";
|
import { getCurrentWindow, type Window } from "@tauri-apps/api/window";
|
||||||
import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
|
import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
|
||||||
import etWindows from "@/composables/windows";
|
import etWindows, { dataSubscribe } from "@/composables/windows";
|
||||||
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
||||||
import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile } from "@tauri-apps/plugin-fs";
|
import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile, remove as removeFile } from "@tauri-apps/plugin-fs";
|
||||||
import { updateConfigJson } from "~/composables/configJson";
|
import { updateConfigJson } from "~/composables/configJson";
|
||||||
import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
|
import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
|
||||||
import { sortedUniq, uniq } from "lodash-es";
|
import { sortedUniq, uniq } from "lodash-es";
|
||||||
import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ } from "~/utils";
|
import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName } from "~/utils";
|
||||||
import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
|
import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
|
||||||
import { getServerArgs } from "@/composables/server";
|
import { getServerArgs } from "@/composables/server";
|
||||||
|
|
||||||
let is_close = false;
|
let is_close = false;
|
||||||
|
const publicPeersLink = import.meta.env.VITE_PUBLIC_PEERS_URL;
|
||||||
const tray = await useTray(
|
const tray = await useTray(
|
||||||
true,
|
true,
|
||||||
async () => {
|
async () => {
|
||||||
@@ -587,12 +740,13 @@
|
|||||||
const config = mainStore.config;
|
const config = mainStore.config;
|
||||||
// console.error(config);
|
// console.error(config);
|
||||||
const protocols = supportProtocols();
|
const protocols = supportProtocols();
|
||||||
const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
|
const data = reactive({
|
||||||
hasNewVersion: false, //easytierGame有没有新版
|
hasNewVersion: false, //easytierGame有没有新版
|
||||||
logVisible: false,
|
logVisible: false,
|
||||||
cidrVisible: false,
|
cidrVisible: false,
|
||||||
advanceVisible: false,
|
advanceVisible: false,
|
||||||
toolVisible: false,
|
toolVisible: false,
|
||||||
|
gameListVisible: false,
|
||||||
serverVisible: false,
|
serverVisible: false,
|
||||||
winipBcPid: 0, //WinIPBroadcast进程id
|
winipBcPid: 0, //WinIPBroadcast进程id
|
||||||
winipBcStart: false,
|
winipBcStart: false,
|
||||||
@@ -600,7 +754,7 @@
|
|||||||
log: "",
|
log: "",
|
||||||
serverLog: "", //服务端日志
|
serverLog: "", //服务端日志
|
||||||
update: false,
|
update: false,
|
||||||
releaseList: [],
|
releaseList: [[]],
|
||||||
coreVersion: "-",
|
coreVersion: "-",
|
||||||
isSuccessGetIp: false,
|
isSuccessGetIp: false,
|
||||||
startLoading: false,
|
startLoading: false,
|
||||||
@@ -615,6 +769,13 @@
|
|||||||
list: [] //配置文件列表
|
list: [] //配置文件列表
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const configAdminData = reactive<{ fileName: string; list: Array<{ path: string; name: string }>; [key: string]: any }>({
|
||||||
|
visible: false,
|
||||||
|
loading: false,
|
||||||
|
list: [],
|
||||||
|
fileName: ""
|
||||||
|
});
|
||||||
|
|
||||||
const importConfigData = reactive<{ data: ""; [key: string]: any }>({
|
const importConfigData = reactive<{ data: ""; [key: string]: any }>({
|
||||||
visible: false,
|
visible: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
@@ -627,17 +788,6 @@
|
|||||||
data: ""
|
data: ""
|
||||||
});
|
});
|
||||||
|
|
||||||
const copyServerUrl = async (serverUrl: string) => {
|
|
||||||
const [err, _] = await ATJ(writeText(serverUrl));
|
|
||||||
|
|
||||||
if (!err) {
|
|
||||||
ElMessage.success("地址已复制");
|
|
||||||
} else {
|
|
||||||
console.error(err);
|
|
||||||
ElMessage.success("复制失败");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const closePrevent = async () => {
|
const closePrevent = async () => {
|
||||||
const appWindow = getCurrentWindow();
|
const appWindow = getCurrentWindow();
|
||||||
if (appWindow.label == "main") {
|
if (appWindow.label == "main") {
|
||||||
@@ -652,6 +802,15 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleCopyIp = async () => {
|
||||||
|
if (!config.ipv4?.trim()) return;
|
||||||
|
if (data.isStart || !config.dhcp) {
|
||||||
|
await copyText(mainStore.config.ipv4);
|
||||||
|
} else {
|
||||||
|
await copyText(mainStore.config.ipv4, "复制成功,联机后IP可能会变化");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const handleOpenCache = async () => {
|
const handleOpenCache = async () => {
|
||||||
const cache_path = import.meta.env.VITE_CACHE_PATH;
|
const cache_path = import.meta.env.VITE_CACHE_PATH;
|
||||||
const resourceDir = await getResourceDir();
|
const resourceDir = await getResourceDir();
|
||||||
@@ -696,23 +855,11 @@
|
|||||||
mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers]);
|
mainStore.basePeers = uniq([mainStore.config.serverUrl, ...mainStore.basePeers]);
|
||||||
};
|
};
|
||||||
|
|
||||||
// 手动触发持久化数据
|
|
||||||
const persist = async (appWindow: Window) => {
|
|
||||||
try {
|
|
||||||
appWindow.emitTo({ kind: "Any" }, "global-main-store", { store: { ...mainStore.$state } });
|
|
||||||
mainStore.$persist();
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
ElMessage.error("手动持久数据失败");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const listenObj: { [key: string]: any } = {
|
const listenObj: { [key: string]: any } = {
|
||||||
unListenOutPut: null,
|
unListenOutPut: null,
|
||||||
unListenThreadId: null,
|
unListenThreadId: null,
|
||||||
unListenServerOutPut: null,
|
unListenServerOutPut: null,
|
||||||
unListenServerThreadId: null,
|
unListenServerThreadId: null,
|
||||||
unListenConfigStart: null,
|
|
||||||
unListenStartStopServer: null,
|
unListenStartStopServer: null,
|
||||||
thread_id: null,
|
thread_id: null,
|
||||||
server_thread_id: ref(null),
|
server_thread_id: ref(null),
|
||||||
@@ -797,24 +944,7 @@
|
|||||||
});
|
});
|
||||||
this.unListenServerThreadId = unListen;
|
this.unListenServerThreadId = unListen;
|
||||||
},
|
},
|
||||||
async listenConfigStart() {
|
|
||||||
const appWindow = getCurrentWindow();
|
|
||||||
const unListen = await listen("config", event => {
|
|
||||||
const ipv4 = config.ipv4;
|
|
||||||
mainStore.$patch(event.payload as any);
|
|
||||||
config.ipv4 = ipv4;
|
|
||||||
if (mainStore.config.enablePreventSleep) {
|
|
||||||
preventSleep();
|
|
||||||
} else {
|
|
||||||
stopPreventSleep();
|
|
||||||
}
|
|
||||||
persist(appWindow);
|
|
||||||
});
|
|
||||||
const unListen2 = mainStore.$subscribe(() => {
|
|
||||||
persist(appWindow);
|
|
||||||
});
|
|
||||||
this.unListenConfigStart = [unListen, unListen2];
|
|
||||||
},
|
|
||||||
async listenStartStopServer() {
|
async listenStartStopServer() {
|
||||||
const unListen = await listen<{ args: Array<string> }>("startStopServer", async event => {
|
const unListen = await listen<{ args: Array<string> }>("startStopServer", async event => {
|
||||||
await listenObj?.unListenServerOutPut?.();
|
await listenObj?.unListenServerOutPut?.();
|
||||||
@@ -848,6 +978,18 @@
|
|||||||
data.coreVersion = (coreVersion as string).replace("easytier-core ", "");
|
data.coreVersion = (coreVersion as string).replace("easytier-core ", "");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const haveNewCoreVersion = computed<boolean>(() => {
|
||||||
|
if (!data.coreVersion) return false;
|
||||||
|
const releaseLatestVersion = data?.releaseList?.[0]?.[0];
|
||||||
|
if (!releaseLatestVersion) return false;
|
||||||
|
const version = `v${/(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1]}`;
|
||||||
|
// console.log(version, releaseLatestVersion)
|
||||||
|
if (releaseLatestVersion != version) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
const checkUpdate = async () => {
|
const checkUpdate = async () => {
|
||||||
// const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
|
// const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
|
||||||
let [downloadUrl, versionFileName] = (coreManagementData.data as string).split("<>");
|
let [downloadUrl, versionFileName] = (coreManagementData.data as string).split("<>");
|
||||||
@@ -879,7 +1021,7 @@
|
|||||||
|
|
||||||
const handleCoreManagement = async () => {
|
const handleCoreManagement = async () => {
|
||||||
coreManagementData.visible = true;
|
coreManagementData.visible = true;
|
||||||
await getReleaseList();
|
// await getReleaseList();
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleInstallCore = async () => {
|
const handleInstallCore = async () => {
|
||||||
@@ -912,7 +1054,7 @@
|
|||||||
// console.log(el, el[0], el[2]);
|
// console.log(el, el[0], el[2]);
|
||||||
return el && el[0] && el[2] && !el[2].includes("gui");
|
return el && el[0] && el[2] && !el[2].includes("gui");
|
||||||
})
|
})
|
||||||
];
|
] as any;
|
||||||
coreManagementData.loading = false;
|
coreManagementData.loading = false;
|
||||||
// console.log(data.releaseList);
|
// console.log(data.releaseList);
|
||||||
};
|
};
|
||||||
@@ -994,14 +1136,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const b = bounce(600);
|
|
||||||
mainStore.$subscribe(async (...a) => {
|
|
||||||
if (mainStore.createConfigInEasytier) {
|
|
||||||
b(async () => {
|
|
||||||
await updateConfigJson(data.configJsonSeverUrl);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const initAutoStartServer = async () => {
|
const initAutoStartServer = async () => {
|
||||||
@@ -1037,6 +1171,7 @@
|
|||||||
let serverLogsTimer: NodeJS.Timeout | null = null;
|
let serverLogsTimer: NodeJS.Timeout | null = null;
|
||||||
let cidrTimer: NodeJS.Timeout | null = null;
|
let cidrTimer: NodeJS.Timeout | null = null;
|
||||||
|
|
||||||
|
const b = bounce(600);
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
await initGuiJson();
|
await initGuiJson();
|
||||||
await compatibleInitAutoStart();
|
await compatibleInitAutoStart();
|
||||||
@@ -1045,7 +1180,6 @@
|
|||||||
await getCoreVersion();
|
await getCoreVersion();
|
||||||
await listenObj.listenThreadId();
|
await listenObj.listenThreadId();
|
||||||
await listenObj.listenServerThreadId();
|
await listenObj.listenServerThreadId();
|
||||||
await listenObj.listenConfigStart();
|
|
||||||
await listenObj.listenStartStopServer();
|
await listenObj.listenStartStopServer();
|
||||||
await initConfigDir();
|
await initConfigDir();
|
||||||
await initAutoStartServer();
|
await initAutoStartServer();
|
||||||
@@ -1054,13 +1188,19 @@
|
|||||||
mountedShow(); // 不需要await
|
mountedShow(); // 不需要await
|
||||||
closePrevent();
|
closePrevent();
|
||||||
data.hasNewVersion = await checkNewVersion();
|
data.hasNewVersion = await checkNewVersion();
|
||||||
|
dataSubscribe(async () => {
|
||||||
|
if (mainStore.createConfigInEasytier) {
|
||||||
|
b(async () => {
|
||||||
|
await updateConfigJson(data.configJsonSeverUrl);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
getReleaseList();
|
||||||
});
|
});
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
unListenAll();
|
unListenAll();
|
||||||
listenObj.unListenReleaseList && listenObj.unListenReleaseList();
|
listenObj.unListenReleaseList && listenObj.unListenReleaseList();
|
||||||
listenObj.unListenConfigStart && listenObj.unListenConfigStart[0]();
|
|
||||||
listenObj.unListenConfigStart && listenObj.unListenConfigStart[1]();
|
|
||||||
listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
|
listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
|
||||||
logsTimer && clearInterval(logsTimer);
|
logsTimer && clearInterval(logsTimer);
|
||||||
serverLogsTimer && clearInterval(serverLogsTimer);
|
serverLogsTimer && clearInterval(serverLogsTimer);
|
||||||
@@ -1193,6 +1333,12 @@
|
|||||||
if (config.compression && config.compression != "none") {
|
if (config.compression && config.compression != "none") {
|
||||||
args.push("--compression", config.compression);
|
args.push("--compression", config.compression);
|
||||||
}
|
}
|
||||||
|
if (config.enableKcpProxy) {
|
||||||
|
args.push("--enable-kcp-proxy");
|
||||||
|
}
|
||||||
|
if (config.disableKcpInput) {
|
||||||
|
args.push("--disable-kcp-input");
|
||||||
|
}
|
||||||
return args;
|
return args;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1250,21 +1396,26 @@
|
|||||||
configStart.visible = true;
|
configStart.visible = true;
|
||||||
const path = import.meta.env.VITE_CONFIG_PATH;
|
const path = import.meta.env.VITE_CONFIG_PATH;
|
||||||
const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
|
const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
|
||||||
if (isExists) {
|
if (!isExists) {
|
||||||
const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
|
|
||||||
configStart.list = entries
|
|
||||||
.filter(item => item.isFile)
|
|
||||||
.map(item => ({
|
|
||||||
name: item.name,
|
|
||||||
path: `${path}${item.name}`
|
|
||||||
})) as any;
|
|
||||||
} else {
|
|
||||||
mainStore.configStartEnable = false;
|
mainStore.configStartEnable = false;
|
||||||
mainStore.configPath = "";
|
mainStore.configPath = "";
|
||||||
try {
|
try {
|
||||||
await mkdir(path, { baseDir: BaseDirectory.Resource });
|
await mkdir(path, { baseDir: BaseDirectory.Resource, recursive: true });
|
||||||
} catch (err) {}
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
|
||||||
|
configStart.list = entries
|
||||||
|
.filter(item => {
|
||||||
|
const nameLower = item.name.toLowerCase();
|
||||||
|
return item.isFile && (nameLower.endsWith(".toml") || nameLower.endsWith(".yaml"));
|
||||||
|
})
|
||||||
|
.map(item => ({
|
||||||
|
name: item.name,
|
||||||
|
path: `${path}${item.name}`
|
||||||
|
})) as any;
|
||||||
}
|
}
|
||||||
if (command === "share_config") {
|
if (command === "share_config") {
|
||||||
try {
|
try {
|
||||||
@@ -1294,7 +1445,9 @@
|
|||||||
disableUdpHolePunching,
|
disableUdpHolePunching,
|
||||||
relayAllPeerrpc,
|
relayAllPeerrpc,
|
||||||
compression,
|
compression,
|
||||||
enablePreventSleep
|
enablePreventSleep,
|
||||||
|
enableKcpProxy,
|
||||||
|
disableKcpInput
|
||||||
} = mainStore.config;
|
} = mainStore.config;
|
||||||
const WT = btoa(
|
const WT = btoa(
|
||||||
encodeURIComponent(
|
encodeURIComponent(
|
||||||
@@ -1325,26 +1478,28 @@
|
|||||||
disableUdpHolePunching,
|
disableUdpHolePunching,
|
||||||
relayAllPeerrpc,
|
relayAllPeerrpc,
|
||||||
compression,
|
compression,
|
||||||
enablePreventSleep
|
enablePreventSleep,
|
||||||
|
enableKcpProxy,
|
||||||
|
disableKcpInput
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
await writeText(WT);
|
await writeText(WT);
|
||||||
|
await ElConfirmPrimary(
|
||||||
|
`{action} 虚拟网IP,主机名,子网代理,为子网代理启用smoltcp堆栈,开机自启,软件启动自动联机,出口节点,不生成Tun网卡,错误日志相关配置`,
|
||||||
|
"提示",
|
||||||
|
{
|
||||||
|
confirmButtonText: "知道了",
|
||||||
|
showCancelButton: false,
|
||||||
|
action: "不会分享"
|
||||||
|
}
|
||||||
|
);
|
||||||
ElMessage.success("配置已复制");
|
ElMessage.success("配置已复制");
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
ElMessage.error("分享失败");
|
ElMessage.error("分享失败");
|
||||||
}
|
}
|
||||||
ElConfirmPrimary(
|
|
||||||
`{action} 虚拟网IP,主机名,子网代理,为子网代理启用smoltcp堆栈,开机自启,软件启动自动联机,出口节点,不生成Tun网卡,错误日志相关配置`,
|
|
||||||
"提示",
|
|
||||||
{
|
|
||||||
confirmButtonText: "知道了",
|
|
||||||
showCancelButton: false,
|
|
||||||
action: "不会分享"
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
if (command === "import_config") {
|
if (command === "import_config") {
|
||||||
importConfigData.data = "";
|
importConfigData.data = "";
|
||||||
@@ -1353,6 +1508,140 @@
|
|||||||
if (command === "create_server") {
|
if (command === "create_server") {
|
||||||
await handleShowServerDialog();
|
await handleShowServerDialog();
|
||||||
}
|
}
|
||||||
|
if (command === "config_admin") {
|
||||||
|
configAdminData.visible = true;
|
||||||
|
const path = import.meta.env.VITE_CONFIG_ADMIN_PATH;
|
||||||
|
const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
|
||||||
|
if (!isExists) {
|
||||||
|
try {
|
||||||
|
await mkdir(path, { baseDir: BaseDirectory.Resource, recursive: true });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
|
||||||
|
configAdminData.list = entries
|
||||||
|
.filter(item => item.isFile)
|
||||||
|
.map(item => ({
|
||||||
|
name: item.name,
|
||||||
|
path: `${path}${item.name}`
|
||||||
|
})) as any;
|
||||||
|
}
|
||||||
|
if (command === "save_config_admin") {
|
||||||
|
const config = btoa(encodeURIComponent(JSON.stringify(mainStore.$state)));
|
||||||
|
const [error, { value = "" } = {}] = await ATJ(
|
||||||
|
ElMessageBox.prompt("请输入配置的存储名", "提示", {
|
||||||
|
confirmButtonText: "保存",
|
||||||
|
cancelButtonText: "取消",
|
||||||
|
inputPlaceholder: "请输入2个字以上的存储名",
|
||||||
|
closeOnPressEscape: false,
|
||||||
|
closeOnClickModal: false,
|
||||||
|
inputValidator: (value: string) => {
|
||||||
|
const result = isValidWindowsFileName(value);
|
||||||
|
if (result) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return "文件名不合法";
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
if (!error) {
|
||||||
|
const dir = import.meta.env.VITE_CONFIG_ADMIN_PATH;
|
||||||
|
const filePath = `${dir}${value}`;
|
||||||
|
const isExistsDir = await exists(dir, { baseDir: BaseDirectory.Resource });
|
||||||
|
if (!isExistsDir) {
|
||||||
|
try {
|
||||||
|
await mkdir(dir, { baseDir: BaseDirectory.Resource, recursive: true });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const isExists = await exists(filePath, { baseDir: BaseDirectory.Resource });
|
||||||
|
let allowWrite = true;
|
||||||
|
if (isExists) {
|
||||||
|
const [err] = await ElConfirmPrimary("配置名已存在,是否覆盖?", "提示", {
|
||||||
|
confirmButtonText: "确定",
|
||||||
|
cancelButtonText: "取消"
|
||||||
|
});
|
||||||
|
if (err) {
|
||||||
|
allowWrite = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (allowWrite) {
|
||||||
|
let encoder = new TextEncoder();
|
||||||
|
let data = encoder.encode(config);
|
||||||
|
// console.log(filePath, data);
|
||||||
|
await writeFile(filePath, data, { baseDir: BaseDirectory.Resource });
|
||||||
|
ElMessage.success("保存成功");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (command === "game_start_config") {
|
||||||
|
await etWindows(
|
||||||
|
"gameList",
|
||||||
|
{
|
||||||
|
title: "本地游戏列表",
|
||||||
|
width: 800,
|
||||||
|
height: 400,
|
||||||
|
minWidth: 800,
|
||||||
|
minHeight: 400,
|
||||||
|
resizable: true,
|
||||||
|
url: "#/gameList"
|
||||||
|
},
|
||||||
|
(_, appWindow) => {
|
||||||
|
data.gameListVisible = true;
|
||||||
|
},
|
||||||
|
() => {
|
||||||
|
data.gameListVisible = false;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDeleteAdminConfig = async () => {
|
||||||
|
const path = configAdminData.fileName;
|
||||||
|
if (!path) return ElMessage.warning("请选择配置");
|
||||||
|
const [err] = await ElConfirmDanger("确定{action}选中的配置吗?", "提示", {
|
||||||
|
confirmButtonText: "确定",
|
||||||
|
cancelButtonText: "取消",
|
||||||
|
action: "删除"
|
||||||
|
});
|
||||||
|
if (err) return;
|
||||||
|
try {
|
||||||
|
await removeFile(path, { baseDir: BaseDirectory.Resource });
|
||||||
|
ElMessage.success("删除成功");
|
||||||
|
configAdminData.fileName = "";
|
||||||
|
await handleStartCommand("config_admin");
|
||||||
|
} catch (err) {
|
||||||
|
ElMessage.error("删除配置失败");
|
||||||
|
console.log(err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleExchangeAdminConfig = async () => {
|
||||||
|
const path = configAdminData.fileName;
|
||||||
|
if (!path) return ElMessage.warning("请选择配置");
|
||||||
|
// import.meta.env.VITE_CONFIG_ADMIN_PATH
|
||||||
|
const [err] = await ElConfirmPrimary("会覆盖当前配置,确定切换吗?");
|
||||||
|
if (err) return;
|
||||||
|
const base64U8Arrray = await readFile(path, { baseDir: BaseDirectory.Resource });
|
||||||
|
const decoder = new TextDecoder("utf-8");
|
||||||
|
try {
|
||||||
|
if (data.isStart) {
|
||||||
|
ElMessage.warning("停止联机..");
|
||||||
|
await reset();
|
||||||
|
}
|
||||||
|
const json: typeof mainStore.$state = JSON.parse(decodeURIComponent(atob(decoder.decode(base64U8Arrray))));
|
||||||
|
mainStore.$patch(json);
|
||||||
|
ElMessage.success("切换成功");
|
||||||
|
configAdminData.visible = false;
|
||||||
|
} catch (err) {
|
||||||
|
ElMessage.error("读取配置失败");
|
||||||
|
console.log(err);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleStartImport = async () => {
|
const handleStartImport = async () => {
|
||||||
@@ -1400,6 +1689,12 @@
|
|||||||
// console.error(configPath);
|
// console.error(configPath);
|
||||||
await Command.create("explorer", [configPath]).execute();
|
await Command.create("explorer", [configPath]).execute();
|
||||||
};
|
};
|
||||||
|
const openConfigAdminDir = async () => {
|
||||||
|
const resourceDir = await getResourceDir();
|
||||||
|
const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_ADMIN_PATH);
|
||||||
|
// console.error(configPath);
|
||||||
|
await Command.create("explorer", [configPath]).execute();
|
||||||
|
};
|
||||||
|
|
||||||
const handleShowMemberDialog = async () => {
|
const handleShowMemberDialog = async () => {
|
||||||
if (!data.isStart) {
|
if (!data.isStart) {
|
||||||
|
|||||||
+1
-1
@@ -39,7 +39,7 @@
|
|||||||
effect="dark"
|
effect="dark"
|
||||||
:type="row.cost == 'p2p' ? 'success' : 'info'"
|
:type="row.cost == 'p2p' ? 'success' : 'info'"
|
||||||
>
|
>
|
||||||
{{ row.cost ? row.cost.replace("relay", "中转") : row.cost }}
|
{{ row.cost ? row.cost.replace("relay", "中转").replace("p2p", "直连") : row.cost }}
|
||||||
</ElTag>
|
</ElTag>
|
||||||
</template>
|
</template>
|
||||||
</ElTableColumn>
|
</ElTableColumn>
|
||||||
|
|||||||
+1
-3
@@ -123,8 +123,6 @@
|
|||||||
await appWindow.emitTo("main", "startStopServer", { args });
|
await appWindow.emitTo("main", "startStopServer", { args });
|
||||||
};
|
};
|
||||||
|
|
||||||
dataSubscribe(async (...a) => {
|
dataSubscribe();
|
||||||
return { serverConfig: { ...mainStore.serverConfig }};
|
|
||||||
});
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
+2
-14
@@ -42,7 +42,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<ElTooltip
|
<ElTooltip
|
||||||
content="使用ForceBindIP启动应用 (强制绑定IP或者网卡),如果还有没启动联机,请先启动联机,联机成功后,点击刷新获取easytier生成的网卡"
|
content="使用ForceBindIP启动应用 (强制绑定IP或者网卡),如果还没有启动联机,请先启动联机,联机成功后,点击刷新获取easytier生成的网卡"
|
||||||
>
|
>
|
||||||
<ElText>
|
<ElText>
|
||||||
方案2
|
方案2
|
||||||
@@ -477,19 +477,6 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
dataSubscribe(async (...a) => {
|
|
||||||
return {
|
|
||||||
winIpBcAutoStart: mainStore.winIpBcAutoStart,
|
|
||||||
winipBcStart: mainStore.winipBcStart,
|
|
||||||
winipBcPid: mainStore.winipBcPid,
|
|
||||||
forceBindIpBit: mainStore.forceBindIpBit,
|
|
||||||
delayInjectDll: mainStore.delayInjectDll,
|
|
||||||
forceBindInput: mainStore.forceBindInput,
|
|
||||||
forceBindFile: mainStore.forceBindFile,
|
|
||||||
config: { ...mainStore.config }
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
const getGuids = async () => {
|
const getGuids = async () => {
|
||||||
const guids = await invoke<string[][]>("get_network_adapter_guids");
|
const guids = await invoke<string[][]>("get_network_adapter_guids");
|
||||||
data.guids = guids && guids.length > 0 ? guids : [];
|
data.guids = guids && guids.length > 0 ? guids : [];
|
||||||
@@ -505,5 +492,6 @@
|
|||||||
data.pingIp = mainStore.config.ipv4;
|
data.pingIp = mainStore.config.ipv4;
|
||||||
initStartWinIpBroadcast();
|
initStartWinIpBroadcast();
|
||||||
getGuids();
|
getGuids();
|
||||||
|
dataSubscribe();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Generated
+820
-812
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 130 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB |
Generated
+1067
-480
File diff suppressed because it is too large
Load Diff
+15
-14
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "easytier-game"
|
name = "easytier-game"
|
||||||
version = "1.3.6"
|
version = "1.4.0"
|
||||||
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"
|
||||||
@@ -8,7 +8,7 @@ authors = ["leizi97"]
|
|||||||
license = "LICENSE"
|
license = "LICENSE"
|
||||||
|
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.77.2"
|
# rust-version = "1.77.2"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
@@ -18,31 +18,32 @@ name = "app_lib"
|
|||||||
crate-type = ["staticlib", "cdylib", "rlib"]
|
crate-type = ["staticlib", "cdylib", "rlib"]
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tauri-build = { version = "2.0.3", features = [] }
|
tauri-build = { version = "2.0.5", features = [] }
|
||||||
# prost-build = "0.13.2"
|
# prost-build = "0.13.2"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
serde_json = "1.0"
|
serde_json = "1.0.137"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0.217", features = ["derive"] }
|
||||||
log = "0.4"
|
log = "0.4.25"
|
||||||
tauri = { version = "2.1.1", features = [
|
tauri = { version = "2.2.5", features = [ "protocol-asset",
|
||||||
"tray-icon",
|
"tray-icon",
|
||||||
"image-png",
|
"image-png",
|
||||||
"image-ico",
|
"image-ico",
|
||||||
|
"devtools"
|
||||||
] }
|
] }
|
||||||
|
|
||||||
tauri-plugin-log = "2.2.0"
|
tauri-plugin-log = "2.2.1"
|
||||||
tauri-plugin-shell = "2.2.0"
|
tauri-plugin-shell = "2.2.0"
|
||||||
reqwest = { version = "0.12", features = ["json"] }
|
reqwest = { version = "0.12.12", features = ["json"] }
|
||||||
zip = "2.2.2"
|
zip = "2.2.2"
|
||||||
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.0.2"
|
tauri-plugin-clipboard-manager = "2.2.1"
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
tokio = { version = "1.42.0", features = ["process"] }
|
tokio = { version = "1.43.0", features = ["process"] }
|
||||||
tauri-plugin-dialog = "2"
|
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"
|
||||||
@@ -53,5 +54,5 @@ features = ["Win32_System_TaskScheduler", "Win32_System_Power", "Win32_NetworkMa
|
|||||||
|
|
||||||
[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.0"
|
tauri-plugin-single-instance = "2.2.1"
|
||||||
tauri-plugin-window-state = "2.2.0"
|
tauri-plugin-window-state = "2.2.1"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"$schema": "../gen/schemas/desktop-schema.json",
|
"$schema": "../gen/schemas/desktop-schema.json",
|
||||||
"identifier": "default",
|
"identifier": "default",
|
||||||
"description": "enables the default permissions",
|
"description": "enables the default permissions",
|
||||||
"windows": ["main", "log", "member", "cidr", "advance", "tool", "server"],
|
"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList"],
|
||||||
"permissions": [
|
"permissions": [
|
||||||
"core:default",
|
"core:default",
|
||||||
"core:window:allow-minimize",
|
"core:window:allow-minimize",
|
||||||
|
|||||||
@@ -24,5 +24,7 @@
|
|||||||
"enableCustonProtocol": false, // 是否启用自定义协议
|
"enableCustonProtocol": false, // 是否启用自定义协议
|
||||||
"customProtocol": "tcp", // 自定义协议类型
|
"customProtocol": "tcp", // 自定义协议类型
|
||||||
"enableNetCardMetric": false, // 自定义easytier每次生成的网卡跃点
|
"enableNetCardMetric": false, // 自定义easytier每次生成的网卡跃点
|
||||||
"netCardMetricValue": 1 // 网卡跃点数量(1-9999)
|
"netCardMetricValue": 1, // 网卡跃点数量(1-9999)
|
||||||
|
"enableKcpProxy": false, // 启用kcp代理
|
||||||
|
"disableKcpInput": false //禁用kcp输入
|
||||||
}
|
}
|
||||||
Binary file not shown.
Binary file not shown.
@@ -754,7 +754,7 @@ pub fn run() {
|
|||||||
// }
|
// }
|
||||||
#[cfg(not(target_os = "android"))]
|
#[cfg(not(target_os = "android"))]
|
||||||
let _tray_menu = TrayIconBuilder::with_id("main")
|
let _tray_menu = TrayIconBuilder::with_id("main")
|
||||||
.menu_on_left_click(false)
|
.show_menu_on_left_click(false)
|
||||||
.on_tray_icon_event(|tray, event| {
|
.on_tray_icon_event(|tray, event| {
|
||||||
if let TrayIconEvent::Click {
|
if let TrayIconEvent::Click {
|
||||||
button: MouseButton::Left,
|
button: MouseButton::Left,
|
||||||
|
|||||||
@@ -1,19 +1,18 @@
|
|||||||
{
|
{
|
||||||
"$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.3.6",
|
"version": "1.4.0",
|
||||||
"identifier": "com.tauri.easytier-game",
|
"identifier": "com.tauri.easytier-game",
|
||||||
|
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../dist",
|
"frontendDist": "../dist",
|
||||||
"devUrl": "http://localhost:5000",
|
"devUrl": "http://localhost:5000",
|
||||||
"beforeBuildCommand": "pnpm build",
|
|
||||||
"beforeDevCommand": "pnpm dev"
|
"beforeDevCommand": "pnpm dev"
|
||||||
},
|
},
|
||||||
"app": {
|
"app": {
|
||||||
"windows": [
|
"windows": [
|
||||||
{
|
{
|
||||||
"title": "easytier-game 1.3.6",
|
"title": "easytier-game 1.4.0",
|
||||||
"label": "main",
|
"label": "main",
|
||||||
"minWidth": 340,
|
"minWidth": 340,
|
||||||
"width": 340,
|
"width": 340,
|
||||||
@@ -31,7 +30,11 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"security": {
|
"security": {
|
||||||
"csp": null
|
"csp": null,
|
||||||
|
"assetProtocol": {
|
||||||
|
"enable": true,
|
||||||
|
"scope": ["**"]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"plugins": {
|
"plugins": {
|
||||||
@@ -63,7 +66,8 @@
|
|||||||
"easytier/Packet.dll",
|
"easytier/Packet.dll",
|
||||||
"easytier/wintun.dll",
|
"easytier/wintun.dll",
|
||||||
"easytier/clear_local_data.bat",
|
"easytier/clear_local_data.bat",
|
||||||
"帮助.txt"
|
"帮助.txt",
|
||||||
|
"uninstall.exe"
|
||||||
],
|
],
|
||||||
"windows": {
|
"windows": {
|
||||||
"webviewInstallMode": {
|
"webviewInstallMode": {
|
||||||
|
|||||||
Binary file not shown.
+3
-1
@@ -8,12 +8,14 @@
|
|||||||
|
|
||||||
|
|
||||||
[如果想彻底删除easytierGame]
|
[如果想彻底删除easytierGame]
|
||||||
|
--
|
||||||
1. 关闭easytierGame
|
1. 关闭easytierGame
|
||||||
|
|
||||||
2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认,清除本地存储数据
|
2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认,清除本地存储数据
|
||||||
|
|
||||||
3. 删除easytierGame文件夹
|
3. 删除easytierGame文件夹
|
||||||
|
--
|
||||||
|
或者直接使用uninstall.exe
|
||||||
|
|
||||||
|
|
||||||
[没有服务器,怎么自建服务]
|
[没有服务器,怎么自建服务]
|
||||||
|
|||||||
+12
-3
@@ -39,6 +39,8 @@ const store = defineStore("main", {
|
|||||||
netCardMetricValue: 1, //自定义网卡跃点值
|
netCardMetricValue: 1, //自定义网卡跃点值
|
||||||
enablePreventSleep: false, //组织系统休眠
|
enablePreventSleep: false, //组织系统休眠
|
||||||
compression: "none", //加密算法
|
compression: "none", //加密算法
|
||||||
|
enableKcpProxy: true, //启用kcp代理 默认开启
|
||||||
|
disableKcpInput: false, //禁用kcp输入
|
||||||
},
|
},
|
||||||
serverConfig: {
|
serverConfig: {
|
||||||
enableWhiteList: true, // 是否启用白名单
|
enableWhiteList: true, // 是否启用白名单
|
||||||
@@ -55,7 +57,7 @@ const store = defineStore("main", {
|
|||||||
configPath: "", //配置文件路径
|
configPath: "", //配置文件路径
|
||||||
winIpBcAutoStart: true,
|
winIpBcAutoStart: true,
|
||||||
createConfigInEasytier: false, //在easytier目录生成config.json文件吗
|
createConfigInEasytier: false, //在easytier目录生成config.json文件吗
|
||||||
githubFastUrl: "https://ghproxy.cc/",
|
githubFastUrl: "https://ghfast.top/",
|
||||||
|
|
||||||
// forceBindIp配置
|
// forceBindIp配置
|
||||||
forceBindIpBit: "64",
|
forceBindIpBit: "64",
|
||||||
@@ -64,7 +66,9 @@ const store = defineStore("main", {
|
|||||||
forceBindFile: "",
|
forceBindFile: "",
|
||||||
|
|
||||||
winipBcPid: 0,
|
winipBcPid: 0,
|
||||||
winipBcStart: false
|
winipBcStart: false,
|
||||||
|
|
||||||
|
gameList: [] as Array<{name: string, exePath: string, id: string, coverImg: string; showImg: string}>, // 游戏列表
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
persist: {
|
persist: {
|
||||||
@@ -109,6 +113,9 @@ const store = defineStore("main", {
|
|||||||
"config.enablePreventSleep",
|
"config.enablePreventSleep",
|
||||||
"config.compression",
|
"config.compression",
|
||||||
|
|
||||||
|
"config.enableKcpProxy",
|
||||||
|
"config.disableKcpInput",
|
||||||
|
|
||||||
"serverConfig.autoStart",
|
"serverConfig.autoStart",
|
||||||
// 'serverConfig.enableListener',
|
// 'serverConfig.enableListener',
|
||||||
"serverConfig.enableWhiteList",
|
"serverConfig.enableWhiteList",
|
||||||
@@ -128,7 +135,9 @@ const store = defineStore("main", {
|
|||||||
"forceBindIpBit",
|
"forceBindIpBit",
|
||||||
"delayInjectDll",
|
"delayInjectDll",
|
||||||
"forceBindInput",
|
"forceBindInput",
|
||||||
"forceBindFile"
|
"forceBindFile",
|
||||||
|
|
||||||
|
"gameList"
|
||||||
]
|
]
|
||||||
// // 除了这些,其他都要存下来
|
// // 除了这些,其他都要存下来
|
||||||
// omit: ["winipBcPid", "winipBcStart"]
|
// omit: ["winipBcPid", "winipBcStart"]
|
||||||
|
|||||||
Vendored
+1
@@ -4,6 +4,7 @@ interface ImportMetaEnv {
|
|||||||
readonly VITE_LOG_PATH: string;
|
readonly VITE_LOG_PATH: string;
|
||||||
readonly VITE_CACHE_PATH: string;
|
readonly VITE_CACHE_PATH: string;
|
||||||
readonly VITE_AUTO_START_SERVICE_NAME: string;
|
readonly VITE_AUTO_START_SERVICE_NAME: string;
|
||||||
|
readonly VITE_GAME_LIST_PATH: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ImportMeta {
|
interface ImportMeta {
|
||||||
|
|||||||
+3
-3
@@ -4,7 +4,7 @@ import { h, type VNode } from "vue";
|
|||||||
type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null, showCancelButton?:boolean }
|
type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null, showCancelButton?:boolean }
|
||||||
export const ElConfirmDanger = (
|
export const ElConfirmDanger = (
|
||||||
content: string,
|
content: string,
|
||||||
title: string,
|
title: string = "提示",
|
||||||
opt: Opt = {
|
opt: Opt = {
|
||||||
action: "",
|
action: "",
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: "确定",
|
||||||
@@ -40,7 +40,7 @@ export const ElConfirmDanger = (
|
|||||||
|
|
||||||
export const ElConfirmSucces = (
|
export const ElConfirmSucces = (
|
||||||
content: string,
|
content: string,
|
||||||
title: string,
|
title: string = "提示",
|
||||||
opt: Opt = {
|
opt: Opt = {
|
||||||
action: "",
|
action: "",
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: "确定",
|
||||||
@@ -76,7 +76,7 @@ export const ElConfirmSucces = (
|
|||||||
|
|
||||||
export const ElConfirmPrimary = (
|
export const ElConfirmPrimary = (
|
||||||
content: string,
|
content: string,
|
||||||
title: string,
|
title: string = "提示",
|
||||||
opt: Opt = {
|
opt: Opt = {
|
||||||
action: "",
|
action: "",
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: "确定",
|
||||||
|
|||||||
+38
-11
@@ -1,5 +1,7 @@
|
|||||||
import { invoke } from "@tauri-apps/api/core";
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
|
import { writeText } from "@tauri-apps/plugin-clipboard-manager";
|
||||||
import { open } from "@tauri-apps/plugin-shell";
|
import { open } from "@tauri-apps/plugin-shell";
|
||||||
|
import { ElMessage } from "element-plus";
|
||||||
export const ENV = import.meta.env;
|
export const ENV = import.meta.env;
|
||||||
|
|
||||||
//防抖
|
//防抖
|
||||||
@@ -51,8 +53,8 @@ export const numRemoveZero = (num: Number) => {
|
|||||||
// await-to-js
|
// await-to-js
|
||||||
export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefined) => {
|
export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefined) => {
|
||||||
return promise
|
return promise
|
||||||
.then((data) => [null, data])
|
.then(data => [null, data])
|
||||||
.catch((err) => {
|
.catch(err => {
|
||||||
if (errorExt) {
|
if (errorExt) {
|
||||||
if (typeof errorExt !== "object") {
|
if (typeof errorExt !== "object") {
|
||||||
return [errorExt, undefined];
|
return [errorExt, undefined];
|
||||||
@@ -69,26 +71,26 @@ const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
|
|||||||
|
|
||||||
export const supportProtocols = () => {
|
export const supportProtocols = () => {
|
||||||
return _supportProtocols.slice();
|
return _supportProtocols.slice();
|
||||||
}
|
};
|
||||||
|
|
||||||
let _prevent_timer: NodeJS.Timeout| null = null;
|
let _prevent_timer: NodeJS.Timeout | null = null;
|
||||||
let _prevent_timer_count = 15; // 秒
|
let _prevent_timer_count = 15; // 秒
|
||||||
export const preventSleep = () => {
|
export const preventSleep = () => {
|
||||||
_prevent_timer && clearInterval(_prevent_timer);
|
_prevent_timer && clearInterval(_prevent_timer);
|
||||||
_prevent_timer = setInterval(async () => {
|
_prevent_timer = setInterval(async () => {
|
||||||
const result = await invoke('prevent_sleep');
|
const result = await invoke("prevent_sleep");
|
||||||
// console.log(`trigger prevent sleep ${result}`);
|
// console.log(`trigger prevent sleep ${result}`);
|
||||||
}, _prevent_timer_count * 1000);
|
}, _prevent_timer_count * 1000);
|
||||||
}
|
};
|
||||||
|
|
||||||
export const stopPreventSleep = async () => {
|
export const stopPreventSleep = async () => {
|
||||||
_prevent_timer && clearInterval(_prevent_timer);
|
_prevent_timer && clearInterval(_prevent_timer);
|
||||||
_prevent_timer = null;
|
_prevent_timer = null;
|
||||||
const _result = await invoke('allow_sleep');
|
const _result = await invoke("allow_sleep");
|
||||||
}
|
};
|
||||||
|
|
||||||
export const parseCliInfo = (content: string) => {
|
export const parseCliInfo = (content: string) => {
|
||||||
if(!content) return [];
|
if (!content) return [];
|
||||||
// 将表格字符串分割成行
|
// 将表格字符串分割成行
|
||||||
const lines = content.split("\n");
|
const lines = content.split("\n");
|
||||||
|
|
||||||
@@ -96,7 +98,7 @@ export const parseCliInfo = (content: string) => {
|
|||||||
const headers = lines[1]
|
const headers = lines[1]
|
||||||
.split("│")
|
.split("│")
|
||||||
.slice(1, -1)
|
.slice(1, -1)
|
||||||
.map((h) => h.trim());
|
.map(h => h.trim());
|
||||||
|
|
||||||
// 初始化结果数组
|
// 初始化结果数组
|
||||||
const result: any[] = [];
|
const result: any[] = [];
|
||||||
@@ -109,7 +111,7 @@ export const parseCliInfo = (content: string) => {
|
|||||||
const values = lines[i]
|
const values = lines[i]
|
||||||
.split("│")
|
.split("│")
|
||||||
.slice(1, -1)
|
.slice(1, -1)
|
||||||
.map((v) => v.trim());
|
.map(v => v.trim());
|
||||||
|
|
||||||
// 创建对象并添加到结果数组
|
// 创建对象并添加到结果数组
|
||||||
const obj: any = {};
|
const obj: any = {};
|
||||||
@@ -124,6 +126,20 @@ export const parseCliInfo = (content: string) => {
|
|||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export function isValidWindowsFileName(name: string) {
|
||||||
|
if(name.length > 255) return false;
|
||||||
|
const reserved_names = [
|
||||||
|
"CON", "PRN", "AUX", "NUL",
|
||||||
|
"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
|
||||||
|
"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"
|
||||||
|
];
|
||||||
|
if(reserved_names.includes(name.toUpperCase())) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return /^[^<>:"/\\|?*\x00-\x1F]+[^<>:"/\\|?*\x00-\x1F .]$/g.test(name);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export const addQQGroup = () => {
|
export const addQQGroup = () => {
|
||||||
open("https://qm.qq.com/q/Yo3HmaEIWC");
|
open("https://qm.qq.com/q/Yo3HmaEIWC");
|
||||||
};
|
};
|
||||||
@@ -134,3 +150,14 @@ export function isValidIP(ip: string) {
|
|||||||
const ipv6Pattern = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$/;
|
const ipv6Pattern = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$/;
|
||||||
return ipv4Pattern.test(ip) || ipv6Pattern.test(ip);
|
return ipv4Pattern.test(ip) || ipv6Pattern.test(ip);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const copyText = async (text: string, message: string = "复制成功") => {
|
||||||
|
const [err, _] = await ATJ(writeText(text));
|
||||||
|
|
||||||
|
if (!err) {
|
||||||
|
ElMessage.success(message);
|
||||||
|
} else {
|
||||||
|
console.error(err);
|
||||||
|
ElMessage.success("复制失败");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|||||||
Binary file not shown.
@@ -1,14 +1,15 @@
|
|||||||
/**
|
/**
|
||||||
* 生成 release 发布包 zip 文件
|
* 生成 release 发布包 zip 文件
|
||||||
*/
|
*/
|
||||||
|
const pkg = require("./package.json");
|
||||||
const releaseDir = "./src-tauri/target/release";
|
const isWin7 = process.argv[2] == 'win7';
|
||||||
|
const releaseDir = isWin7 ? "./src-tauri/target/x86_64-win7-windows-msvc/release" : "./src-tauri/target/release";
|
||||||
|
const fileName = isWin7 ? `easytier-game_windows7_fix_${pkg.version}.zip` : `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
|
||||||
const releaseDirEasytier = `${releaseDir}/easytier/`;
|
const releaseDirEasytier = `${releaseDir}/easytier/`;
|
||||||
const releaseExe = `${releaseDir}/easytier-game.exe`;
|
const releaseExe = `${releaseDir}/easytier-game.exe`;
|
||||||
const releaseHelp = `${releaseDir}/帮助.txt`;
|
const releaseHelp = `${releaseDir}/帮助.txt`;
|
||||||
|
const releaseUninstall = `${releaseDir}/uninstall.exe`;
|
||||||
const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
|
const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
|
||||||
const pkg = require("./package.json");
|
|
||||||
const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
|
|
||||||
const releaseZipDir = "./release";
|
const releaseZipDir = "./release";
|
||||||
const releaseZip = `${releaseZipDir}/${fileName}`;
|
const releaseZip = `${releaseZipDir}/${fileName}`;
|
||||||
|
|
||||||
@@ -62,5 +63,6 @@ archive.pipe(output);
|
|||||||
archive
|
archive
|
||||||
.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
|
.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
|
||||||
.append(fs.createReadStream(path.join(__dirname, releaseHelp)), { name: "帮助.txt" })
|
.append(fs.createReadStream(path.join(__dirname, releaseHelp)), { name: "帮助.txt" })
|
||||||
|
.append(fs.createReadStream(path.join(__dirname, releaseUninstall)), { name: "uninstall.exe" })
|
||||||
.directory(path.join(__dirname, releaseDirEasytier), "easytier")
|
.directory(path.join(__dirname, releaseDirEasytier), "easytier")
|
||||||
.finalize();
|
.finalize();
|
||||||
|
|||||||
Reference in New Issue
Block a user