mirror of
https://github.com/EasyTier/EasytierGame.git
synced 2025-05-19 10:27:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 黑先森
|
affce1125b | ||
|
黑先森
|
2b87747fe5 | ||
|
黑先森
|
423d3ba243 | ||
|
黑先森
|
0ce2595833 | ||
|
黑先森
|
9eb0e5b7ac | ||
|
leizi97
|
6fde1c2236 | ||
|
黑先森
|
6fd3b999d7 | ||
|
黑先森
|
3773e11b24 | ||
|
黑先森
|
987541ab52 | ||
|
黑先森
|
a5954744a1 |
@@ -56,6 +56,9 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
|
||||
- 1.2.6重写 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html),也可查看帮助.txt
|
||||
|
||||
|
||||
- 1.3.5 增强工具 新增了forceBindIP
|
||||
|
||||
|
||||
## 特性
|
||||
|
||||
- 基于easytier组网工具开发，界面清晰简单
|
||||
|
||||
+8
-1
@@ -55,5 +55,12 @@ html.dark body {
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
@@ -0,0 +1,11 @@
|
||||
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
|
||||
+2
-2
@@ -46,7 +46,7 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
|
||||
|
||||
if (init) {
|
||||
tray.setTooltip(`EasyTierGame\n${pkg.version}`);
|
||||
tray.setMenuOnLeftClick(false);
|
||||
tray.setShowMenuOnLeftClick(false);
|
||||
tray.setMenu(
|
||||
await Menu.new({
|
||||
id: "main",
|
||||
@@ -89,7 +89,7 @@ export async function MenuItemPublicPeers() {
|
||||
id: "publicPeers",
|
||||
text: "公共节点",
|
||||
action: async () => {
|
||||
await open("https://easytier.gd.nkbpal.cn/status/easytier")
|
||||
await open(import.meta.env.VITE_PUBLIC_PEERS_URL)
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
Vendored
+2
@@ -1,5 +1,7 @@
|
||||
VITE_CONFIG_PATH=easytier/config/
|
||||
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_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
|
||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||
Vendored
+2
@@ -1,5 +1,7 @@
|
||||
VITE_CONFIG_PATH=easytier/config/
|
||||
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_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
|
||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||
+13
-15
@@ -3,41 +3,39 @@
|
||||
"private": true,
|
||||
"author": "leizi97",
|
||||
"description": "A simple network initiator based on Easytier",
|
||||
"version": "1.3.6",
|
||||
"version": "1.3.8",
|
||||
"scripts": {
|
||||
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
|
||||
"build": "nuxt generate --dotenv env/.env.prod",
|
||||
"release": "node zip.js"
|
||||
"release": "node zip.js",
|
||||
"release-win7": "node zip.js win7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@element-plus/icons-vue": "^2.3.1",
|
||||
"@element-plus/nuxt": "^1.1.1",
|
||||
"@nuxtjs/tailwindcss": "^6.12.2",
|
||||
"@nuxtjs/tailwindcss": "6.13.1",
|
||||
"@pinia/nuxt": "0.9.0",
|
||||
"@tauri-apps/api": "^2.2.0",
|
||||
"@tauri-apps/cli": "^2.2.2",
|
||||
"@tauri-apps/cli": "2.2.5",
|
||||
"@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-dialog": "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",
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@vitejs/plugin-vue-jsx": "^4.1.1",
|
||||
"@vueuse/core": "12.2.0",
|
||||
"@vueuse/core": "12.4.0",
|
||||
"archiver": "^7.0.1",
|
||||
"element-plus": "2.9.2",
|
||||
"less": "^4.2.0",
|
||||
"element-plus": "2.9.3",
|
||||
"less": "4.2.1",
|
||||
"lodash-es": "^4.17.21",
|
||||
"nuxt": "3.15.1",
|
||||
"nuxt": "3.15.2",
|
||||
"pinia": "^2.3.0",
|
||||
"pinia-plugin-persistedstate": "^4.2.0",
|
||||
"postcss": "^8.4.38",
|
||||
"prettier": "^3.4.1",
|
||||
"prettier-plugin-tailwindcss": "^0.6.9",
|
||||
"vue-clipboard3": "^2.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tauri-apps/plugin-dialog": "2.2.0"
|
||||
"prettier": "3.4.2",
|
||||
"prettier-plugin-tailwindcss": "0.6.10"
|
||||
}
|
||||
}
|
||||
|
||||
+298
-71
@@ -17,7 +17,7 @@
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
<span>-</span>
|
||||
<div class="h-[fit-content]">-</div>
|
||||
<ElTag
|
||||
effect="dark"
|
||||
:type="data.isSuccessGetIp ? 'success' : 'info'"
|
||||
@@ -32,10 +32,13 @@
|
||||
</ElButton>
|
||||
<div
|
||||
v-else
|
||||
class="flex-1 truncate"
|
||||
class="flex-1 truncate !leading-[1em]"
|
||||
>
|
||||
<ElTooltip :content="`内核版本:${data.coreVersion}(不是软件的版本)`">
|
||||
<ElTag type="info">
|
||||
<ElTag
|
||||
size="small"
|
||||
type="info"
|
||||
>
|
||||
{{ data.coreVersion }}
|
||||
</ElTag>
|
||||
</ElTooltip>
|
||||
@@ -82,6 +85,18 @@
|
||||
</ElSelect>
|
||||
</div>
|
||||
</template>
|
||||
<template #footer>
|
||||
<div class="text-center">
|
||||
<ElLink
|
||||
type="primary"
|
||||
size="small"
|
||||
:underline="false"
|
||||
@click.stop="open(publicPeersLink)"
|
||||
>
|
||||
其他公共服务器
|
||||
</ElLink>
|
||||
</div>
|
||||
</template>
|
||||
<ElOption
|
||||
v-for="item in mainStore.basePeers"
|
||||
:key="item"
|
||||
@@ -104,7 +119,7 @@
|
||||
</p>
|
||||
<div class="ml-auto flex-shrink-0">
|
||||
<ElButton
|
||||
@click.stop="copyServerUrl(item)"
|
||||
@click.stop="copyText(item)"
|
||||
circle
|
||||
size="small"
|
||||
title="复制"
|
||||
@@ -130,9 +145,9 @@
|
||||
<template #label>
|
||||
<div class="flex items-center">
|
||||
房间名
|
||||
<ElTooltip content="对应命令行参数 --network-name">
|
||||
<!-- <ElTooltip content="对应命令行参数 --network-name">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</ElTooltip> -->
|
||||
</div>
|
||||
</template>
|
||||
<ElInput
|
||||
@@ -147,9 +162,9 @@
|
||||
<template #label>
|
||||
<div class="flex items-center">
|
||||
房间密码
|
||||
<ElTooltip content="对应命令行参数 --network-secret">
|
||||
<!-- <ElTooltip content="对应命令行参数 --network-secret">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</ElTooltip> -->
|
||||
</div>
|
||||
</template>
|
||||
<ElInput
|
||||
@@ -167,9 +182,9 @@
|
||||
<template #label>
|
||||
<div class="flex items-center">
|
||||
成员名
|
||||
<ElTooltip content="对应命令行参数 --hostname">
|
||||
<!-- <ElTooltip content="对应命令行参数 --hostname">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</ElTooltip> -->
|
||||
</div>
|
||||
</template>
|
||||
<ElInput
|
||||
@@ -183,38 +198,61 @@
|
||||
label="局域网IP"
|
||||
>
|
||||
<template #label>
|
||||
<div class="flex h-[20px] items-center">
|
||||
<div class="flex h-[20px] items-center gap-[3px]">
|
||||
虚拟网IP
|
||||
<ElTooltip content="对应命令行参数 --ipv4">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
<ElButton
|
||||
@click.stop="handleCopyIp"
|
||||
type="primary"
|
||||
text
|
||||
size="small"
|
||||
title="复制IP"
|
||||
:icon="CopyDocument"
|
||||
></ElButton>
|
||||
<ElSwitch
|
||||
v-model="config.dhcp"
|
||||
class="ml-[5px]"
|
||||
inline-prompt
|
||||
inactive-text="固定IP"
|
||||
active-text="动态获取IP"
|
||||
active-text="动态获取"
|
||||
size="small"
|
||||
></ElSwitch>
|
||||
<!-- <ElTooltip content="对应命令行参数 --ipv4">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip> -->
|
||||
</div>
|
||||
</template>
|
||||
<ElInput
|
||||
maxlength="100"
|
||||
:disabled="config.dhcp"
|
||||
:readonly="config.dhcp"
|
||||
:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
|
||||
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>
|
||||
</div>
|
||||
</ElForm>
|
||||
<div class="mt-auto flex items-start">
|
||||
<div>
|
||||
<div>
|
||||
<div class="pt-[4px]">
|
||||
<ElDropdown
|
||||
@command="handleStartCommand"
|
||||
split-button
|
||||
trigger="click"
|
||||
size="default"
|
||||
placement="right-end"
|
||||
:type="!data.isStart ? 'primary' : 'danger'"
|
||||
:disabled="data.startLoading || !data.coreVersion || data.update"
|
||||
@click="handleConnection"
|
||||
@@ -226,13 +264,13 @@
|
||||
command="import_config"
|
||||
:icon="Link"
|
||||
>
|
||||
导入配置
|
||||
导入联机配置
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
command="share_config"
|
||||
:icon="Share"
|
||||
>
|
||||
分享联机相关配置
|
||||
分享联机配置
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem disabled>
|
||||
<ElDivider class="!m-0 !h-[2px]" />
|
||||
@@ -257,11 +295,26 @@
|
||||
>
|
||||
使用外部配置文件
|
||||
</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>
|
||||
</ElDropdownMenu>
|
||||
</template>
|
||||
</ElDropdown>
|
||||
</div>
|
||||
<div class="mt-[6px] pl-[2px]">
|
||||
<div class="mt-[10px] pl-[2px]">
|
||||
<ElTooltip
|
||||
placement="left"
|
||||
content="日志"
|
||||
@@ -274,18 +327,20 @@
|
||||
plain
|
||||
></ElButton>
|
||||
</ElTooltip>
|
||||
<ElTooltip
|
||||
<!-- <ElTooltip
|
||||
placement="left"
|
||||
content="房间信息"
|
||||
> -->
|
||||
<ElButton
|
||||
class="!ml-[7px]"
|
||||
@click="handleShowMemberDialog"
|
||||
plain
|
||||
type="success"
|
||||
size="small"
|
||||
>
|
||||
<ElButton
|
||||
class="!ml-[7px]"
|
||||
@click="handleShowMemberDialog"
|
||||
plain
|
||||
type="success"
|
||||
size="small"
|
||||
>房间信息</ElButton>
|
||||
</ElTooltip>
|
||||
房间信息
|
||||
</ElButton>
|
||||
<!-- </ElTooltip> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="ml-auto">
|
||||
@@ -490,7 +545,7 @@
|
||||
@click="openConfigDir"
|
||||
size="small"
|
||||
>
|
||||
打开配置目录
|
||||
打开存储目录
|
||||
</ElButton>
|
||||
<ElButton
|
||||
@click="handleStartCommand('toml')"
|
||||
@@ -528,6 +583,70 @@
|
||||
</div>
|
||||
</template>
|
||||
</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 gap-[0_4px]">
|
||||
<ElButton
|
||||
@click="openConfigAdminDir"
|
||||
size="small"
|
||||
>
|
||||
打开存储目录
|
||||
</ElButton>
|
||||
<ElButton
|
||||
@click="handleStartCommand('config_admin')"
|
||||
type="primary"
|
||||
:icon="RefreshRight"
|
||||
size="small"
|
||||
>
|
||||
刷新
|
||||
</ElButton>
|
||||
</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"
|
||||
type="danger"
|
||||
>
|
||||
关闭
|
||||
</ElButton>
|
||||
</div>
|
||||
</template>
|
||||
</ElDialog>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
@@ -537,7 +656,7 @@
|
||||
QuestionFilled,
|
||||
Delete,
|
||||
List,
|
||||
UserFilled,
|
||||
CirclePlusFilled,
|
||||
Setting,
|
||||
Share,
|
||||
RefreshRight,
|
||||
@@ -546,7 +665,8 @@
|
||||
MagicStick,
|
||||
SetUp,
|
||||
Folder,
|
||||
CopyDocument
|
||||
CopyDocument,
|
||||
Platform
|
||||
} from "@element-plus/icons-vue";
|
||||
import { reactive, onBeforeUnmount, onMounted, ref, toRaw } from "vue";
|
||||
import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } from "~/composables/tray";
|
||||
@@ -558,16 +678,16 @@
|
||||
import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
|
||||
import etWindows from "@/composables/windows";
|
||||
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 } from "@tauri-apps/plugin-fs";
|
||||
import { updateConfigJson } from "~/composables/configJson";
|
||||
import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
|
||||
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 { getServerArgs } from "@/composables/server";
|
||||
|
||||
let is_close = false;
|
||||
|
||||
const publicPeersLink = import.meta.env.VITE_PUBLIC_PEERS_URL;
|
||||
const tray = await useTray(
|
||||
true,
|
||||
async () => {
|
||||
@@ -587,7 +707,7 @@
|
||||
const config = mainStore.config;
|
||||
// console.error(config);
|
||||
const protocols = supportProtocols();
|
||||
const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
|
||||
const data = reactive({
|
||||
hasNewVersion: false, //easytierGame有没有新版
|
||||
logVisible: false,
|
||||
cidrVisible: false,
|
||||
@@ -600,7 +720,7 @@
|
||||
log: "",
|
||||
serverLog: "", //服务端日志
|
||||
update: false,
|
||||
releaseList: [],
|
||||
releaseList: [[]],
|
||||
coreVersion: "-",
|
||||
isSuccessGetIp: false,
|
||||
startLoading: false,
|
||||
@@ -615,6 +735,13 @@
|
||||
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 }>({
|
||||
visible: false,
|
||||
loading: false,
|
||||
@@ -627,17 +754,6 @@
|
||||
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 appWindow = getCurrentWindow();
|
||||
if (appWindow.label == "main") {
|
||||
@@ -652,6 +768,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 cache_path = import.meta.env.VITE_CACHE_PATH;
|
||||
const resourceDir = await getResourceDir();
|
||||
@@ -912,7 +1037,7 @@
|
||||
// console.log(el, el[0], el[2]);
|
||||
return el && el[0] && el[2] && !el[2].includes("gui");
|
||||
})
|
||||
];
|
||||
] as any;
|
||||
coreManagementData.loading = false;
|
||||
// console.log(data.releaseList);
|
||||
};
|
||||
@@ -1250,21 +1375,26 @@
|
||||
configStart.visible = true;
|
||||
const path = import.meta.env.VITE_CONFIG_PATH;
|
||||
const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
|
||||
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 {
|
||||
if (!isExists) {
|
||||
mainStore.configStartEnable = false;
|
||||
mainStore.configPath = "";
|
||||
try {
|
||||
await mkdir(path, { baseDir: BaseDirectory.Resource });
|
||||
} catch (err) {}
|
||||
await mkdir(path, { baseDir: BaseDirectory.Resource, recursive: true });
|
||||
} 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") {
|
||||
try {
|
||||
@@ -1331,20 +1461,20 @@
|
||||
)
|
||||
);
|
||||
await writeText(WT);
|
||||
await ElConfirmPrimary(
|
||||
`{action} 虚拟网IP，主机名，子网代理，为子网代理启用smoltcp堆栈，开机自启，软件启动自动联机，出口节点，不生成Tun网卡，错误日志相关配置`,
|
||||
"提示",
|
||||
{
|
||||
confirmButtonText: "知道了",
|
||||
showCancelButton: false,
|
||||
action: "不会分享"
|
||||
}
|
||||
);
|
||||
ElMessage.success("配置已复制");
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
ElMessage.error("分享失败");
|
||||
}
|
||||
ElConfirmPrimary(
|
||||
`{action} 虚拟网IP，主机名，子网代理，为子网代理启用smoltcp堆栈，开机自启，软件启动自动联机，出口节点，不生成Tun网卡，错误日志相关配置`,
|
||||
"提示",
|
||||
{
|
||||
confirmButtonText: "知道了",
|
||||
showCancelButton: false,
|
||||
action: "不会分享"
|
||||
}
|
||||
);
|
||||
}
|
||||
if (command === "import_config") {
|
||||
importConfigData.data = "";
|
||||
@@ -1353,6 +1483,97 @@
|
||||
if (command === "create_server") {
|
||||
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个字以上的存储名",
|
||||
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("保存成功");
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
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 () => {
|
||||
@@ -1400,6 +1621,12 @@
|
||||
// console.error(configPath);
|
||||
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 () => {
|
||||
if (!data.isStart) {
|
||||
|
||||
Generated
+584
-430
File diff suppressed because it is too large
Load Diff
Generated
+949
-472
File diff suppressed because it is too large
Load Diff
+15
-14
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "easytier-game"
|
||||
version = "1.3.6"
|
||||
version = "1.3.8"
|
||||
homepage = "https://github.com/EasyTier/EasyTier"
|
||||
repository = "https://github.com/EasyTier/EasytierGame"
|
||||
description = "A simple network initiator based on Easytier"
|
||||
@@ -8,7 +8,7 @@ authors = ["leizi97"]
|
||||
license = "LICENSE"
|
||||
|
||||
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
|
||||
|
||||
@@ -18,34 +18,35 @@ name = "app_lib"
|
||||
crate-type = ["staticlib", "cdylib", "rlib"]
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "2.0.3", features = [] }
|
||||
tauri-build = { version = "2.0.5", features = [] }
|
||||
# prost-build = "0.13.2"
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
log = "0.4"
|
||||
tauri = { version = "2.1.1", features = [
|
||||
serde_json = "1.0.137"
|
||||
serde = { version = "1.0.217", features = ["derive"] }
|
||||
log = "0.4.25"
|
||||
tauri = { version = "2.2.3", features = [
|
||||
"tray-icon",
|
||||
"image-png",
|
||||
"image-ico",
|
||||
"devtools"
|
||||
] }
|
||||
|
||||
tauri-plugin-log = "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"
|
||||
sysinfo = '0.33.1'
|
||||
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
|
||||
whoami = "1.5.2"
|
||||
tauri-plugin-fs = "2.2.0"
|
||||
tauri-plugin-clipboard-manager = "2.0.2"
|
||||
tauri-plugin-clipboard-manager = "2.2.0"
|
||||
rand = "0.8.5"
|
||||
tokio = { version = "1.42.0", features = ["process"] }
|
||||
tauri-plugin-dialog = "2"
|
||||
tokio = { version = "1.43.0", features = ["process"] }
|
||||
tauri-plugin-dialog = "2.2.0"
|
||||
# prost = "0.13"
|
||||
# prost-types = "0.13"
|
||||
|
||||
hashbrown = "0.15.2"
|
||||
|
||||
[dependencies.windows]
|
||||
version = "0.58.0"
|
||||
@@ -53,5 +54,5 @@ features = ["Win32_System_TaskScheduler", "Win32_System_Power", "Win32_NetworkMa
|
||||
|
||||
[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
|
||||
tauri-plugin-cli = "2.2.0"
|
||||
tauri-plugin-single-instance = "2.2.0"
|
||||
tauri-plugin-window-state = "2.2.0"
|
||||
tauri-plugin-single-instance = "2.2.1"
|
||||
tauri-plugin-window-state = "2.2.1"
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -754,7 +754,7 @@ pub fn run() {
|
||||
// }
|
||||
#[cfg(not(target_os = "android"))]
|
||||
let _tray_menu = TrayIconBuilder::with_id("main")
|
||||
.menu_on_left_click(false)
|
||||
.show_menu_on_left_click(false)
|
||||
.on_tray_icon_event(|tray, event| {
|
||||
if let TrayIconEvent::Click {
|
||||
button: MouseButton::Left,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||
"productName": "easytier-game",
|
||||
"version": "1.3.6",
|
||||
"version": "1.3.8",
|
||||
"identifier": "com.tauri.easytier-game",
|
||||
|
||||
"build": {
|
||||
@@ -13,7 +13,7 @@
|
||||
"app": {
|
||||
"windows": [
|
||||
{
|
||||
"title": "easytier-game 1.3.6",
|
||||
"title": "easytier-game 1.3.8",
|
||||
"label": "main",
|
||||
"minWidth": 340,
|
||||
"width": 340,
|
||||
@@ -63,7 +63,8 @@
|
||||
"easytier/Packet.dll",
|
||||
"easytier/wintun.dll",
|
||||
"easytier/clear_local_data.bat",
|
||||
"帮助.txt"
|
||||
"帮助.txt",
|
||||
"uninstall.exe"
|
||||
],
|
||||
"windows": {
|
||||
"webviewInstallMode": {
|
||||
|
||||
Binary file not shown.
+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 }
|
||||
export const ElConfirmDanger = (
|
||||
content: string,
|
||||
title: string,
|
||||
title: string = "提示",
|
||||
opt: Opt = {
|
||||
action: "",
|
||||
confirmButtonText: "确定",
|
||||
@@ -40,7 +40,7 @@ export const ElConfirmDanger = (
|
||||
|
||||
export const ElConfirmSucces = (
|
||||
content: string,
|
||||
title: string,
|
||||
title: string = "提示",
|
||||
opt: Opt = {
|
||||
action: "",
|
||||
confirmButtonText: "确定",
|
||||
@@ -76,7 +76,7 @@ export const ElConfirmSucces = (
|
||||
|
||||
export const ElConfirmPrimary = (
|
||||
content: string,
|
||||
title: string,
|
||||
title: string = "提示",
|
||||
opt: Opt = {
|
||||
action: "",
|
||||
confirmButtonText: "确定",
|
||||
|
||||
+38
-11
@@ -1,5 +1,7 @@
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { writeText } from "@tauri-apps/plugin-clipboard-manager";
|
||||
import { open } from "@tauri-apps/plugin-shell";
|
||||
import { ElMessage } from "element-plus";
|
||||
export const ENV = import.meta.env;
|
||||
|
||||
//防抖
|
||||
@@ -51,8 +53,8 @@ export const numRemoveZero = (num: Number) => {
|
||||
// await-to-js
|
||||
export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefined) => {
|
||||
return promise
|
||||
.then((data) => [null, data])
|
||||
.catch((err) => {
|
||||
.then(data => [null, data])
|
||||
.catch(err => {
|
||||
if (errorExt) {
|
||||
if (typeof errorExt !== "object") {
|
||||
return [errorExt, undefined];
|
||||
@@ -69,26 +71,26 @@ const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
|
||||
|
||||
export const supportProtocols = () => {
|
||||
return _supportProtocols.slice();
|
||||
}
|
||||
};
|
||||
|
||||
let _prevent_timer: NodeJS.Timeout| null = null;
|
||||
let _prevent_timer: NodeJS.Timeout | null = null;
|
||||
let _prevent_timer_count = 15; // 秒
|
||||
export const preventSleep = () => {
|
||||
_prevent_timer && clearInterval(_prevent_timer);
|
||||
_prevent_timer = setInterval(async () => {
|
||||
const result = await invoke('prevent_sleep');
|
||||
const result = await invoke("prevent_sleep");
|
||||
// console.log(`trigger prevent sleep ${result}`);
|
||||
}, _prevent_timer_count * 1000);
|
||||
}
|
||||
};
|
||||
|
||||
export const stopPreventSleep = async () => {
|
||||
_prevent_timer && clearInterval(_prevent_timer);
|
||||
_prevent_timer = null;
|
||||
const _result = await invoke('allow_sleep');
|
||||
}
|
||||
const _result = await invoke("allow_sleep");
|
||||
};
|
||||
|
||||
export const parseCliInfo = (content: string) => {
|
||||
if(!content) return [];
|
||||
if (!content) return [];
|
||||
// 将表格字符串分割成行
|
||||
const lines = content.split("\n");
|
||||
|
||||
@@ -96,7 +98,7 @@ export const parseCliInfo = (content: string) => {
|
||||
const headers = lines[1]
|
||||
.split("│")
|
||||
.slice(1, -1)
|
||||
.map((h) => h.trim());
|
||||
.map(h => h.trim());
|
||||
|
||||
// 初始化结果数组
|
||||
const result: any[] = [];
|
||||
@@ -109,7 +111,7 @@ export const parseCliInfo = (content: string) => {
|
||||
const values = lines[i]
|
||||
.split("│")
|
||||
.slice(1, -1)
|
||||
.map((v) => v.trim());
|
||||
.map(v => v.trim());
|
||||
|
||||
// 创建对象并添加到结果数组
|
||||
const obj: any = {};
|
||||
@@ -124,6 +126,20 @@ export const parseCliInfo = (content: string) => {
|
||||
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 = () => {
|
||||
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}$/;
|
||||
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 文件
|
||||
*/
|
||||
|
||||
const releaseDir = "./src-tauri/target/release";
|
||||
const pkg = require("./package.json");
|
||||
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 releaseExe = `${releaseDir}/easytier-game.exe`;
|
||||
const releaseHelp = `${releaseDir}/帮助.txt`;
|
||||
const releaseUninstall = `${releaseDir}/uninstall.exe`;
|
||||
const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
|
||||
const pkg = require("./package.json");
|
||||
const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
|
||||
const releaseZipDir = "./release";
|
||||
const releaseZip = `${releaseZipDir}/${fileName}`;
|
||||
|
||||
@@ -62,5 +63,6 @@ archive.pipe(output);
|
||||
archive
|
||||
.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, releaseUninstall)), { name: "uninstall.exe" })
|
||||
.directory(path.join(__dirname, releaseDirEasytier), "easytier")
|
||||
.finalize();
|
||||
|
||||
Reference in New Issue
Block a user