Compare commits

...
129 Commits
Author SHA1 Message Date
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
leizi97 e977c633d6 1.3.1发布 2024-12-17 22:44:02 +08:00
黑先森 3cbfae072c 增加easytierGame发布新版的提示 2024-12-17 17:48:11 +08:00
黑先森 9b856f31af 优化与修复
+ 点击托盘只显示窗口,优化显示窗口逻辑,修复无法显示到最上层的问题
+ 防止休眠代码优化,修复防止休眠选中后没保存的问题
2024-12-17 15:50:27 +08:00
黑先森 7d6e93d796 增加 防止系统休眠 功能 修复winipboadcast关闭后再次打开又启动的bug,优化成员列表字体大小和布局 2024-12-04 18:13:55 +08:00
黑先森 0253d95597 Merge branch 'dev_1.2.9' 2024-12-03 19:00:26 +08:00
黑先森 a2be6ebe86 全局状态同步,修复winipbroadcast无法停止的bug 2024-12-03 18:39:37 +08:00
黑先森 b94d5de463 优化多个界面的数据同步问题,增加功能,修复bug
高级选项-增加默认协议配置
高级选项-增加自定义监听相关配置
修复创建子窗口多次触发监听的问题
config.json增加对自定义协议配置
优化高级选项文本说明
2024-12-03 18:07:42 +08:00
黑先森 e8b82007c2 不再兼容原autostart库-移除autostart库
将开机自启检测使用plugins-cli进行判断
修复创建窗口后多次触发监听的情况
2024-12-03 16:08:59 +08:00
黑先森 5d11f39855 修复使用配置文件启动无法获取IP的问题 2024-12-02 17:24:33 +08:00
黑先森 5875b30c34 增加 prettier 包 2024-12-02 14:49:46 +08:00
黑先森 3aa90dbb67 once改为listen修复日志监听无法触发的bug 增加输入框右键菜单 增加成员列表接收和传输的字符大小 优化成员列表nat_type为中文 修复ipv4无法显示的问题 2024-11-30 15:16:40 +08:00
黑先森 02b53098e8 内核管理增加 打开内核缓存目录按钮 2024-11-28 11:43:05 +08:00
黑先森 c9fcc40ee3 修复弹窗点击空白区域关闭的问题 2024-11-28 11:00:41 +08:00
黑先森 5e418bd6e5 修复断开连接后成员列表界面卡死的情况 2024-11-28 10:59:10 +08:00
黑先森 779f5cecf1 更新 readme 2024-11-27 20:01:57 +08:00
黑先森 8373efa3ba 增加内核管理判断 2024-11-27 19:54:43 +08:00
黑先森 73ae6b90db 内核管理下载的内核保存于easytier/cache目录,下次切换不用下载 2024-11-27 19:47:38 +08:00
黑先森 55c6e49d4a 自建服务器单独重写,成员列表新增断开连接判断,联机增加断开联机的检测 2024-11-27 19:24:19 +08:00
黑先森 5fc931f94e 自建服务器功能重写: 基础配置 2024-11-26 18:17:19 +08:00
黑先森 8120b65c9b 增加处于联机状态切换自建服务器时的确认
+ 升级vue -> 3.5.13
+ 升级nuxt -> 3.14.1592
2024-11-26 17:46:31 +08:00
黑先森 7af0683775 帮助文档外移至easytier-game.exe同级 2024-11-25 16:08:54 +08:00
黑先森 4191a0a12d 增加生成release包的方法 2024-11-25 15:53:42 +08:00
黑先森 66d8bff8b4 修复打印日志config,修复配置文件启动权重不是最高权重的bug 2024-11-25 15:23:21 +08:00
黑先森 c740039325 更新readme 2024-11-25 14:42:52 +08:00
黑先森 589511e356 新增自建服务器功能,修复优化部分文本,成员列表新增通道协议显示 2024-11-25 14:30:18 +08:00
黑先森 c2d060b202 更新readme 直接使用群号 2024-11-22 18:03:44 +08:00
黑先森 d2cd72fed9 增加部分头像和群图,更新readme 2024-11-22 11:55:39 +08:00
leizi97 efee636180 增加tooltip文本提示 2024-11-21 23:43:51 +08:00
leizi97 4e3f1cbd89 系统托盘增加联机和断开的切换 2024-11-21 23:37:24 +08:00
黑先森 c23191fe45 修复开机自启搭配配置文件方式启动 出现的找不到文件路径问题,并增加配置文件启动相关判断 2024-11-21 18:17:34 +08:00
leizi97 0776b074d2 文档更新 2024-11-20 22:45:07 +08:00
leizi97 cdd3fada1f 新增内核管理模块,可切换easytier内核版本,优化帮助和清除数据提示 2024-11-20 22:36:33 +08:00
黑先森 fe785f6066 增加easytierGame帮助文档,包括删除和打不开界面解决方案 2024-11-20 20:26:23 +08:00
黑先森 37fd7b6fb0 修复一些文本说明,增加清除easytierGame数据的bat,可用于完全卸载easytierGame 2024-11-20 12:09:07 +08:00
leizi97 096d5f03da 增加nat类型显示 2024-11-17 22:09:32 +08:00
leizi97 1813240378 增加gui日志,修复config.json无效的问题,修复下载内核失败一直加载的问题 2024-11-17 21:52:49 +08:00
黑先森 2d4a44740a 增加窗口保存需要的权限,修改启动自动联机错误的英文拼写 2024-11-15 17:25:14 +08:00
黑先森 f0633761a0 保存窗口的大小状态,优化成员列表显示,开机自启隐藏于托盘,服务器地址输入支持带协议 [protocol]:// 2024-11-15 16:22:21 +08:00
leizi97 4bedec63ca 开机自启功能修复完成 2024-11-15 00:13:49 +08:00
黑先森 ab67ba94a3 config.json存储优化,新增设置网卡跃点功能,以及其他bug修复
- 修复服务器地址过长导致无法删除地址的问题
- 新增设置网卡跃点功能
- 优化config.json serverUrl的输入格式,可数组或字符串逗号分隔
2024-11-14 14:57:42 +08:00
黑先森 8e6f8d602e readme修改 2024-11-13 16:50:53 +08:00
黑先森 92d25ab907 新增生成config.json界面基础配置的高级选项 2024-11-13 16:42:55 +08:00
黑先森 1c8314c6fa 更新pinia插件的使用 2024-11-12 20:23:45 +08:00
黑先森 b352d49e0b manage package 开发环境和生成环境正常运行
remove defu dayjs xlsx @pinia-plugin-persistedstate/nuxt vue qs @types/qs
add pinia-plugin-persistedstate
update nuxt pinia element-plus(/nuxt)  @vitejs/plugin-vue-jsx
修改nuxt.config.ts配置
2024-11-12 18:26:32 +08:00
黑先森 44183b1ad2 升级tauri为2.1.1 2024-11-12 15:40:48 +08:00
黑先森 fe1bc6f89e 增加ping的延迟1秒一次 2024-11-12 14:18:55 +08:00
黑先森 be59e56bd1 fix: 修复分享配置有中文无法分享的问题 2024-11-12 12:12:35 +08:00
黑先森 f556e17f85 固定窗口高度 2024-11-12 11:21:03 +08:00
黑先森 c7170967ec 给予一定的宽度可变调整 2024-11-12 11:04:21 +08:00
黑先森 1801082601 修复与优化
- 没有自动保存配置文件启动的bug
- 修复配置文件启动无法打开成员列表的bug
- 修复动态ipv4获取后,没有正确赋值到界面上的bug
- 增加使用配置文件启动时的提示
2024-11-11 18:19:28 +08:00
黑先森 189f3467c3 Merge branch 'dev_1.1.5'
# Conflicts:
#	README.md
2024-11-11 16:56:48 +08:00
黑先森 bf1403bf07 修复winIp无法自启的bug 2024-11-11 16:50:18 +08:00
黑先森 7a181200f3 增加下载内核的提示 2024-11-11 16:28:23 +08:00
黑先森 9413449c8e 合并 内核外工具 到 增强工具窗口, 新增防火墙关闭 跃点修改 ping测试功能 2024-11-11 16:01:41 +08:00
黑先森 2eb69352f7 优化readme 2024-11-08 12:17:38 +08:00
黑先森 9ea0eea0ac Merge branch 'dev_1.1.4' 2024-11-05 18:30:29 +08:00
黑先森 ef172e4d4c 增加base64编码分享和导入 界面配置 #1
优化是否联机成功的判断,优化本地存储日志数量
2024-11-05 18:30:08 +08:00
leizi97 c572925a0d Merge branch 'dev_1.1.3' 2024-11-04 22:46:28 +08:00
leizi97 1a5d2cc8fc 托盘图标增加主题切换功能,调整成员列表延迟至前方,增加nat类型查看,修复自定义网卡无法保存信息的问题 2024-11-04 22:38:53 +08:00
leizi97 e4fbaa921c Merge branch 'dev_1.1.2' 2024-11-04 21:29:29 +08:00
leizi97 cf351b8708 增加根据windows主题切换主题颜色的功能,优化高级配置界面显示,增加网卡名称配置 2024-11-04 21:23:20 +08:00
leizi97 ddf4c32ae6 主题颜色跟随window进行切换 2024-11-04 01:05:51 +08:00
leizi97 76d29cbeeb Merge branch 'dev_1.1.1' 2024-11-03 23:13:43 +08:00
leizi97 3adf64e251 增加标题版本号,系统托盘按钮顺序切换 2024-11-03 23:09:13 +08:00
leizi97 4e4ebf1246 UAC开机自启版本回退 2024-11-03 22:17:59 +08:00
leizi97 6f57a866a4 Merge branch 'dev_1.1.0' 2024-11-03 22:09:58 +08:00
黑先森 4296f4a338 修复与功能更新
1.解决UAC开机自启失败的问题
2.联机成功后右下角图标增加 ip地址的 tooltip提示
3.高级选项: 新增软件启动自动联机的功能开关,搭配修复后的开机自启功能,可实现类windows服务的无感联机
4.高级选项:增加日志配置
2024-11-01 18:36:56 +08:00
leizi97 fe9f1c01b7 Merge branch 'dev_1.0.9' 2024-10-29 23:32:48 +08:00
leizi97 60078f00f7 增加宽度,减少间隔,避免个别电脑出现布局错误 2024-10-29 23:31:11 +08:00
leizi97 43d681e888 Merge branch 'dev_1.0.9' 2024-10-29 22:51:34 +08:00
leizi97 d0567e96b5 新增配置文件启动,修复部分文本缺失 2024-10-29 22:48:56 +08:00
黑先森 d402f107b0 Merge branch 'dev_1.0.8' 2024-10-25 18:42:52 +08:00
黑先森 8c911f47f9 优化日志输出和提示 成员列表显示bug修复 优化打包后的目录结构,清爽干净 2024-10-25 18:40:47 +08:00
leizi97 74fbfed7be Merge branch 'dev_1.0.7' 2024-10-23 22:04:58 +08:00
leizi97 f3fc37957c 增加子网代理和部分高级配置功能 升级tauri到2.0.6 2024-10-23 21:58:36 +08:00
黑先森 a4d6fe6e95 封装二级弹窗方法,新增子网代理和高级配置按钮,新增子网代理页面 2024-10-23 18:37:11 +08:00
黑先森 9b883d686d 优化界面css,增加部分页面autostart权限
-- 更新 element-plus 2.7.1 -> 2.8.6 并修复升级后的问题
-- 升级autostart插件为2.0.1 win10测试开机自启成功
2024-10-22 19:09:45 +08:00
黑先森 2ac0afb847 插件版本更新,rust打包使用1.77.2,支持win7 2024-10-21 10:51:16 +08:00
黑先森 5b9eed9520 Merge branch 'dev_1.0.6' 2024-10-17 19:35:37 +08:00
黑先森 a04fae725d #improvement 联机成功后右下角角标增加绿点,优化二级窗口创建逻辑修复控制台报错,增加开机自启功能,禁用p2p默认改为不禁用 2024-10-17 19:30:05 +08:00
黑先森andGitHub 1ae122ab2a Update README.md 2024-10-16 17:41:44 +08:00
黑先森 3db962f3dc #improvement 增加说明图 2024-10-16 17:35:24 +08:00
黑先森 a7f1292067 Merge branch 'dev_1.0.5' 2024-10-16 17:22:00 +08:00
黑先森 3150878dbd #Fix 紧急修复日志无法打开的问题 2024-10-16 17:21:49 +08:00
黑先森 022e71de01 Merge branch 'dev_1.0.5' 2024-10-16 16:41:30 +08:00
黑先森 0467074eec #Fix 内置WinIPBroadcast默认开启,成员列表显示优化 1.0.5发布 2024-10-16 16:33:45 +08:00
黑先森 2e598ac026 优化成员列表表头为中文,修复日志接收失败的问题 2024-10-16 11:18:10 +08:00
黑先森 5350af87ed Merge branch 'dev_1.0.4' 2024-10-16 09:52:35 +08:00
luoleixin 4bb1216a07 增加日志窗口,增加成员弹窗,优化按钮和布局,增加仓库地址,增加license,优化退出代码,退出时停止子进程,屏蔽右键菜单 2024-10-15 20:49:23 +08:00
leizi97 5d6b7bdf13 Merge branch 'main' of https://github.com/EasyTier/EasytierGame 2024-10-13 21:37:27 +08:00
黑先森andGitHub 5740bd08c1 Update README.md 2024-10-13 21:28:41 +08:00
84 changed files with 10656 additions and 5641 deletions
+4
View File
@@ -10,3 +10,7 @@ dist
.idea .idea
.vscode .vscode
release release
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
+23
View File
@@ -0,0 +1,23 @@
{
"plugins": ["prettier-plugin-tailwindcss"],
"arrowParens": "avoid",
"bracketSpacing": true,
"endOfLine": "lf",
"htmlWhitespaceSensitivity": "ignore",
"insertPragma": false,
"singleAttributePerLine": true,
"bracketSameLine": false,
"jsxBracketSameLine": false,
"jsxSingleQuote": true,
"printWidth": 150,
"proseWrap": "preserve",
"quoteProps": "as-needed",
"requirePragma": false,
"semi": true,
"singleQuote": false,
"tabWidth": 4,
"trailingComma": "none",
"useTabs": true,
"embeddedLanguageFormatting": "auto",
"vueIndentScriptAndStyle": true
}
+73
View File
@@ -0,0 +1,73 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
(a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
Copyright 2023 sunsijie
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+83 -8
View File
@@ -1,10 +1,85 @@
# EasyiterGame # [EasyTier游戏联机启动器](https://github.com/EasyTier/EasytierGame)
基于easytier的简易游戏联机客户端
1. 开发环境如何运行 ## 简介
拉取仓库,使用命令行 pnpm install 安装包
安装完成后, 使用 pnpm tauri dev 进行rust编译 等待启动 EasyTierGame游戏联机启动器,由`nuxt3` `typescript` `rust` `tauri` 开发
具有简易的界面,附带最新版easytier内核,联机游玩的时候无论是心理上和使用上都能给予您最舒服的体验,同时支持自定义配置文件启动,满足各种需求
## 下载
Github
Releases [https://github.com/EasyTier/EasytierGame/releases](https://github.com/EasyTier/EasytierGame/releases)
- 只有绿色zip包,个人不喜欢安装包各种写注册表,解压即用就行,目录清爽干净
![game-step1](/assets/game-step1.png)
## 使用教程
- 第一次使用,输入一个“主机名”点击启动联机即可,后续可以自建服务器或者使用爱心群友提供的服务器
![game-step2](/assets/game-step2.png)
![game-step3](/assets/game-step3.png)
- 高级选项里有一些特殊配置,可以自行选择
![game-step4](/assets/game-step4.png)
- 如果还是无法满足您的需求,可以使用配置文件进行启动,具体如何配置,可以查看文档[配置文件](/guide/network/config-file.html)
![game-step5](/assets/game-step5.png)
- easytier内核升级后,可以点击内核管理按钮就可以进行内核切换和更新,但是需要出国或者github加速链接,如果无法更新,可以在群里获取
- 1.2.6内核管理下载的内核 保存于easytier/cache目录,下次切换不用二次下载
![game-step6](/assets/game-step6.png)
- 1.1.4更新了 配置分享功能 可以与朋友之间分享配置,方便联机
![game-step7](/assets/game-step7.png)
- 1.1.5 合并额外插件于 "增强工具" 窗口 新增了网卡跃点设置 关闭防火墙功能 ping功能
![game-step8](/assets/game-step8.png)
![game-step9](/assets/game-step9.png)
- 1.1.8 新增了 生成 easytier/config.json 的功能 会将一部分配置写入到 config.json 文件中,方便用户自定义配置,你可以在高级设置里启用和关闭这个功能(默认关闭)
**需要注意的是,如果config.json存在,每次启动easytierGame默认按照config.json的配置为准**
**解压zip后你可以查看 easytier/config_template.json 里的注释进行配置**
![game-step10](/assets/game-step10.png)
- 1.2.3新增了帮助.txt 位于“easytier/帮助.txt" 内含 无法打开界面和卸载EasytierGame的办法,新增 "easytier/clear_local_data.bat" 用于清除easytierGame的本地缓存数据(需要管理员模式运行)
![game-step11](/assets/game-step11.png)
- 1.2.5新增 自建服务器功能,可以自行搭建服务器,但是需要一些网络知识,具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html)
![game-step12](/assets/game-step12.png)
- 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组网工具开发,界面清晰简单
- 自带“更新”按钮,在easytier组网工具发布新版本时,点击更新即可(需要出国工具)
- 第一次使用,输入一个“主机名”点击启动联机即可,后续可以自建服务器或者使用群友的服务器
- 配置简单,也含有高级功能,同时也支持自定义配置文件启动
- 默认开启 **WinIPBroadcast** 不再怕联机找不到房间(例如:无主之地3)
- 已经测试 **艾尔登法环学习版**,**无主之地3**,**深岩银河**,**怪物猎人世界** 等都可稳定联机游玩
## 系统支持
支持Windows 11 、Windows 10 、 Windows 7
## 群聊交流
- 主群 EasyTier 支持
### 949700262
- EasyTier游戏联机交流群
### 596667137
## 请不要将本程序和仓库代码用于任何违法用途,由此产生的一切后果,仓库所有者和参与开发的人员不承担任何责任
2. 生产环境发布
执行 pnpm tauri build
产物位于 src-tauri/target/release 下 easytier-game.exe
+29
View File
@@ -4,4 +4,33 @@
</NuxtLayout> </NuxtLayout>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import useMainStore from "@/stores/index";
import { initTheme } from "@/composables/theme";
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 => {
original(message);
try {
if (typeof message === "string") {
logger(message);
} else {
logger(JSON.stringify(message));
}
} catch (e) {
logger(`${message}`);
}
};
}
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)
initTheme(mainStore.theme);
</script> </script>
+43 -12
View File
@@ -1,15 +1,17 @@
@tailwind base; /* @tailwind base; */
/* /*
用于进行主题更换,如果要更换elemenet-plus-ui的主题记得加上!important,不然更换会失败 用于进行主题更换,如果要更换elemenet-plus-ui的主题记得加上!important,不然更换会失败
*/ */
@layer base { /* @layer base {
html { html {
font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", STHeiti, "Microsoft YaHei"; font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", STHeiti, "Microsoft YaHei";
} }
} */
html {
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
} }
html, html,
body { body {
height: 100%; height: 100%;
@@ -19,25 +21,54 @@ body {
* { * {
outline: none; outline: none;
} }
body {
background-color: #fff;
}
html.dark body {
background-color: #000;
}
#__easytier { #__easytier {
display: flex;
flex-direction: column;
flex-wrap: nowrap;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
background-color: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 3px 5px; padding: 3px 5px;
} }
::-webkit-scrollbar { .full-label .el-form-item__label {
width: 6px; width: 100%;
padding-right: 0;
} }
::-webkit-scrollbar-thumb { .full-content .el-form-item__content {
background-color: #0003; /* height: 100%; */
border-radius: 10px; align-items: flex-start;
transition: all 0.2s ease-in-out; overflow: auto;
flex: 1;
} }
::-webkit-scrollbar-track { .el-table {
border-radius: 10px; 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: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

+12
View File
@@ -0,0 +1,12 @@
pnpm run build
rustup default nightly
rem 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
pnpm tauri build -- -Z build-std --target x86_64-win7-windows-msvc
rustup default stable
pnpm tauri build
pnpm run release
pnpm run release-win7
+3
View File
@@ -0,0 +1,3 @@
<template>
<ElTag size="small" type="danger">内核 >= {{ $attrs.version }}</ElTag>
</template>
+47
View File
@@ -0,0 +1,47 @@
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) => {
const mainStore = useMainStore();
const path = import.meta.env.VITE_CONFIG_FILE_NAME;
if (isNil(configJsonSeverUrl)) {
configJsonSeverUrl = [];
}
const isArray = Array.isArray(configJsonSeverUrl);
const isString = typeof configJsonSeverUrl === "string";
try {
const {
proxyNetworks,
autoStart,
connectAfterStart,
saveErrorLog,
serverUrl,
enableCustomListener,
customListenerData,
...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),
mainStore.basePeers
);
}
if (isString && configJsonSeverUrl) {
writeServerUrl = intersection(
uniq([serverUrl, ...(configJsonSeverUrl as string).split(",")]).filter(boolean => boolean),
mainStore.basePeers
).join(",");
}
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;
}
};
+60
View File
@@ -0,0 +1,60 @@
import { invoke } from "@tauri-apps/api/core";
import { Command } from "@tauri-apps/plugin-shell";
import { ElMessage, type TabPaneName } from "element-plus";
import useMainStore from "@/stores/index";
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)
});
};
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
});
}
}
};
export const initStartWinIpBroadcast = async () => {
const mainStore = useMainStore();
await getWinIpBroadcastPid();
// console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
await handleWinipBcStart();
}
};
+24
View File
@@ -0,0 +1,24 @@
import useMainStore from "@/stores/index";
export const getServerArgs = () => {
const mainStore = useMainStore();
const args = [];
if (!mainStore.serverConfig.port) {
mainStore.serverConfig.port = "11010";
}
args.push("-l", mainStore.serverConfig.port);
if (mainStore.serverConfig.relayAllPeerrpc) {
args.push("--relay-all-peer-rpc");
}
const whiteList = mainStore.serverConfig.serverWhiteList
.trim()
.split("\n")
.map(el => el.trim())
.filter(el => el)
if (whiteList && mainStore.serverConfig.enableWhiteList) {
args.push("--relay-network-whitelist", ...whiteList);
}
if (!whiteList && mainStore.serverConfig.enableWhiteList) {
args.push("--relay-network-whitelist");
}
return args;
};
+21
View File
@@ -0,0 +1,21 @@
import { useDark, useToggle, usePreferredDark } from "@vueuse/core";
import { isFunction } from "lodash-es";
// const isDark = usePreferredDark();
const darkConfig = useDark({
selector: "html",
attribute: "class",
valueDark: "dark",
valueLight: "",
});
const toggleDark = useToggle(darkConfig);
export const initTheme = (isDark: boolean) => {
if (isDark && isFunction(toggleDark)) {
toggleDark(isDark);
}
};
export const setTheme = (dark: boolean) => {
if (isFunction(toggleDark)) {
toggleDark(dark);
}
}
+154 -84
View File
@@ -1,105 +1,175 @@
import { Menu, MenuItem, PredefinedMenuItem } from '@tauri-apps/api/menu' import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
import { TrayIcon } from '@tauri-apps/api/tray' import { TrayIcon } from "@tauri-apps/api/tray";
import { getCurrentWindow } from '@tauri-apps/api/window' import { getCurrentWindow } from "@tauri-apps/api/window";
import pkg from '@/package.json' import pkg from "@/package.json";
import { setTheme } from "~/composables/theme";
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 { computed } from "vue";
const DEFAULT_TRAY_NAME = 'main' const DEFAULT_TRAY_NAME = "main";
async function toggleVisibility() { async function toggleVisibility() {
if (await getCurrentWindow().isVisible()) { if (await getCurrentWindow().isVisible()) {
await getCurrentWindow().hide() await getCurrentWindow().hide();
} } else {
else { await getCurrentWindow().show();
await getCurrentWindow().show() await getCurrentWindow().unminimize();
await getCurrentWindow().setFocus() await getCurrentWindow().setFocus();
} }
} }
export async function useTray(init: boolean = false) { export async function useTray(init: boolean = false, beforExit: Function, handleConnection: Function) {
let tray let tray;
try { try {
tray = await TrayIcon.getById(DEFAULT_TRAY_NAME) tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
if (!tray) { if (!tray) {
tray = await TrayIcon.new({ tray = await TrayIcon.new({
tooltip: `EasyTier\n${pkg.version}`, tooltip: `EasyTierGame\n${pkg.version}`,
title: `EasyTier\n${pkg.version}`, title: `EasyTierGame\n${pkg.version}`,
id: DEFAULT_TRAY_NAME, id: DEFAULT_TRAY_NAME,
menu: await Menu.new({ menu: await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }),
id: 'main', action: async e => {
items: await generateMenuItem(), toggleVisibility();
}), }
action: async () => { });
toggleVisibility() }
}, } catch (error) {
}) console.error("Error while creating tray icon:", error);
} return null;
} }
catch (error) {
console.warn('Error while creating tray icon:', error)
return null
}
if (init) { if (init) {
tray.setTooltip(`EasyTier\n${pkg.version}`) tray.setTooltip(`EasyTierGame\n${pkg.version}`);
tray.setMenuOnLeftClick(false) tray.setShowMenuOnLeftClick(false);
tray.setMenu(await Menu.new({ tray.setMenu(await Menu.new({ id: "main", items: await generateMenuItem(beforExit, handleConnection) }));
id: 'main', }
items: await generateMenuItem(),
}))
}
return tray return tray;
} }
export async function generateMenuItem() { export async function generateMenuItem(beforExit: Function, handleConnection: Function) {
return [ return [
await MenuItemExit('Exit'), await MenuItemShow("显示 / 隐藏"),
await PredefinedMenuItem.new({ item: 'Separator' }), await MenuItemExchangeConnection("联机 / 断开", handleConnection),
await MenuItemShow('Show / Hide'), await MenuItemTheme(),
] await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemPublicPeers(),
await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemExit("退出", beforExit)
];
} }
export async function MenuItemExit(text: string) { export async function MenuItemExit(text: string, beforExit: Function) {
return await PredefinedMenuItem.new({ return await MenuItem.new({
text, id: "quit",
item: 'Quit', text,
}) action: async () => {
if (beforExit) {
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);
}
});
} }
export async function MenuItemShow(text: string) { export async function MenuItemShow(text: string) {
return await MenuItem.new({ return await MenuItem.new({
id: 'show', id: "show",
text, text,
action: async () => { action: async () => {
await toggleVisibility() await toggleVisibility();
}, }
}) });
} }
export async function setTrayMenu(items: (MenuItem | PredefinedMenuItem)[] | undefined = undefined) { export async function MenuItemExchangeConnection(text: string, handleConnection: Function) {
const tray = await useTray() const menutItem = await MenuItem.new({
if (!tray) id: "exchangeConnection",
return text,
const menu = await Menu.new({ action: async () => {
id: 'main', const isStart = await handleConnection();
items: items || await generateMenuItem(), }
}) });
tray.setMenu(menu) return menutItem;
} }
export async function setTrayRunState(isRunning: boolean = false) { export async function MenuItemTheme() {
const tray = await useTray() return await MenuItem.new({
if (!tray) id: "theme",
return text: "主题切换",
tray.setIcon(isRunning ? 'icons/icon-inactive.ico' : 'icons/icon.ico') action: async () => {
const mainStore = useMainStore();
mainStore.$patch({ theme: !mainStore.theme });
// mainStore.$persist();
await setTheme(mainStore.theme);
}
});
} }
export async function setTrayTooltip(tooltip: string) { // export async function setTrayMenu(items: (MenuItem | PredefinedMenuItem)[] | undefined = undefined) {
if (tooltip) { // // const tray = await useTray()
const tray = await useTray() // const tray = await TrayIcon.getById(DEFAULT_TRAY_NAME)
if (!tray) // if (!tray)
return // return
tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`) // const menu = await Menu.new({
tray.setTitle(`EasyTier\n${pkg.version}\n${tooltip}`) // id: 'main',
} // items: items || await generateMenuItem(),
// })
// tray.setMenu(menu)
// }
export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean = false) {
if (!tray) return;
const resourceDir = await getResourceDir();
const path = await join(resourceDir, isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico");
// "easytier/icons/icon-inactive.ico", { baseDir: BaseDirectory.Resource }
await tray.setIcon(path);
} }
export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) {
if (!tray) return;
if (tooltip) {
await tray.setTooltip(`EasyTierGame\n${pkg.version}\n${tooltip}`);
} else {
await tray.setTooltip(`EasyTierGame\n${pkg.version}`);
}
}
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");
mainStore.latestTagName = tagName;
};
export const hasNewVersion = computed<boolean>(() => {
const mainStore = useMainStore();
return !!mainStore.latestTagName && versionDifference(pkg.version, mainStore.latestTagName) < 0 ;
});
+82
View File
@@ -0,0 +1,82 @@
import { type UnlistenFn } from "@tauri-apps/api/event";
import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } 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";
const _listenersMaps: { [key: string]: [UnlistenFn | null, UnlistenFn | null] } = {};
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;
let dialog = await WebviewWindow.getByLabel(label);
if (!dialog) {
let defaultOpts: { [key: string]: any; parent: Window | undefined } = {
parent: undefined,
closable: true,
resizable: true,
decorations: true,
maximizable: false,
minimizable: false,
x: 0,
y: 0
};
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();
}
});
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;
} else {
const visible = await dialog.isVisible();
if (visible) {
await dialog.close();
unlistenLogCreated && (await (unlistenLogCreated as Function)());
}
}
};
export const dataSubscribe = async (cb?: (...args: any) => any) => {
if (!cb) return;
const mainStore = useMainStore();
const abort = new AbortController();
window.addEventListener("storage", async () => {
mainStore.$hydrate();
if (cb && cb instanceof Function) {
await cb();
}
}, {
signal: abort.signal
})
onBeforeUnmount(() => {
abort?.abort();
})
};
+8
View File
@@ -0,0 +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
+8
View File
@@ -0,0 +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
+6 -18
View File
@@ -3,23 +3,11 @@
</template> </template>
<script setup lang="tsx"> <script setup lang="tsx">
import { onBeforeUnmount } from "vue"; //屏蔽右键菜单
import { getCurrentWindow } from "@tauri-apps/api/window"; document.addEventListener("contextmenu", (e: MouseEvent) => {
import { listen } from "@tauri-apps/api/event"; const el = (e.target as HTMLElement);
if (import.meta.env.PROD && !el.classList.contains("el-input__inner") && !el.classList.contains("el-textarea__inner")) { // 所有输入框不禁用右键
const appWindow = getCurrentWindow(); e.preventDefault();
}
const unlisten = listen("window-close-event", (event) => {
closeApp();
}); });
onBeforeUnmount(() => {
unlisten.then((unlisten) => {
unlisten && unlisten instanceof Function && unlisten();
});
});
const closeApp = async () => {
appWindow.hide();
};
</script> </script>
+21 -18
View File
@@ -1,16 +1,7 @@
import { defineNuxtConfig } from "nuxt/config"; import { defineNuxtConfig } from "nuxt/config";
import fs from "fs";
import path from "path"; import path from "path";
import vueJSX from "@vitejs/plugin-vue-jsx"; import vueJSX from "@vitejs/plugin-vue-jsx";
const isDev = process?.argv?.[2] == "_dev" || process?.argv?.[2] == "dev";
const optimizeDepsElementPlusIncludes = ["element-plus/es"];
fs.readdirSync("node_modules/element-plus/es/components").map(dirname => {
fs.access(`node_modules/element-plus/es/components/${dirname}/style/css.mjs`, err => {
if (!err) {
optimizeDepsElementPlusIncludes.push(`element-plus/es/components/${dirname}/style/css`);
}
});
});
export default defineNuxtConfig({ export default defineNuxtConfig({
ssr: false, ssr: false,
@@ -18,12 +9,25 @@ export default defineNuxtConfig({
port: 5000 port: 5000
}, },
telemetry: false,
imports: { imports: {
autoImport: false autoImport: false
}, },
css: ["~/assets/css/main.css"], css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
modules: ["@element-plus/nuxt", "@pinia/nuxt", "@pinia-plugin-persistedstate/nuxt", "@nuxtjs/tailwindcss"], modules: [
"@element-plus/nuxt",
"@pinia/nuxt",
[
"pinia-plugin-persistedstate/nuxt",
{
key: "__glj_persisted_%id",
storage: "localStorage"
}
],
"@nuxtjs/tailwindcss"
],
alias: { alias: {
"@": path.resolve(__dirname, "./") "@": path.resolve(__dirname, "./")
@@ -44,12 +48,10 @@ export default defineNuxtConfig({
}, },
vite: { vite: {
plugins: [ plugins: [vueJSX({})],
vueJSX({}),
],
envDir: "env", envDir: "env",
optimizeDeps: { optimizeDeps: {
include: [...optimizeDepsElementPlusIncludes] // include: [...optimizeDepsElementPlusIncludes]
}, },
// prevent vite from obscuring rust errors // prevent vite from obscuring rust errors
clearScreen: false, clearScreen: false,
@@ -70,7 +72,7 @@ export default defineNuxtConfig({
sourcemap: !!process.env.TAURI_DEBUG sourcemap: !!process.env.TAURI_DEBUG
}, },
esbuild: { esbuild: {
pure: ["console.log"], // pure: ["console.log"],
drop: ["debugger"] drop: ["debugger"]
} }
}, },
@@ -102,5 +104,6 @@ export default defineNuxtConfig({
// script: [], // script: [],
// noscript: [] // noscript: []
} }
} },
compatibilityDate: "2024-11-12"
}); });
+27 -27
View File
@@ -1,41 +1,41 @@
{ {
"name": "easytier-game", "name": "easytier-game",
"private": true, "private": true,
"author": "luoleixin@digisky.com", "author": "leizi97",
"description": "A simple network initiator based on Easytier", "description": "A simple network initiator based on Easytier",
"version": "1.0.3", "version": "1.4.2",
"scripts": { "scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod" "build": "nuxt generate --dotenv env/.env.prod",
"release": "node zip.js",
"release-win7": "node zip.js win7"
}, },
"devDependencies": { "devDependencies": {
"@element-plus/icons-vue": "^2.3.1", "@element-plus/icons-vue": "^2.3.1",
"@element-plus/nuxt": "^1.0.9", "@element-plus/nuxt": "^1.1.1",
"@nuxtjs/tailwindcss": "^6.12.0", "@nuxtjs/tailwindcss": "6.13.1",
"@pinia-plugin-persistedstate/nuxt": "^1.2.0", "@pinia/nuxt": "0.10.1",
"@pinia/nuxt": "^0.5.1", "@tauri-apps/api": "2.3.0",
"@tauri-apps/api": "^2.0.2", "@tauri-apps/cli": "2.3.0",
"@tauri-apps/cli": "^2.0.2", "@tauri-apps/plugin-cli": "^2.2.0",
"@tauri-apps/plugin-cli": "^2.0.0", "@tauri-apps/plugin-clipboard-manager": "2.2.1",
"@tauri-apps/plugin-http": "^2.0.0", "@tauri-apps/plugin-dialog": "2.2.0",
"@tinymce/tinymce-vue": "^5.1.1", "@tauri-apps/plugin-fs": "^2.2.0",
"@tauri-apps/plugin-log": "2.2.2",
"@tauri-apps/plugin-shell": "^2.2.0",
"@tauri-apps/plugin-window-state": "2.2.1",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/qs": "^6.9.15", "@vitejs/plugin-vue-jsx": "^4.1.1",
"@vitejs/plugin-vue-jsx": "^3.1.0", "@vueuse/core": "12.7.0",
"dayjs": "^1.11.10", "archiver": "^7.0.1",
"defu": "^6.1.4", "element-plus": "2.9.4",
"element-plus": "^2.7.1", "less": "4.2.1",
"javascript-obfuscator": "^4.1.0",
"less": "^4.2.0",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"nuxt": "^3.11.2", "nuxt": "3.15.4",
"pinia": "^2.1.7", "pinia": "3.0.1",
"pinia-plugin-persistedstate": "^4.2.0",
"postcss": "^8.4.38", "postcss": "^8.4.38",
"qs": "^6.12.0", "prettier": "3.5.2",
"typescript": "^5.4.5", "prettier-plugin-tailwindcss": "0.6.11"
"vue": "^3.4.24",
"vue-clipboard3": "^2.0.0",
"xlsx": "^0.18.5",
"@tauri-apps/plugin-shell": "~2"
} }
} }
+326
View File
@@ -0,0 +1,326 @@
<template>
<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>
<div class="w-[80px]">
<ElSelect
size="small"
v-model="mainStore.config.customProtocol"
placeholder="请选择协议"
class="ml-[5px]"
>
<ElOption
v-for="item in protocols"
:key="item"
:label="`${item}`"
:value="item"
></ElOption>
</ElSelect>
</div>
</div>
<div>
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">帮助对等节点建立直连(p2p)通信</ElCheckbox>
</div>
<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后自动"启动联机"(搭配开机自启无感联机)</ElCheckbox></div>
<div class="flex flex-nowrap items-center gap-[15px]">
<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
<ElButton
@click="openConfigJsonDir"
size="small"
>
打开config.json目录
</ElButton>
</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="视网络质量进行选择,可能会出现中转与直连(p2p)来回切换的情况">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
<div class="flex flex-nowrap items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.enableKcpProxy">启用KCP代理</ElCheckbox>
<ElTooltip content="将TCP流量转为KCP流量,降低传输延迟,提升传输速度">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.2.0" />
</div>
<div class="flex flex-nowrap items-center gap-[5px]">
<ElCheckbox v-model="mainStore.config.disableKcpInput">禁用KCP输入</ElCheckbox>
<ElTooltip content="禁用KCP入站流量,其他开启KCP代理的节点无法连接到本节点">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.2.0" />
</div>
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
<ElDivider />
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口只连接到对等节点</ElCheckbox>
<ElTooltip content="无法联机时,可以尝试开启这个选项">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
<div class="flex items-center gap-[10px]">
<ElText
class="flex-shrink-0"
size="small"
>
监听端口
</ElText>
<ElInput
:disabled="mainStore.config.disbleListenner || mainStore.config.enableCustomListener"
size="small"
:maxlength="10"
v-model="mainStore.config.port"
placeholder="请输入端口号"
/>
</div>
<div class="flex items-center gap-[10px]">
<ElCheckbox
:disabled="mainStore.config.disbleListenner"
v-model="mainStore.config.enableCustomListener"
>
自定义监听地址
</ElCheckbox>
<ElButton
size="small"
:disabled="mainStore.config.disbleListenner"
@click="handleListenerDialog"
>
填写
</ElButton>
<ElDialog
width="95%"
top="10px"
append-to-body
:z-index="10"
class="!mb-0"
v-model="listenerDialogData.visible"
:close-on-press-escape="false"
title="自定义监听地址"
>
<ElInput
type="textarea"
:rows="8"
placeholder="请输入监听地址一行一个"
v-model="mainStore.config.customListenerData"
></ElInput>
<template #footer>
<div class="text-right">
<ElButton
size="default"
@click="handleFinishInputListener"
type="primary"
>
确定
</ElButton>
</div>
</template>
</ElDialog>
</div>
<div class="flex items-center gap-[10px]">
<ElCheckbox
:disabled="mainStore.config.disbleListenner"
v-model="mainStore.config.enableCustomListenerV6"
>
自定义IPV6监听地址
</ElCheckbox>
<div class="w-[200px]">
<ElInput
:disabled="mainStore.config.disbleListenner || mainStore.config.enableCustomListenerV6"
size="small"
:maxlength="100"
v-model="mainStore.config.customListenerV6Data"
placeholder="请输入自定义IPV6监听地址"
/>
</div>
<ElTooltip content="例如:tcp://[::]:11010,如果未设置,将在随机UDP端口上监听">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<CoreVersionWarning version="2.1.0" />
</div>
<ElDivider />
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
<ElInput
size="small"
maxlength="10"
v-model="mainStore.config.devNameValue"
placeholder="请输入网卡名"
/>
</div>
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.enableNetCardMetric">自定义easytier网卡跃点</ElCheckbox>
<ElInputNumber
controls-position="right"
:min="1"
:value-on-clear="1"
:max="9999"
:step="1"
:precision="0"
size="small"
v-model="mainStore.config.netCardMetricValue"
placeholder="请选择跃点数"
/>
<ElTooltip content="设置easytier网卡的跃点,提升网卡优先级,跃点越小,网卡优先级越高">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
<div>
<ElText
size="small"
type="warning"
>
(不使用自定义网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡也可以使用 设置跃点 功能除非你启用了下面的功能)
</ElText>
</div>
<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备(网卡)可以使用子网代理访问节点</ElCheckbox></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-[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 class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox>
<ElTooltip content="使用用户态TCP/IP协议栈smoltcp,避免操作系统防火墙问题导致无法子网代理">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
<div class="flex flex-nowrap items-center gap-[15px]">
<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
<div class="w-[140px]">
<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>
<script setup lang="ts">
import useMainStore from "@/stores/index";
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, remove } from "@tauri-apps/plugin-fs";
import { ElMessage } from "element-plus";
import { reactive, ref } from "vue";
import { dataSubscribe } from "@/composables/windows";
import { ATJ, supportProtocols } from "~/utils";
import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
import { ElConfirmDanger } from "~/utils/element";
import { invoke } from "@tauri-apps/api/core";
const protocols = supportProtocols();
const listenerDialogData = reactive<{ [key: string]: any }>({
visible: false,
loading: false
});
const handleListenerDialog = () => {
listenerDialogData.visible = true;
};
const handleFinishInputListener = async () => {
listenerDialogData.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;
const logDirPath = await join(resourceDir, logPath);
const isExists = await exists(logPath, { baseDir: BaseDirectory.Resource });
if (!isExists) {
try {
await mkdir(logPath, { baseDir: BaseDirectory.Resource });
} catch (err) {}
}
await Command.create("explorer", [logDirPath]).execute();
};
const openConfigJsonDir = async () => {
const resourceDir = await getResourceDir();
const easytierDir = await join(resourceDir, "easytier/");
const isExists = await exists("easytier/", { baseDir: BaseDirectory.Resource });
if (isExists) {
await Command.create("explorer", [easytierDir]).execute();
} else {
ElMessage.error("config.json的目录不存在");
}
};
// 为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>
+118
View File
@@ -0,0 +1,118 @@
<template>
<div class="flex h-full flex-col gap-[10px]">
<ElRadioGroup
:disabled="!data.isSwitchEnable"
v-model="mainStore.cidrEnable"
>
<ElRadioButton :value="true">开启</ElRadioButton>
<ElRadioButton :value="false">关闭</ElRadioButton>
</ElRadioGroup>
<div class="flex-1 overflow-auto">
<ElInput
placeholder="例如: 192.168.1.0/24 一行一个"
v-model="mainStore.config.proxyNetworks"
type="textarea"
: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();
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>
+1629 -181
View File
File diff suppressed because it is too large Load Diff
+33
View File
@@ -0,0 +1,33 @@
<template>
<ElInput
type="textarea"
:rows="17"
v-model="data.log"
resize="none"
readonly
placeholder="等待日志中,请先'启动联机'..."
/>
</template>
<script setup lang="ts">
import { listen, type UnlistenFn } from "@tauri-apps/api/event";
import { reactive, onMounted, onBeforeUnmount } from "vue";
const data = reactive({
log: ""
});
const listenStart = async () => {
const unListen = await listen<string>("logs", event => {
data.log = event.payload || "";
});
return unListen;
};
let unlistenStart: UnlistenFn | null = null;
onMounted(async () => {
unlistenStart = await listenStart();
});
onBeforeUnmount(() => {
unlistenStart && unlistenStart();
});
</script>
+212
View File
@@ -0,0 +1,212 @@
<template>
<div class="h-full overflow-auto">
<div class="w-[1200px]">
<ElText
size="small"
v-if="!data.member || data.member.length <= 0"
>
{{ "等待成员信息中..." }}
</ElText>
<ElTable
stripe
border
:data="data.member"
v-else
>
<ElTableColumn
sortable
width="140"
label="成员名"
prop="hostname"
>
<template #default="{ row }">
{{
(row.hostname || "").toLowerCase().includes("publicserver")
? (row.hostname || "").replace("PublicServer", "服务器")
: row.hostname || "-"
}}
</template>
</ElTableColumn>
<ElTableColumn
sortable
width="90"
prop="cost"
label="方式"
>
<template #default="{ row }">
<ElTag
size="small"
effect="dark"
:type="row.cost == 'p2p' ? 'success' : 'info'"
>
{{ row.cost ? row.cost.replace("relay", "中转").replace("p2p", "直连") : row.cost }}
</ElTag>
</template>
</ElTableColumn>
<ElTableColumn
sortable
width="120"
prop="ipv4"
label="虚拟网IP"
></ElTableColumn>
<ElTableColumn
sortable
prop="lat_ms"
width="100"
label="延迟/ms"
></ElTableColumn>
<ElTableColumn
sortable
width="100"
prop="loss_rate"
label="丢包率"
>
<template #default="{ row }">
{{ row.loss_rate && row.loss_rate != "-" ? Number(row.loss_rate * 100).toFixed(2) + "%" : row.loss_rate }}
</template>
</ElTableColumn>
<ElTableColumn
sortable
width="110"
label="NAT类型"
prop="nat_type"
>
<template #default="{ row }">
{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
</template>
</ElTableColumn>
<ElTableColumn
sortable
width="122"
prop="version"
label="版本"
></ElTableColumn>
<ElTableColumn
sortable
width="100"
prop="tunnel_proto"
label="隧道协议"
></ElTableColumn>
<ElTableColumn
sortable
width="90"
prop="rx_bytes"
label="接收"
></ElTableColumn>
<ElTableColumn
sortable
prop="tx_bytes"
label="传输"
></ElTableColumn>
</ElTable>
</div>
</div>
</template>
<script setup lang="ts">
import { invoke } from "@tauri-apps/api/core";
import { reactive, onMounted, onBeforeUnmount } from "vue";
import { ATJ, parseCliInfo } from "@/utils";
import { ElConfirmDanger } from "~/utils/element";
import { getCurrentWindow } from "@tauri-apps/api/window";
// enum NatType {
// // has NAT; but own a single public IP, port is not changed
// Unknown = 0;
// OpenInternet = 1;
// NoPAT = 2;
// FullCone = 3;
// Restricted = 4;
// PortRestricted = 5;
// Symmetric = 6;
// SymUdpFirewall = 7;
// SymmetricEasyInc = 8;
// SymmetricEasyDec = 9;
// }
const natMaps = {
unknown: "未知",
OpenInternet: "nat0-openinternet",
nopat: "nat0-nopat",
fullcone: "nat1",
restricted: "nat2",
portrestricted: "nat3",
symmetric: "nat4",
symmetriceasydec: "nat4-easydec",
symmetriceasyinc: "nat4-easyinc",
symUdpfirewall: "nat4-udpfirewall"
};
type natKyes = keyof typeof natMaps;
const data = reactive<{ member: { hostname: string; cost: string; ipv4: string; lat_msg: string; loss_rate: string; nat_type: string }[] }>({
member: []
});
const _showTableHeader = [
["hostname", "主机名"],
["cost", "路由"],
["ipv4", "虚拟网IP"],
["lat_ms", "延迟/ms"],
["loss_rate", "丢包率"],
["nat_type", "NAT类型"],
["version", "版本"],
["tunnel_proto", "隧道协议"],
["rx_bytes", "接收"],
["tx_bytes", "传输"]
];
let timer: NodeJS.Timeout | null = null;
const listenOutput = async () => {
const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
// if(!member) return;
if (error) {
data.member = [];
return "";
}
if (member === "_EasytierGameCliFailedToConnect_") {
data.member = [];
stopTimer();
const [error] = await ElConfirmDanger("连接已断开,是否重新尝试?", "警告", {
confirmButtonText: "重试",
cancelButtonText: "关闭窗口"
});
if (!error) {
await listenOutput();
} else {
const appWindow = getCurrentWindow();
await appWindow.close();
}
return;
}
const peerInfo = parseCliInfo(member);
peerInfo.forEach(value => {
if (value.cost === "Local") {
value.cost = "本机";
}
if (value.ipv4 && value.ipv4.includes("/")) {
value.ipv4 = value.ipv4.split("/")[0];
}
});
// console.log(peerInfo)
data.member = peerInfo;
startTimer();
};
const startTimer = () => {
timer && clearTimeout(timer);
timer = setTimeout(() => {
listenOutput();
}, 1000);
};
const stopTimer = () => {
timer && clearTimeout(timer);
timer = null;
};
onMounted(async () => {
await listenOutput();
});
onBeforeUnmount(() => {
stopTimer();
});
</script>
+128
View File
@@ -0,0 +1,128 @@
<template>
<div class="flex flex-col gap-[10px] h-full">
<ElForm
size="small"
label-position="top"
:model="mainStore.serverConfig"
>
<ElFormItem
label="白名单"
prop="ServerWhiteList"
class="full-label full-content overflow-hidden !flex flex-col h-full !mb-[0]"
>
<template #label>
<div class="flex items-center gap-[10px]">
白名单
<ElSwitch
v-model="mainStore.serverConfig.enableWhiteList"
inline-prompt
active-text="启用"
inactive-text="禁用"
></ElSwitch>
<div class="ml-auto">
<ElTooltip
placement="top"
content="打开软件的时候,就会开启这个自建服务"
>
<ElCheckbox v-model="mainStore.serverConfig.autoStart">自动启动</ElCheckbox>
</ElTooltip>
<ElTooltip
placement="top"
content="帮助其他虚拟网建立P2P链接"
>
<ElCheckbox v-model="mainStore.serverConfig.relayAllPeerrpc">转发所有对等节点的RPC数据包</ElCheckbox>
</ElTooltip>
</div>
</div>
</template>
<div class="h-full w-full flex flex-col overflow-hidden">
<div class="flex-1 overflow-auto">
<ElInput
:disabled="!mainStore.serverConfig.enableWhiteList"
placeholder="一行一个,支持通配符列表,如(ab*)。当该参数的列表为空时,就不会为所有其他网络提供转发服务。"
:maxlength="1000"
v-model="mainStore.serverConfig.serverWhiteList"
type="textarea"
:rows="3"
resize="none"
></ElInput>
</div>
</div>
</ElFormItem>
</ElForm>
<div class="flex items-center gap-[10px]">
<div class="flex items-center gap-[5px]">
<ElText>服务器端口</ElText>
<div class="max-w-[100px]">
<ElTooltip content="端口号">
<ElInput v-model="mainStore.serverConfig.port"></ElInput>
</ElTooltip>
</div>
</div>
<ElButton
size="large"
:loading="data.loading"
:type="data.isStart ? 'danger' : 'primary'"
@click="hanldeClickStart"
>
{{ !data.isStart ? "启动服务器" : "停止服务器" }}
</ElButton>
</div>
<ElInput
placeholder="服务器日志"
:model-value="data.log"
type="textarea"
:rows="14"
resize="none"
></ElInput>
</div>
</template>
<script setup lang="ts">
import useMainStore from "@/stores/index";
import { reactive, onMounted, onBeforeUnmount } 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";
const appWindow = getCurrentWindow();
const mainStore = useMainStore();
const data = reactive({
log: "",
isStart: false,
loading: true
});
const listenStart = async () => {
const unListen = await listen<{ log: string; threadId: number | null }>("server_logs", event => {
data.log = event.payload.log || "";
if (event.payload.threadId) {
data.isStart = true;
} else {
data.isStart = false;
}
data.loading = false;
});
return unListen;
};
let unlistenStart: UnlistenFn | null = null;
onMounted(async () => {
unlistenStart = await listenStart();
});
onBeforeUnmount(() => {
unlistenStart && unlistenStart();
});
const hanldeClickStart = async () => {
data.loading = true;
const args = getServerArgs();
await appWindow.emitTo("main", "startStopServer", { args });
};
dataSubscribe();
</script>
+497
View File
@@ -0,0 +1,497 @@
<template>
<div class="h-full overflow-auto">
<ElTabs
v-model="data.activeTab"
@tab-change="handleTabsChange"
class="h-full"
>
<ElTabPane
label="联机失败解决办法"
name="netcard"
class="flex h-full flex-col"
>
<div>
<div>
<ElTooltip
content="找不到游戏房间时,就开启它后再尝试搜索房间(默认开启)
例如: 一个游戏玩家,有时通过本地局域网联机,有时通过某些联机工具进行联机,但是他只能在其中一个联机方式里看到朋友的游戏房间,而另一个里看不到,这时就可以使用这个工具,让他在两个地方都能看到游戏房间"
>
<ElText>
方案1
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
</ElText>
</ElTooltip>
</div>
<ElLink
class="mr-[10px] !text-[15px]"
type="info"
:underline="false"
@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
>
WinIPBroadcast
</ElLink>
<ElSwitch
inline-prompt
:model-value="mainStore.winipBcStart"
@change="handleWinipBcStart"
size="small"
label="WinIPBroadcast"
active-text="已开启"
inactive-text="已关闭"
></ElSwitch>
</div>
<div>
<ElTooltip
content="使用ForceBindIP启动应用 (强制绑定IP或者网卡),如果还没有启动联机,请先启动联机,联机成功后,点击刷新获取easytier生成的网卡"
>
<ElText>
方案2
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
</ElText>
</ElTooltip>
</div>
<div>
<div>
<ElLink
class="!text-[15px]"
type="info"
:underline="false"
@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="设置网卡的跃点,提升网卡优先级,尝试将您联机使用的网卡跃点设置为最小,请先查询网卡信息">
<ElText>
方案3
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
</ElText>
</ElTooltip>
</div>
<div class="mt-[5px] flex items-center">
<ElButton
@click="initNetCardInfo"
size="small"
type="primary"
>
查询网卡信息
</ElButton>
<div
v-if="data.row.name"
class="ml-auto flex flex-nowrap items-center gap-[10px]"
>
<ElTooltip content="跃点越小,网卡优先级越高,范围(1-9999)">
<ElInput
class="!w-[80px]"
autofocus
size="small"
v-model="data.row.metric"
placeholder="请输入跃点"
/>
</ElTooltip>
<ElButton
type="success"
size="small"
@click="handleSaveMetric"
>
保存
</ElButton>
</div>
</div>
<div class="mt-[5px] flex-1 overflow-auto">
<ElTable
height="100%"
empty-text="暂无数据"
highlight-current-row
:data="data.netcardList"
@row-click="handleRowClick"
border
>
<ElTableColumn
sortable
label="网卡名"
prop="name"
></ElTableColumn>
<ElTableColumn
sortable
label="跃点"
prop="metric"
></ElTableColumn>
</ElTable>
</div>
</ElTabPane>
<ElTabPane
label="防火墙"
name="firewall"
class="flex h-full flex-col"
>
<div class="flex flex-col items-center">
<div class="mb-[10px]">
<ElButton
type="warning"
size="small"
>
一键关闭防火墙
</ElButton>
<ElButton
@click="handleCustomFireWall"
type="danger"
size="small"
>
自定义防火墙策略
</ElButton>
</div>
<div class="mb-[10px]">
<ElText class="!mx-[10px]">域防火墙</ElText>
<ElTag :type="data.firewallStatus.domain ? 'danger' : 'success'">
{{ data.firewallStatus.domain ? "已开启" : "已关闭" }}
</ElTag>
</div>
<div class="mb-[10px]">
<ElText class="!mx-[10px]">公用防火墙</ElText>
<ElTag :type="data.firewallStatus.public ? 'danger' : 'success'">
{{ data.firewallStatus.public ? "已开启" : "已关闭" }}
</ElTag>
</div>
<div>
<ElText class="!mx-[10px]">专用防火墙</ElText>
<ElTag :type="data.firewallStatus.dedicated ? 'danger' : 'success'">
{{ data.firewallStatus.dedicated ? "已开启" : "已关闭" }}
</ElTag>
</div>
</div>
<ElDivider>Ping测试</ElDivider>
<div class="flex items-center gap-[10px]">
<ElInput
style="width: 150px"
size="small"
v-model="data.pingIp"
placeholder="请输入IP地址"
/>
<ElInputNumber
controls-position="right"
size="small"
:precision="0"
v-model="data.pingNum"
:min="1"
:max="10"
>
<template #suffix>
<span></span>
</template>
</ElInputNumber>
<ElButton
size="small"
:disabled="data.isPing"
@click="handleTestPing"
>
Ping一下
</ElButton>
</div>
<div class="mt-[5px] flex-1 overflow-auto">
<ElInput
placeholder="日志信息"
type="textarea"
:autosize="{ minRows: 9 }"
resize="none"
v-model="data.pingLog"
/>
</div>
</ElTabPane>
</ElTabs>
</div>
</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";
import useMainStore from "@/stores/index";
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<{ guids: string[][]; [key: string]: any }>({
activeTab: "netcard",
winipBcPid: 0,
pingNum: 1,
winipBcStart: false,
pingIp: "",
isPing: false,
pingLog: "",
firewallStatus: {
domain: false,
public: false,
dedicated: false
},
row: {
name: "",
metric: ""
},
netcardList: [],
guids: [],
forceBindStart: false
});
const handleCustomFireWall = async () => {
await open("wf.msc");
}
const handleTabsChange = async (tabPaneName: TabPaneName) => {
if (tabPaneName === "netcard") {
// await initNetCardInfo();
} else if (tabPaneName == "firewall") {
await initFirewall();
}
};
const handleRowClick = async (row: any, column: any, event: Event) => {
data.row = { ...row };
};
const handleSaveMetric = async () => {
if (data.row.metric && data.row.name) {
try {
const output = await Command.create("netsh", ["interface", "ipv4", "set", "interface", data.row.name, "metric=", data.row.metric], {
encoding: "gb2312"
}).execute();
ElMessage.success("设置成功");
await initNetCardInfo();
} catch (err) {
console.error(err);
}
}
};
const awaitTime = (time: number) => {
return new Promise(res => {
setTimeout(res, time);
});
};
const handleTestPing = async () => {
// const is = isValidIP(data.pingIp);
if (data.pingIp) {
data.pingLog = "";
data.isPing = true;
try {
for (let i = 0; i < data.pingNum; i++) {
const output = await Command.create("ping", ["-n", "1", data.pingIp], {
encoding: "gb2312"
}).execute();
if (output.stdout) {
data.pingLog += `${i + 1} - ${output.stdout.split("\n")[2]}`;
}
if (output.stderr) {
data.pingLog += `${i + 1}error - ${output.stderr}`;
}
if (i != data.pingNum - 1) {
await awaitTime(1000);
}
}
data.pingLog += "完毕";
} catch (err) {
ElMessage.error("Ping发生错误");
console.error(err);
} finally {
data.isPing = false;
}
} else {
ElMessage.error("请输入正确的IP");
}
};
const initNetCardInfo = async () => {
try {
const output = await Command.create("netsh", ["interface", "ipv4", "show", "interface"], {
encoding: "gb2312"
}).execute();
data.netcardList = output.stdout
.split("\n")
.map(el => el.trim().replace(/\s+/g, " "))
.filter(el => el)
.slice(2)
.map(el => {
const [idx, Met, MTU, status, ...rest] = el.split(" ");
return {
index: idx,
metric: Met,
MTU,
status,
name: rest.join(" ")
};
}) as any;
} catch (err) {
ElMessage.error("网卡获取失败");
console.error(err);
}
};
const initFirewall = async () => {
try {
const output = await Command.create("netsh", ["advfirewall", "show", "allprofiles", "state"], {
encoding: "gb2312"
}).execute();
const state = output.stdout
.trim()
.replace(/[\-]+/g, "")
.split("\n")
.map(el => el.trim())
.filter(el => el)
.slice(0, -1);
for (let idx = 0; idx < state.length; idx += 2) {
const status = state[idx + 1].replace(/状态\s+/, "");
const matchName = /域|公用|专用/.exec(state[idx]);
if (matchName) {
const name = matchName[0];
if (name == "域") {
data.firewallStatus.domain = status != "关闭";
} else if (name == "公用") {
data.firewallStatus.public = status != "关闭";
} else if (name == "专用") {
data.firewallStatus.dedicated = status != "关闭";
}
}
}
} catch (err) {
// netsh advfirewall firewall add rule name="EXE名称" dir=out action=allow program="EXE绝对路径"
ElMessage.error("获取防火墙状态失败");
console.error(err);
}
};
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();
getGuids();
dataSubscribe();
});
</script>
-10
View File
@@ -1,10 +0,0 @@
import { createPersistedState } from "pinia-plugin-persistedstate";
import { defineNuxtPlugin } from "nuxt/app";
export default defineNuxtPlugin((nuxtApp: any) => {
nuxtApp.$pinia.use(
createPersistedState({
storage: localStorage,
key: id => `__glj_persisted_${id}`
})
);
});
+2943 -4461
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

+2 -2
View File
@@ -2,5 +2,5 @@
# will have compiled files and executables # will have compiled files and executables
/target/ /target/
/gen/schemas /gen/schemas
/easytier-windows-x86_64-v2.0.3.zip /easytier/logs
/easytier-windows-x86_64/ /easytier/logs/*.*
+2096 -639
View File
File diff suppressed because it is too large Load Diff
+39 -16
View File
@@ -1,35 +1,58 @@
[package] [package]
name = "easytier-game" name = "easytier-game"
version = "1.0.3" version = "1.4.2"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier" description = "A simple network initiator based on Easytier"
authors = ["you"] authors = ["leizi97"]
license = "" license = "LICENSE"
repository = ""
edition = "2021" edition = "2021"
rust-version = "1.77.2" # rust-version = "1.77.2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib] [lib]
name = "app_lib" name = "app_lib"
crate-type = ["staticlib", "cdylib", "rlib"] crate-type = ["staticlib", "cdylib", "rlib"]
[build-dependencies] [build-dependencies]
tauri-build = { version = "2.0.1", features = [] } tauri-build = { version = "2.0.6", features = [] }
# prost-build = "0.13.2"
[dependencies] [dependencies]
serde_json = "1.0" serde_json = "1.0.137"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0.217", features = ["derive"] }
log = "0.4" log = "0.4.26"
tauri = { version = "2.0.2", features = [ tauri = { version = "2.3.0", features = [ "protocol-asset",
"tray-icon", "tray-icon",
"image-png", "image-png",
"image-ico", "image-ico"
] } ] }
tauri-plugin-log = "2.0.0-rc"
tauri-plugin-shell = "2" tauri-plugin-log = "2.2.2"
reqwest = { version = "0.12", features = ["json"] } tauri-plugin-shell = "2.2.0"
zip = "2.2.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.2.0"
tauri-plugin-clipboard-manager = "2.2.1"
rand = "0.9.0"
tokio = { version = "1.43.0", features = ["process"] }
tauri-plugin-dialog = "2.2.0"
# prost = "0.13"
# prost-types = "0.13"
hashbrown = "0.15.2"
# futures-util = "0.3"
[dependencies.windows]
version = "0.58.0"
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] [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
tauri-plugin-single-instance = "2" tauri-plugin-cli = "2.2.0"
tauri-plugin-single-instance = "2.2.2"
tauri-plugin-window-state = "2.2.1"
+1
View File
@@ -0,0 +1 @@
../LICENSE
+121 -13
View File
@@ -1,15 +1,123 @@
{ {
"$schema": "../gen/schemas/desktop-schema.json", "$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default", "identifier": "default",
"description": "enables the default permissions", "description": "enables the default permissions",
"windows": [ "windows": ["main", "log", "member", "cidr", "advance", "tool", "server", "gameList"],
"main" "permissions": [
], "core:default",
"permissions": [ "core:window:allow-minimize",
"core:default", "core:window:allow-unminimize",
"core:window:allow-minimize", "core:window:allow-hide",
"core:window:allow-hide", "core:window:allow-close",
"core:window:allow-close", "core:window:allow-set-focus",
"shell:allow-open" "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"
},
{
"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"
]
} }
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
这里存放每次打包需要用到的最新版本的easytier 和 相关工具
+57
View File
@@ -0,0 +1,57 @@
@echo off
chcp 65001 >nul
setlocal
REM 检查是否具有管理员权限
openfiles >nul 2>&1
if %errorlevel% neq 0 (
echo 当前没有管理员权限,鼠标右键clear_data.bat,选择使用管理员模式运行...
pause
exit /b
)
REM 获取当前用户的 Local 目录路径
set "local_dir=%LOCALAPPDATA%"
REM 设置要删除的任务计划程序文件夹名称
set "folder_name=\easytierGame"
set "task_name=auto start"
REM 设置要删除的目标文件夹
set "target_data_dir=%local_dir%\com.tauri.easytier-game"
echo ---
REM 打印 Local 目录路径
echo 当前数据目录: %target_data_dir%
echo ---
echo 您确定要清除EasytierGame的本地数据吗? (y/n)
echo ---
REM 等待用户输入
set /p confirm=输入'y/n'进行确认:
if /i "%confirm%"=="y" (
echo 清除数据中,请稍后...
echo ---
@REM REM 删除任务计划程序文件夹
echo delete auto_start task ...
echo ---
echo ---
schtasks /delete /tn "%folder_name%\%task_name%" /f
schtasks /delete /tn "%folder_name%" /f
echo ---
echo 开始清除本地缓存数据,没有使用开机自启上面就会报错,不影响数据清理...
if exist "%target_data_dir%" (
REM 删除目标文件夹及其内容
rd /s /q "%target_data_dir%"
)
echo 清除本地缓存数据完毕.
echo ---
echo 您可以手动删除EasytierGame目录下所有文件,即可完成卸载.
) else (
echo 取消清理数据
)
pause
endlocal
@@ -0,0 +1,77 @@
# 实例名称,用于在同一台机器上标识此节点
instance_name = ""
# 主机名,用于标识此设备的主机名
hostname = ""
# 实例 ID,一般为 UUID,在同一个虚拟网络中唯一
instance_id = ""
# 此节点的虚拟网 IPv4 地址,如果为空,则此节点将仅转发数据包,不会创建 TUN 设备
ipv4 = ""
# 由 Easytier 自动确定并设置IP地址,默认从10.0.0.1开始。警告:在使用 DHCP 时,如果网络中出现 IP 冲突,IP 将自动更改
dhcp = false
# 监听器列表,用于接受连接
listeners = [
"tcp://0.0.0.0:11010",
"udp://0.0.0.0:11010",
"wg://0.0.0.0:11011",
"ws://0.0.0.0:11011/",
"wss://0.0.0.0:11012/",
]
# 退出节点列表
exit_nodes = [
]
# 用于管理的 RPC 门户地址
rpc_portal = "127.0.0.1:15888"
[network_identity]
# 网络名称,用于标识虚拟网络
network_name = ""
# 网络密钥,用于验证此节点属于虚拟网络
network_secret = ""
# 这里是对等连接节点配置,可以多段配置
[[peer]]
uri = "tcp://public.easytier.top:11010"
[[peer]]
uri = "udp://public.easytier.top:11010"
# 这里是子网代理节点配置,可以有多段配置
[[proxy_network]]
cidr = "10.0.1.0/24"
[[proxy_network]]
cidr = "10.0.2.0/24"
# WireGuard 配置信息
[vpn_portal_config]
# WireGuard 客户端所在的网段,下面为示例
client_cidr = "10.14.14.0/24"
#wg所监听的端口(请勿和listeners的wg冲突)
wireguard_listen = "0.0.0.0:11012"
[flags]
# 连接到对等节点使用的默认协议
default_protocol = "tcp"
# TUN 设备名称,如果为空,则使用默认名称
dev_name = ""
# 禁用p2p
disable_p2p = false
# 是否启用加密
enable_encryption = true
# 是否启用 IPv6 支持
enable_ipv6 = true
# TUN 设备的 MTU
mtu = 1380
# 延迟优先模式,将尝试使用最低延迟路径转发流量,默认使用最短路径
latency_first = false
# 将本节点配置为退出节点
enable_exit_node = false
# 禁用 TUN 设备
no_tun = false
# 为子网代理启用 smoltcp 堆栈
use_smoltcp = false
# 仅转发白名单网络的流量,支持通配符字符串。多个网络名称间可以使用英文空格间隔。如果该参数为空,则禁用转发。默认允许所有网络。例如:'*'(所有网络),'def*'(以def为前缀的网络),'net1 net2'(只允许net1和net2
foreign_network_whitelist = "*"
+40
View File
@@ -0,0 +1,40 @@
{
// 如果您的配置过于复杂,可以参考 使用配置文件进行联机的办法,以下是基础的界面配置,用于快速分享联机
"protocol": [
"tcp",
"udp"
], // 协议类型
// easytier服务地址 - 可填写多个 方式1,逗号分隔,"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] (默认选中第一个)
"serverUrl": "public.easytier.top:11010",
"enableCustomListener": true,
"customListenerData": [
"tcp://0.0.0.0:11010",
"udp://0.0.0.0:11010",
"tcp://[::]:11010"
],
"networkName": "", //房间名
"networkPassword": "", //房间密码
"hostname": "", //主机名
"ipv4": "", // 虚拟IP地址
"disableIpv6": false, // 禁用ipv6
"enableCustomListenerV6": true, // 启用ipv6监听
"customListenerV6Data": "udp://[::]:11010", // ipv6监听地址
"disbleListenner": false, // 禁用监听
"disableEncryption": false, // 禁用加密
"enablExitNode": false, // 启用出口节点
"noTun": false, // 禁用tun
"latencyfirst": false, // 延迟优先
"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代理
"disableKcpInput": false // 禁用kcp输入
}
Binary file not shown.
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+582 -98
View File
@@ -1,17 +1,126 @@
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 reqwest::{Client, Error};
use serde::Deserialize; // use futures_util::StreamExt;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::fs::{self, File}; use std::fs::{self, File};
use std::io::{BufRead, BufReader, Write}; use std::io::{BufRead, BufReader, Write};
use std::os::windows::process::CommandExt; use std::os::windows::process::CommandExt;
use std::process::{Command, Stdio}; use std::process::{Command, Stdio};
use std::sync::{ use std::ptr;
atomic::{AtomicBool, Ordering}, use std::sync::mpsc;
mpsc, Arc,
};
use std::{path, thread}; use std::{path, thread};
use sysinfo::System;
use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent}; use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
use tauri::Emitter; use tauri::Emitter;
use tauri::{Manager, WindowEvent}; use tauri::Manager;
use windows::core::{BSTR, VARIANT};
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 {
let result =
SetThreadExecutionState(ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_CONTINUOUS);
result != EXECUTION_STATE(0)
}
}
#[tauri::command(rename_all = "snake_case")]
fn allow_sleep() -> bool {
unsafe {
let result = SetThreadExecutionState(ES_CONTINUOUS);
result != EXECUTION_STATE(0)
}
}
// 定义GitHub Release的结构体 // 定义GitHub Release的结构体
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
@@ -36,40 +145,62 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
let client = Client::new(); let client = Client::new();
// 构建请求的URL // 构建请求的URL
let url = format!("https://api.github.com/repos/easytier/easytier/releases",); let url = format!("https://api.github.com/repos/easytier/easytier/releases",);
let user_agent = generate_random_user_agent();
// 发送HTTP GET请求 // 发送HTTP GET请求
let response = client let response = client
.get(&url) .get(&url)
.header("User-Agent", "Tauri-fetch") .header("User-Agent", user_agent)
.send() .send()
.await?; .await?;
// 反序列化响应体为Release列表 // 反序列化响应体为Release列表
response.json::<Vec<Release>>().await response.json::<Vec<Release>>().await
} }
static mut IS_CLOSE: bool = false;
#[tauri::command(rename_all = "snake_case")] #[tauri::command(rename_all = "snake_case")]
fn my_commit_output(commit_msg: String, window: tauri::Window) -> Result<bool, String> { async fn fetch_game_releases() -> [String; 2] {
println!("{}", commit_msg); // 创建HTTP客户端
unsafe { let client = Client::new();
IS_CLOSE = true; // 构建请求的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", user_agent)
.send()
.await
{
// 反序列化响应体为Release列表
match response.json::<Vec<Release>>().await {
Ok(releases) => {
if releases.len() <= 0 {
return [String::from(""), String::from("")];
}
let release = releases.first().unwrap();
let tag_name = release.tag_name.as_str();
let browser_download_url = release
.assets
.first()
.unwrap()
.browser_download_url
.as_str();
[String::from(tag_name), String::from(browser_download_url)]
}
Err(_e) => {
log::error!("game release {}", _e.to_string());
[String::from(""), String::from("")]
}
}
} else {
log::error!("failed to get game release");
[String::from(""), String::from("")]
} }
window.close().unwrap();
return Ok(true);
}
#[tauri::command(rename_all = "snake_case")]
fn force_close(window: tauri::Window) {
unsafe {
IS_CLOSE = true;
}
window.close().unwrap();
} }
#[tauri::command(rename_all = "snake_case")] #[tauri::command(rename_all = "snake_case")]
fn get_core_version() -> String { fn get_core_version() -> String {
match Command::new("easytier-core.exe") let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
match Command::new(&core_path)
.arg("--version") .arg("--version")
.creation_flags(0x08000000) .creation_flags(0x08000000)
.output() .output()
@@ -78,33 +209,180 @@ fn get_core_version() -> String {
let output_str = String::from_utf8_lossy(&output.stdout); let output_str = String::from_utf8_lossy(&output.stdout);
return output_str.trim().to_string(); return output_str.trim().to_string();
} }
Err(_e) => return "".to_string(), Err(_e) => {
log::error!("{}", _e.to_string());
return "".to_string();
}
}
}
// #[tauri::command(rename_all = "snake_case")]
// #[warn(dead_code)]
// fn get_cli_version() -> String {
// let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
// match Command::new(&cli_path)
// .arg("--version")
// .creation_flags(0x08000000)
// .output()
// {
// Ok(output) => {
// let output_str = String::from_utf8_lossy(&output.stdout);
// return output_str.trim().to_string();
// }
// Err(_e) => return "".to_string(),
// }
// }
fn get_tool_exe_path(path: &str) -> String {
let cur_vec = get_exe_directory();
let tool_path = format!("{}{}", cur_vec[1].as_str(), path);
// log::error!("tool path: {}", tool_path);
return tool_path;
}
#[derive(Serialize, Deserialize, Debug)]
struct RoutePeerInfo {
peer_id: u64,
cost: u64,
hostname: Option<String>,
udp_stun_info: String,
easytier_version: String,
network_length: u64,
}
#[derive(Serialize, Deserialize, Debug)]
struct RouteTable {
peer_infos: HashMap<u32, RoutePeerInfo>,
ipv4_peer_id_map: HashMap<String, u64>,
}
#[derive(Serialize, Deserialize, Debug)]
struct PeerRouteServiceImpl {
route_table_with_cost: RouteTable,
}
#[derive(Serialize, Deserialize, Debug)]
struct PeerRoute {
my_peer_id: u64,
service_impl: PeerRouteServiceImpl,
}
#[derive(Serialize, Deserialize, Debug)]
struct MyResponse {
response: PeerRoute,
}
#[tauri::command(rename_all = "snake_case")]
async fn get_members_by_cli() -> String {
let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
match tokioCommand::new(&cli_path)
.arg("peer")
.arg("list")
.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 member list error");
return "".to_string();
}
} }
} }
#[tauri::command(rename_all = "snake_case")] #[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 target = format!("https://ghp.ci/?q={}",download_url); let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
let response = reqwest::get(target) 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);
if cache_file_name_path.exists() {
unzip(cache_file_name_path);
return;
}
let target = format!("{}", download_url);
let mut response = reqwest::get(target)
.await .await
.expect("error to download easytier url"); .expect("error to download easytier url");
let file_path = format!("./{}", file_name); let easytier_path = get_tool_exe_path("\\easytier");
let file_path = format!("{}\\{}", easytier_path, file_name);
// println!("download easytier to {}", file_path);
let easytier_dir = path::Path::new(&easytier_path);
if !easytier_dir.exists() {
fs::create_dir_all(&easytier_dir).unwrap();
}
let path = path::Path::new(&file_path); let path = path::Path::new(&file_path);
println!("download easytier to {}", path.display());
let mut file = match File::create(&path) { let mut file = match File::create(&path) {
Err(why) => panic!("couldn't create {}", why), Err(why) => panic!("couldn't create {}", why),
Ok(file) => file, Ok(file) => file,
}; };
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
}
};
let content = response.bytes().await.expect("error to bytes easytier");
println!("下载完成,开始写入");
file.write_all(&content).expect("error to write easytier");
println!("写入完成");
unzip(path);
match fs::remove_file(path) {
Ok(_) => println!("删除zip文件成功"),
Err(_) => println!("删除zip文件失败"),
} }
println!("下载完成");
unzip(path);
let cache_dir_path = path::Path::new(&cache_dir_path);
if !cache_dir_path.exists() {
fs::create_dir_all(&cache_dir_path).unwrap();
}
match fs::rename(path, cache_file_name) {
Ok(_) => println!("保存zip文件至easytier/cache成功"),
Err(_) => log::error!("保存zip文件失败"),
}
// match fs::remove_file(path) {
// Ok(_) => println!("删除zip文件成功"),
// Err(_) => log::error!("删除zip文件失败"),
// }
} }
fn unzip(fname: &path::Path) { fn unzip(fname: &path::Path) {
@@ -137,7 +415,14 @@ fn unzip(fname: &path::Path) {
// fs::create_dir_all(p).unwrap(); // fs::create_dir_all(p).unwrap();
// } // }
// } // }
let out_file_path = path::Path::new("./").join(outpath.file_name().clone().unwrap()); let easytier_path = get_tool_exe_path("\\easytier");
let easytier_dir = path::Path::new(&easytier_path);
// if !easytier_dir.exists() {
// fs::create_dir_all(&easytier_dir).unwrap();
// }
// let out_file_path = path::Path::new("./").join(outpath.file_name().clone().unwrap());
let out_file_path = easytier_dir.join(outpath.file_name().clone().unwrap());
println!("outFilePath: {}", out_file_path.display()); println!("outFilePath: {}", out_file_path.display());
let mut outfile = fs::File::create(&out_file_path).unwrap(); let mut outfile = fs::File::create(&out_file_path).unwrap();
std::io::copy(&mut file, &mut outfile).unwrap(); std::io::copy(&mut file, &mut outfile).unwrap();
@@ -145,23 +430,26 @@ fn unzip(fname: &path::Path) {
} }
#[tauri::command(rename_all = "snake_case")] #[tauri::command(rename_all = "snake_case")]
fn run_command( fn run_command(app_handle: tauri::AppHandle, args: Vec<String>, is_server: Option<bool>) {
app_handle: tauri::AppHandle, let is_server = is_server.unwrap_or(false);
args: Vec<String>,
stop_signal: tauri::State<Arc<AtomicBool>>,
) {
// if !path::Path::new("easytier-core.exe").exists() {
// app_handle.emit("command-output", "easytier-core.exe 不存在");
// return
// }
let (tx, rx) = mpsc::channel(); let (tx, rx) = mpsc::channel();
stop_signal.store(false, Ordering::Relaxed);
let app_handle1 = app_handle.clone(); let app_handle1 = app_handle.clone();
let app_handle2 = app_handle.clone(); let app_handle2 = app_handle.clone();
let stop_signal = Arc::clone(&stop_signal);
let args2 = args.clone(); let args2 = args.clone();
let mut thread_id_str = "thread-id";
if is_server {
thread_id_str = "server-thread-id";
}
let mut command_output_str = "command-output";
if is_server {
command_output_str = "server-command-output";
}
thread::spawn(move || { thread::spawn(move || {
let mut child = Command::new("easytier-core.exe") let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
// trace, debug, info, warn, error, off
let mut child = Command::new(&core_path)
.args(args) .args(args)
.creation_flags(0x08000000) .creation_flags(0x08000000)
.stdout(Stdio::piped()) .stdout(Stdio::piped())
@@ -170,44 +458,43 @@ fn run_command(
println!("child id: {}", child.id()); println!("child id: {}", child.id());
app_handle1 app_handle1
.emit("thread-id", child.id()) .emit(thread_id_str, child.id())
.expect("failed to emit id event"); .expect("failed to emit id event");
app_handle1 app_handle1
.emit("command-output", args2.join(" ")) .emit(command_output_str, args2.join(" "))
.expect("error output args"); .expect("error output args");
let stdout = child.stdout.take().expect("failed to capture stdout"); let stdout = child.stdout.take().expect("failed to capture stdout");
let reader = BufReader::new(stdout); let reader = BufReader::new(stdout);
for line in reader.lines() { for line in reader.lines() {
match line { match line {
Ok(line) => { Ok(line) => match tx.send(line) {
tx.send(line).expect("failed to send line"); Ok(_) => {}
} Err(e) => {
log::error!("error sending line: {}", e);
break;
}
},
Err(e) => { Err(e) => {
eprintln!("error reading line: {}", e); log::error!("error reading line: {}", e);
break; break;
} }
} }
} }
println!("end"); println!("end");
}); });
thread::spawn(move || { thread::spawn(move || {
while let Ok(line) = rx.recv() { while let Ok(line) = rx.recv() {
if stop_signal.load(Ordering::Relaxed) {
break;
}
app_handle2 app_handle2
.emit("command-output", line) .emit(command_output_str, line)
.expect("failed to emit event"); .expect("failed to emit event");
} }
}); });
} }
#[tauri::command(rename_all = "snake_case")] #[tauri::command(rename_all = "snake_case")]
fn stop_command(child_id: u32, stop_signal: tauri::State<Arc<AtomicBool>>) { fn stop_command(child_id: u32) {
println!("stop command");
if child_id != 0 { if child_id != 0 {
let output = Command::new("taskkill") let output = Command::new("taskkill")
.arg("/F") .arg("/F")
@@ -223,8 +510,9 @@ fn stop_command(child_id: u32, stop_signal: tauri::State<Arc<AtomicBool>>) {
} else { } else {
eprintln!("Failed to terminate process {}.", child_id); eprintln!("Failed to terminate process {}.", child_id);
} }
} else {
println!("child id is 0");
} }
stop_signal.store(true, Ordering::Relaxed);
} }
#[tauri::command(rename_all = "snake_case")] #[tauri::command(rename_all = "snake_case")]
@@ -245,57 +533,238 @@ async fn fetch_easytier_list() -> Vec<Vec<[String; 3]>> {
} }
release_list.push(assets_list); release_list.push(assets_list);
} }
return release_list; release_list
} else { } else {
return Vec::new(); Vec::new()
} }
} }
fn toggle_window_visibility<R: tauri::Runtime>(app: &tauri::AppHandle<R>) { fn toggle_window_visibility<R: tauri::Runtime>(app: &tauri::AppHandle<R>) {
if let Some(window) = app.get_webview_window("main") { if let Some(window) = app.get_webview_window("main") {
if window.is_visible().unwrap_or_default() { let _ = window.show();
let _ = window.hide(); let _ = window.unminimize();
} else { let _ = window.set_focus();
let _ = window.show(); }
let _ = window.set_focus(); }
#[tauri::command(rename_all = "snake_case")]
fn search_pid_by_pname(target_process_name: String) -> u32 {
// 创建一个新的 System 实例
let mut system = System::new_all();
// 刷新所有进程信息
system.refresh_all();
// 遍历所有进程
for (pid, process) in system.processes() {
if process
.name()
.to_string_lossy()
.to_lowercase()
.contains(&target_process_name.to_lowercase())
{
println!("Found process '{}' with PID: {}", target_process_name, pid);
return pid.as_u32();
}
}
return 0;
}
#[tauri::command]
fn get_exe_directory() -> Vec<String> {
let mut ret_vec: Vec<String> = Vec::new();
match std::env::current_exe() {
Ok(exe_path) => {
// println!("Path of this executable is: {}", exe_path.display());
ret_vec.push(exe_path.display().to_string());
ret_vec.push(exe_path.parent().unwrap().display().to_string());
return ret_vec;
}
Err(e) => {
println!("failed to get current exe path: {e}");
ret_vec.push("".to_string());
ret_vec.push("".to_string());
return ret_vec;
}
};
}
#[tauri::command]
fn spawn_autostart(enabled: bool) {
let (tx, rx) = mpsc::channel();
thread::spawn(move || match autostart(enabled) {
Ok(_) => {
let _ = tx.send(true);
}
Err(e) => {
log::error!("Error: {}", e);
let _ = tx.send(false);
}
});
match rx.recv() {
Ok(_) => {
// println!("autostart enabled: {}", enabled);
}
Err(_e) => {}
}
}
fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
unsafe {
let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
task_service.Connect(
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
)?;
// 指定要删除的任务文件夹路径
let folder_path = BSTR::from("\\easytierGame");
// let root = BSTR::from("\\");
let task_name = BSTR::from("auto start");
let mut penabled = VARIANT_BOOL::from(false);
let bool_ptr: *mut VARIANT_BOOL = &mut penabled;
// 获取任务文件夹F
let task_folder: ITaskFolder = task_service.GetFolder(&folder_path)?;
let task = task_folder.GetTask(&task_name)?;
task.Definition()?
.Triggers()?
.get_Item(1)?
.Enabled(bool_ptr)?;
// 释放 COM 库
CoUninitialize();
// return penabled.as_bool();
Ok(penabled.as_bool())
}
}
#[tauri::command]
fn autostart_is_enabled() -> bool {
match autostart_enabled() {
Ok(enabled) => {
println!("autostart enabled: {}", enabled);
return enabled;
}
Err(e) => {
log::error!("autostart enabled: false -> {}", e);
return false;
} }
} }
} }
// 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>> {
if !enabled {
unsafe {
let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
task_service.Connect(
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
)?;
// 指定要删除的任务文件夹路径
let folder_path = BSTR::from("\\easytierGame");
let root = BSTR::from("\\");
let task_name = BSTR::from("auto start");
// 获取任务文件夹
let task_folder: ITaskFolder = task_service.GetFolder(&folder_path)?;
task_folder.DeleteTask(&task_name, 0)?;
println!("Task AutoStart Task deleted successfully.");
let task_folder: ITaskFolder = task_service.GetFolder(&root)?;
// 删除任务文件夹
task_folder.DeleteFolder(&folder_path, 0)?;
println!("Task folder easytierGame deleted successfully.");
// 释放 COM 库
CoUninitialize();
}
} else {
let ts = planIfTaskScheduler::new()?;
let com = ts.get_com();
let sb = ScheduleBuilder::new(&com).unwrap();
let exe = std::env::current_exe()?;
let exe = exe.to_str().unwrap();
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)?;
}
Ok(())
}
#[cfg_attr(mobile, tauri::mobile_entry_point)] #[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() { pub fn run() {
let stop_signal = Arc::new(AtomicBool::new(false)); // 创建一个原子布尔值,用于控制命令的停止 // 获取命令行参数
let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆,用于传递给命令 let _args: Vec<String> = std::env::args().collect();
let context = tauri::generate_context!(); let context = tauri::generate_context!();
tauri::Builder::default() tauri::Builder::default()
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_cli::init())
.plugin(
tauri_plugin_window_state::Builder::new()
.with_state_flags(tauri_plugin_window_state::StateFlags::SIZE)
.build(),
)
.plugin(tauri_plugin_clipboard_manager::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_shell::init()) .plugin(tauri_plugin_shell::init())
.on_window_event(move |window, event| {
if let WindowEvent::CloseRequested { api, .. } = event {
unsafe {
if !IS_CLOSE {
api.prevent_close();
window.emit("window-close-event", "").unwrap();
}
}
}
})
.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| { .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
let _ = app let _ = app
.get_webview_window("main") .get_webview_window("main")
.expect("no main window") .expect("no main window")
.set_focus(); .set_focus()
.expect("failed to set focus");
})) }))
.setup(|app| { .setup(move |app| {
if cfg!(debug_assertions) { // let args = args.clone();
app.handle().plugin( // if cfg!(debug_assertions) {
tauri_plugin_log::Builder::default() let log_path = get_tool_exe_path("\\easytier\\guiLogs");
.level(log::LevelFilter::Info) app.handle().plugin(
.build(), tauri_plugin_log::Builder::default()
)?; .target(tauri_plugin_log::Target::new(
} tauri_plugin_log::TargetKind::Folder {
path: std::path::PathBuf::from(log_path),
file_name: None,
},
))
.max_file_size(50_000 /* bytes */)
.level(log::LevelFilter::Error)
.build(),
)?;
// }
#[cfg(not(target_os = "android"))] #[cfg(not(target_os = "android"))]
let _tray_menu = TrayIconBuilder::with_id("main") let _tray_menu = TrayIconBuilder::with_id("main")
.menu_on_left_click(false) .show_menu_on_left_click(false)
.on_tray_icon_event(|tray, event| { .on_tray_icon_event(|tray, event| {
if let TrayIconEvent::Click { if let TrayIconEvent::Click {
button: MouseButton::Left, button: MouseButton::Left,
@@ -312,17 +781,32 @@ pub fn run() {
))?) ))?)
.icon_as_template(false) .icon_as_template(false)
.build(app)?; .build(app)?;
// 开机自启隐藏到托盘或者显示主窗口
// if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
// let main_window = app.get_webview_window("main").unwrap();
// main_window.show().expect("failed to show window");
// main_window.set_focus().expect("failed to set focus");
// }
Ok(()) Ok(())
}) })
.manage(stop_signal_clone)
.invoke_handler(tauri::generate_handler![ .invoke_handler(tauri::generate_handler![
my_commit_output,
force_close,
run_command, run_command,
stop_command, stop_command,
get_core_version, get_core_version,
fetch_easytier_list, fetch_easytier_list,
download_easytier_zip 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,
get_network_adapter_guids
]) ])
.run(context) .run(context)
.expect("error while running tauri application"); .expect("error while running tauri application");
+52 -9
View File
@@ -1,37 +1,80 @@
{ {
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game", "productName": "easytier-game",
"version": "1.0.3", "version": "1.4.2",
"identifier": "com.tauri.easytier-game", "identifier": "com.tauri.easytier-game",
"build": { "build": {
"frontendDist": "../dist", "frontendDist": "../dist",
"devUrl": "http://localhost:5000", "devUrl": "http://localhost:5000",
"beforeBuildCommand": "pnpm build",
"beforeDevCommand": "pnpm dev" "beforeDevCommand": "pnpm dev"
}, },
"app": { "app": {
"windows": [ "windows": [
{ {
"title": "easytier-game", "title": "easytier-game 1.4.2",
"width": 331, "label": "main",
"height": 285, "minWidth": 340,
"resizable": false, "width": 340,
"height": 305,
"minHeight": 305,
"maxHeight": 305,
"maxWidth": 360,
"resizable": true,
"fullscreen": false, "fullscreen": false,
"decorations": true, "decorations": true,
"maximizable": false,
"center": true, "center": true,
"visible": false,
"maximizable": false,
"transparent": false "transparent": false
} }
], ],
"security": { "security": {
"csp": null "csp": null,
"assetProtocol": {
"enable": true,
"scope": ["**"]
}
}
},
"plugins": {
"cli": {
"description": "easytier game CLI Plugin",
"args": [
{
"name": "task-auto-start",
"description": "easytier game autostart"
}
]
} }
}, },
"bundle": { "bundle": {
"active": false, "active": false,
"targets": "all", "targets": "all",
"resources": [
"easytier/config/",
"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",
"uninstall.exe"
],
"windows": {
"webviewInstallMode": {
"type": "embedBootstrapper"
}
},
"createUpdaterArtifacts": false, "createUpdaterArtifacts": false,
"icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"] "icon": ["icons/icon.png", "icons/icon.rgba", "icons/icon.icns", "icons/icon.ico"]
} }
} }
Binary file not shown.
+26
View File
@@ -0,0 +1,26 @@
[如果界面无法打开]
1. 如果您已经启动easytier-game.exe,那它可能会在后台运行,打开任务管理器关闭easytier-game.exe
2. 使用easytier-game安装目录下的 easytier/tool/MicrosoftEdgeWebview2Setup.exe 安装webview2
3. 再次启用easytier-game.exe
[如果想彻底删除easytierGame]
--
1. 关闭easytierGame
2. 运行easytier-game安装目录下的 easytier/clear_local_data.bat (需要管理员权限) 输入y确认,清除本地存储数据
3. 删除easytierGame文件夹
--
或者直接使用uninstall.exe
[没有服务器,怎么自建服务]
1. 点击 启动联机 按钮旁边的箭头 选择自建服务 设置好端口号后 点击启动服务器
2. 搜索一下 openFrp mossFrp sakurafrp 等 将你的本地服务通过它(们)代理到公网
3. 将代理之后的地址发给别人,他们就可以通过这个加入你的服务了
+128 -13
View File
@@ -1,34 +1,149 @@
import { defineStore } from "pinia"; import { acceptHMRUpdate, defineStore } from "pinia";
export default defineStore("main", { const store = defineStore("main", {
state() { state() {
return { return {
config: { config: {
protocol: ["tcp", "udp"], // 网络协议 protocol: ["tcp"], // 网络协议
serverUrl: "public.easytier.top:11010", serverUrl: "public.easytier.top:11010",
networkName: "", networkName: "",
networkPassword: "", networkPassword: "",
hostname: "", hostname: "",
ipv4: "", ipv4: "",
proxyNetworks: "", // 子网代理
autoStart: false, // 是否自动启动
connectAfterStart: false, //软件打开后,是否自动连接
disableIpv6: false, // 是否禁用IPv6 disableIpv6: false, // 是否禁用IPv6
port: "11010", // 监听端口号
enableCustomListener: true, // 是否自定义监听
enableCustomListenerV6: true, // 是否自定义IPV6监听
customListenerV6Data: "udp://[::]:11010", //自定义ipv6监
customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
disbleListenner: false, // 是否禁用监听 disbleListenner: false, // 是否禁用监听
disbleP2p: true, // 是否使用P2P disableEncryption: false, // 是否禁用加密
multiThread: false, //使用多线程
enablExitNode: false, // 是否启用退出节点
noTun: false, // 是否使用TUN
latencyfirst: false, // 是否优先延迟
useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
disableUdpHolePunching: false, // 是否禁用UDP打洞
relayAllPeerrpc: true, // 是否启用所有对等RPC
disbleP2p: false, // 是否使用P2P
dhcp: true, // 是否使用DHCP dhcp: true, // 是否使用DHCP
saveErrorLog: true, // 是否保存错误日志
logLevel: "error", //日志等级
devName: true, //自定义网卡名
devNameValue: "etgame", //自定义网卡名
enableCustomProtocol: true, //自定义默认协议
customProtocol: "tcp", //自定义默认协议
enableNetCardMetric: true, //启用网卡自定义跃点
netCardMetricValue: 1, //自定义网卡跃点值
enablePreventSleep: false, //组织系统休眠
compression: "none", //加密算法
enableKcpProxy: true, //启用kcp代理 默认开启
disableKcpInput: false //禁用kcp输入
}, },
basePeers: ["public.easytier.top:11010"], serverConfig: {
enableWhiteList: true, // 是否启用白名单
relayAllPeerrpc: false, // 是否启用所有对等RPC
serverWhiteList: "", // 服务器流量转发白名单
// enableListener: true, // 是否启用监听
autoStart: false, //随软件自启
port: "11010" // 服务器端口
},
cidrEnable: false,
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://ghfast.top/",
// forceBindIp配置
forceBindIpBit: "64",
delayInjectDll: false,
forceBindInput: "",
forceBindFile: "",
winipBcPid: 0,
winipBcStart: false,
latestTagName: "",
gameList: [] as Array<{ name: string; exePath: string; id: string; coverImg?: string; showImg: string }> // 游戏列表
}; };
}, },
persist: { persist: {
paths: [ // 防止持久化保存 用户使用config.json输入的无用的字段
"basePeers", pick: [
"config.protocol",
"config.serverUrl", "config.serverUrl",
"config.networkName", "config.networkName",
"config.protocol",
"config.networkPassword", "config.networkPassword",
"config.disbleP2p",
"config.disableIpv6",
"config.disbleListenner",
"config.hostname", "config.hostname",
"config.ipv4",
"config.proxyNetworks",
"config.autoStart",
"config.connectAfterStart",
"config.disableIpv6",
"config.disableEncryption",
"config.multiThread",
"config.enablExitNode",
"config.noTun",
"config.latencyfirst",
"config.useSmoltcp",
"config.disableUdpHolePunching",
"config.relayAllPeerrpc",
"config.disbleP2p",
"config.dhcp", "config.dhcp",
], "config.saveErrorLog",
}, "config.logLevel",
"config.devName",
"config.devNameValue",
"config.enableNetCardMetric",
"config.netCardMetricValue",
"config.port",
"config.disbleListenner",
"config.enableCustomListener",
"config.customListenerData",
"config.enableCustomListenerV6",
"config.customListenerV6Data",
"config.enableCustomProtocol",
"config.customProtocol",
"config.enablePreventSleep",
"config.compression",
"config.enableKcpProxy",
"config.disableKcpInput",
"serverConfig.autoStart",
// 'serverConfig.enableListener',
"serverConfig.enableWhiteList",
"serverConfig.relayAllPeerrpc",
"serverConfig.serverWhiteList",
"serverConfig.port",
"cidrEnable",
"basePeers",
"theme",
"configStartEnable",
"configPath",
"winIpBcAutoStart",
"createConfigInEasytier",
"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').Config} */
/** @type {import('tailwindcss/plugin')} */ /** @type {import('tailwindcss/plugin')} */
import plugin from "tailwindcss/plugin"
const plugin = require("tailwindcss/plugin"); // const plugin = require("tailwindcss/plugin");
module.exports = { export default {
content: ["./components/**/*.{js,vue,ts}", "./layouts/**/*.vue", "./pages/**/*.vue", "./plugins/**/*.{js,ts}", "./app.vue", "./error.vue"], content: ["./components/**/*.{js,vue,ts}", "./layouts/**/*.vue", "./pages/**/*.vue", "./plugins/**/*.{js,ts}", "./app.vue", "./error.vue"],
theme: { theme: {
extend: {} extend: {}
+5 -3
View File
@@ -6,6 +6,8 @@
"components/**/*.ts", "components/**/*.ts",
"components/**/*.js", "components/**/*.js",
"components/**/*.vue", "components/**/*.vue",
"composables/**/*.ts",
"app.vue",
"pages/**/*.ts", "pages/**/*.ts",
"pages/**/*.js", "pages/**/*.js",
"pages/**/*.vue", "pages/**/*.vue",
@@ -27,16 +29,16 @@
"compilerOptions": { "compilerOptions": {
"target": "ESNext", "target": "ESNext",
"module": "ESNext", "module": "ESNext",
"moduleResolution": "Node",
// "types": ["element-plus/global"] // "types": ["element-plus/global"]
"resolveJsonModule": true, "resolveJsonModule": true,
// 从 Vue 3.4 开始,Vue 不再隐式注册全局 JSX 命名空间。要指示 TypeScript 使用 Vue 的 JSX 类型定义,请确保在你的 tsconfig.json 中包含以下内容 // 从 Vue 3.4 开始,Vue 不再隐式注册全局 JSX 命名空间。要指示 TypeScript 使用 Vue 的 JSX 类型定义,请确保在你的 tsconfig.json 中包含以下内容
"jsx": "preserve", "jsx": "preserve",
"jsxImportSource": "vue", "jsxImportSource": "vue",
"types": ["@pinia/nuxt", "vite/client", "element-plus/global"], "types": ["@pinia/nuxt", "vite/client", "element-plus/global", "pinia-plugin-persistedstate"],
"allowJs": true, // 允许编译器编译JSJSX文件 "allowJs": true, // 允许编译器编译JSJSX文件
"checkJs": true, // 允许在JS文件中报错,通常与allowJS一起使用 "checkJs": false, // 允许在JS文件中报错,通常与allowJS一起使用
"esModuleInterop": true, // 允许export=导出,由import from 导入 "esModuleInterop": true, // 允许export=导出,由import from 导入
"lib": ["DOM", "ESNext"], "lib": ["DOM", "ESNext"],
"allowSyntheticDefaultImports": true "allowSyntheticDefaultImports": true
} }
+11
View File
@@ -1 +1,12 @@
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 {
readonly env: ImportMetaEnv;
}
+13 -5
View File
@@ -1,10 +1,10 @@
import { ElMessageBox } from "element-plus"; import { ElMessageBox } from "element-plus";
import { ATJ } from "./index"; import { ATJ } from "./index";
import { h, type VNode } from "vue"; 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 = ( export const ElConfirmDanger = (
content: string, content: string,
title: string, title: string = "提示",
opt: Opt = { opt: Opt = {
action: "", action: "",
confirmButtonText: "确定", confirmButtonText: "确定",
@@ -29,6 +29,8 @@ export const ElConfirmDanger = (
} }
return ATJ( return ATJ(
ElMessageBox.confirm(message, title, { ElMessageBox.confirm(message, title, {
closeOnClickModal: false, // 点击遮罩层不关闭弹窗
closeOnPressEscape: false, // 按下Esc键不关闭弹窗
cancelButtonText, cancelButtonText,
confirmButtonText, confirmButtonText,
confirmButtonClass: "el-button--danger" confirmButtonClass: "el-button--danger"
@@ -38,7 +40,7 @@ export const ElConfirmDanger = (
export const ElConfirmSucces = ( export const ElConfirmSucces = (
content: string, content: string,
title: string, title: string = "提示",
opt: Opt = { opt: Opt = {
action: "", action: "",
confirmButtonText: "确定", confirmButtonText: "确定",
@@ -63,6 +65,8 @@ export const ElConfirmSucces = (
} }
return ATJ( return ATJ(
ElMessageBox.confirm(message, title, { ElMessageBox.confirm(message, title, {
closeOnClickModal: false, // 点击遮罩层不关闭弹窗
closeOnPressEscape: false, // 按下Esc键不关闭弹窗
cancelButtonText, cancelButtonText,
confirmButtonText, confirmButtonText,
confirmButtonClass: "el-button--success" confirmButtonClass: "el-button--success"
@@ -72,15 +76,16 @@ export const ElConfirmSucces = (
export const ElConfirmPrimary = ( export const ElConfirmPrimary = (
content: string, content: string,
title: string, title: string = "提示",
opt: Opt = { opt: Opt = {
action: "", action: "",
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
showCancelButton: true,
VNode: null VNode: null
} }
): Promise<any | [any, any]> => { ): 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 formatContentArr = content.split("{action}");
const action_length = formatContentArr.length - 1; const action_length = formatContentArr.length - 1;
const messageArr = []; const messageArr = [];
@@ -97,6 +102,9 @@ export const ElConfirmPrimary = (
} }
return ATJ( return ATJ(
ElMessageBox.confirm(message, title, { ElMessageBox.confirm(message, title, {
closeOnClickModal: false, // 点击遮罩层不关闭弹窗
closeOnPressEscape: false, // 按下Esc键不关闭弹窗
showCancelButton,
cancelButtonText, cancelButtonText,
confirmButtonText, confirmButtonText,
confirmButtonClass: "el-button--primary" confirmButtonClass: "el-button--primary"
+96 -16
View File
@@ -1,19 +1,9 @@
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"; import { ElMessage } from "element-plus";
import Clipboard from "vue-clipboard3";
export const ENV = import.meta.env; export const ENV = import.meta.env;
export const clipBoardCopy = async (text: string) => {
const { toClipboard } = Clipboard();
try {
await toClipboard(text);
ElMessage.success("复制成功");
} catch (e) {
ElMessage.error("复制失败");
}
};
//防抖 //防抖
export const bounce = (time = 3000) => { export const bounce = (time = 3000) => {
let bounceTimer: NodeJS.Timeout | null = null; let bounceTimer: NodeJS.Timeout | null = null;
@@ -77,7 +67,97 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
}); });
}; };
export const openBrowser = (key: string) => { const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
// logger.info(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`)
// _launcherApi.openBrowser(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`); export const supportProtocols = () => {
return _supportProtocols.slice();
};
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");
// console.log(`trigger prevent sleep ${result}`);
}, _prevent_timer_count * 1000);
};
export const stopPreventSleep = async () => {
_prevent_timer && clearInterval(_prevent_timer);
_prevent_timer = null;
const _result = await invoke("allow_sleep");
};
export const parseCliInfo = (content: string) => {
if (!content) return [];
// 将表格字符串分割成行
const lines = content.split("\n");
// 提取表头(keys
const headers = lines[1]
.split("│")
.slice(1, -1)
.map(h => h.trim());
// 初始化结果数组
const result: any[] = [];
// 遍历数据行
for (let i = 3; i < lines.length - 1; i += 2) {
if (lines[i].trim() === "") continue; // 跳过空行
// 分割每一行的数据
const values = lines[i]
.split("│")
.slice(1, -1)
.map(v => v.trim());
// 创建对象并添加到结果数组
const obj: any = {};
headers.forEach((header, index) => {
obj[header] = values[index] === "-" || values[index] === "" ? null : values[index];
});
// 每行数据都作为一个新对象添加到结果数组中
result.push(obj);
}
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");
};
export function isValidIP(ip: string) {
const ipv4Pattern =
/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
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("复制失败");
}
}; };
+53
View File
@@ -0,0 +1,53 @@
import useMainStore from "@/stores/index";
import { open, Command } from "@tauri-apps/plugin-shell";
import { invoke } from "@tauri-apps/api/core";
const getExeAbsPath = async () => {
const aExePath = (await invoke("get_exe_directory")) as [string, string];
return aExePath;
};
const checkServerOnWindows = async () => {
try {
const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
if (serverStatus.stderr.includes("Can't open service")) {
return false;
}
return true;
} catch (err) {
return false;
}
};
const handleAutoStartByNssm = async () => {
const config = useMainStore().config;
const [exeAbsPath, parentDir] = await getExeAbsPath();
const isExist = await checkServerOnWindows();
if (isExist) {
const outputStop = await Command.create("nssm", ["stop", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
console.log({ outputStop });
const outputRemove = await Command.create("nssm", ["remove", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
console.log({ outputRemove });
}
if (exeAbsPath) {
const output = await Command.create("nssm", ["install", import.meta.env.VITE_AUTO_START_SERVICE_NAME, exeAbsPath]).execute();
console.log(output);
if (output.stdout && output.stdout.includes("installed successfully")) {
const outputAppDirectory = await Command.create("nssm", [
"set",
import.meta.env.VITE_AUTO_START_SERVICE_NAME,
"AppDirectory",
parentDir
]).execute();
console.log({ outputAppDirectory });
const outputStart = await Command.create("nssm", [
"set",
import.meta.env.VITE_AUTO_START_SERVICE_NAME,
"Start",
"SERVICE_AUTO_START"
]).execute();
console.log({ outputStart });
config.autoStart = true;
}
}
};
Binary file not shown.
+68
View File
@@ -0,0 +1,68 @@
/**
* 生成 release 发布包 zip 文件
*/
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 releaseZipDir = "./release";
const releaseZip = `${releaseZipDir}/${fileName}`;
const fs = require("fs");
const path = require("path");
const archiver = require("archiver");
const output = fs.createWriteStream(path.join(__dirname, releaseZip));
const archive = archiver("zip", {
zlib: { level: 8 } // Sets the compression level.
});
// listen for all archive data to be written
// 'close' event is fired only when a file descriptor is involved
output.on("close", function () {
console.log(archive.pointer() + " total bytes");
console.log(`archiver has been finalized and the output ${releaseZip}`);
});
// This event is fired when the data source is drained no matter what was the data source.
// It is not part of this library but rather from the NodeJS Stream API.
// @see: https://nodejs.org/api/stream.html#stream_event_end
output.on("end", function () {
console.log("Data has been drained");
});
// good practice to catch warnings (ie stat failures and other non-blocking errors)
archive.on("warning", function (err) {
if (err.code === "ENOENT") {
// log warning
} else {
// throw error
throw err;
}
});
archive.on("error", function (err) {
throw err;
});
for (const f of deleteEasytierFiles) {
fs.rmSync(path.join(__dirname, releaseDirEasytier + f), { recursive: true, force: true });
}
const r = path.join(__dirname, releaseZipDir);
if (!fs.existsSync(r)) {
fs.mkdirSync(r);
}
// pipe archive data to the file
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();