Compare commits

...
8 Commits
27 changed files with 859 additions and 226 deletions
+3 -1
View File
@@ -11,4 +11,6 @@ dist
.vscode
release
src-tauri/easytier/logs
src-tauri/easytier/logs
src-tauri/easytier/tool/ResourcesExtract.exe
src-tauri/easytier/tool/ResourcesExtract.cfg
+1 -1
View File
@@ -1 +1 @@
20.18.1
20.18.3
+33
View File
@@ -0,0 +1,33 @@
import { basename, extname } from "@tauri-apps/api/path";
import { exists } from "@tauri-apps/plugin-fs";
import { Command } from "@tauri-apps/plugin-shell";
export const getIcon = async function (sourcePath: string, icoDirPath: string) {
if(sourcePath.endsWith(".url")) return false;
let res = await Command.create("ResourcesExtract", [
"/Source",
sourcePath,
"/DestFolder",
icoDirPath,
"/ExtractIcons",
"1",
"/ExtractCursors",
"0",
"/OpenDestFolder",
"0",
"/MultiFilesMode",
"1"
]).execute();
if (res.code == 0) {
let icoPath = icoDirPath + "\\" + (await basename(sourcePath));
icoPath = icoPath.replace(`.${await extname(sourcePath)}`, "_1.ico");
if (await exists(icoPath)) {
return icoPath;
} else {
return false;
}
return;
} else {
return false;
}
};
+4 -3
View File
@@ -121,9 +121,10 @@ export async function MenuItemTheme() {
text: "主题切换",
action: async () => {
const mainStore = useMainStore();
mainStore.theme = !mainStore.theme;
// const appWindow = getCurrentWindow();
// appWindow.emitTo("main", "config", { theme: mainStore.theme });
mainStore.$patch({
theme: !mainStore.theme
});
// mainStore.$persist();
await setTheme(mainStore.theme);
},
});
+12 -17
View File
@@ -67,21 +67,16 @@ export default async (
export const dataSubscribe = async (cb?: (...args: any) => any) => {
if (!cb) return;
const mainStore = useMainStore();
const currentWindow = getCurrentWindow();
let removeSubscribe = mainStore.$subscribe(async (...args) => {
const emitData = await cb(args);
await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
});
const unlisten = currentWindow.listen<any>("global-main-store", event => {
removeSubscribe && removeSubscribe();
mainStore.$patch({ ...event.payload.store }); // 更新全局状态
removeSubscribe = mainStore.$subscribe(async (...args) => {
const emitData = await cb(args);
await currentWindow.emitTo({ kind: "Window", label: "main" }, "config", emitData);
});
});
onBeforeUnmount(async () => {
unlisten && (await unlisten)();
removeSubscribe && removeSubscribe();
});
const abort = new AbortController();
window.addEventListener("storage", async () => {
mainStore.$hydrate();
if (cb && cb instanceof Function) {
await cb();
}
}, {
signal: abort.signal
})
onBeforeUnmount(() => {
abort?.abort();
})
};
+1
View File
@@ -3,5 +3,6 @@ VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
VITE_CONFIG_FILE_NAME=easytier/config.json
VITE_LOG_PATH=easytier/logs/
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
+1
View File
@@ -3,5 +3,6 @@ VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
VITE_CONFIG_FILE_NAME=easytier/config.json
VITE_LOG_PATH=easytier/logs/
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
+93 -93
View File
@@ -3,107 +3,107 @@ import path from "path";
import vueJSX from "@vitejs/plugin-vue-jsx";
export default defineNuxtConfig({
ssr: false,
ssr: false,
devServer: {
port: 5000
},
telemetry: false,
devServer: {
port: 5000
},
telemetry: false,
imports: {
autoImport: false
},
imports: {
autoImport: false
},
css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
modules: [
"@element-plus/nuxt",
"@pinia/nuxt",
[
"pinia-plugin-persistedstate/nuxt",
{
key: "__glj_persisted_%id",
storage: "localStorage"
}
],
"@nuxtjs/tailwindcss"
],
css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
modules: [
"@element-plus/nuxt",
"@pinia/nuxt",
[
"pinia-plugin-persistedstate/nuxt",
{
key: "__glj_persisted_%id",
storage: "localStorage"
}
],
"@nuxtjs/tailwindcss"
],
alias: {
"@": path.resolve(__dirname, "./")
},
alias: {
"@": path.resolve(__dirname, "./")
},
experimental: {
payloadExtraction: false
},
experimental: {
payloadExtraction: false
},
devtools: {
enabled: false
},
devtools: {
enabled: false
},
router: {
options: {
hashMode: true
}
},
router: {
options: {
hashMode: true
}
},
vite: {
plugins: [vueJSX({})],
envDir: "env",
optimizeDeps: {
// include: [...optimizeDepsElementPlusIncludes]
},
// prevent vite from obscuring rust errors
clearScreen: false,
// Tauri expects a fixed port, fail if that port is not available
server: {
strictPort: true
},
// to access the Tauri environment variables set by the CLI with information about the current target
envPrefix: ["VITE_", "TAURI_"],
build: {
// minify: "esbuild",
chunkSizeWarningLimit: 1500,
// Tauri uses Chromium on Windows and WebKit on macOS and Linux
target: process.env.TAURI_PLATFORM == "windows" ? "chrome105" : "safari13",
// don't minify for debug builds
minify: !process.env.TAURI_DEBUG ? "esbuild" : false,
// 为调试构建生成源代码映射 (sourcemap)
sourcemap: !!process.env.TAURI_DEBUG
},
esbuild: {
// pure: ["console.log"],
drop: ["debugger"]
}
},
vite: {
plugins: [vueJSX({})],
envDir: "env",
optimizeDeps: {
// include: [...optimizeDepsElementPlusIncludes]
},
// prevent vite from obscuring rust errors
clearScreen: false,
// Tauri expects a fixed port, fail if that port is not available
server: {
strictPort: true
},
// to access the Tauri environment variables set by the CLI with information about the current target
envPrefix: ["VITE_", "TAURI_"],
build: {
// minify: "esbuild",
chunkSizeWarningLimit: 1500,
// Tauri uses Chromium on Windows and WebKit on macOS and Linux
target: process.env.TAURI_PLATFORM == "windows" ? "chrome105" : "safari13",
// don't minify for debug builds
minify: !process.env.TAURI_DEBUG ? "esbuild" : false,
// 为调试构建生成源代码映射 (sourcemap)
sourcemap: !!process.env.TAURI_DEBUG
},
esbuild: {
// pure: ["console.log"],
drop: ["debugger"]
}
},
postcss: {
plugins: {
tailwindcss: {},
autoprefixer: {}
}
},
postcss: {
plugins: {
tailwindcss: {},
autoprefixer: {}
}
},
app: {
rootId: "__easytier",
cdnURL: "./",
buildAssetsDir: "__easytier/",
head: {
meta: [
{
name: "viewport",
content: "width=device-width, initial-scale=1"
},
{
charset: "utf-8"
}
],
title: "easytier-game"
// link: [],
// style: [],
// script: [],
// noscript: []
}
},
compatibilityDate: "2024-11-12"
app: {
rootId: "__easytier",
cdnURL: "./",
buildAssetsDir: "__easytier/",
head: {
meta: [
{
name: "viewport",
content: "width=device-width, initial-scale=1"
},
{
charset: "utf-8"
}
],
title: "easytier-game"
// link: [],
// style: [],
// script: [],
// noscript: []
}
},
compatibilityDate: "2024-11-12"
});
+2 -2
View File
@@ -3,7 +3,7 @@
"private": true,
"author": "leizi97",
"description": "A simple network initiator based on Easytier",
"version": "1.3.9",
"version": "1.4.1",
"scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod",
@@ -28,7 +28,7 @@
"@vitejs/plugin-vue-jsx": "^4.1.1",
"@vueuse/core": "12.4.0",
"archiver": "^7.0.1",
"element-plus": "2.9.3",
"element-plus": "2.9.4",
"less": "4.2.1",
"lodash-es": "^4.17.21",
"nuxt": "3.15.4",
+1 -5
View File
@@ -302,7 +302,7 @@
guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : [];
};
dataSubscribe(async (...a) => {
dataSubscribe(async () => {
if (!mainStore.createConfigInEasytier) {
// 考虑删除本地config.json文件
const configJsonPath = import.meta.env.VITE_CONFIG_FILE_NAME;
@@ -322,9 +322,5 @@
}
}
}
return {
config: { ...mainStore.config },
createConfigInEasytier: mainStore.createConfigInEasytier
};
});
</script>
+2 -3
View File
@@ -107,13 +107,12 @@
onMounted(async () => {
unlistenStart = await listenStart();
dataSubscribe();
});
onBeforeUnmount(() => {
unlistenStart && unlistenStart();
});
dataSubscribe(async (...a) => {
return { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } };
});
</script>
+533
View File
@@ -0,0 +1,533 @@
<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="!ml-[0px] 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" placement="top">
<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-[61px] z-[1] hidden h-[calc(100%-61px)] w-full flex-col items-center justify-center rounded-[5px] bg-[var(--el-mask-color)] group-hover/card:flex"
>
<ElButton
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 flex-col 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>
<ElText>支持从桌面拖放新增</ElText>
</div>
</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="showImg"
>
<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('showImg')"
: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, basename, extname, resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
import { convertFileSrc, Resource } from "@tauri-apps/api/core";
import { computed, nextTick, onBeforeUnmount, onMounted, 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";
import { listen, type UnlistenFn } from "@tauri-apps/api/event";
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; id: string; showImg: string };
const createGameData = reactive({
visible: false,
isEdit: false,
form: {
id: "",
name: "",
exePath: "",
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: "",
showImg: defaultPng
};
await nextTick();
createGameData.visible = true;
};
const handleBrowser = async (type: "showImg" | "exePath") => {
const filters = type === "showImg" ? [{ name: "", extensions: ["png", "jpg", "jpeg"] }] : [{ name: "", extensions: ["exe"] }];
const file = await dialogOpen({
multiple: false,
directory: false,
filters
});
if (file) {
if (type === "showImg") {
if (file) {
if (!createGameData.form.id) {
const time = new Date().getTime();
createGameData.form.id = uniqueId(`${time}`);
}
let showImg = file;
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 = showImg.split(".").pop();
const toPathFileName = `${toPath}.${suffix}`;
if (showImg != toPathFileName) {
await copyFile(showImg, toPathFileName);
}
// console.log(toPathFileName);
const isExistsToPath = await exists(toPathFileName);
if (isExistsToPath) {
const baseName = await basename(toPathFileName);
createGameData.form = { ...createGameData.form, showImg: `${baseName}` }; // 如果复制正确,那就存储文件名即可
}
}
}
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 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, showImg: defaultPng };
};
const removeFileById = async (id: string) => {
if (!id) return;
const isExists = await exists(gameListResourceDir);
if (!isExists) 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);
const isExists = await exists(imgPath);
if (!isExists) continue;
await remove(imgPath);
}
}
}
};
const handleDeleteItem = async ({ 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;
mainStore.gameList[idx] = { ...item };
mainStore.$patch({
gameList: [...mainStore.gameList]
});
};
const showImgConvertFileSrc = (showImg: string) => {
if (showImg == defaultPng) return defaultPng;
showImg = /^[a-z]\:/g.test(showImg.toLowerCase())
? `${convertFileSrc(showImg)}?${new Date().getTime()}`
: `${convertFileSrc(`${gameListResourceDir}\\${showImg}`)}?${new Date().getTime()}`;
return showImg;
};
let unlistenDragDrop: UnlistenFn | null = null;
const listenDragDrop = async () => {
unlistenDragDrop = await listen<{ paths: string[]; position: { x: number; y: number } }>("tauri://drag-drop", async e => {
const AllFiles = e.payload.paths;
let result: Array<gameItemType> = [];
const date = new Date().getTime();
const showImg = defaultPng;
const extUrls = [];
const lnkFiles = [];
for (const item of AllFiles) {
if (item.endsWith(".url")) {
extUrls.push(item);
} else {
lnkFiles.push(item);
}
}
if (lnkFiles.length > 0) {
// console.log(lnkFiles)
let lnkFilesstr = "$lnkFiles = @(";
for (let i = 0; i < lnkFiles.length; i++) {
lnkFilesstr = lnkFilesstr + `\"${lnkFiles[i]}\"`;
if (i == lnkFiles.length - 1) {
lnkFilesstr = lnkFilesstr + ");";
} else {
lnkFilesstr = lnkFilesstr + ",";
}
}
let forstr =
lnkFilesstr +
`
$shell = New-Object -ComObject WScript.Shell;
$results = @();
foreach ($lnkFile in $lnkFiles) {
$shortcut = $shell.CreateShortcut($lnkFile);
$targetPath = $shortcut.TargetPath;
$iconLocation = $shortcut.IconLocation;
$results += [PSCustomObject]@{
TargetPath = $targetPath
LinkFile = $lnkFile
};
};
$results | ConvertTo-Json
`;
let outputtarget = await Command.create("powershell", [`${forstr}`], {
encoding: "GBK"
}).execute();
let res: {
TargetPath: string;
LinkFile: string;
}[] = JSON.parse(outputtarget.stdout);
if (res && !Array.isArray(res)) {
res = [res];
}
if (res.length > 0) {
for (const idx in res) {
const item = res[idx];
// console.log(item);
const id = `${date}-${idx}`;
const exePath = item.TargetPath || item.LinkFile;
const namePath = item.LinkFile || item.TargetPath;
const allName = await basename(namePath);
const extName = await extname(namePath);
result.push({
exePath: exePath,
name: allName.replace(`.${extName}`, ""),
id,
showImg
});
}
}
}
if (extUrls.length > 0) {
for (const idx in extUrls) {
const TargetPath = extUrls[idx];
const id = `${date}-${idx}-url`;
const allName = await basename(TargetPath);
const extName = await extname(TargetPath);
result.push({
exePath: TargetPath,
name: allName.replace(`.${extName}`, ""),
id,
showImg
});
}
}
if (result.length > 0) {
mainStore.$patch({
gameList: [...mainStore.gameList, ...result]
});
}
});
};
// 兼容新的存储方式
const compatibleGameList = async () => {
const gameList = [...mainStore.gameList];
if(gameList.length <= 0) return;
const newGameList = [];
for(const item of gameList) {
const newItem = {...item}
if(newItem.showImg != defaultPng && /^[a-z]\:/g.test(newItem.showImg.toLowerCase())) {
newItem.showImg = await basename(item.showImg);
if(Reflect.has(newItem, "coverImg")) {
delete newItem['coverImg'];
}
}
newGameList.push(newItem);
}
mainStore.$patch({
gameList: newGameList
})
}
onMounted(async () => {
await compatibleGameList();
listenDragDrop(); //监听拖放
});
onBeforeUnmount(() =>{
unlistenDragDrop && unlistenDragDrop();
})
dataSubscribe();
</script>
+108 -57
View File
@@ -44,16 +44,24 @@
</ElTooltip>
</div>
<ElTooltip content="请先停止自建服务和联机后再使用,否则内核被占用的情况下,无法进行内核更换">
<ElButton
class="ml-auto"
:disabled="data.isStart || listenObj.server_thread_id.value"
@click="handleCoreManagement"
:loading="data.update"
type="primary"
size="small"
<ElBadge
badge-class="!text-[9px] cursor-pointer"
:hidden="!haveNewCoreVersion"
:offset="[-5, 6]"
@click.stop="handleCoreManagement"
value="N"
>
内核管理
</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>
</div>
</template>
@@ -310,6 +318,12 @@
>
保存当前房间配置
</ElDropdownItem>
<ElDropdownItem
command="game_start_config"
:icon="SwitchFilled"
>
本地游戏列表
</ElDropdownItem>
</ElDropdownMenu>
</template>
</ElDropdown>
@@ -423,8 +437,11 @@
>
<div>
<ElText>当前版本: {{ data.coreVersion || "-" }}</ElText>
<div v-if="data.update">
<ElProgress :percentage="progress"></ElProgress>
</div>
</div>
<div class="mt-[10px] pb-[5px]">
<div class="mt-[5px] pb-[5px]">
<ElText class="!mr-[10px]">选择一个内核版本安装</ElText>
<ElButton
:loading="coreManagementData.loading"
@@ -467,7 +484,13 @@
<ElInput
v-model="mainStore.githubFastUrl"
placeholder="请输入github加速地址"
></ElInput>
>
<template #append>
<ElTooltip content="github加速链接的发布地址,当前地址失效后,访问它获取最新的地址">
<ElButton @click="open('https://ghproxy.link/')">发布地址</ElButton>
</ElTooltip>
</template>
</ElInput>
<template #footer>
<div class="text-right">
<ElButton
@@ -668,7 +691,7 @@
</template>
<script setup lang="ts">
import { invoke } from "@tauri-apps/api/core";
import { listen } from "@tauri-apps/api/event";
import { listen, type UnlistenFn } from "@tauri-apps/api/event";
import { open, Command } from "@tauri-apps/plugin-shell";
import {
QuestionFilled,
@@ -684,9 +707,10 @@
SetUp,
Folder,
CopyDocument,
Platform
Platform,
SwitchFilled
} 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 { getMatches } from "@tauri-apps/plugin-cli";
import { initStartWinIpBroadcast } from "~/composables/netcard";
@@ -694,7 +718,7 @@
import { ElMessage, ElMessageBox, ElTooltip } from "element-plus";
import { getCurrentWindow, type Window } from "@tauri-apps/api/window";
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 { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile, remove as removeFile } from "@tauri-apps/plugin-fs";
import { updateConfigJson } from "~/composables/configJson";
@@ -731,6 +755,7 @@
cidrVisible: false,
advanceVisible: false,
toolVisible: false,
gameListVisible: false,
serverVisible: false,
winipBcPid: 0, //WinIPBroadcast进程id
winipBcStart: false,
@@ -839,23 +864,11 @@
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 } = {
unListenOutPut: null,
unListenThreadId: null,
unListenServerOutPut: null,
unListenServerThreadId: null,
unListenConfigStart: null,
unListenStartStopServer: null,
thread_id: null,
server_thread_id: ref(null),
@@ -940,24 +953,7 @@
});
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() {
const unListen = await listen<{ args: Array<string> }>("startStopServer", async event => {
await listenObj?.unListenServerOutPut?.();
@@ -991,6 +987,18 @@
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 latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
let [downloadUrl, versionFileName] = (coreManagementData.data as string).split("<>");
@@ -1022,14 +1030,20 @@
const handleCoreManagement = async () => {
coreManagementData.visible = true;
await getReleaseList();
// await getReleaseList();
};
let unlistenDownload: UnlistenFn | null = null;
let unlistenDownloadError: UnlistenFn | null = null;
let progress = ref<number>(0);
let size = 0;
const handleInstallCore = async () => {
try {
if (!coreManagementData.data) {
return ElMessage.error("请选择一个内核");
}
progress.value = 0;
size = 0;
data.update = true;
await getCoreVersion();
const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
@@ -1037,6 +1051,22 @@
if (isNeedUpdate) {
await reset();
// console.error(downloadUrl);
if (unlistenDownload) {
await unlistenDownload();
}
if (unlistenDownloadError) {
await unlistenDownloadError();
}
unlistenDownload = await listen<[number, number]>("download_core_progress", ({ payload }) => {
size += payload[0];
progress.value = Math.round((size / payload[1]) * 100);
});
unlistenDownloadError = await listen("download_core_progress_error", () => {
data.update = false;
progress.value = 0;
size = 0;
ElMessage.error("发生错误,请重试");
});
await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName });
}
await getCoreVersion();
@@ -1061,6 +1091,7 @@
};
const handleAutoStartByTask = async () => {
if (import.meta.env.DEV) return ElMessage.warning("开发环境不支持开机自启");
await invoke("spawn_autostart", { enabled: !config.autoStart });
const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
config.autoStart = is_enable_by_task;
@@ -1071,6 +1102,7 @@
let is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
if (is_enable_by_task) {
// 每次打开Exe重新加载一次开机自启,因为可能路径变了
if (import.meta.env.DEV) return ElMessage.warning("开发环境不支持开机自启");
await invoke("spawn_autostart", { enabled: false });
await invoke("spawn_autostart", { enabled: true });
}
@@ -1137,14 +1169,6 @@
}
}
}
const b = bounce(600);
mainStore.$subscribe(async (...a) => {
if (mainStore.createConfigInEasytier) {
b(async () => {
await updateConfigJson(data.configJsonSeverUrl);
});
}
});
};
const initAutoStartServer = async () => {
@@ -1180,6 +1204,7 @@
let serverLogsTimer: NodeJS.Timeout | null = null;
let cidrTimer: NodeJS.Timeout | null = null;
const b = bounce(600);
onMounted(async () => {
await initGuiJson();
await compatibleInitAutoStart();
@@ -1188,7 +1213,6 @@
await getCoreVersion();
await listenObj.listenThreadId();
await listenObj.listenServerThreadId();
await listenObj.listenConfigStart();
await listenObj.listenStartStopServer();
await initConfigDir();
await initAutoStartServer();
@@ -1197,13 +1221,19 @@
mountedShow(); // 不需要await
closePrevent();
data.hasNewVersion = await checkNewVersion();
dataSubscribe(async () => {
if (mainStore.createConfigInEasytier) {
b(async () => {
await updateConfigJson(data.configJsonSeverUrl);
});
}
});
getReleaseList();
});
onBeforeUnmount(() => {
unListenAll();
listenObj.unListenReleaseList && listenObj.unListenReleaseList();
listenObj.unListenConfigStart && listenObj.unListenConfigStart[0]();
listenObj.unListenConfigStart && listenObj.unListenConfigStart[1]();
listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
logsTimer && clearInterval(logsTimer);
serverLogsTimer && clearInterval(serverLogsTimer);
@@ -1581,6 +1611,27 @@
}
}
}
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 () => {
+1 -3
View File
@@ -123,8 +123,6 @@
await appWindow.emitTo("main", "startStopServer", { args });
};
dataSubscribe(async (...a) => {
return { serverConfig: { ...mainStore.serverConfig }};
});
dataSubscribe();
</script>
+2 -14
View File
@@ -42,7 +42,7 @@
</div>
<div>
<ElTooltip
content="使用ForceBindIP启动应用 (强制绑定IP或者网卡),如果还没启动联机,请先启动联机,联机成功后,点击刷新获取easytier生成的网卡"
content="使用ForceBindIP启动应用 (强制绑定IP或者网卡),如果还没启动联机,请先启动联机,联机成功后,点击刷新获取easytier生成的网卡"
>
<ElText>
方案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 guids = await invoke<string[][]>("get_network_adapter_guids");
data.guids = guids && guids.length > 0 ? guids : [];
@@ -505,5 +492,6 @@
data.pingIp = mainStore.config.ipv4;
initStartWinIpBroadcast();
getGuids();
dataSubscribe();
});
</script>
+8 -8
View File
@@ -13,7 +13,7 @@ importers:
version: 2.3.1(vue@3.5.13(typescript@5.6.3))
'@element-plus/nuxt':
specifier: ^1.1.1
version: 1.1.1(@element-plus/icons-vue@2.3.1(vue@3.5.13(typescript@5.6.3)))(element-plus@2.9.3(vue@3.5.13(typescript@5.6.3)))(magicast@0.3.5)(rollup@4.27.4)
version: 1.1.1(@element-plus/icons-vue@2.3.1(vue@3.5.13(typescript@5.6.3)))(element-plus@2.9.4(vue@3.5.13(typescript@5.6.3)))(magicast@0.3.5)(rollup@4.27.4)
'@nuxtjs/tailwindcss':
specifier: 6.13.1
version: 6.13.1(magicast@0.3.5)(rollup@4.27.4)
@@ -60,8 +60,8 @@ importers:
specifier: ^7.0.1
version: 7.0.1
element-plus:
specifier: 2.9.3
version: 2.9.3(vue@3.5.13(typescript@5.6.3))
specifier: 2.9.4
version: 2.9.4(vue@3.5.13(typescript@5.6.3))
less:
specifier: 4.2.1
version: 4.2.1
@@ -1702,8 +1702,8 @@ packages:
electron-to-chromium@1.5.56:
resolution: {integrity: sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==}
element-plus@2.9.3:
resolution: {integrity: sha512-6tSLp5XytDS4TMZ0P3aGZnr7MXTagfNycepNfIDitd9IgwM9y01+Ssu6mglNi8RiXYhek6LBWNOd/cvpIO12+w==}
element-plus@2.9.4:
resolution: {integrity: sha512-sGnW0wd9zf6lEGixXV2gfwx3X6VTMkP52qTkX7zbURJ2oariyslrKTBh2txt1sdn1pUvj2l0KY3OfSXoZGmDOw==}
peerDependencies:
vue: ^3.2.0
@@ -4104,11 +4104,11 @@ snapshots:
dependencies:
vue: 3.5.13(typescript@5.6.3)
'@element-plus/nuxt@1.1.1(@element-plus/icons-vue@2.3.1(vue@3.5.13(typescript@5.6.3)))(element-plus@2.9.3(vue@3.5.13(typescript@5.6.3)))(magicast@0.3.5)(rollup@4.27.4)':
'@element-plus/nuxt@1.1.1(@element-plus/icons-vue@2.3.1(vue@3.5.13(typescript@5.6.3)))(element-plus@2.9.4(vue@3.5.13(typescript@5.6.3)))(magicast@0.3.5)(rollup@4.27.4)':
dependencies:
'@element-plus/icons-vue': 2.3.1(vue@3.5.13(typescript@5.6.3))
'@nuxt/kit': 3.15.0(magicast@0.3.5)(rollup@4.27.4)
element-plus: 2.9.3(vue@3.5.13(typescript@5.6.3))
element-plus: 2.9.4(vue@3.5.13(typescript@5.6.3))
magic-string: 0.27.0
unplugin: 1.16.0
transitivePeerDependencies:
@@ -5739,7 +5739,7 @@ snapshots:
electron-to-chromium@1.5.56: {}
element-plus@2.9.3(vue@3.5.13(typescript@5.6.3)):
element-plus@2.9.4(vue@3.5.13(typescript@5.6.3)):
dependencies:
'@ctrl/tinycolor': 3.6.1
'@element-plus/icons-vue': 2.3.1(vue@3.5.13(typescript@5.6.3))
Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

