Compare commits

...
72 Commits
Author SHA1 Message Date
heixiansen 777ec9b982 1.4.8发布 2025-08-21 18:52:17 +08:00
heixiansen 167002691c #Update 增加自定义IPV6地址,高级选项增加tcp和udp端口填写 #11,内核默认为2.4.2 2025-08-21 18:28:36 +08:00
heixiansen 434014f690 #Update 更新包体版本,优化日志代码 2025-08-15 18:35:07 +08:00
heixiansen 0d0901de94 #Feature 新版日志操作框,增加对单行日志的复制和复制所有日志以及颜色区分 2025-07-25 15:33:23 +08:00
heixiansen 18f6c54a4f #Update 去掉服务器设置里的quic协议(高级选项已有)新用户默认去掉v6监听 2025-07-25 14:41:43 +08:00
heixiansen ad0f252dfd #Feature 自建服务器勾选私有模式 弹出房间名和密码设置窗口,更新相关包体 2025-07-25 12:08:01 +08:00
heixiansen 6bf4d54361 #Update 更新包体 2025-07-11 10:50:30 +08:00
heixiansen 8f2c800380 增加quic代理配置,config.json增加quic配置,默认使用2.3.2内核,增加窗口可拖动的大小用于应对用户调整字体大小缩放的问题 #14 2025-06-23 12:20:29 +08:00
heixiansen 8b2ce406d8 如果是内核是预发布版本,不再提示更新 2025-06-20 16:11:43 +08:00
heixiansen 10dde939cb Merge branch 'main' into dev_1.4.7 2025-06-16 11:44:52 +08:00
heixiansen 84460409ed 对于三层tun而言,winipbroadcast没有作用,先禁用 #15 2025-06-16 11:44:26 +08:00
heixiansen 60faa01769 监听窗口缩放比例,默认按照缩放计算并设置一次窗口大小 2025-06-16 11:44:26 +08:00
heixiansen 26f3f6fb36 托盘菜单也增加重新联机选项 2025-06-16 11:44:26 +08:00
heixiansen 494087820a 增加重新联机的按钮 2025-06-16 11:44:26 +08:00
heixiansen 87f4d98518 对于三层tun而言,winipbroadcast没有作用,先禁用 #15 2025-06-16 11:43:54 +08:00
黑先森 30a2c3430b Merge pull request #16 from lurenjia1213/main
允许在使用电池时自启动
2025-06-16 11:42:55 +08:00
lurenjia1213 aab8175ce3 允许在使用电池时自启动 2025-06-15 21:49:46 +08:00
heixiansen 136ce06c33 监听窗口缩放比例,默认按照缩放计算并设置一次窗口大小 2025-06-09 15:49:43 +08:00
heixiansen bdeda8bebd 托盘菜单也增加重新联机选项 2025-06-06 18:13:11 +08:00
heixiansen 3ee09f7d60 增加重新联机的按钮 2025-06-06 18:09:08 +08:00
heixiansen 7853d3b2f5 适配命令行参数用法,修复部分参数不生效的问题 2025-06-06 17:25:39 +08:00
heixiansen aacf47b6f5 自建服务器 增加私有模式配置 2025-06-06 16:40:26 +08:00
heixiansen d9b01fc754 默认使用2.3.1内核,高级选项增加 私有模式配置, 成员列表排序优化, 启动软件时,左上角出现遮盖图标进行去除修复 2025-06-06 16:34:19 +08:00
heixiansen 844fba8462 修复左上角会出现小图标窗口的问题 2025-06-04 18:11:24 +08:00
heixiansen 6bfe3860a8 增加端口转发说明 2025-05-26 20:37:22 +08:00
heixiansen a0b4071c49 增加 端口转发配置 2025-05-26 20:34:02 +08:00
heixiansen 8e9bb114d6 高级选项增加魔法DNS( 2.3.0内核以上) 优化成员列表延迟排序,1.4.5发布 2025-05-26 17:20:56 +08:00
heixiansen fb8e127198 修复主界面保存config.json失败的问题,优化开机自启(默认调整为不登录也自动启动)优化窗口数据同步问题 升级开发包 升级内核至少2.3.0 2025-05-26 16:00:50 +08:00
黑先森 3cd19ae42a 更新element-plus和nuxt3包体,删除增强工具-自定义防火墙策略按钮,修复一键关闭防火墙无效的bug 2025-05-10 16:18:06 +08:00
heixiansen 5be1a681ca 修复每次打开窗口信息可能会出现不同步的bug(如日志信息不更新)(子网代理按钮点不起等) 2025-05-09 11:39:36 +08:00
heixiansen 29464179f5 加入thunk以支持windows7 2025-04-30 15:29:38 +08:00
heixiansen 88f06fbeba 延迟显示的数字调整为整数 #10 2025-04-25 18:18:13 +08:00
heixiansen ced035dc36 去除IPV6监听高级选项,高级选项文本优化#9 2025-04-17 11:14:35 +08:00
heixiansen feea75dcb6 修复ipv6监听不兼容导致的无法启动联机的问题#7,更新内核为最新,增加绑定设备和子网代理页面增加禁用nat相关选项 2025-03-25 21:33:46 +08:00
heixiansen 229fd31de6 增加版本号权重校验,发布1.4.2 2025-02-27 18:05:44 +08:00
heixiansen db3acd0c32 config.json界面配置完善,增加config_template.json的字段说明,优化启动器最新版本判断,减少请求发生
+ tauri升级为最新版
+ 包体统一升级更新
2025-02-27 17:47:49 +08:00
heixiansen 6defb9e0ac 优化本地游戏列表存储结构并兼容老结构 2025-02-17 16:01:48 +08:00
heixiansen 7751c25e15 增加图标导出库 2025-02-17 15:10:22 +08:00
heixiansen e598f3806b 升级内核为2.2.2,本地游戏列表支持拖拽添加 2025-02-17 14:33:49 +08:00
heixiansen 2383178a61 升级node版本20.18.1 -> 20.18.3 2025-02-14 14:54:02 +08:00
黑先森 2a7f51ccde 新增下载内核进度条以及github加速时节点发布地址按钮 2025-02-13 17:03:50 +08:00
黑先森 3fdcb2c642 更新包版本,内核管理新增新版本提示 2025-02-07 20:43:20 +08:00
黑先森 436c265e95 优化文字提示,启动联机下拉按钮新增本地游戏列表功能 2025-02-07 20:13:33 +08:00
黑先森 01d475860b 优化本地存储代码质量使用pinia $hydrate 2025-02-05 19:30:22 +08:00
黑先森 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
黑先森 6fd3b999d7 修复安全漏洞 2025-01-09 10:33:42 +08:00
黑先森 3773e11b24 去除房间信息tooltip 2025-01-09 09:53:35 +08:00
黑先森 987541ab52 Merge branch 'dev_1.3.6_package_upgrade' 2025-01-08 15:04:57 +08:00
黑先森 d800a414c0 升级package,增强工具 防火墙类别,新增自定义防火墙策略界面开启按钮 2025-01-08 12:12:00 +08:00
黑先森 922ba3f1ea 优化主界面文字说明,高级选项排版和文字说明 2025-01-06 20:00:47 +08:00
黑先森 a5954744a1 更新readme 2025-01-03 17:28:15 +08:00
黑先森 8ed652ee26 托盘菜单新增公共节点 2025-01-03 17:16:06 +08:00
黑先森 9d976707ac 增强工具 内 新增forceBindIP方案 2025-01-03 16:55:47 +08:00
黑先森 0b54a623a8 版本号 -> 1.3.5
+ 优化字段信息
2025-01-03 11:42:52 +08:00
黑先森 7501a5661c 修复不启用config.json,但是本地存在config.json,无法取消勾选的bug,增加删除config.json的提示 2025-01-03 10:39:54 +08:00
黑先森 539092d769 升级nuxt -> 3.15.0 修复防止休眠无法停止的问题 2024-12-31 11:46:04 +08:00
黑先森 cefcc930b8 打包最新版easytier内核 2.1.1 2024-12-25 15:32:42 +08:00
黑先森 e7d92cce47 更新包版本,优化分享配置操作,增加不进行分享的配置提示
Cargo.toml
+ tauri-plugin-single-instance 2.2.0
+ tauri-plugin-cli 2.2.0
+ tauri-plugin-window-state 2.2.0
+ tauri-plugin-fs 2.2.0
+ tauri-plugin-log 2.2.0
+ tauri-plugin-shell 2.2.0

