Compare commits

..
Author SHA1 Message Date
黑先森 4564cf994b 升级内核为2.2.0,增加kcp代理相关配置,优化使用说明和文字提示 2025-02-05 11:35:20 +08:00
黑先森 c1bcee32ab 优化文本,提升使用体验,房间配置管理增加删除按钮
+ tauri相关包更新到最新
2025-01-26 12:10:30 +08:00
黑先森 073bc59e59 文本描述优化,高级选项排列优化 2025-01-20 15:57:43 +08:00
黑先森 affce1125b 去除无用的库,新增配置管理功能 #4,界面体验优化 2025-01-20 15:34:24 +08:00
黑先森 2b87747fe5 增加虚拟网IP复制按钮,优化界面表现 #2 2025-01-17 15:13:37 +08:00
黑先森 423d3ba243 重大结构更新
+ 升级rust为1.8版本
+ 升级tauri为最新版,以及其他包升级
+ 现在构建分为window7和window7以上两种版本
+ 优化分享配置弹窗遮盖问题
+ 增加uninstall.exe(不会删除日志)
+ 增加windows.0.48.5.lib
+ 增加build.bat 内含windows7构建之前的操作

弃用API替换
2025-01-16 17:30:57 +08:00
黑先森 0ce2595833 这是一个测试分支,用于rust最新包更新与适配 2025-01-16 17:30:52 +08:00
黑先森 9eb0e5b7ac 替换easytier内核为最新版 2025-01-14 15:07:54 +08:00
leizi97 6fde1c2236 优化界面 2025-01-12 23:10:29 +08:00
20 changed files with 977 additions and 705 deletions
+19 -4
View File
@@ -10,7 +10,7 @@
}
} */
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,
body {
@@ -51,9 +51,24 @@ html.dark body {
}
.el-table {
font-size: 12px!important;
font-size: 12px !important;
}
.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;
}
+6 -5
View File
@@ -1,9 +1,10 @@
pnpm run build
rustup default nightly
@echo 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
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
+2 -2
View File
@@ -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)
},
});
}
+2
View File
@@ -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
+2
View File
@@ -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
+9 -10
View File
@@ -3,7 +3,7 @@
"private": true,
"author": "leizi97",
"description": "A simple network initiator based on Easytier",
"version": "1.3.7",
"version": "1.3.9",
"scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod",
@@ -16,14 +16,14 @@
"@nuxtjs/tailwindcss": "6.13.1",
"@pinia/nuxt": "0.9.0",
"@tauri-apps/api": "^2.2.0",
"@tauri-apps/cli": "2.2.4",
"@tauri-apps/cli": "2.2.7",
"@tauri-apps/plugin-cli": "^2.2.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-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",
"@vitejs/plugin-vue-jsx": "^4.1.1",
"@vueuse/core": "12.4.0",
@@ -31,12 +31,11 @@
"element-plus": "2.9.3",
"less": "4.2.1",
"lodash-es": "^4.17.21",
"nuxt": "3.15.2",
"pinia": "^2.3.0",
"nuxt": "3.15.4",
"pinia": "2.3.1",
"pinia-plugin-persistedstate": "^4.2.0",
"postcss": "^8.4.38",
"prettier": "3.4.2",
"prettier-plugin-tailwindcss": "0.6.10",
"vue-clipboard3": "^2.0.0"
"prettier-plugin-tailwindcss": "0.6.11"
}
}
+31 -3
View File
@@ -43,6 +43,21 @@
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</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>
<ElDivider />
<div class="flex items-center gap-[10px]">
@@ -194,8 +209,12 @@
</div>
<ElDivider />
<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
<div class="flex items-center gap-[10px]">
<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]">
<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
<div class="w-[140px]">
@@ -229,11 +248,12 @@
import { Command } from "@tauri-apps/plugin-shell";
import { exists, mkdir, BaseDirectory, remove } from "@tauri-apps/plugin-fs";
import { ElMessage } from "element-plus";
import { reactive } from "vue";
import { reactive, ref } from "vue";
import { dataSubscribe } from "@/composables/windows";
import { ATJ, supportProtocols } from "~/utils";
import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
import { ElConfirmDanger } from "~/utils/element";
import { invoke } from "@tauri-apps/api/core";
const protocols = supportProtocols();
const listenerDialogData = reactive<{ [key: string]: any }>({
@@ -251,6 +271,7 @@
const mainStore = useMainStore();
const data = ["trace", "debug", "info", "warn", "error", "off"];
const guids = ref<string[][]>([]);
const openLogDir = async () => {
const resourceDir = await getResourceDir();
const logPath = import.meta.env.VITE_LOG_PATH;
@@ -263,6 +284,7 @@
}
await Command.create("explorer", [logDirPath]).execute();
};
const openConfigJsonDir = async () => {
const resourceDir = await getResourceDir();
const easytierDir = await join(resourceDir, "easytier/");
@@ -274,6 +296,12 @@
}
};
// 为bind_device功能增加改方法
const _getGuids = async () => {
const guidsValue = await invoke<string[][]>("get_network_adapter_guids");
guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : [];
};
dataSubscribe(async (...a) => {
if (!mainStore.createConfigInEasytier) {
// 考虑删除本地config.json文件
+339 -63
View File
@@ -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="日志"
@@ -278,13 +331,15 @@
placement="left"
content="房间信息"
> -->
<ElButton
class="!ml-[7px]"
@click="handleShowMemberDialog"
plain
type="success"
size="small"
>房间信息</ElButton>
<ElButton
class="!ml-[7px]"
@click="handleShowMemberDialog"
plain
type="success"
size="small"
>
房间信息
</ElButton>
<!-- </ElTooltip> -->
</div>
</div>
@@ -490,7 +545,7 @@
@click="openConfigDir"
size="small"
>
打开配置目录
打开存储目录
</ElButton>
<ElButton
@click="handleStartCommand('toml')"
@@ -528,6 +583,88 @@
</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">
<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>
<script setup lang="ts">
import { invoke } from "@tauri-apps/api/core";
@@ -537,7 +674,7 @@
QuestionFilled,
Delete,
List,
UserFilled,
CirclePlusFilled,
Setting,
Share,
RefreshRight,
@@ -546,7 +683,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 +696,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, remove as removeFile } 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 +725,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 +738,7 @@
log: "",
serverLog: "", //服务端日志
update: false,
releaseList: [],
releaseList: [[]],
coreVersion: "-",
isSuccessGetIp: false,
startLoading: false,
@@ -615,6 +753,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 +772,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 +786,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 +1055,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);
};
@@ -1193,6 +1336,12 @@
if (config.compression && config.compression != "none") {
args.push("--compression", config.compression);
}
if (config.enableKcpProxy) {
args.push("--enable-kcp-proxy");
}
if (config.disableKcpInput) {
args.push("--disable-kcp-input");
}
return args;
};
@@ -1250,21 +1399,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 {
@@ -1294,7 +1448,9 @@
disableUdpHolePunching,
relayAllPeerrpc,
compression,
enablePreventSleep
enablePreventSleep,
enableKcpProxy,
disableKcpInput
} = mainStore.config;
const WT = btoa(
encodeURIComponent(
@@ -1325,7 +1481,9 @@
disableUdpHolePunching,
relayAllPeerrpc,
compression,
enablePreventSleep
enablePreventSleep,
enableKcpProxy,
disableKcpInput
}
})
)
@@ -1345,7 +1503,6 @@
console.error(err);
ElMessage.error("分享失败");
}
}
if (command === "import_config") {
importConfigData.data = "";
@@ -1354,6 +1511,119 @@
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个字以上的存储名",
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("保存成功");
}
}
}
};
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 () => {
@@ -1401,6 +1671,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) {
+1 -1
View File
@@ -39,7 +39,7 @@
effect="dark"
: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>
</template>
</ElTableColumn>
+367 -574
View File
File diff suppressed because it is too large Load Diff
+139 -18
View File
@@ -1161,7 +1161,16 @@ version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
dependencies = [
"dirs-sys",
"dirs-sys 0.4.1",
]
[[package]]
name = "dirs"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
dependencies = [
"dirs-sys 0.5.0",
]
[[package]]
@@ -1172,10 +1181,22 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
"option-ext",
"redox_users",
"redox_users 0.4.6",
"windows-sys 0.48.0",
]
[[package]]
name = "dirs-sys"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
dependencies = [
"libc",
"option-ext",
"redox_users 0.5.0",
"windows-sys 0.59.0",
]
[[package]]
name = "dispatch"
version = "0.2.0"
@@ -1269,7 +1290,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]]
name = "easytier-game"
version = "1.3.7"
version = "1.3.9"
dependencies = [
"hashbrown 0.15.2",
"log",
@@ -1774,8 +1795,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"js-sys",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
]
[[package]]
@@ -2093,6 +2116,7 @@ dependencies = [
"tokio",
"tokio-rustls",
"tower-service",
"webpki-roots",
]
[[package]]
@@ -3607,6 +3631,58 @@ dependencies = [
"memchr",
]
[[package]]
name = "quinn"
version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
dependencies = [
"bytes",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
"rustc-hash",
"rustls",
"socket2",
"thiserror 2.0.10",
"tokio",
"tracing",
]
[[package]]
name = "quinn-proto"
version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
dependencies = [
"bytes",
"getrandom 0.2.15",
"rand 0.8.5",
"ring",
"rustc-hash",
"rustls",
"rustls-pki-types",
"slab",
"thiserror 2.0.10",
"tinyvec",
"tracing",
"web-time",
]
[[package]]
name = "quinn-udp"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
dependencies = [
"cfg_aliases 0.2.1",
"libc",
"once_cell",
"socket2",
"tracing",
"windows-sys 0.59.0",
]
[[package]]
name = "quote"
version = "1.0.38"
@@ -3749,6 +3825,17 @@ dependencies = [
"thiserror 1.0.69",
]
[[package]]
name = "redox_users"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
dependencies = [
"getrandom 0.2.15",
"libredox",
"thiserror 2.0.10",
]
[[package]]
name = "regex"
version = "1.11.1"
@@ -3814,7 +3901,10 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite",
"quinn",
"rustls",
"rustls-pemfile",
"rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
@@ -3822,6 +3912,7 @@ dependencies = [
"system-configuration",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tokio-util",
"tower",
"tower-service",
@@ -3830,6 +3921,7 @@ dependencies = [
"wasm-bindgen-futures",
"wasm-streams",
"web-sys",
"webpki-roots",
"windows-registry",
]
@@ -3922,6 +4014,12 @@ version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "rustc-hash"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
[[package]]
name = "rustc_version"
version = "0.4.1"
@@ -3951,6 +4049,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
dependencies = [
"once_cell",
"ring",
"rustls-pki-types",
"rustls-webpki",
"subtle",
@@ -3971,6 +4070,9 @@ name = "rustls-pki-types"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
dependencies = [
"web-time",
]
[[package]]
name = "rustls-webpki"
@@ -4148,9 +4250,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.135"
version = "1.0.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b"
dependencies = [
"itoa 1.0.14",
"memchr",
@@ -4628,13 +4730,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tauri"
version = "2.2.2"
version = "2.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2979ec5ec5a9310b15d1548db3b8de98d8f75abf2b5b00fec9cd5c0553ecc09c"
checksum = "58a998b6be84104ca05c7e9a21f2180ddec020c8b84ea59a8fc8530a2a19588d"
dependencies = [
"anyhow",
"bytes",
"dirs",
"dirs 6.0.0",
"dunce",
"embed_plist",
"futures-util",
@@ -4685,7 +4787,7 @@ checksum = "8e950124f6779c6cf98e3260c7a6c8488a74aa6350dd54c6950fdaa349bca2df"
dependencies = [
"anyhow",
"cargo_toml",
"dirs",
"dirs 5.0.1",
"glob",
"heck 0.5.0",
"json-patch",
@@ -4774,9 +4876,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-clipboard-manager"
version = "2.2.0"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5be2c6f5d82396c1a86d5b16052cc97976a82e92244bf074dd6e2f6272d8619d"
checksum = "54de1e3a2ea008687954d5d72952800e87b09f6fbea6d0960d99e58050537642"
dependencies = [
"arboard",
"log",
@@ -4830,16 +4932,16 @@ dependencies = [
[[package]]
name = "tauri-plugin-log"
version = "2.2.0"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eddd784c138c08a43954bc3e735402e6b2b2ee8d8c254a7391f4e77c01273dd5"
checksum = "367a28a5e0ca39eac98005699466e8906edc4a2a8f8e13a5f1a71dc0bea6c677"
dependencies = [
"android_logger",
"byte-unit",
"cocoa",
"fern",
"log",
"objc",
"objc2",
"objc2-foundation",
"serde",
"serde_json",
"serde_repr",
@@ -4888,9 +4990,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-window-state"
version = "2.2.0"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "234dd891cc7960fa28f93ea911f3e0d9ce8375ebf9ff303831bdd7a3443d5714"
checksum = "35e344b512b0d99d9d06225f235d87d6c66d89496a3bf323d9b578d940596e6c"
dependencies = [
"bitflags 2.7.0",
"log",
@@ -5319,7 +5421,7 @@ checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b"
dependencies = [
"core-graphics 0.24.0",
"crossbeam-channel",
"dirs",
"dirs 5.0.1",
"libappindicator",
"muda",
"objc2",
@@ -5715,6 +5817,16 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "web-time"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "webkit2gtk"
version = "2.0.1"
@@ -5759,6 +5871,15 @@ dependencies = [
"system-deps",
]
[[package]]
name = "webpki-roots"
version = "0.26.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
dependencies = [
"rustls-pki-types",
]
[[package]]
name = "webview2-com"
version = "0.34.0"
+6 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.3.7"
version = "1.3.9"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier"
@@ -22,17 +22,17 @@ tauri-build = { version = "2.0.5", features = [] }
# prost-build = "0.13.2"
[dependencies]
serde_json = "1.0.135"
serde_json = "1.0.137"
serde = { version = "1.0.217", features = ["derive"] }
log = "0.4.25"
tauri = { version = "2.2.2", features = [
tauri = { version = "2.2.5", features = [
"tray-icon",
"image-png",
"image-ico",
"devtools"
] }
tauri-plugin-log = "2.2.0"
tauri-plugin-log = "2.2.1"
tauri-plugin-shell = "2.2.0"
reqwest = { version = "0.12.12", features = ["json"] }
zip = "2.2.2"
@@ -40,7 +40,7 @@ sysinfo = '0.33.1'
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
whoami = "1.5.2"
tauri-plugin-fs = "2.2.0"
tauri-plugin-clipboard-manager = "2.2.0"
tauri-plugin-clipboard-manager = "2.2.1"
rand = "0.8.5"
tokio = { version = "1.43.0", features = ["process"] }
tauri-plugin-dialog = "2.2.0"
@@ -55,4 +55,4 @@ 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.1"
tauri-plugin-window-state = "2.2.0"
tauri-plugin-window-state = "2.2.1"
+3 -1
View File
@@ -24,5 +24,7 @@
"enableCustonProtocol": false, // 是否启用自定义协议
"customProtocol": "tcp", // 自定义协议类型
"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.
+2 -3
View File
@@ -1,19 +1,18 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.3.7",
"version": "1.3.9",
"identifier": "com.tauri.easytier-game",
"build": {
"frontendDist": "../dist",
"devUrl": "http://localhost:5000",
"beforeBuildCommand": "pnpm build",
"beforeDevCommand": "pnpm dev"
},
"app": {
"windows": [
{
"title": "easytier-game 1.3.7",
"title": "easytier-game 1.3.9",
"label": "main",
"minWidth": 340,
"width": 340,
+3 -1
View File
@@ -8,12 +8,14 @@
[如果想彻底删除easytierGame]
--
1. 关闭easytierGame
2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认,清除本地存储数据
3. 删除easytierGame文件夹
--
或者直接使用uninstall.exe
[没有服务器,怎么自建服务]
+5
View File
@@ -39,6 +39,8 @@ const store = defineStore("main", {
netCardMetricValue: 1, //自定义网卡跃点值
enablePreventSleep: false, //组织系统休眠
compression: "none", //加密算法
enableKcpProxy: true, //启用kcp代理 默认开启
disableKcpInput: false, //禁用kcp输入
},
serverConfig: {
enableWhiteList: true, // 是否启用白名单
@@ -109,6 +111,9 @@ const store = defineStore("main", {
"config.enablePreventSleep",
"config.compression",
"config.enableKcpProxy",
"config.disableKcpInput",
"serverConfig.autoStart",
// 'serverConfig.enableListener',
"serverConfig.enableWhiteList",
+3 -3
View File
@@ -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
View File
@@ -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("复制失败");
}
};