+8 -1
View File
@@ -1290,7 +1290,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]]
name = "easytier-game"
version = "1.3.9"
version = "1.4.1"
dependencies = [
"hashbrown 0.15.2",
"log",
@@ -2075,6 +2075,12 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "http-range"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
[[package]]
name = "httparse"
version = "1.9.5"
@@ -4745,6 +4751,7 @@ dependencies = [
"gtk",
"heck 0.5.0",
"http",
"http-range",
"image",
"jni",
"libc",
+3 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.3.9"
version = "1.4.1"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier"
@@ -25,7 +25,7 @@ tauri-build = { version = "2.0.5", features = [] }
serde_json = "1.0.137"
serde = { version = "1.0.217", features = ["derive"] }
log = "0.4.25"
tauri = { version = "2.2.5", features = [
tauri = { version = "2.2.5", features = [ "protocol-asset",
"tray-icon",
"image-png",
"image-ico",
@@ -47,6 +47,7 @@ tauri-plugin-dialog = "2.2.0"
# prost = "0.13"
# prost-types = "0.13"
hashbrown = "0.15.2"
# futures-util = "0.3"
[dependencies.windows]
version = "0.58.0"
+10 -2
View File
@@ -2,7 +2,7 @@
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "enables the default permissions",
"windows": ["main", "log", "member", "cidr", "advance", "tool", "server"],
"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList"],
"permissions": [
"core:default",
"core:window:allow-minimize",
@@ -88,11 +88,19 @@
"args": true,
"cmd": "ping",
"name": "ping"
},
{
"args": true,
"cmd": "powershell",
"name": "powershell"
}
]
},
"fs:default",
"fs:allow-read-dir",
{
"identifier": "fs:allow-read-dir",
"allow": [{ "path": "$DESKTOP" }, { "path": "$DESKTOP/*" }, { "path": "**/*" }, { "path": "**" }]
},
"fs:allow-exists",
"fs:allow-open",
"fs:allow-resource-read",
Binary file not shown.
Binary file not shown.
+18 -8
View File
@@ -3,6 +3,7 @@ use planif::schedule::TaskScheduler as planIfTaskScheduler;
use planif::schedule_builder::{Action, ScheduleBuilder};
use planif::settings::{Duration, LogonType, PrincipalSettings, RunLevel};
use reqwest::{Client, Error};
// use futures_util::StreamExt;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::fs::{self, File};
@@ -325,7 +326,7 @@ async fn get_route_by_cli() -> String {
}
#[tauri::command(rename_all = "snake_case")]
async fn download_easytier_zip(download_url: String, file_name: String) {
async fn download_easytier_zip(app_handle: tauri::AppHandle ,download_url: String, file_name: String) {
let cache_dir_path = get_tool_exe_path("\\easytier\\cache");
let cache_file_name = format!("{}\\{}", cache_dir_path, file_name);
let cache_file_name_path = path::Path::new(&cache_file_name);
@@ -335,12 +336,12 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
}
let target = format!("{}", download_url);
let response = reqwest::get(target)
let mut response = reqwest::get(target)
.await
.expect("error to download easytier url");
let easytier_path = get_tool_exe_path("\\easytier");
let file_path = format!("{}\\{}", easytier_path, file_name);
println!("download easytier to {}", file_path);
// println!("download easytier to {}", file_path);
let easytier_dir = path::Path::new(&easytier_path);
if !easytier_dir.exists() {
@@ -354,11 +355,20 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
Err(why) => panic!("couldn't create {}", why),
Ok(file) => file,
};
let content = response.bytes().await.expect("error to bytes easytier");
println!("下载完成,开始写入");
file.write_all(&content).expect("error to write easytier");
println!("写入完成");
let context_size: u64 = response.content_length().unwrap();
while let Some(item) = response.chunk().await.unwrap() {
match file.write_all(&item) {
Ok(_) => {
app_handle.emit("download_core_progress", [item.len() as u64, context_size]).expect("error to emit download_core_progress");
},Err(why) => {
log::error!("error to write file: {}", why);
app_handle.emit("download_core_progress_error", why.to_string()).expect("error to emit download_core_progress_error");
return
}
};
}
println!("下载完成");
unzip(path);
let cache_dir_path = path::Path::new(&cache_dir_path);
+7 -3
View File
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.3.9",
"version": "1.4.1",
"identifier": "com.tauri.easytier-game",
"build": {
@@ -12,7 +12,7 @@
"app": {
"windows": [
{
"title": "easytier-game 1.3.9",
"title": "easytier-game 1.4.1",
"label": "main",
"minWidth": 340,
"width": 340,
@@ -30,7 +30,11 @@
}
],
"security": {
"csp": null
"csp": null,
"assetProtocol": {
"enable": true,
"scope": ["**"]
}
}
},
"plugins": {
+7 -3
View File
@@ -57,7 +57,7 @@ const store = defineStore("main", {
configPath: "", //配置文件路径
winIpBcAutoStart: true,
createConfigInEasytier: false, //在easytier目录生成config.json文件吗
githubFastUrl: "https://ghproxy.cc/",
githubFastUrl: "https://ghfast.top/",
// forceBindIp配置
forceBindIpBit: "64",
@@ -66,7 +66,9 @@ const store = defineStore("main", {
forceBindFile: "",
winipBcPid: 0,
winipBcStart: false
winipBcStart: false,
gameList: [] as Array<{name: string, exePath: string, id: string, coverImg?: string; showImg: string}>, // 游戏列表
};
},
persist: {
@@ -133,7 +135,9 @@ const store = defineStore("main", {
"forceBindIpBit",
"delayInjectDll",
"forceBindInput",
"forceBindFile"
"forceBindFile",
"gameList"
]
// // 除了这些,其他都要存下来
// omit: ["winipBcPid", "winipBcStart"]
+1
View File
@@ -4,6 +4,7 @@ interface ImportMetaEnv {
readonly VITE_LOG_PATH: string;
readonly VITE_CACHE_PATH: string;
readonly VITE_AUTO_START_SERVICE_NAME: string;
readonly VITE_GAME_LIST_PATH: string;
}
interface ImportMeta {