package.json
+ "@tauri-apps/plugin-cli" -> ^2.2.0
2024-12-25 15:26:27 +08:00
黑先森 76bdec0e1d 修复自定义协议勾选后没持久化存储的bug 2024-12-21 17:53:55 +08:00
黑先森 997f3798ae 优化文字提示,修复压缩算法选择不生效问题 2024-12-20 22:29:04 +08:00
黑先森 f9e0b8e1db 新增 + 优化
+ 高级选项 增加2.1.0内核功能 压缩算法和ipv6监听地址
+ 增加服务器地址栏复制按钮
+ 更新内核为最新版本
+ config.json 新增压缩算法配置 可参考 config_template.json
2024-12-20 16:10:57 +08:00
黑先森 582a4ab819 增加子网代理使用的判断 2024-12-19 17:23:28 +08:00
黑先森 0fde619516 优化对githubApi的请求,减少被过滤无法获取的情况发生 2024-12-19 17:11:03 +08:00
黑先森 410f0dc32b 新增+修复+优化
+ 新增子网代理页面 表格查看代理情况
+ 修复子网代理启动联机被覆盖的bug
+ 优化部分代码逻辑
2024-12-19 16:41:09 +08:00
55 changed files with 10269 additions and 4711 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 @@
18.18.2
20.18.3
+3
View File
@@ -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
![game-step13](/assets/game-step13.png)
- 1.3.5 增强工具 新增了forceBindIP
![game-step14](/assets/game-step14.png)
## 特性
- 基于easytier组网工具开发,界面清晰简单
+15 -15
View File
@@ -9,26 +9,26 @@
import { warn, debug, trace, info, error } from "@tauri-apps/plugin-log";
function forwardConsole(fnName: "log" | "debug" | "info" | "warn" | "error", logger: (message: string) => Promise<void>) {
const original = console[fnName];
console[fnName] = (message) => {
console[fnName] = message => {
original(message);
if (import.meta.env.PROD) {
try {
if (typeof message === "string") {
logger(message);
} else {
logger(JSON.stringify(message));
}
} catch (e) {
logger(`${message}`);
try {
if (typeof message === "string") {
logger(message);
} else {
logger(JSON.stringify(message));
}
} catch (e) {
logger(`${message}`);
}
};
}
forwardConsole("log", info);
forwardConsole("debug", debug);
forwardConsole("info", info);
forwardConsole("warn", warn);
forwardConsole("error", error);
if (import.meta.env.PROD) {
forwardConsole("log", info);
forwardConsole("debug", debug);
forwardConsole("info", info);
forwardConsole("warn", warn);
forwardConsole("error", error);
}
const mainStore = useMainStore();
// console.log(mainStore.theme)
+22 -3
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,5 +51,24 @@ html.dark body {
}
.el-table {
font-size: 12px!important;
}
font-size: 12px !important;
}
.el-select-dropdown__wrap {
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;
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

+12
View File
@@ -0,0 +1,12 @@
pnpm run build
rustup default nightly
@REM rem 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录
@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
@REM 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
+3
View File
@@ -0,0 +1,3 @@
<template>
<ElTag size="small" type="danger">内核 >= {{ $attrs.version }}</ElTag>
</template>
+29 -9
View File
@@ -2,7 +2,21 @@ import { BaseDirectory, writeTextFile } from "@tauri-apps/plugin-fs";
import useMainStore from "@/stores/index";
import { ElMessage } from "element-plus";
import { uniq, intersection, isNil } from "lodash-es";
export const updateConfigJson = async (configJsonSeverUrl: Array<string> | string | null | undefined) => {
import { bounce } from "~/utils";
const b = bounce(600);
export type ConfigServerUrlType = Array<string> | string | null | undefined | null;
export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType) => {
b(async () => {
const mainStore = useMainStore();
if (mainStore.createConfigInEasytier) {
await updateConfigJson(configJsonSeverUrl);
}
});
};
export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType) => {
const mainStore = useMainStore();
const path = import.meta.env.VITE_CONFIG_FILE_NAME;
if (isNil(configJsonSeverUrl)) {
@@ -14,21 +28,23 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
const {
proxyNetworks,
autoStart,
relayAllPeerrpc,
connectAfterStart,
multiThread,
enablExitNode,
useSmoltcp,
saveErrorLog,
logLevel,
serverUrl,
port,
enableCustomListener,
enablePreventSleep,
customListenerData,
bindDeviceEnable,
acceptDNS,
enablePortForward,
portForwardData,
tcpWhitelist,
udpWhitelist,
tcpWhitelistEnable,
udpWhitelistEnable,
...otherConfig
} = mainStore.config;
let writeServerUrl: Array<string> | string = serverUrl;
let writeCustomListenerData: Array<string> = (customListenerData || "").split("\n");
if (isArray) {
writeServerUrl = intersection(
uniq([serverUrl, ...configJsonSeverUrl]).filter(boolean => boolean),
@@ -41,7 +57,11 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
mainStore.basePeers
).join(",");
}
await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
await writeTextFile(
path,
JSON.stringify({ serverUrl: writeServerUrl, enableCustomListener, customListenerData: writeCustomListenerData, ...otherConfig }, null, 4),
{ baseDir: BaseDirectory.Resource }
);
} catch (err) {
console.error(err);
ElMessage.error(`更新config.json失败`);
+33
View File
@@ -0,0 +1,33 @@
import { basename, extname } from "@tauri-apps/api/path";
import { exists } from "@tauri-apps/plugin-fs";
import { Command } from "@tauri-apps/plugin-shell";
export const getIcon = async function (sourcePath: string, icoDirPath: string) {
if(sourcePath.endsWith(".url")) return false;
let res = await Command.create("ResourcesExtract", [
"/Source",
sourcePath,
"/DestFolder",
icoDirPath,
"/ExtractIcons",
"1",
"/ExtractCursors",
"0",
"/OpenDestFolder",
"0",
"/MultiFilesMode",
"1"
]).execute();
if (res.code == 0) {
let icoPath = icoDirPath + "\\" + (await basename(sourcePath));
icoPath = icoPath.replace(`.${await extname(sourcePath)}`, "_1.ico");
if (await exists(icoPath)) {
return icoPath;
} else {
return false;
}
return;
} else {
return false;
}
};
+44 -44
View File
@@ -6,55 +6,55 @@ import { BaseDirectory } from "@tauri-apps/api/path";
import { exists } from "@tauri-apps/plugin-fs";
const getWinIpBroadcastPid = async () => {
const mainStore = useMainStore();
const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
mainStore.winipBcPid = (pid as number) || 0;
mainStore.$patch({
winipBcStart: !!(mainStore.winipBcPid && mainStore.winipBcPid > 0)
});
// const mainStore = useMainStore();
// const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
// mainStore.winipBcPid = (pid as number) || 0;
// mainStore.$patch({
// winipBcStart: !!(mainStore.winipBcPid && mainStore.winipBcPid > 0)
// });
};
export const handleWinipBcStart = async () => {
const mainStore = useMainStore();
if (!mainStore.winipBcStart) {
try {
await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
const isExists = await exists("easytier/tool/WinIPBroadcast.exe", { baseDir: BaseDirectory.Resource });
if (!isExists) {
ElMessage.error(`WinipBc不存在`);
console.error(`WinipBc不存在`);
return;
}
const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
mainStore.winipBcPid = child.pid || 0;
await getWinIpBroadcastPid();
if (mainStore.winipBcPid) {
mainStore.$patch({
winIpBcAutoStart: true
});
} else {
ElMessage.error(`WinipBc失败`);
}
} catch (err) {
ElMessage.error(`WinipBc失败`);
console.error(err);
}
} else {
await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
await getWinIpBroadcastPid();
if (mainStore.winipBcPid <= 0) {
mainStore.$patch({
winIpBcAutoStart: false
});
}
}
// const mainStore = useMainStore();
// if (!mainStore.winipBcStart) {
// try {
// await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
// const isExists = await exists("easytier/tool/WinIPBroadcast.exe", { baseDir: BaseDirectory.Resource });
// if (!isExists) {
// ElMessage.error(`WinipBc不存在`);
// console.error(`WinipBc不存在`);
// return;
// }
// const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
// mainStore.winipBcPid = child.pid || 0;
// await getWinIpBroadcastPid();
// if (mainStore.winipBcPid) {
// mainStore.$patch({
// winIpBcAutoStart: true
// });
// } else {
// ElMessage.error(`WinipBc失败`);
// }
// } catch (err) {
// ElMessage.error(`WinipBc失败`);
// console.error(err);
// }
// } else {
// await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
// await getWinIpBroadcastPid();
// if (mainStore.winipBcPid <= 0) {
// mainStore.$patch({
// winIpBcAutoStart: false
// });
// }
// }
};
export const initStartWinIpBroadcast = async () => {
const mainStore = useMainStore();
await getWinIpBroadcastPid();
// const mainStore = useMainStore();
// await getWinIpBroadcastPid();
// console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
await handleWinipBcStart();
}
// if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
// await handleWinipBcStart();
// }
};
+12
View File
@@ -20,5 +20,17 @@ export const getServerArgs = () => {
if (!whiteList && mainStore.serverConfig.enableWhiteList) {
args.push("--relay-network-whitelist");
}
if (mainStore.serverConfig.privateMode) {
args.push("--private-mode", "true");
}
const networkName = mainStore.serverConfig.privateNetworkName.trim();
if (networkName) {
args.push("--network-name", networkName);
}
const networkSecret = mainStore.serverConfig.privateNetworkPassword.trim();
if (networkSecret) {
args.push("--network-secret", networkSecret);
}
return args;
};
+62 -38
View File
@@ -7,7 +7,8 @@ import useMainStore from "@/stores/index";
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
import { invoke } from "@tauri-apps/api/core";
// import { ElConfirmPrimary } from "~/utils/element";
// import { open } from "@tauri-apps/plugin-shell";
import { open } from "@tauri-apps/plugin-shell";
import { computed } from "vue";
const DEFAULT_TRAY_NAME = "main";
@@ -21,7 +22,7 @@ async function toggleVisibility() {
}
}
export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function) {
export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function, handleReconnect: Function) {
let tray;
try {
tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
@@ -30,13 +31,10 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
tooltip: `EasyTierGame\n${pkg.version}`,
title: `EasyTierGame\n${pkg.version}`,
id: DEFAULT_TRAY_NAME,
menu: await Menu.new({
id: "main",
items: await generateMenuItem(beforExit, handleConnection),
}),
action: async (e) => {
menu: await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection, handleReconnect) }),
action: async e => {
toggleVisibility();
},
}
});
}
} catch (error) {
@@ -46,28 +44,36 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
if (init) {
tray.setTooltip(`EasyTierGame\n${pkg.version}`);
tray.setMenuOnLeftClick(false);
tray.setMenu(
await Menu.new({
id: "main",
items: await generateMenuItem(beforExit, handleConnection),
})
);
tray.setShowMenuOnLeftClick(false);
tray.setMenu(await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection, handleReconnect) }));
}
return tray;
}
export async function generateMenuItem(beforExit: Function, handleConnection:Function) {
export async function generateMenuItem(beforExit: Function, handleConnection: Function, handleReconnect: Function) {
return [
await MenuItemShow("显示 / 隐藏"),
await MenuItemExchangeConnection("联机 / 断开", handleConnection),
await MenuItemReconnect("重新联机", handleReconnect),
await MenuItemTheme(),
await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemExit("退出", beforExit),
await MenuItemPublicPeers(),
await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemExit("退出", beforExit)
];
}
export async function MenuItemReconnect(text: string, handleReconnect: Function) {
return await MenuItem.new({
id: "reconnect",
text,
action: async () => {
await handleReconnect();
}
});
}
export async function MenuItemExit(text: string, beforExit: Function) {
return await MenuItem.new({
id: "quit",
@@ -77,7 +83,17 @@ export async function MenuItemExit(text: string, beforExit: Function) {
await beforExit();
}
await getCurrentWindow().close();
},
}
});
}
export async function MenuItemPublicPeers() {
return await MenuItem.new({
id: "publicPeers",
text: "公共节点",
action: async () => {
await open(import.meta.env.VITE_PUBLIC_PEERS_URL);
}
});
}
@@ -87,17 +103,17 @@ export async function MenuItemShow(text: string) {
text,
action: async () => {
await toggleVisibility();
},
}
});
}
export async function MenuItemExchangeConnection(text: string, handleConnection:Function) {
const menutItem = await MenuItem.new({
export async function MenuItemExchangeConnection(text: string, handleConnection: Function) {
const menutItem = await MenuItem.new({
id: "exchangeConnection",
text,
action: async () => {
const isStart = await handleConnection();
},
}
});
return menutItem;
}
@@ -108,11 +124,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);
},
}
});
}
@@ -145,18 +160,27 @@ export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | n
}
}
const versionWeight = (version: string) => {
version = version ? version.trim() : "";
const [major = "0", minor = "0", patch = "0"] = version.split(".");
return parseInt(major) * 10000 + parseInt(minor) * 100 + parseInt(patch);
};
const versionDifference = (current: string, latest: string) => {
const currentVersion = versionWeight(current);
const latestVersion = versionWeight(latest);
return currentVersion - latestVersion;
};
export const checkNewVersion = async () => {
const mainStore = useMainStore();
// if(mainStore.latestTagName && mainStore.latestTagName == pkg.version) return;
if (hasNewVersion.value) return;
let [tagName, downloadUrl] = await invoke<string[]>("fetch_game_releases");
if(tagName && pkg.version !== tagName) {
return true; //有新版
// const [err] = await ElConfirmPrimary("有新版本是否下载?", "发现新版本", {
// confirmButtonText: "下载",
// cancelButtonText: "取消",
// })
// if(!err) {
// open(downloadUrl);
// }
}
return false; //没有新版
}
mainStore.latestTagName = tagName;
};
export const hasNewVersion = computed<boolean>(() => {
const mainStore = useMainStore();
return !!mainStore.latestTagName && versionDifference(pkg.version, mainStore.latestTagName) < 0 ;
});
+57 -46
View File
@@ -1,20 +1,32 @@
import { type UnlistenFn } from "@tauri-apps/api/event";
import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } from "@tauri-apps/api/window";
import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor, PhysicalSize } from "@tauri-apps/api/window";
import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
import type { WebviewLabel, WebviewOptions } from "@tauri-apps/api/webview";
import useMainStore from "@/stores/index";
import { onBeforeUnmount } from "vue";
import { updateConfigJsonBounce, type ConfigServerUrlType } from "./configJson";
const _listenersMaps: { [key: string]: [UnlistenFn | null, UnlistenFn | null] } = {};
const _listenersMaps: { [key: string]: [UnlistenFn | null] } = {};
const dealCloseListener = async (dialog: WebviewWindow, label: string, beforeCloseFunc?: () => void | null) => {
const unlistenFnList: [UnlistenFn | null] = _listenersMaps[label] || [null];
let [unListenlogClose] = unlistenFnList;
unListenlogClose && (await unListenlogClose());
unListenlogClose = await dialog.onCloseRequested(async () => {
beforeCloseFunc && (await beforeCloseFunc());
unListenlogClose && (await unListenlogClose());
console.log("close");
});
};
export default async (
label: WebviewLabel,
options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
beforeCloseFunc?: () => void | null
) => {
const unlistenFnList: [UnlistenFn | null, UnlistenFn | null] = _listenersMaps[label] || [null, null];
let [unlistenLogCreated, unListenlogClose] = unlistenFnList;
const unlistenFnList: [UnlistenFn | null] = _listenersMaps[label] || [null];
let dialog = await WebviewWindow.getByLabel(label);
if (!dialog) {
let defaultOpts: { [key: string]: any; parent: Window | undefined } = {
@@ -29,59 +41,58 @@ export default async (
};
const appWindow = getCurrentWindow();
if (appWindow) {
const appSize = await appWindow.outerSize();
const factor = await appWindow.scaleFactor();
const appPosition = await appWindow.outerPosition();
const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
defaultOpts.parent = appWindow;
// console.error(logicalPosition);
defaultOpts.x = logicalPosition.x;
defaultOpts.y = logicalPosition.y;
}
unlistenLogCreated && (await (unlistenLogCreated as Function)());
unListenlogClose && (await unListenlogClose());
dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
unlistenLogCreated = await dialog.listen("tauri://webview-created", async () => {
if (dialog) {
afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
await dialog.show();
if (defaultOpts.x == 0 && defaultOpts.y == 0) {
const logicalAppSize = {
width: 340,
height: 305
}
const factor = await appWindow.scaleFactor();
const appPosition = await appWindow.outerPosition();
const logicalPosition = new PhysicalPosition(appPosition.x + Math.ceil((logicalAppSize.width + 5) * factor), appPosition.y).toLogical(factor);
defaultOpts.x = logicalPosition.x;
defaultOpts.y = logicalPosition.y;
}
});
unlistenFnList[0] = unlistenLogCreated;
unListenlogClose = await dialog.onCloseRequested(async () => {
beforeCloseFunc && (await beforeCloseFunc());
unListenlogClose && (await unListenlogClose());
unlistenLogCreated && (await (unlistenLogCreated as Function)());
});
unlistenFnList[1] = unlistenLogCreated;
_listenersMaps[label] = unlistenFnList;
}
dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
await dealCloseListener(dialog, label, beforeCloseFunc);
await dialog.show();
afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
} else {
const visible = await dialog.isVisible();
if (visible) {
await dialog.close();
unlistenLogCreated && (await (unlistenLogCreated as Function)());
} else {
const appWindow = getCurrentWindow();
await dealCloseListener(dialog, label, beforeCloseFunc);
await dialog.show();
afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
}
}
};
export const dataSubscribe = async (cb?: (...args: any) => any) => {
if (!cb) return;
export const dataSubscribe = async (cb?: any, getconfigServerUrl?: () => ConfigServerUrlType) => {
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 () => {
// console.log("触发", {dhcp:mainStore.config.dhcp, c: mainStore.createConfigInEasytier})
mainStore.$hydrate();
const configServerUrl = getconfigServerUrl && getconfigServerUrl instanceof Function ? getconfigServerUrl() : null;
updateConfigJsonBounce(configServerUrl);
if (cb && cb instanceof Function) {
await cb();
}
},
{
signal: abort.signal
}
);
onBeforeUnmount(() => {
console.log("取消监听");
abort?.abort();
});
};
+3
View File
@@ -1,5 +1,8 @@
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_GAME_LIST_PATH=easytier/gameList/
VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
+3
View File
@@ -1,5 +1,8 @@
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_GAME_LIST_PATH=easytier/gameList/
VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
+2 -1
View File
@@ -6,7 +6,8 @@
//屏蔽右键菜单
document.addEventListener("contextmenu", (e: MouseEvent) => {
const el = (e.target as HTMLElement);
if (import.meta.env.PROD && !el.classList.contains("el-input__inner") && !el.classList.contains("el-textarea__inner")) { // 所有输入框不禁用右键
if (import.meta.env.PROD && !el.classList.contains("el-input__inner") && !el.classList.contains("el-textarea__inner")
&& !el.classList.contains("allow-contextmenu")) { // 所有输入框不禁用右键
e.preventDefault();
}
});
+1 -1
View File
@@ -8,7 +8,7 @@ export default defineNuxtConfig({
devServer: {
port: 5000
},
telemetry: false,
imports: {
+27 -24
View File
@@ -3,39 +3,42 @@
"private": true,
"author": "leizi97",
"description": "A simple network initiator based on Easytier",
"version": "1.3.1",
"version": "1.4.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.0",
"@nuxtjs/tailwindcss": "^6.12.0",
"@pinia/nuxt": "0.9.0",
"@tauri-apps/api": "^2.1.1",
"@tauri-apps/cli": "^2.1.0",
"@tauri-apps/plugin-cli": "^2.0.0",
"@tauri-apps/plugin-clipboard-manager": "^2.0.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",
"@element-plus/nuxt": "1.1.4",
"@nuxtjs/tailwindcss": "6.13.2",
"@pinia/nuxt": "0.11.1",
"@tauri-apps/api": "2.7.0",
"@tauri-apps/cli": "2.7.1",
"@tauri-apps/plugin-cli": "2.4.0",
"@tauri-apps/plugin-clipboard-manager": "2.3.0",
"@tauri-apps/plugin-dialog": "2.3.1",
"@tauri-apps/plugin-fs": "2.4.1",
"@tauri-apps/plugin-log": "2.6.0",
"@tauri-apps/plugin-shell": "2.3.0",
"@tauri-apps/plugin-window-state": "2.4.0",
"@types/lodash-es": "^4.17.12",
"@vitejs/plugin-vue-jsx": "^4.1.0",
"@vueuse/core": "12.0.0",
"@vitejs/plugin-vue-jsx": "5.0.1",
"@vueuse/core": "12.7.0",
"archiver": "^7.0.1",
"element-plus": "^2.8.7",
"less": "^4.2.0",
"element-plus": "2.10.7",
"less": "4.2.1",
"lodash-es": "^4.17.21",
"nuxt": "^3.14.1592",
"pinia": "^2.3.0",
"pinia-plugin-persistedstate": "^4.1.3",
"nuxt": "3.18.1",
"pinia": "3.0.3",
"pinia-plugin-persistedstate": "4.4.1",
"postcss": "^8.4.38",
"prettier": "^3.4.1",
"prettier-plugin-tailwindcss": "^0.6.9",
"typescript": "^5.6.3",
"vue-clipboard3": "^2.0.0"
"prettier": "3.6.2",
"prettier-plugin-tailwindcss": "0.6.14"
},
"dependencies": {
"is-ip": "^5.0.1"
}
}
+289 -53
View File
@@ -1,10 +1,9 @@
<template>
<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
<div class="flex items-center gap-[15px] flex-nowrap">
<div class="flex items-center gap-[5px] flex-nowrap">
<ElCheckbox v-model="mainStore.config.enableCustonProtocol">自定义联机时使用的默认协议</ElCheckbox>
<ElTooltip content="如果没有支持该协议的节点地址,程序会自动处理,请放心使用">
<div class="flex h-full flex-col items-start overflow-auto px-[25px]">
<div class="flex flex-nowrap items-center gap-[15px]">
<div class="flex flex-nowrap items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.enableCustomProtocol">直连(P2P)优先使用传输协议</ElCheckbox>
<ElTooltip content="若无法建立指定的协议,会自动使用可建立连接的协议">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
@@ -24,32 +23,11 @@
</ElSelect>
</div>
</div>
<div class="flex items-center gap-[15px] flex-nowrap">
<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
<div class="w-[140px]">
<ElSelect
size="small"
v-model="mainStore.config.logLevel"
placeholder="请选择日志等级"
class="ml-[5px]"
>
<ElOption
v-for="item in data"
:key="item"
:label="`level - ${item}`"
:value="item"
></ElOption>
</ElSelect>
</div>
<ElButton
@click="openLogDir"
size="small"
>
打开日志目录
</ElButton>
<div>
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">帮助他人建立直连(P2P)连接</ElCheckbox>
</div>
<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后自动"启动联机"(搭配开机自启无感联机)</ElCheckbox></div>
<div class="flex items-center gap-[15px] flex-nowrap">
<div class="flex flex-nowrap items-center gap-[15px]">
<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
<ElButton
@click="openConfigJsonDir"
@@ -58,8 +36,78 @@
打开config.json目录
</ElButton>
</div>
<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止休眠</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止系统休眠(比如:屏幕会一直亮着)</ElCheckbox></div>
<div class="flex flex-nowrap items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.latencyfirst">使用低延迟模式</ElCheckbox>
<ElTooltip content="弱网环境下可能会导致网络延迟延迟忽高忽低">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
<div class="flex flex-nowrap items-center gap-[5px]">
<ElCheckbox
@change="handleKcpProxyChange"
v-model="mainStore.config.enableKcpProxy"
>
启用KCP代理
</ElCheckbox>
<ElTooltip content="(不可与QUIC代理同时开启)将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 代理 TCP 流到此节点。开启 KCP 代理的节点访问此节点时,依然使用原始 TCP 连接">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.2.0" />
</div>
<div class="flex flex-nowrap items-center gap-[5px]">
<ElCheckbox
@change="handleQuicProxyChange"
v-model="mainStore.config.enableQuicProxy"
>
启用QUIC代理
</ElCheckbox>
<ElTooltip content="(不可与KCP代理同时开启)使用 QUIC 代理 TCP 流,提高在 UDP 丢包网络上的延迟和吞吐量">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.3.2" />
</div>
<div class="flex flex-nowrap items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.disableQuicInput">禁用QUIC输入</ElCheckbox>
<ElTooltip content="不允许其他节点使用 QUIC 代理 TCP 流到此节点。开启 QUIC 代理的节点访问此节点时,依然使用原始 TCP 连接">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.3.2" />
</div>
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
<div class="flex flex-nowrap items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.acceptDNS">魔法DNS</ElCheckbox>
<ElTooltip content="您可以使用域名访问其他节点,例如:<hostname>.et.net。魔法DNS将修改您的系统DNS设置,请谨慎启用">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.3.0" />
</div>
<div class="flex flex-nowrap items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.privateMode">启用私有模式</ElCheckbox>
<ElTooltip content="启用后,不允许使用了与本网络不同的房间名和密码的节点通过本节点进行握手或中转">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.3.1" />
</div>
<ElDivider />
<div class="flex w-full flex-nowrap items-center gap-[5px] mb-[3px]">
<ElCheckbox v-model="mainStore.config.tcpWhitelistEnable">TCP端口白名单</ElCheckbox>
<ElInput class="flex-1" v-model="mainStore.config.tcpWhitelist" placeholder="支持单个端口(80)和范围(8000-9000" />
<CoreVersionWarning version="2.4.2" />
</div>
<div class="flex w-full flex-nowrap items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.udpWhitelistEnable">UDP端口白名单</ElCheckbox>
<ElInput class="flex-1" v-model="mainStore.config.udpWhitelist" placeholder="支持单个端口(53)和范围(5000-6000" />
<CoreVersionWarning version="2.4.2" />
</div>
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口只连接到对等节点</ElCheckbox>
<ElTooltip content="无法联机时,可以尝试开启这个选项">
@@ -103,6 +151,7 @@
class="!mb-0"
v-model="listenerDialogData.visible"
:close-on-press-escape="false"
:close-on-click-modal="false"
title="自定义监听地址"
>
<ElInput
@@ -124,18 +173,77 @@
</template>
</ElDialog>
</div>
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.enablePortForward">端口转发</ElCheckbox>
<ElTooltip
:disabled="mainStore.config.enablePortForward"
content="请先开启端口转发功能"
>
<ElButton
size="small"
:disabled="!mainStore.config.enablePortForward"
@click="handlePortForwardDialog"
>
配置
</ElButton>
</ElTooltip>
<ElTooltip
content="将本地端口转发到虚拟网络中的远程端口.如:udp://0.0.0.0:12345/10.126.126.1:23456,表示将本地UDP端口12345转发到虚拟网络中的10.126.126.1:23456.可以指定多个"
>
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.3.0" />
<ElDialog
width="95%"
top="5px"
append-to-body
:z-index="10"
class="!mb-0"
v-model="portForwardDialogData.visible"
:close-on-press-escape="false"
:close-on-click-modal="false"
title="端口转发配置"
>
<div class="mb-4">
<ElText
size="small"
type="info"
>
<div> 每行一个转发规则</div>
<div> 格式协议://本地地址:本地端口/目标地址:目标端口</div>
<div class="flex items-center">
<span class="mr-auto"> 例如udp://0.0.0.0:12345/10.126.126.1:23456</span>
<ElButton
size="default"
type="primary"
@click.stop="handleFinishInputPortForward"
>
填写完毕
</ElButton>
</div>
</ElText>
</div>
<ElInput
type="textarea"
:rows="10"
placeholder="请输入端口转发规则,每行一个&#10;例如:&#10;udp://0.0.0.0:12345/10.126.126.1:23456&#10;tcp://0.0.0.0:8080/192.168.1.100:80"
v-model="mainStore.config.portForwardData"
></ElInput>
<!-- -->
</ElDialog>
</div>
<ElDivider />
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
<ElCheckbox v-model="mainStore.config.devName">自定义虚拟网卡名</ElCheckbox>
<ElInput
size="small"
maxlength="10"
v-model="mainStore.config.devNameValue"
placeholder="请输入网卡名"
placeholder="请输入虚拟网卡名"
/>
</div>
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.enableNetCardMetric">自定义easytier网卡跃点</ElCheckbox>
<ElCheckbox v-model="mainStore.config.enableNetCardMetric">自定义虚拟网卡优先级</ElCheckbox>
<ElInputNumber
controls-position="right"
:min="1"
@@ -145,9 +253,9 @@
:precision="0"
size="small"
v-model="mainStore.config.netCardMetricValue"
placeholder="请选择跃点数"
placeholder="请输入优先级"
/>
<ElTooltip content="设置easytier网卡的跃点,提升网卡优先级,跃点越小,网卡优先级越高">
<ElTooltip content="数值越小,优先级越高">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
@@ -156,22 +264,93 @@
size="small"
type="warning"
>
(不使用自定义网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡也可以使用 设置跃点 功能除非你启用了下面的功能)
(不使用自定义虚拟网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡也可以使用 自定义虚拟网卡优先级
功能除非你启用了下面的功能)
</ElText>
</div>
<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备(网卡)可以使用子网代理访问节点</ElCheckbox></div>
<div class="flex items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.noTun">不创建TUN虚拟网卡</ElCheckbox>
<ElTooltip content="开启后该节点无法主动访问其他节点">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
<div class="flex items-center gap-[5px]">
<div><ElCheckbox v-model="mainStore.config.bindDeviceEnable">绑定物理网卡</ElCheckbox></div>
<ElTooltip content="将连接器的套接字绑定到物理设备以避免路由问题。比如子网代理网段与某节点的网段冲突,绑定物理设备后可以与该节点正常通信">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.2.3" />
</div>
<ElDivider />
<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.multiThread">启用多线程运行</ElCheckbox></div>
<div class="flex items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.disableEncryption">关闭信息加密</ElCheckbox>
<ElTooltip content="关闭后通信数据将在互联网上明文传输,如房间名和密码">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
<div class="flex items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.multiThread">开启多线程</ElCheckbox>
<ElTooltip content="开启后可能会提高网络性能">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
<div class="flex items-center gap-[10px]">
<ElText>传输数据压缩算法</ElText>
<div class="w-[160px]">
<ElSelect
size="small"
v-model="mainStore.config.compression"
placeholder="请选择压缩算法"
>
<ElOption
v-for="item in [
['none', '不压缩(游戏联机推荐)'],
['zstd', 'zstd算法']
]"
:key="item[0]"
:label="item[1]"
:value="item[0]"
></ElOption>
</ElSelect>
</div>
<CoreVersionWarning version="2.1.0" />
</div>
<ElDivider />
<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式将尝试使用最低延迟路径转发流量</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
<div>
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包即使对等节点不在转发网络白名单内</ElCheckbox>
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理和 KCP 代理开启用户网络栈</ElCheckbox>
<ElTooltip content="开启后会降低网络性能,但不需要配置防火墙">
<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]">
<ElSelect
size="small"
v-model="mainStore.config.logLevel"
placeholder="请选择日志等级"
class="ml-[5px]"
>
<ElOption
v-for="item in data"
:key="item"
:label="`level - ${item}`"
:value="item"
></ElOption>
</ElSelect>
</div>
<ElButton
@click="openLogDir"
size="small"
>
打开日志目录
</ElButton>
</div>
</div>
</template>
@@ -180,11 +359,14 @@
import { QuestionFilled } from "@element-plus/icons-vue";
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
import { Command } from "@tauri-apps/plugin-shell";
import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
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 { supportProtocols } from "~/utils";
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 }>({
@@ -192,6 +374,15 @@
loading: false
});
const portForwardDialogData = reactive<{ [key: string]: any }>({
visible: false,
loading: false
});
const handlePortForwardDialog = () => {
portForwardDialogData.visible = true;
};
const handleListenerDialog = () => {
listenerDialogData.visible = true;
};
@@ -200,8 +391,13 @@
listenerDialogData.visible = false;
};
const handleFinishInputPortForward = async () => {
portForwardDialogData.visible = false;
};
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;
@@ -214,6 +410,7 @@
}
await Command.create("explorer", [logDirPath]).execute();
};
const openConfigJsonDir = async () => {
const resourceDir = await getResourceDir();
const easytierDir = await join(resourceDir, "easytier/");
@@ -225,10 +422,49 @@
}
};
dataSubscribe(async (...a) => {
return {
config: { ...mainStore.config },
createConfigInEasytier: mainStore.createConfigInEasytier
};
const handleKcpProxyChange = () => {
if (mainStore.config.enableKcpProxy) {
if (mainStore.config.enableQuicProxy) {
ElMessage.warning("KCP代理和QUIC代理不能同时开启");
}
mainStore.config.enableQuicProxy = false;
}
};
const handleQuicProxyChange = () => {
if (mainStore.config.enableQuicProxy) {
if (mainStore.config.enableKcpProxy) {
ElMessage.warning("KCP代理和QUIC代理不能同时开启");
}
mainStore.config.enableKcpProxy = false;
}
};
// 为bind_device功能增加改方法
const getGuids = async () => {
const guidsValue = await invoke<string[][]>("get_network_adapter_guids");
guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : [];
};
dataSubscribe(async () => {
if (!mainStore.createConfigInEasytier) {
// 考虑删除本地config.json文件
const configJsonPath = import.meta.env.VITE_CONFIG_FILE_NAME;
const isExists = await exists(configJsonPath, { baseDir: BaseDirectory.Resource });
// console.log({ isExists });
if (isExists) {
const [error, _] = await ElConfirmDanger("生成配置文件功能被关闭,是否删除本地config.json", "提示", {
confirmButtonText: "删除",
cancelButtonText: "保留"
});
if (!error) {
// 删除本地config.json文件
const [error, _] = await ATJ(remove(configJsonPath, { baseDir: BaseDirectory.Resource }));
if (error) {
ElMessage.error("删除失败请打开目录手动删除");
}
}
}
}
});
</script>
+106 -8
View File
@@ -1,25 +1,123 @@
<template>
<div class="h-full flex flex-col gap-[10px]">
<ElRadioGroup v-model="mainStore.cidrEnable">
<ElRadioButton :value="true">开启</ElRadioButton>
<ElRadioButton :value="false">关闭</ElRadioButton>
</ElRadioGroup>
<div class="flex h-full flex-col gap-[10px]">
<div class="flex items-center gap-[10px]">
<ElRadioGroup
:disabled="!data.isSwitchEnable"
v-model="mainStore.cidrEnable"
>
<ElRadioButton :value="true">开启</ElRadioButton>
<ElRadioButton :value="false">关闭</ElRadioButton>
</ElRadioGroup>
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.proxyForwardBySystem">通过系统内核转发子网代理数据包禁用内置NAT</ElCheckbox>
<CoreVersionWarning version="2.2.3" />
</div>
</div>
<div class="flex-1 overflow-auto">
<ElInput
placeholder="例如: 192.168.1.0/24 一行一个"
v-model="mainStore.config.proxyNetworks"
type="textarea"
:rows="30"
:rows="5"
resize="none"
></ElInput>
<ElTable
stripe
border
empty-text="暂无数据"
:data="data.route"
class="mt-[5px]"
>
<ElTableColumn
sortable
width="140"
label="主机名"
prop="hostname"
></ElTableColumn>
<ElTableColumn
width="120"
sortable
label="虚拟网IP"
prop="ipv4"
></ElTableColumn>
<ElTableColumn
sortable
label="被代理的子网"
prop="proxy_cidrs"
></ElTableColumn>
</ElTable>
</div>
</div>
</template>
<script setup lang="ts">
import useMainStore from "@/stores/index";
import { dataSubscribe } from "@/composables/windows";
import { invoke } from "@tauri-apps/api/core";
import { reactive, onMounted, onBeforeUnmount } from "vue";
import { ATJ, parseCliInfo } from "@/utils";
import { listen, type UnlistenFn } from "@tauri-apps/api/event";
const mainStore = useMainStore();
dataSubscribe(async (...a) => {
return { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } };
const data = reactive<{ [key: string]: any }>({
route: [],
isStart: false,
isSwitchEnable: false,
isRunning: false
});
const listenOutput = async () => {
data.isRunning = true;
const [error, member] = await ATJ(invoke<string>("get_route_by_cli"));
data.isRunning = false;
// if(!member) return;
if (error) {
data.route = [];
return "";
}
if (member === "_EasytierGameCliFailedToConnect_") {
data.route = [];
await listenOutput();
return;
}
const routeInfo = parseCliInfo(member);
routeInfo.forEach(value => {
if (value.cost === "Local") {
value.cost = "本机";
}
if (value.ipv4 && value.ipv4.includes("/")) {
value.ipv4 = value.ipv4.split("/")[0];
}
});
data.route = routeInfo;
};
const listenStart = async () => {
const unListen = await listen<boolean>("route", async event => {
data.isStart = event.payload;
if (data.isStart) {
data.isSwitchEnable = false;
if (mainStore.cidrEnable && !data.isRunning) {
await listenOutput();
} else {
data.route = [];
}
} else {
data.isSwitchEnable = true;
data.route = [];
}
});
return unListen;
};
let unlistenStart: UnlistenFn | null = null;
onMounted(async () => {
unlistenStart = await listenStart();
});
dataSubscribe();
onBeforeUnmount(() => {
unlistenStart && unlistenStart();
});
</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>
+923 -238
View File
File diff suppressed because it is too large Load Diff
+120 -8
View File
@@ -1,27 +1,139 @@
<template>
<ElInput
<!-- <ElInput
type="textarea"
:rows="17"
v-model="data.log"
v-model="data.originLog"
resize="none"
readonly
placeholder="等待日志中,请先'启动联机'..."
/>
/> -->
<div
ref="logRef"
@scroll="handleScroll"
class="overflow-auto"
>
<div v-if="!data.log || data.log.length <= 0" class="p-[5px]">
<ElText type="info">等待日志中请先'启动联机'...</ElText>
</div>
<div
v-else
v-for="item in data.log"
:key="item.id"
class="p-[5px]"
>
<div class="group/item flex items-center justify-start leading-[26px]">
<ElText
:closable="false"
:type="item.type"
>
{{ item.text }}
<ElTooltip
placement="right"
content="复制"
>
<ElButton
class="ml-[3px] !hidden w-fit group-hover/item:!inline-flex"
@click.stop="handleCopyLog(item.text)"
type="success"
size="small"
circle
plain
:icon="CopyDocument"
></ElButton>
</ElTooltip>
</ElText>
</div>
</div>
<ElAffix
v-if="data.originLog"
class="w-full"
position="bottom"
:offset="10"
>
<div class="bg-(var(--el-color-primary)) mr-[10px] flex items-center justify-end">
<ElTooltip
content="复制全部"
placement="top"
>
<ElButton
@click.stop="handleCopyLog(data.originLog)"
type="info"
size="large"
circle
:icon="CopyDocument"
></ElButton>
</ElTooltip>
</div>
</ElAffix>
</div>
</template>
<script setup lang="ts">
import { CopyDocument } from "@element-plus/icons-vue";
import { listen, type UnlistenFn } from "@tauri-apps/api/event";
import { reactive, onMounted, onBeforeUnmount } from "vue";
const data = reactive({
log: ""
import { reactive, onMounted, onBeforeUnmount, useTemplateRef, nextTick } from "vue";
import { copyText } from "~/utils";
type LogItem = { id: string; text: string; type: "danger" | "info" | "warning" | "primary" };
const data = reactive<{ log: LogItem[]; originLog: string; autoScrollToBottom: boolean }>({
log: [],
originLog: "", // 原始日志
autoScrollToBottom: true // 是否允许自动滚动到底部
});
const logEl = useTemplateRef<HTMLDivElement>("logRef");
const scrollToBottom = () => {
if (data.autoScrollToBottom) {
logEl.value?.scrollTo({
top: logEl.value?.scrollHeight,
behavior: "smooth"
});
}
};
const handleScroll = () => {
if (logEl.value) {
const autoScrollToBottom = logEl.value.scrollTop + logEl.value.clientHeight >= logEl.value.scrollHeight;
data.autoScrollToBottom = autoScrollToBottom;
}
};
const listenStart = async () => {
const unListen = await listen("logs", event => {
data.log = (event.payload as string) || "";
const unListen = await listen<string>("logs", async event => {
const payload = event.payload || "";
if (data.originLog === payload) return;
data.originLog = payload;
data.log = payload
.split("\n")
.filter(text => text.trim())
.map((text, idx) => {
const toLowerCaseText = text.toLocaleLowerCase();
return {
id: `${text}-${idx}`,
text,
type:
toLowerCaseText.includes("error") ||
toLowerCaseText.includes("fail") ||
toLowerCaseText.includes("failed") ||
toLowerCaseText.includes("exception") ||
toLowerCaseText.includes("err")
? "danger"
: toLowerCaseText.includes("warn")
? "warning"
: toLowerCaseText.includes("new peer connection")
? "primary"
: "info"
};
});
await nextTick();
scrollToBottom();
});
return unListen;
};
const handleCopyLog = async (text: string) => {
await copyText(text, "复制记录成功");
};
let unlistenStart: UnlistenFn | null = null;
onMounted(async () => {
unlistenStart = await listenStart();
+176 -14
View File
@@ -1,7 +1,12 @@
<template>
<div class="overflow-auto h-full">
<div class="h-full overflow-auto">
<div class="w-[1200px]">
<ElText size="small" v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</ElText>
<ElText
size="small"
v-if="!data.member || data.member.length <= 0"
>
{{ "等待成员信息中..." }}
</ElText>
<ElTable
stripe
border
@@ -11,11 +16,15 @@
<ElTableColumn
sortable
width="140"
label="主机名"
label="成员名"
prop="hostname"
>
<template #default="{row}">
{{ (row.hostname || "").toLowerCase().includes('publicserver') ? (row.hostname || "").replace("PublicServer", "服务器") : (row.hostname || "-") }}
<template #default="{ row }">
{{
(row.hostname || "").toLowerCase().includes("publicserver")
? (row.hostname || "").replace("PublicServer", "服务器")
: row.hostname || "-"
}}
</template>
</ElTableColumn>
<ElTableColumn
@@ -30,7 +39,7 @@
effect="dark"
:type="row.cost == 'p2p' ? 'success' : 'info'"
>
{{ row.cost }}
{{ row.cost ? row.cost.replace("relay", "中转").replace("p2p", "直连") : row.cost }}
</ElTag>
</template>
</ElTableColumn>
@@ -39,13 +48,21 @@
width="120"
prop="ipv4"
label="虚拟网IP"
:sort-method="sortIpv4"
:sort-orders="['ascending', 'descending', null]"
></ElTableColumn>
<ElTableColumn
sortable
prop="lat_ms"
width="100"
label="延迟/ms"
></ElTableColumn>
:sort-method="sortLatMs"
:sort-orders="['ascending', 'descending', null]"
>
<template #default="{ row }">
{{ formatLatency(row.lat_ms) }}
</template>
</ElTableColumn>
<ElTableColumn
sortable
width="100"
@@ -83,11 +100,15 @@
width="90"
prop="rx_bytes"
label="接收"
:sort-method="sortBytes"
:sort-orders="['ascending', 'descending', null]"
></ElTableColumn>
<ElTableColumn
sortable
prop="tx_bytes"
label="传输"
:sort-method="(a, b) => sortBytes(a, b, 'tx_bytes')"
:sort-orders="['ascending', 'descending', null]"
></ElTableColumn>
</ElTable>
</div>
@@ -96,9 +117,10 @@
<script setup lang="ts">
import { invoke } from "@tauri-apps/api/core";
import { reactive, onMounted, onBeforeUnmount } from "vue";
import { ATJ, parsePeerInfo } from "@/utils";
import { ATJ, parseCliInfo } from "@/utils";
import { ElConfirmDanger } from "~/utils/element";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { isNaN } from "lodash-es";
// enum NatType {
// // has NAT; but own a single public IP, port is not changed
// Unknown = 0;
@@ -126,10 +148,150 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
};
type natKyes = keyof typeof natMaps;
const data = reactive<{ member: {hostname: string, cost: string, ipv4: string, lat_msg: string, loss_rate: string, nat_type: string}[] }>({
const data = reactive<{ member: { hostname: string; cost: string; ipv4: string; lat_msg: string; loss_rate: string; nat_type: string }[] }>({
member: []
});
// 延迟排序函数
const sortLatMs = (a: any, b: any): number => {
const getLatencyValue = (row: any): number => {
const latMs = row.lat_ms;
if (latMs === null || latMs === undefined || latMs === "") {
return Infinity;
}
const num = Number(latMs);
if (isNaN(num) || num < 0) {
return Infinity;
}
return Math.floor(num);
};
const valueA = getLatencyValue(a);
const valueB = getLatencyValue(b);
if (valueA === Infinity && valueB === Infinity) {
return 0;
}
return valueA - valueB;
};
// IP地址排序函数
const sortIpv4 = (a: any, b: any): number => {
const ipToNumber = (ip: string): number => {
if (!ip || ip === "-" || ip === "") {
return 0;
}
// 处理可能包含端口号或子网掩码的情况
const cleanIp = ip.split("/")[0].split(":")[0];
const parts = cleanIp.split(".");
if (parts.length !== 4) {
return 0;
}
try {
const nums = parts.map(part => {
const num = parseInt(part, 10);
return isNaN(num) || num < 0 || num > 255 ? 0 : num;
});
// 将IP地址转换为32位数字进行比较
return (nums[0] << 24) + (nums[1] << 16) + (nums[2] << 8) + nums[3];
} catch {
return 0;
}
};
const numA = ipToNumber(a.ipv4);
const numB = ipToNumber(b.ipv4);
return numA - numB;
};
// 字节数据排序函数
const sortBytes = (a: any, b: any, field: string = 'rx_bytes'): number => {
const parseBytes = (bytesStr: string): number => {
if (!bytesStr || bytesStr === "-" || bytesStr === "") {
return 0;
}
// 统一转换为小写并去除空格
const cleanStr = bytesStr.toLowerCase().trim();
// 使用正则表达式匹配数字和单位
const match = cleanStr.match(/^(\d+(?:\.\d+)?)\s*([a-z]*)$/);
if (!match) {
return 0;
}
const value = parseFloat(match[1]);
const unit = match[2];
if (isNaN(value)) {
return 0;
}
// 根据单位转换为字节数
switch (unit) {
case 'b':
case 'byte':
case 'bytes':
case '':
return value;
case 'k':
case 'kb':
case 'kib':
return value * 1024;
case 'm':
case 'mb':
case 'mib':
return value * 1024 * 1024;
case 'g':
case 'gb':
case 'gib':
return value * 1024 * 1024 * 1024;
case 't':
case 'tb':
case 'tib':
return value * 1024 * 1024 * 1024 * 1024;
case 'p':
case 'pb':
case 'pib':
return value * 1024 * 1024 * 1024 * 1024 * 1024;
default:
return value; // 未知单位当作字节处理
}
};
const bytesA = parseBytes(a[field]);
const bytesB = parseBytes(b[field]);
return bytesA - bytesB;
};
// 格式化延迟显示
const formatLatency = (latMs: any): string => {
if (latMs === null || latMs === undefined || latMs === "") {
return "-";
}
const num = Number(latMs);
if (isNaN(num)) {
return "-";
}
if (num < 0) {
return "-";
}
return num.toFixed(0);
};
const _showTableHeader = [
["hostname", "主机名"],
["cost", "路由"],
@@ -139,8 +301,8 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
["nat_type", "NAT类型"],
["version", "版本"],
["tunnel_proto", "隧道协议"],
['rx_bytes', '接收'],
['tx_bytes', '传输']
["rx_bytes", "接收"],
["tx_bytes", "传输"]
];
let timer: NodeJS.Timeout | null = null;
@@ -167,7 +329,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
}
return;
}
const peerInfo = parsePeerInfo(member);
const peerInfo = parseCliInfo(member);
peerInfo.forEach(value => {
if (value.cost === "Local") {
value.cost = "本机";
@@ -191,7 +353,7 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
const stopTimer = () => {
timer && clearTimeout(timer);
timer = null;
}
};
onMounted(async () => {
await listenOutput();
+90 -8
View File
@@ -1,5 +1,5 @@
<template>
<div class="flex flex-col gap-[10px] h-full">
<div class="flex h-full flex-col gap-[10px]">
<ElForm
size="small"
label-position="top"
@@ -8,7 +8,7 @@
<ElFormItem
label="白名单"
prop="ServerWhiteList"
class="full-label full-content overflow-hidden !flex flex-col h-full !mb-[0]"
class="full-label full-content !mb-[0] !flex h-full flex-col overflow-hidden"
>
<template #label>
<div class="flex items-center gap-[10px]">
@@ -27,6 +27,17 @@
>
<ElCheckbox v-model="mainStore.serverConfig.autoStart">自动启动</ElCheckbox>
</ElTooltip>
<ElTooltip
placement="top"
content="启用后,不允许使用了与本网络不同的房间名和密码的节点通过本节点进行握手或中转"
>
<ElCheckbox
@click.stop="handlePrivateModeClick"
:model-value="mainStore.serverConfig.privateMode"
>
私有模式
</ElCheckbox>
</ElTooltip>
<ElTooltip
placement="top"
content="帮助其他虚拟网建立P2P链接"
@@ -36,7 +47,7 @@
</div>
</div>
</template>
<div class="h-full w-full flex flex-col overflow-hidden">
<div class="flex h-full w-full flex-col overflow-hidden">
<div class="flex-1 overflow-auto">
<ElInput
:disabled="!mainStore.serverConfig.enableWhiteList"
@@ -70,6 +81,58 @@
</ElButton>
</div>
<ElDialog
v-model="privateModeDialogData.visible"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="私有模式"
:show-close="false"
width="300px"
>
<ElAlert
type="primary"
:closable="false"
>
建议为服务器设置一个房间名和密码
</ElAlert>
<div class="h-[15px]"></div>
<ElForm
:model="mainStore.serverConfig"
label-position="top"
>
<ElFormItem
label="房间名"
prop="privateNetworkName"
>
<ElInput
clearable
placeholder="请输入房间名 (默认为default)"
v-model="mainStore.serverConfig.privateNetworkName"
></ElInput>
</ElFormItem>
<ElFormItem
label="密码"
prop="privateNetworkPassword"
>
<ElInput
clearable
type="password"
show-password
placeholder="请输入密码 (可选)"
v-model="mainStore.serverConfig.privateNetworkPassword"
></ElInput>
</ElFormItem>
</ElForm>
<template #footer>
<ElButton
type="primary"
@click="handlePrivateModeDialogConfirm"
>
继续启用
</ElButton>
</template>
</ElDialog>
<ElInput
placeholder="服务器日志"
:model-value="data.log"
@@ -81,13 +144,14 @@
</template>
<script setup lang="ts">
import useMainStore from "@/stores/index";
import { reactive, onMounted, onBeforeUnmount } from "vue";
import { reactive, onMounted, onBeforeUnmount, useTemplateRef, nextTick } from "vue";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { listen, type UnlistenFn } from "@tauri-apps/api/event";
import { getServerArgs } from "@/composables/server";
import { dataSubscribe } from "@/composables/windows";
import { ElMessage, type FormInstance } from "element-plus";
const appWindow = getCurrentWindow();
const appWindow = getCurrentWindow();
const mainStore = useMainStore();
const data = reactive({
log: "",
@@ -119,12 +183,30 @@
const hanldeClickStart = async () => {
data.loading = true;
const args = getServerArgs();
const args = getServerArgs();
await appWindow.emitTo("main", "startStopServer", { args });
};
dataSubscribe(async (...a) => {
return { serverConfig: { ...mainStore.serverConfig }};
// const privateModeDialogFormEl = useTemplateRef<FormInstance>("privateModeDialogFormRef");
const privateModeDialogData = reactive({
visible: false
});
const handlePrivateModeClick = async () => {
if (mainStore.serverConfig.privateMode) {
mainStore.serverConfig.privateMode = false;
return;
}
privateModeDialogData.visible = true;
};
const handlePrivateModeDialogConfirm = async () => {
privateModeDialogData.visible = false;
mainStore.serverConfig.privateMode = true;
};
dataSubscribe();
</script>
+6
View File
@@ -0,0 +1,6 @@
<template></template>
<script setup lang="ts">
import { dataSubscribe } from "~/composables/windows";
dataSubscribe();
</script>
+188 -22
View File
@@ -8,9 +8,9 @@
<ElTabPane
label="联机失败解决办法"
name="netcard"
class="flex flex-col h-full"
class="flex h-full flex-col"
>
<div>
<!-- <div>
<div>
<ElTooltip
content="找不到游戏房间时,就开启它后再尝试搜索房间(默认开启)
@@ -23,9 +23,9 @@
</ElTooltip>
</div>
<ElLink
class="!text-[15px] mr-[10px]"
class="mr-[10px] !text-[15px]"
type="info"
:underline="false"
underline="never"
@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
>
WinIPBroadcast
@@ -39,6 +39,94 @@
active-text="已开启"
inactive-text="已关闭"
></ElSwitch>
</div> -->
<div>
<ElTooltip
content="使用ForceBindIP启动应用 (强制绑定IP或者网卡),如果还没有启动联机,请先启动联机,联机成功后,点击刷新获取easytier生成的网卡"
>
<ElText>
方案1
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
</ElText>
</ElTooltip>
</div>
<div>
<div>
<ElLink
class="!text-[15px]"
type="info"
underline="never"
@click="open('https://r1ch.net/projects/forcebindip')"
>
ForceBindIP
</ElLink>
</div>
<div>
<ElRadioGroup
class="mr-[30px]"
v-model="mainStore.forceBindIpBit"
>
<ElRadio
label="32位"
value="32"
></ElRadio>
<ElRadio
label="64位"
value="64"
></ElRadio>
</ElRadioGroup>
<ElTooltip
placement="top"
content="如果目标应用程序在启动时崩溃或出现其他意外行为,请尝试开启它,ForceBindIP 加载程序将等待应用程序进入其消息循环后再注入拦截 DLL"
>
<ElCheckbox
v-model="mainStore.delayInjectDll"
label="延迟注入DLL"
></ElCheckbox>
</ElTooltip>
</div>
<div class="flex items-center gap-[5px]">
<ElSelect
placeholder="请输入IP地址或选择网卡"
v-model="mainStore.forceBindInput"
filterable
allow-create
no-data-text="暂无网卡数据请尝试刷新"
>
<ElOption
v-for="guid in data.guids"
:key="guid[0]"
:label="guid[1]"
:value="guid[0]"
></ElOption>
</ElSelect>
<ElButton @click="getGuids">刷新</ElButton>
</div>
<div class="mt-[5px] flex items-center gap-[5px]">
<ElInput
placeholder="请选择或输入应用程序路径"
:disabled="data.forceBindStart"
v-model="mainStore.forceBindFile"
></ElInput>
<div class="flex items-center">
<ElButton
@click="handleBrowser"
:disabled="data.forceBindStart"
>
浏览
</ElButton>
<ElButton
:disabled="data.forceBindStart"
@click="startForceBindIp"
type="primary"
>
启动
</ElButton>
</div>
</div>
</div>
<div>
<!-- const guids = await invoke<string[]>("get_network_adapter_guids"); -->
</div>
<div>
<ElTooltip content="设置网卡的跃点,提升网卡优先级,尝试将您联机使用的网卡跃点设置为最小,请先查询网卡信息">
@@ -48,7 +136,7 @@
</ElText>
</ElTooltip>
</div>
<div class="flex items-center mt-[5px]">
<div class="mt-[5px] flex items-center">
<ElButton
@click="initNetCardInfo"
size="small"
@@ -58,7 +146,7 @@
</ElButton>
<div
v-if="data.row.name"
class="ml-auto flex items-center flex-nowrap gap-[10px]"
class="ml-auto flex flex-nowrap items-center gap-[10px]"
>
<ElTooltip content="跃点越小,网卡优先级越高,范围(1-9999)">
<ElInput
@@ -78,7 +166,7 @@
</ElButton>
</div>
</div>
<div class="flex-1 overflow-auto mt-[5px]">
<div class="mt-[5px] flex-1 overflow-auto">
<ElTable
height="100%"
empty-text="暂无数据"
@@ -103,13 +191,14 @@
<ElTabPane
label="防火墙"
name="firewall"
class="flex flex-col h-full"
class="flex h-full flex-col"
>
<div class="flex flex-col items-center">
<div class="mb-[10px]">
<ElButton
type="warning"
size="small"
@click.stop="handleCloseAllFireWall"
>
一键关闭防火墙
</ElButton>
@@ -156,10 +245,17 @@
<ElButton
size="small"
:disabled="data.isPing"
@click="handleTestPing"
@click="handleTestPing('v4')"
>
Ping一下
</ElButton>
<!-- <ElButton
size="small"
:disabled="data.isPing"
@click="handleTestPing('v6')"
>
Ping一下(v6)
</ElButton> -->
</div>
<div class="mt-[5px] flex-1 overflow-auto">
<ElInput
@@ -176,6 +272,7 @@
</template>
<script setup lang="ts">
import { open, Command } from "@tauri-apps/plugin-shell";
import { open as dialogOpen } from "@tauri-apps/plugin-dialog";
import { ElMessage, type TabPaneName } from "element-plus";
import { QuestionFilled } from "@element-plus/icons-vue";
import { onMounted, reactive } from "vue";
@@ -183,9 +280,11 @@
import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
import { isValidIP } from "~/utils";
import { dataSubscribe } from "~/composables/windows";
import { invoke } from "@tauri-apps/api/core";
import { BaseDirectory, exists } from "@tauri-apps/plugin-fs";
const mainStore = useMainStore();
const data = reactive({
const data = reactive<{ guids: string[][]; [key: string]: any }>({
activeTab: "netcard",
winipBcPid: 0,
pingNum: 1,
@@ -202,9 +301,25 @@
name: "",
metric: ""
},
netcardList: []
netcardList: [],
guids: [],
forceBindStart: false
});
const handleCloseAllFireWall = async () => {
try {
const output = await Command.create("netsh", ["advfirewall", "set", "allprofiles", "state", "off"], {
encoding: "gb2312"
}).execute();
ElMessage.success("关闭成功");
await initFirewall();
} catch (err) {
ElMessage.error(`关闭失败${err}`);
console.error(err);
}
}
const handleTabsChange = async (tabPaneName: TabPaneName) => {
if (tabPaneName === "netcard") {
// await initNetCardInfo();
@@ -237,14 +352,15 @@
});
};
const handleTestPing = async () => {
const handleTestPing = async (type: 'v4' | 'v6' = 'v4') => {
// const is = isValidIP(data.pingIp);
if (data.pingIp) {
data.pingLog = "";
data.isPing = true;
const args = type === 'v4' ? ["-n", "1", data.pingIp] : ["-6", '-n', "1", data.pingIp]
try {
for (let i = 0; i < data.pingNum; i++) {
const output = await Command.create("ping", ["-n", "1", data.pingIp], {
const output = await Command.create("ping", args, {
encoding: "gb2312"
}).execute();
if (output.stdout) {
@@ -328,17 +444,67 @@
}
};
dataSubscribe(async (...a) => {
return {
winIpBcAutoStart: mainStore.winIpBcAutoStart,
winipBcStart: mainStore.winipBcStart,
winipBcPid: mainStore.winipBcPid,
config: { ...mainStore.config }
};
});
const handleBrowser = async () => {
const file = await dialogOpen({
multiple: false,
directory: false
});
if (file) {
mainStore.forceBindFile = file;
} else {
ElMessage.error("获取文件路径失败");
}
};
const startForceBindIp = async () => {
if (!mainStore.forceBindInput) {
return ElMessage.error("请输入IP地址或者选择一个网卡");
}
if (!mainStore.forceBindFile) {
return ElMessage.error("请选择一个执行文件");
}
const forceBindIpExe = mainStore.forceBindIpBit == "32" ? "ForceBindIP" : "ForceBindIP64";
const isExists = await exists(`easytier/tool/${forceBindIpExe}.exe`, { baseDir: BaseDirectory.Resource });
if (!isExists) {
return ElMessage.error("forcebindIP文件不存在");
}
data.forceBindStart = true;
try {
const dealyDll = mainStore.delayInjectDll ? "-i" : "";
const child = await Command.create(
forceBindIpExe,
[dealyDll, mainStore.forceBindInput, mainStore.forceBindFile.replace(/\//g, "\\")].filter(el => el),
{
encoding: "gb2312"
}
).spawn();
// console.log({child});
} catch (err) {
ElMessage.error("forcebindIP启动发生未知错误");
console.error(err);
} finally {
data.forceBindStart = false;
}
};
const getGuids = async () => {
const guids = await invoke<string[][]>("get_network_adapter_guids");
data.guids = guids && guids.length > 0 ? guids : [];
if (mainStore.forceBindInput.startsWith("{")) {
const has = data.guids.find(el => el[0] == mainStore.forceBindInput);
if (!has) {
mainStore.forceBindInput = "";
}
}
};
onMounted(() => {
data.pingIp = mainStore.config.ipv4;
initStartWinIpBroadcast();
// initStartWinIpBroadcast();
getGuids();
});
dataSubscribe();
</script>
+4935 -2706
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

+4 -4
View File
@@ -1,6 +1,6 @@
# Generated by Cargo
# will have compiled files and executables
/target/
/gen/schemas
/easytier/logs
/easytier/logs/*.*
target/
gen/schemas
./easytier/logs
easytier/logs
+1968 -1209
View File
File diff suppressed because it is too large Load Diff
+29 -23
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.3.1"
version = "1.4.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,38 +18,44 @@ name = "app_lib"
crate-type = ["staticlib", "cdylib", "rlib"]
[build-dependencies]
tauri-build = { version = "2.0.3", features = [] }
tauri-build = { version = "2.3.1", features = [] }
# prost-build = "0.13.2"
[target.x86_64-pc-windows-msvc.build-dependencies]
thunk-rs = { git = "https://github.com/easytier/thunk.git", default-features = false, features = ["win7"] } # 需要安装curl和7zip,并添加他们的路径到环境变量
[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.26"
tauri = { version = "2.7.0", features = [ "protocol-asset",
"tray-icon",
"image-png",
"image-ico",
"image-ico"
] }
tauri-plugin-log = "2.0.2"
tauri-plugin-shell = "2.0.2"
reqwest = { version = "0.12", features = ["json"] }
zip = "2.2"
sysinfo = '0.32.0'
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
tauri-plugin-log = "2.6.0"
tauri-plugin-shell = "2.3.0"
reqwest = { version = "0.12.12", features = ["json"] }
zip = "2.2.3"
sysinfo = '0.33.1'
# planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
whoami = "1.5.2"
tauri-plugin-fs = "2"
tauri-plugin-clipboard-manager = "2.0.2"
tokio = { version = "1.41.1", features = ["process"] }
tauri-plugin-fs = "2.4.1"
tauri-plugin-clipboard-manager = "2.3.0"
rand = "0.9.0"
tokio = { version = "1.45.1", features = ["process"] }
tauri-plugin-dialog = "2.3.1"
# prost = "0.13"
# prost-types = "0.13"
hashbrown = "0.15.2"
# futures-util = "0.3"
[dependencies.windows]
version = "0.58.0"
features = ["Win32_System_TaskScheduler", "Win32_System_Power"]
version = "0.61.3"
features = ["Win32_System_TaskScheduler", "Win32_System_Com", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"]
[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
tauri-plugin-cli = "2"
tauri-plugin-single-instance = "2.0.1"
tauri-plugin-window-state = "2"
tauri-plugin-cli = "2.4.0"
tauri-plugin-single-instance = "2.3.2"
tauri-plugin-window-state = "2.4.0"
+1
View File
@@ -1,4 +1,5 @@
fn main() {
thunk::thunk();
let mut windows = tauri_build::WindowsAttributes::new();
windows = windows.app_manifest(
r#"
+123 -103
View File
@@ -1,104 +1,124 @@
{
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "enables the default permissions",
"windows": [
"main",
"log",
"member",
"cidr",
"advance",
"tool",
"server"
],
"permissions": [
"core:default",
"core:window:allow-minimize",
"core:window:allow-unminimize",
"core:window:allow-hide",
"core:window:allow-close",
"core:window:allow-set-focus",
"core:window:allow-is-visible",
"shell:allow-open",
"core:window:allow-show",
"core:window:allow-create",
"core:window:allow-set-position",
"core:window:allow-destroy",
"core:webview:allow-create-webview-window",
"core:webview:allow-set-webview-size",
"core:webview:allow-set-webview-position",
"core:webview:allow-create-webview",
"core:webview:allow-webview-show",
"core:webview:allow-webview-hide",
"core:webview:allow-webview-close",
"core:tray:allow-get-by-id",
"core:tray:allow-set-icon",
"core:tray:allow-new",
{
"identifier": "shell:allow-spawn",
"allow": [
{
"args": [
"run"
],
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
}
]
},
{
"identifier": "shell:allow-execute",
"allow": [
{
"args": [
"run"
],
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
},
{
"args": true,
"cmd": "$RESOURCE/easytier/tool/nssm",
"name": "nssm"
},
{
"args": true,
"cmd": "explorer",
"name": "explorer"
},
{
"args": true,
"cmd": "netsh",
"name": "netsh"
},
{
"args": true,
"cmd": "ping",
"name": "ping"
}
]
},
"fs:default",
"fs:allow-read-dir",
"fs:allow-exists",
"fs:allow-open",
"fs:allow-resource-read",
"fs:allow-resource-read-recursive",
"fs:allow-resource-write",
"fs:allow-resource-write-recursive",
"clipboard-manager:allow-clear",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text",
"window-state:default",
"window-state:allow-save-window-state",
"window-state:allow-restore-state",
"cli:default",
"cli:allow-cli-matches",
"log:default",
"log:allow-log"
]
}
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "enables the default permissions",
"windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList", "storage-listener"],
"permissions": [
"core:default",
"core:window:allow-minimize",
"core:window:allow-unminimize",
"core:window:allow-hide",
"core:window:allow-close",
"core:window:allow-set-focus",
"core:window:allow-is-visible",
"shell:allow-open",
"core:window:allow-show",
"core:window:allow-create",
"core:window:allow-set-position",
"core:window:allow-destroy",
"core:webview:allow-create-webview-window",
"core:webview:allow-set-webview-size",
"core:webview:allow-set-webview-position",
"core:webview:allow-create-webview",
"core:webview:allow-webview-show",
"core:webview:allow-webview-hide",
"core:webview:allow-webview-close",
"core:tray:allow-get-by-id",
"core:tray:allow-set-icon",
"core:tray:allow-new",
"core:window:allow-set-size",
{
"identifier": "shell:allow-spawn",
"allow": [
{
"args": ["run"],
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
},
{
"args": true,
"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
"name": "ForceBindIP"
},
{
"args": true,
"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
"name": "ForceBindIP64"
}
]
},
{
"identifier": "shell:allow-execute",
"allow": [
{
"args": ["run"],
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
},
{
"args": true,
"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
"name": "ForceBindIP"
},
{
"args": true,
"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
"name": "ForceBindIP64"
},
{
"args": true,
"cmd": "$RESOURCE/easytier/tool/nssm",
"name": "nssm"
},
{
"args": true,
"cmd": "explorer",
"name": "explorer"
},
{
"args": true,
"cmd": "wf.msc",
"name": "wf.msc"
},
{
"args": true,
"cmd": "netsh",
"name": "netsh"
},
{
"args": true,
"cmd": "ping",
"name": "ping"
},
{
"args": true,
"cmd": "powershell",
"name": "powershell"
}
]
},
"fs:default",
{
"identifier": "fs:allow-read-dir",
"allow": [{ "path": "$DESKTOP" }, { "path": "$DESKTOP/*" }, { "path": "**/*" }, { "path": "**" }]
},
"fs:allow-exists",
"fs:allow-open",
"fs:allow-resource-read",
"fs:allow-resource-read-recursive",
"fs:allow-resource-write",
"fs:allow-resource-write-recursive",
"clipboard-manager:allow-clear",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text",
"window-state:default",
"window-state:allow-save-window-state",
"window-state:allow-restore-state",
"cli:default",
"cli:allow-cli-matches",
"log:default",
"log:allow-log",
"dialog:default",
"dialog:allow-open"
]
}
+29 -17
View File
@@ -4,25 +4,37 @@
"tcp",
"udp"
], // 协议类型
// easytier服务地址 - 可填写多个 方式1,逗号分隔,"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] (默认选中第一个)
"serverUrl": "public.easytier.top:11010",
"networkName": "", // 网络名
"networkPassword": "", // 网络密码
"hostname": "configTest", // 主机名
"ipv4": "10.126.126.1", // IP地址(选填,下面有dhcp)
"disableIpv6": false, // 禁用ipv6
"disbleListenner": true, // 禁用端口监听
"serverUrl": "public.easytier.top:11010",
"enableCustomListener": true,
"customListenerData": [
"tcp://0.0.0.0:11010",
"udp://0.0.0.0:11010"
],
"networkName": "", //房间名
"networkPassword": "", //房间密码
"hostname": "", //主机名
"ipv4": "", // 虚拟IP地址
"disableIpv6": false, // 禁用ipv6
"disbleListenner": false, // 禁用监听
"disableEncryption": false, // 禁用加密
"enablExitNode": false, // 启用出口节点
"noTun": false, // 禁用tun
"latencyfirst": false, // 延迟优先
"disableUdpHolePunching": false, // 禁用udp打洞
"disbleP2p": false, // 禁用p2p, 强制中转
"dhcp": false, // 动态分配IP
"devName": false, // 是否启用自定义网卡名
"devNameValue": "", // 网卡名(启用devName之后才生效)
"enableCustonProtocol": false, // 是否启用自定义协议
"customProtocol": "tcp", // 自定义协议类型
"enableNetCardMetric": false, // 自定义easytier每次生成的网卡跃点
"netCardMetricValue": 1 // 网卡跃点数量(1-9999)
"disableUdpHolePunching": false, // 禁用udp打洞
"disbleP2p": false, // 禁用p2p 强制中转
"dhcp": true, // 启用dhcp,动态获取IP
"devName": true, // 启用自定义网卡名
"devNameValue": "etgame", // 自定义网卡名
"enableCustomProtocol": true, // 自定义p2p时默认协议
"customProtocol": "tcp", // 自定义p2p时使用的协议类型
"enableNetCardMetric": true, // 启用自定义网卡跃点
"netCardMetricValue": 1, // 网卡跃点
"enablePreventSleep": false, // 启用防止睡眠
"compression": "none", // 压缩算法
"enableKcpProxy": true, // 启用kcp代理,就不能启用quic代理
"disableKcpInput": false, // 禁用kcp输入
"enableQuicProxy": false, // 启用quic代理,就不能启用kcp代理
"disableQuicInput": false, // 禁用quic输入
"privateMode": false // 启用私有模式
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+251 -47
View File
@@ -1,32 +1,107 @@
use planif::enums::TaskCreationFlags;
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};
use std::io::{BufRead, BufReader, Write};
use std::os::windows::process::CommandExt;
use std::process::{Command, Stdio};
use std::ptr;
use std::sync::mpsc;
use std::{path, thread};
use sysinfo::System;
use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
use tauri::Emitter;
use tauri::Manager;
use windows::core::{BSTR, VARIANT};
use windows::Win32::System::Variant::VARIANT;
use windows::core::{Interface, BSTR};
use windows::Win32::Foundation::VARIANT_BOOL;
use windows::Win32::NetworkManagement::IpHelper::{
GetAdaptersAddresses, GAA_FLAG_INCLUDE_PREFIX, IP_ADAPTER_ADDRESSES_LH,
};
use windows::Win32::Networking::WinSock::AF_UNSPEC;
use windows::Win32::System::Com::*;
use windows::Win32::System::TaskScheduler::*;
// use std::ffi::CStr;
use windows::Win32::System::Power::SetThreadExecutionState;
use windows::Win32::System::Power::{
ES_CONTINUOUS, ES_DISPLAY_REQUIRED, ES_SYSTEM_REQUIRED, EXECUTION_STATE,
};
use rand::Rng;
use tokio::process::Command as tokioCommand;
#[tauri::command(rename_all = "snake_case")]
fn get_network_adapter_guids() -> Vec<[String; 2]> {
let mut guids: Vec<[String; 2]> = Vec::new();
unsafe {
let mut buffer_length: u32 = 0;
let mut result = GetAdaptersAddresses(
AF_UNSPEC.0.into(),
GAA_FLAG_INCLUDE_PREFIX,
Some(ptr::null_mut()),
Some(ptr::null_mut()),
&mut buffer_length,
);
if result != 0 {
let mut buffer: Vec<u8> = vec![0; buffer_length as usize];
let adapter_addresses: *mut IP_ADAPTER_ADDRESSES_LH = buffer.as_mut_ptr() as *mut _;
result = GetAdaptersAddresses(
AF_UNSPEC.0.into(),
GAA_FLAG_INCLUDE_PREFIX,
Some(ptr::null_mut()),
Some(adapter_addresses),
&mut buffer_length,
);
if result == 0 {
let mut current_address = adapter_addresses;
while !current_address.is_null() {
let adapter = &*current_address;
let guid = adapter.AdapterName.to_string().unwrap();
let desc = adapter.Description.to_string().unwrap();
guids.push([guid, desc]);
current_address = adapter.Next;
}
} else {
log::error!("GetAdaptersAddresses failed with error");
}
} else {
log::error!("GetAdaptersAddresses failed to retrieve buffer length with error");
}
}
return guids;
}
fn generate_random_user_agent() -> String {
let user_agents = vec![
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Safari/537.36",
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/{version} Safari/605.1.15",
"Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/{version} Mobile/15E148 Safari/604.1",
"Mozilla/5.0 (Linux; Android 10; SM-G973F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Mobile Safari/537.36",
"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:{version}) Gecko/20100101 Firefox/{version}",
];
let mut rng = rand::rng();
let template = user_agents[rng.random_range(0..user_agents.len())];
// 生成随机版本号
let version_major: u8 = rng.random_range(70..90);
let version_minor: u8 = rng.random_range(0..10);
let version_patch: u8 = rng.random_range(0..10);
let version = format!("{}.{}.{}", version_major, version_minor, version_patch);
// 替换模板中的版本号占位符
template.replace("{version}", &version)
}
#[tauri::command(rename_all = "snake_case")]
fn prevent_sleep() -> bool {
unsafe {
@@ -67,11 +142,11 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
let client = Client::new();
// 构建请求的URL
let url = format!("https://api.github.com/repos/easytier/easytier/releases",);
let user_agent = generate_random_user_agent();
// 发送HTTP GET请求
let response = client
.get(&url)
.header("User-Agent", "Tauri-fetch")
.header("User-Agent", user_agent)
.send()
.await?;
// 反序列化响应体为Release列表
@@ -84,11 +159,11 @@ async fn fetch_game_releases() -> [String; 2] {
let client = Client::new();
// 构建请求的URL
let url = format!("https://api.github.com/repos/Easytier/EasytierGame/releases",);
let user_agent = generate_random_user_agent();
// 发送HTTP GET请求
if let Ok(response) = client
.get(&url)
.header("User-Agent", "Tauri-fetch")
.header("User-Agent", user_agent)
.send()
.await
{
@@ -222,7 +297,37 @@ async fn get_members_by_cli() -> String {
}
#[tauri::command(rename_all = "snake_case")]
async fn download_easytier_zip(download_url: String, file_name: String) {
async fn get_route_by_cli() -> String {
let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
match tokioCommand::new(&cli_path)
.arg("route")
.creation_flags(0x08000000)
.output()
.await
{
Ok(output) => {
if output.status.success() {
let output_str = String::from_utf8_lossy(&output.stdout);
return output_str.trim().to_string();
} else {
let output_str = String::from_utf8_lossy(&output.stderr);
log::error!("{}", output_str.trim().to_string());
return "_EasytierGameCliFailedToConnect_".to_string();
}
}
Err(_e) => {
log::error!("get route list error");
return "".to_string();
}
}
}
#[tauri::command(rename_all = "snake_case")]
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);
@@ -232,12 +337,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() {
@@ -251,11 +356,24 @@ 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);
@@ -403,18 +521,19 @@ fn stop_command(child_id: u32) {
}
#[tauri::command(rename_all = "snake_case")]
async fn fetch_easytier_list() -> Vec<Vec<[String; 3]>> {
async fn fetch_easytier_list() -> Vec<Vec<[String; 4]>> {
// 获取release列表
if let Ok(release) = fetch_releases().await {
let mut release_list = Vec::new();
let mut release_list: Vec<Vec<[String; 4]>> = Vec::new();
for re in release {
let mut assets_list = Vec::new();
let mut assets_list: Vec<[String; 4]> = Vec::new();
for asset in re.assets {
if asset.name.contains("windows-x86_64") {
assets_list.push([
re.tag_name.clone(),
asset.name.clone(),
asset.browser_download_url.clone(),
re.prerelease.to_string(),
]);
}
}
@@ -543,6 +662,50 @@ fn autostart_is_enabled() -> bool {
}
}
// 新增辅助函数
fn ensure_task_folder_and_cleanup(
task_service: &ITaskService,
folder_path: &BSTR,
task_name: &BSTR,
) -> Result<ITaskFolder, Box<dyn std::error::Error>> {
unsafe {
let root = BSTR::from("\\");
let root_folder: ITaskFolder = task_service.GetFolder(&root)?;
match task_service.GetFolder(folder_path) {
Ok(existing_folder) => {
println!("任务文件夹已存在: {}", folder_path);
// 检查并清理现有任务
if let Ok(_existing_task) = existing_folder.GetTask(task_name) {
println!("发现同名任务: {},准备删除", task_name);
match existing_folder.DeleteTask(task_name, 0) {
Ok(_) => println!("成功删除现有任务"),
Err(e) => {
log::error!("删除现有任务失败: {}", e);
// 继续执行,尝试覆盖
}
}
}
Ok(existing_folder)
}
Err(_) => {
println!("创建新的任务文件夹: {}", folder_path);
match root_folder.CreateFolder(folder_path, &VARIANT::default()) {
Ok(new_folder) => {
println!("成功创建任务文件夹");
Ok(new_folder)
}
Err(e) => {
log::error!("创建任务文件夹失败: {}", e);
Err(e.into())
}
}
}
}
}
}
// pub const AUTOSTART_ARG: &str = "--autostart";
pub const TASKAUTOSTART_ARG: &str = "--task-auto-start";
fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error>> {
@@ -577,33 +740,71 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
CoUninitialize();
}
} else {
let ts = planIfTaskScheduler::new()?;
let com = ts.get_com();
let sb = ScheduleBuilder::new(&com).unwrap();
unsafe {
let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
task_service.Connect(
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
)?;
let exe = std::env::current_exe()?;
let exe = exe.to_str().unwrap();
let folder_path = BSTR::from("\\easytierGame");
let task_name = BSTR::from("auto start");
let settings = PrincipalSettings {
display_name: "".to_string(),
group_id: None,
id: "".to_string(),
logon_type: LogonType::InteractiveToken,
run_level: RunLevel::Highest,
user_id: Some(whoami::username()),
};
sb.create_logon()
.author("heixiansen")?
.trigger("trigger", enabled)?
.action(Action::new("auto start", exe, "", &TASKAUTOSTART_ARG))?
.in_folder("easytierGame")?
.principal(settings)?
.delay(Duration {
seconds: Some(6),
..Default::default()
})?
.build()?
.register("auto start", TaskCreationFlags::CreateOrUpdate as i32)?;
let task_definition = task_service.NewTask(0)?;
// 设置任务信息
let registration_info = task_definition.RegistrationInfo()?;
registration_info.SetDescription(&BSTR::from("EasytierGame auto start task"))?;
registration_info.SetAuthor(&BSTR::from("EasytierGame"))?;
// 改为用户登录触发
let triggers = task_definition.Triggers()?;
let trigger = triggers.Create(TASK_TRIGGER_LOGON)?;
let logon_trigger: ILogonTrigger = trigger.cast()?;
logon_trigger.SetEnabled(VARIANT_BOOL::from(true))?;
// 设置动作
let actions = task_definition.Actions()?;
let action = actions.Create(TASK_ACTION_EXEC)?;
let exec_action: IExecAction = action.cast()?;
let exe = std::env::current_exe()?;
let exe_path: &str = exe.to_str().unwrap();
exec_action.SetPath(&BSTR::from(exe_path))?;
exec_action.SetArguments(&BSTR::from("--task-auto-start"))?;
// 使用当前用户运行
let principal = task_definition.Principal()?;
principal.SetUserId(&BSTR::from(whoami::username().as_str()))?;
principal.SetLogonType(TASK_LOGON_INTERACTIVE_TOKEN)?;
principal.SetRunLevel(TASK_RUNLEVEL_HIGHEST)?;
// 设置任务设置
let settings = task_definition.Settings()?;
settings.SetEnabled(VARIANT_BOOL::from(true))?;
settings.SetCompatibility(TASK_COMPATIBILITY_V2)?; // Windows 7
settings.SetStartWhenAvailable(VARIANT_BOOL::from(true))?;
// settings.SetHidden(VARIANT_BOOL::from(true))?; // 注释掉让任务可见
settings.SetExecutionTimeLimit(&BSTR::from("PT0S"))?;
settings.SetDisallowStartIfOnBatteries(VARIANT_BOOL(0))?; // 允许在电池供电时启动
// 获取文件夹并注册任务
let task_folder =
ensure_task_folder_and_cleanup(&task_service, &folder_path, &task_name)?;
let _auto_task = task_folder.RegisterTaskDefinition(
&task_name,
&task_definition,
TASK_CREATE_OR_UPDATE.0,
&VARIANT::default(),
&VARIANT::default(),
TASK_LOGON_INTERACTIVE_TOKEN,
&VARIANT::default(),
)?;
CoUninitialize();
}
}
Ok(())
}
@@ -615,6 +816,7 @@ pub fn run() {
let context = tauri::generate_context!();
tauri::Builder::default()
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_cli::init())
.plugin(
tauri_plugin_window_state::Builder::new()
@@ -650,7 +852,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,
@@ -685,12 +887,14 @@ pub fn run() {
fetch_game_releases,
download_easytier_zip,
get_members_by_cli,
get_route_by_cli,
search_pid_by_pname,
get_exe_directory,
spawn_autostart,
autostart_is_enabled,
prevent_sleep,
allow_sleep
allow_sleep,
get_network_adapter_guids
])
.run(context)
.expect("error while running tauri application");
+15 -7
View File
@@ -1,26 +1,25 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.3.1",
"version": "1.4.8",
"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.1",
"title": "easytier-game 1.4.8",
"label": "main",
"minWidth": 340,
"width": 340,
"height": 305,
"minHeight": 305,
"maxHeight": 305,
"maxWidth": 360,
"maxHeight": 405,
"maxWidth": 460,
"resizable": true,
"fullscreen": false,
"decorations": true,
@@ -31,7 +30,11 @@
}
],
"security": {
"csp": null
"csp": null,
"assetProtocol": {
"enable": true,
"scope": ["**"]
}
}
},
"plugins": {
@@ -53,13 +56,18 @@
"easytier/icons/",
"easytier/config_template.json",
"easytier/tool/WinIPBroadcast.exe",
"easytier/tool/ForceBindIP.exe",
"easytier/tool/ForceBindIP64.exe",
"easytier/tool/BindIP.dll",
"easytier/tool/BindIP64.dll",
"easytier/tool/MicrosoftEdgeWebview2Setup.exe",
"easytier/easytier-cli.exe",
"easytier/easytier-core.exe",
"easytier/Packet.dll",
"easytier/wintun.dll",
"easytier/clear_local_data.bat",
"帮助.txt"
"帮助.txt",
"uninstall.exe"
],
"windows": {
"webviewInstallMode": {
Binary file not shown.
+3 -1
View File
@@ -8,12 +8,14 @@
[如果想彻底删除easytierGame]
--
1. 关闭easytierGame
2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认,清除本地存储数据
3. 删除easytierGame文件夹
--
或者直接使用uninstall.exe
[没有服务器,怎么自建服务]
+87 -18
View File
@@ -1,41 +1,60 @@
import { defineStore } from "pinia";
export default defineStore("main", {
import { acceptHMRUpdate, defineStore } from "pinia";
const store = defineStore("main", {
state() {
return {
config: {
protocol: ["tcp", "udp"], // 网络协议
protocol: ["tcp"], // 网络协议
serverUrl: "public.easytier.top:11010",
networkName: "",
networkPassword: "",
hostname: "",
ipv4: "",
ipv6:"",
tcpWhitelistEnable: false, // tcp端口白名单
udpWhitelistEnable: false, // udp端口白名单
tcpWhitelist: "", // tcp端口白名单
udpWhitelist: "", // udp端口白名单
proxyNetworks: "", // 子网代理
autoStart: false, // 是否自动启动
connectAfterStart: false, //软件打开后,是否自动连接
disableIpv6: false, // 是否禁用IPv6
port: "11010", // 监听端口号
enableCustomListener: false, // 是否自定义监听
customListenerData: "", // 自定义监听地址
enableCustomListener: true, // 是否自定义监听
customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010", // 自定义监听地址
disbleListenner: false, // 是否禁用监听
disableEncryption: true, // 是否禁用加密
disableEncryption: false, // 是否禁用加密
multiThread: false, //使用多线程
enablExitNode: false, // 是否启用退出节点
noTun: false, // 是否使用TUN
latencyfirst: false, // 是否优先延迟
useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
disableUdpHolePunching: false, // 是否禁用UDP打洞
relayAllPeerrpc: false, // 是否启用所有对等RPC
relayAllPeerrpc: true, // 是否启用所有对等RPC
disbleP2p: false, // 是否使用P2P
dhcp: true, // 是否使用DHCP
saveErrorLog: true, // 是否保存错误日志
logLevel: "error", //日志等级
devName: false, //自定义网卡名
devNameValue: "", //自定义网卡名
enableCustonProtocol: false, //自定义默认协议
devName: true, //自定义网卡名
devNameValue: "etgame", //自定义网卡名
enableCustomProtocol: true, //自定义默认协议
customProtocol: "tcp", //自定义默认协议
enableNetCardMetric: false, //启用网卡自定义跃点
enableNetCardMetric: true, //启用网卡自定义跃点
netCardMetricValue: 1, //自定义网卡跃点值
enablePreventSleep: false, //组织系统休眠
compression: "none", //加密算法
enableKcpProxy: true, //启用kcp代理 默认开启
disableKcpInput: false, //禁用kcp输入
enableQuicProxy: false, //启用quic代理 默认开启
disableQuicInput: false, //禁用quic输入
bindDeviceEnable: false, //是否绑定设备
acceptDNS: false, //魔法dns
privateMode: false, //是否启用私有模式
enablePortForward: false, //是否启用端口转发
portForwardData: "", //端口转发数据
},
serverConfig: {
enableWhiteList: true, // 是否启用白名单
@@ -43,19 +62,32 @@ export default defineStore("main", {
serverWhiteList: "", // 服务器流量转发白名单
// enableListener: true, // 是否启用监听
autoStart: false, //随软件自启
port: "11010" // 服务器端口
port: "11010", // 服务器端口
privateMode: false, //是否启用私有模式
privateNetworkName: "", // 私有模式房间名
privateNetworkPassword: "", // 私有模式密码
},
cidrEnable: false,
basePeers: ["public.easytier.top:11010"],
proxyForwardBySystem: false, // 是否通过系统内核转发子网代理数据包,禁用内置NAT
basePeers: ["public.easytier.top:11010", "public.easytier.net:11010"],
theme: false, //主题 false light true dark
configStartEnable: false, //使用配置文件启动
configPath: "", //配置文件路径
winIpBcAutoStart: true,
createConfigInEasytier: false, //在easytier目录生成config.json文件吗
githubFastUrl: "https://ghproxy.cc/",
githubFastUrl: "https://ghfast.top/",
// forceBindIp配置
forceBindIpBit: "64",
delayInjectDll: false,
forceBindInput: "",
forceBindFile: "",
winipBcPid: 0,
winipBcStart: false
winipBcStart: false,
latestTagName: "",
gameList: [] as Array<{ name: string; exePath: string; id: string; coverImg?: string; showImg: string }> // 游戏列表
};
},
persist: {
@@ -67,11 +99,11 @@ export default defineStore("main", {
"config.networkPassword",
"config.hostname",
"config.ipv4",
"config.ipv6",
"config.proxyNetworks",
"config.autoStart",
"config.connectAfterStart",
"config.disableIpv6",
"config.disbleListenner",
"config.disableEncryption",
"config.multiThread",
"config.enablExitNode",
@@ -89,11 +121,34 @@ export default defineStore("main", {
"config.enableNetCardMetric",
"config.netCardMetricValue",
"config.port",
"config.tcpWhitelist",
"config.udpWhitelist",
"config.tcpWhitelistEnable",
"config.udpWhitelistEnable",
"config.enablePortForward",
"config.portForwardData",
"config.disbleListenner",
"config.enableCustomListener",
"config.customListenerData",
"config.enableCustonProtocol",
"config.enableCustomProtocol",
"config.customProtocol",
"config.enablePreventSleep",
"config.compression",
"config.enableKcpProxy",
"config.disableKcpInput",
"config.enableQuicProxy",
"config.disableQuicInput",
"config.bindDeviceEnable",
"config.acceptDNS",
"config.privateMode",
"serverConfig.autoStart",
// 'serverConfig.enableListener',
@@ -101,17 +156,31 @@ export default defineStore("main", {
"serverConfig.relayAllPeerrpc",
"serverConfig.serverWhiteList",
"serverConfig.port",
"serverConfig.privateMode",
"serverConfig.privateNetworkName",
"serverConfig.privateNetworkPassword",
"cidrEnable",
"proxyForwardBySystem",
"basePeers",
"theme",
"configStartEnable",
"configPath",
"winIpBcAutoStart",
"createConfigInEasytier",
"githubFastUrl"
"githubFastUrl",
"forceBindIpBit",
"delayInjectDll",
"forceBindInput",
"forceBindFile",
"latestTagName",
"gameList"
]
// // 除了这些,其他都要存下来
// omit: ["winipBcPid", "winipBcStart"]
}
});
if (import.meta.hot) import.meta.hot.accept(acceptHMRUpdate(store, import.meta.hot));
export default store;
+3 -3
View File
@@ -1,8 +1,8 @@
/** @type {import('tailwindcss').Config} */
/** @type {import('tailwindcss/plugin')} */
const plugin = require("tailwindcss/plugin");
module.exports = {
import plugin from "tailwindcss/plugin"
// const plugin = require("tailwindcss/plugin");
export default {
content: ["./components/**/*.{js,vue,ts}", "./layouts/**/*.vue", "./pages/**/*.vue", "./plugins/**/*.{js,ts}", "./app.vue", "./error.vue"],
theme: {
extend: {}
+4
View File
@@ -1,6 +1,10 @@
interface ImportMetaEnv {
readonly VITE_CONFIG_PATH: string;
readonly VITE_CONFIG_FILE_NAME: string;
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 {
+7 -5
View File
@@ -1,10 +1,10 @@
import { ElMessageBox } from "element-plus";
import { ATJ } from "./index";
import { h, type VNode } from "vue";
type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null }
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,15 +76,16 @@ export const ElConfirmSucces = (
export const ElConfirmPrimary = (
content: string,
title: string,
title: string = "提示",
opt: Opt = {
action: "",
confirmButtonText: "确定",
cancelButtonText: "取消",
showCancelButton: true,
VNode: null
}
): Promise<any | [any, any]> => {
const { action = "", confirmButtonText = "确定", cancelButtonText = "取消", VNode = null } = opt;
const { action = "", confirmButtonText = "确定", cancelButtonText = "取消", VNode = null, showCancelButton = true } = opt;
const formatContentArr = content.split("{action}");
const action_length = formatContentArr.length - 1;
const messageArr = [];
@@ -103,6 +104,7 @@ export const ElConfirmPrimary = (
ElMessageBox.confirm(message, title, {
closeOnClickModal: false, // 点击遮罩层不关闭弹窗
closeOnPressEscape: false, // 按下Esc键不关闭弹窗
showCancelButton,
cancelButtonText,
confirmButtonText,
confirmButtonClass: "el-button--primary"
+41 -13
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];
@@ -65,29 +67,30 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
});
};
const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
const _supportProtocols = ["tcp", "udp", "ws", "wss"];
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 = () => {
export const stopPreventSleep = async () => {
_prevent_timer && clearInterval(_prevent_timer);
_prevent_timer = null;
}
const _result = await invoke("allow_sleep");
};
export const parsePeerInfo = (content: string) => {
if(!content) return [];
export const parseCliInfo = (content: string) => {
if (!content) return [];
// 将表格字符串分割成行
const lines = content.split("\n");
@@ -95,7 +98,7 @@ export const parsePeerInfo = (content: string) => {
const headers = lines[1]
.split("│")
.slice(1, -1)
.map((h) => h.trim());
.map(h => h.trim());
// 初始化结果数组
const result: any[] = [];
@@ -108,7 +111,7 @@ export const parsePeerInfo = (content: string) => {
const values = lines[i]
.split("│")
.slice(1, -1)
.map((v) => v.trim());
.map(v => v.trim());
// 创建对象并添加到结果数组
const obj: any = {};
@@ -123,6 +126,20 @@ export const parsePeerInfo = (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");
};
@@ -133,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("复制失败");
}
};
-17
View File
@@ -1,5 +1,4 @@
import useMainStore from "@/stores/index";
import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
import { open, Command } from "@tauri-apps/plugin-shell";
import { invoke } from "@tauri-apps/api/core";
@@ -52,19 +51,3 @@ const handleAutoStartByNssm = async () => {
}
}
};
// 兼容autostart插件
const compatibleAutoStart = async () => {
const config = useMainStore().config;
const is_enable = await tauriAutoStart.isEnabled();
if (is_enable) {
try {
await tauriAutoStart.disable();
config.autoStart = false;
} catch (err) {
// ElMessage.error(`取消自启失败`);
}
}
const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
console.log(serverStatus);
};
Binary file not shown.
+6 -4
View File
@@ -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();