Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cdd3fada1f | ||
|
|
fe785f6066 | ||
|
|
37fd7b6fb0 | ||
|
|
096d5f03da | ||
|
|
1813240378 | ||
|
|
2d4a44740a | ||
|
|
f0633761a0 | ||
|
|
4bedec63ca | ||
|
|
ab67ba94a3 | ||
|
|
8e6f8d602e | ||
|
|
92d25ab907 | ||
|
|
1c8314c6fa | ||
|
|
b352d49e0b | ||
|
|
44183b1ad2 | ||
|
|
fe1bc6f89e | ||
|
|
be59e56bd1 | ||
|
|
f556e17f85 | ||
|
|
c7170967ec | ||
|
|
1801082601 | ||
|
|
189f3467c3 | ||
|
|
bf1403bf07 | ||
|
|
7a181200f3 | ||
|
|
9413449c8e | ||
|
|
2eb69352f7 | ||
|
|
9ea0eea0ac | ||
|
|
ef172e4d4c | ||
|
|
c572925a0d | ||
|
|
1a5d2cc8fc | ||
|
|
e4fbaa921c | ||
|
|
cf351b8708 | ||
|
|
ddf4c32ae6 | ||
|
|
76d29cbeeb | ||
|
|
3adf64e251 | ||
|
|
4e4ebf1246 | ||
|
|
6f57a866a4 | ||
|
|
4296f4a338 | ||
|
|
fe9f1c01b7 | ||
|
|
60078f00f7 | ||
|
|
43d681e888 | ||
|
|
d0567e96b5 | ||
|
|
d402f107b0 | ||
|
|
8c911f47f9 | ||
|
|
74fbfed7be | ||
|
|
f3fc37957c | ||
|
|
a4d6fe6e95 | ||
|
|
9b883d686d | ||
|
|
2ac0afb847 | ||
|
|
5b9eed9520 | ||
|
|
a04fae725d | ||
|
|
1ae122ab2a | ||
|
|
3db962f3dc | ||
|
|
a7f1292067 | ||
|
|
022e71de01 | ||
|
|
5350af87ed | ||
|
|
5d6b7bdf13 | ||
|
|
5740bd08c1 |
@@ -10,7 +10,5 @@ dist
|
||||
.idea
|
||||
.vscode
|
||||
release
|
||||
src-tauri/easytier-cli.exe
|
||||
src-tauri/easytier-core.exe
|
||||
src-tauri/Packet.dll
|
||||
src-tauri/wintun.dll
|
||||
|
||||
src-tauri/easytier/logs
|
||||
@@ -1,10 +1,65 @@
|
||||
# EasyiterGame
|
||||
基于easytier的简易游戏联机客户端
|
||||
# [EasyTier游戏联机启动器](https://github.com/EasyTier/EasytierGame)
|
||||
|
||||
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包,个人不喜欢安装包各种写注册表,解压即用就行,目录清爽干净
|
||||
|
||||

|
||||
|
||||
|
||||
## 使用教程
|
||||
|
||||
- 第一次使用,输入一个“主机名”点击启动联机即可,后续可以自建服务器或者使用爱心群友提供的服务器
|
||||

|
||||
|
||||

|
||||
|
||||
- 高级选项里有一些特殊配置,可以自行选择
|
||||

|
||||
|
||||
- 如果还是无法满足您的需求,可以使用配置文件进行启动,具体如何配置,可以查看文档[配置文件](/guide/network/config-file.html)
|
||||

|
||||
|
||||
- easytier内核升级后,可以点击更新插件按钮就可以进行更新,但是需要出国,如果无法更新,可以在群里获取
|
||||

|
||||
|
||||
- 1.1.4更新了 配置分享功能 可以与朋友之间分享配置,方便联机
|
||||
|
||||
|
||||

|
||||
|
||||
- 1.1.5 合并额外插件于 "增强工具" 窗口 新增了网卡跃点设置 关闭防火墙功能 ping功能
|
||||

|
||||
|
||||

|
||||
|
||||
- 1.1.8 新增了 生成 easytier/config.json 的功能 会将一部分配置写入到 config.json 文件中,方便用户自定义配置,你可以在高级设置里启用和关闭这个功能(默认关闭)
|
||||
**需要注意的是,如果config.json存在,每次启动easytierGame默认按照config.json的配置为准**
|
||||
**解压zip后你可以查看 easytier/config_template.json 里的注释进行配置**
|
||||

|
||||
|
||||
## 特性
|
||||
|
||||
- 基于easytier组网工具开发,界面清晰简单
|
||||
- 自带“更新”按钮,在easytier组网工具发布新版本时,点击更新即可(需要出国工具)
|
||||
- 第一次使用,输入一个“主机名”点击启动联机即可,后续可以自建服务器或者使用群友的服务器
|
||||
- 配置简单,也含有高级功能,同时也支持自定义配置文件启动
|
||||
- 默认开启 **WinIPBroadcast** 不再怕联机找不到房间(例如:无主之地3)
|
||||
- 已经测试 **艾尔登法环学习版**,**无主之地3**,**深岩银河**,**怪物猎人世界** 等都可稳定联机游玩
|
||||
|
||||
## 系统支持
|
||||
|
||||
支持Windows 11 、Windows 10 、 Windows 7
|
||||
|
||||
|
||||
|
||||
## 请不要将本程序和仓库代码用于任何违法用途,由此产生的一切后果,仓库所有者和参与开发的人员不承担任何责任
|
||||
|
||||
2. 生产环境发布
|
||||
执行 pnpm tauri build
|
||||
产物位于 src-tauri/target/release 下 easytier-game.exe
|
||||
|
||||
@@ -4,4 +4,33 @@
|
||||
</NuxtLayout>
|
||||
</template>
|
||||
<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);
|
||||
if (import.meta.env.PROD) {
|
||||
try {
|
||||
if (typeof message === "string") {
|
||||
logger(message);
|
||||
} else {
|
||||
logger(JSON.stringify(message));
|
||||
}
|
||||
} catch (e) {
|
||||
logger(`${message}`);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
forwardConsole("log", info);
|
||||
forwardConsole("debug", debug);
|
||||
forwardConsole("info", info);
|
||||
forwardConsole("warn", warn);
|
||||
forwardConsole("error", error);
|
||||
|
||||
const mainStore = useMainStore();
|
||||
// console.log(mainStore.theme)
|
||||
initTheme(mainStore.theme);
|
||||
</script>
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
@tailwind base;
|
||||
/* @tailwind base; */
|
||||
|
||||
/*
|
||||
用于进行主题更换,如果要更换elemenet-plus-ui的主题记得加上!important,不然更换会失败
|
||||
*/
|
||||
|
||||
@layer base {
|
||||
/* @layer base {
|
||||
html {
|
||||
font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", STHeiti, "Microsoft YaHei";
|
||||
}
|
||||
}
|
||||
} */
|
||||
|
||||
html,
|
||||
body {
|
||||
@@ -19,25 +19,21 @@ body {
|
||||
* {
|
||||
outline: none;
|
||||
}
|
||||
body {
|
||||
background-color: #fff;
|
||||
}
|
||||
html.dark body {
|
||||
background-color: #000;
|
||||
}
|
||||
|
||||
#__easytier {
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
background-color: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 3px 5px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar {
|
||||
width: 6px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
background-color: #0003;
|
||||
border-radius: 10px;
|
||||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
border-radius: 10px;
|
||||
}
|
||||
.full-label .el-form-item__label {
|
||||
width: 100%;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
After Width: | Height: | Size: 30 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 57 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 27 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 35 KiB |
@@ -0,0 +1,45 @@
|
||||
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,
|
||||
relayAllPeerrpc,
|
||||
connectAfterStart,
|
||||
multiThread,
|
||||
enablExitNode,
|
||||
useSmoltcp,
|
||||
saveErrorLog,
|
||||
logLevel,
|
||||
serverUrl,
|
||||
...otherConfig
|
||||
} = mainStore.config;
|
||||
let writeServerUrl: Array<string> | string = serverUrl;
|
||||
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, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
ElMessage.error(`更新config.json失败`);
|
||||
}
|
||||
};
|
||||
@@ -1,8 +0,0 @@
|
||||
// const infoDialog = new WebviewWindow("log", {
|
||||
// title: "日志",
|
||||
// resizable: false,
|
||||
// width: 600,
|
||||
// height: 400,
|
||||
// parent: appWindow,
|
||||
// url: "/log"
|
||||
// });
|
||||
@@ -0,0 +1,56 @@
|
||||
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;
|
||||
if (mainStore.winipBcPid && mainStore.winipBcPid > 0) {
|
||||
mainStore.winipBcStart = true;
|
||||
} else {
|
||||
mainStore.winipBcStart = false;
|
||||
}
|
||||
};
|
||||
|
||||
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;
|
||||
if (mainStore.winipBcPid) {
|
||||
mainStore.winipBcStart = true;
|
||||
mainStore.winIpBcAutoStart = true;
|
||||
} else {
|
||||
ElMessage.error(`WinipBc失败`);
|
||||
}
|
||||
} catch (err) {
|
||||
ElMessage.error(`WinipBc失败`);
|
||||
console.error(err);
|
||||
}
|
||||
} else {
|
||||
mainStore.winIpBcAutoStart = false;
|
||||
await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
|
||||
await getWinIpBroadcastPid();
|
||||
}
|
||||
};
|
||||
|
||||
export const initStartWinIpBroadcast = async () => {
|
||||
const mainStore = useMainStore();
|
||||
await getWinIpBroadcastPid();
|
||||
// console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
|
||||
if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
|
||||
await handleWinipBcStart();
|
||||
}
|
||||
};
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -1,89 +1,108 @@
|
||||
import { Menu, MenuItem, PredefinedMenuItem } from '@tauri-apps/api/menu'
|
||||
import { TrayIcon } from '@tauri-apps/api/tray'
|
||||
import { getCurrentWindow } from '@tauri-apps/api/window'
|
||||
import pkg from '@/package.json'
|
||||
import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
|
||||
import { TrayIcon } from "@tauri-apps/api/tray";
|
||||
import { getCurrentWindow } from "@tauri-apps/api/window";
|
||||
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";
|
||||
|
||||
const DEFAULT_TRAY_NAME = 'main'
|
||||
const DEFAULT_TRAY_NAME = "main";
|
||||
|
||||
async function toggleVisibility() {
|
||||
if (await getCurrentWindow().isVisible()) {
|
||||
await getCurrentWindow().hide()
|
||||
}
|
||||
else {
|
||||
await getCurrentWindow().show()
|
||||
await getCurrentWindow().setFocus()
|
||||
}
|
||||
if (await getCurrentWindow().isVisible()) {
|
||||
await getCurrentWindow().hide();
|
||||
} else {
|
||||
await getCurrentWindow().show();
|
||||
await getCurrentWindow().setFocus();
|
||||
}
|
||||
}
|
||||
|
||||
export async function useTray(init: boolean = false, beforExit) {
|
||||
let tray
|
||||
try {
|
||||
tray = await TrayIcon.getById(DEFAULT_TRAY_NAME)
|
||||
if (!tray) {
|
||||
tray = await TrayIcon.new({
|
||||
tooltip: `EasyTier\n${pkg.version}`,
|
||||
title: `EasyTier\n${pkg.version}`,
|
||||
id: DEFAULT_TRAY_NAME,
|
||||
menu: await Menu.new({
|
||||
id: 'main',
|
||||
items: await generateMenuItem(beforExit),
|
||||
}),
|
||||
action: async (e) => {
|
||||
toggleVisibility()
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
console.warn('Error while creating tray icon:', error)
|
||||
return null
|
||||
}
|
||||
export async function useTray(init: boolean = false, beforExit: Function) {
|
||||
let tray;
|
||||
try {
|
||||
tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
|
||||
if (!tray) {
|
||||
tray = await TrayIcon.new({
|
||||
tooltip: `EasyTierGame\n${pkg.version}`,
|
||||
title: `EasyTierGame\n${pkg.version}`,
|
||||
id: DEFAULT_TRAY_NAME,
|
||||
menu: await Menu.new({
|
||||
id: "main",
|
||||
items: await generateMenuItem(beforExit),
|
||||
}),
|
||||
action: async (e) => {
|
||||
toggleVisibility();
|
||||
},
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error while creating tray icon:", error);
|
||||
return null;
|
||||
}
|
||||
|
||||
if (init) {
|
||||
tray.setTooltip(`EasyTier\n${pkg.version}`)
|
||||
tray.setMenuOnLeftClick(false)
|
||||
tray.setMenu(await Menu.new({
|
||||
id: 'main',
|
||||
items: await generateMenuItem(beforExit),
|
||||
}))
|
||||
}
|
||||
if (init) {
|
||||
tray.setTooltip(`EasyTierGame\n${pkg.version}`);
|
||||
tray.setMenuOnLeftClick(false);
|
||||
tray.setMenu(
|
||||
await Menu.new({
|
||||
id: "main",
|
||||
items: await generateMenuItem(beforExit),
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
return tray
|
||||
return tray;
|
||||
}
|
||||
|
||||
export async function generateMenuItem(beforExit: Function) {
|
||||
return [
|
||||
await MenuItemExit('退出', beforExit),
|
||||
await PredefinedMenuItem.new({ item: 'Separator' }),
|
||||
await MenuItemShow('显示 / 隐藏'),
|
||||
]
|
||||
return [
|
||||
await MenuItemShow("显示 / 隐藏"),
|
||||
await MenuItemTheme(),
|
||||
await PredefinedMenuItem.new({ item: "Separator" }),
|
||||
await MenuItemExit("退出", beforExit),
|
||||
];
|
||||
}
|
||||
|
||||
export async function MenuItemExit(text: string, beforExit: Function) {
|
||||
return await MenuItem.new({
|
||||
id: "quit",
|
||||
text,
|
||||
action: async () => {
|
||||
if (beforExit) {
|
||||
await beforExit();
|
||||
}
|
||||
await getCurrentWindow().close();
|
||||
}
|
||||
})
|
||||
return await MenuItem.new({
|
||||
id: "quit",
|
||||
text,
|
||||
action: async () => {
|
||||
if (beforExit) {
|
||||
await beforExit();
|
||||
}
|
||||
await getCurrentWindow().close();
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export async function MenuItemShow(text: string) {
|
||||
return await MenuItem.new({
|
||||
id: 'show',
|
||||
text,
|
||||
action: async () => {
|
||||
await toggleVisibility()
|
||||
},
|
||||
})
|
||||
return await MenuItem.new({
|
||||
id: "show",
|
||||
text,
|
||||
action: async () => {
|
||||
await toggleVisibility();
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export async function MenuItemTheme() {
|
||||
return await MenuItem.new({
|
||||
id: "theme",
|
||||
text: "主题切换",
|
||||
action: async () => {
|
||||
const mainStore = useMainStore();
|
||||
mainStore.theme = !mainStore.theme;
|
||||
// const appWindow = getCurrentWindow();
|
||||
// appWindow.emitTo("main", "config", { theme: mainStore.theme });
|
||||
await setTheme(mainStore.theme);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// export async function setTrayMenu(items: (MenuItem | PredefinedMenuItem)[] | undefined = undefined) {
|
||||
// const tray = await useTray()
|
||||
// // const tray = await useTray()
|
||||
// const tray = await TrayIcon.getById(DEFAULT_TRAY_NAME)
|
||||
// if (!tray)
|
||||
// return
|
||||
// const menu = await Menu.new({
|
||||
@@ -93,19 +112,19 @@ export async function MenuItemShow(text: string) {
|
||||
// tray.setMenu(menu)
|
||||
// }
|
||||
|
||||
// export async function setTrayRunState(isRunning: boolean = false) {
|
||||
// const tray = await useTray()
|
||||
// if (!tray)
|
||||
// return
|
||||
// tray.setIcon(isRunning ? 'icons/icon-inactive.ico' : 'icons/icon.ico')
|
||||
// }
|
||||
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(tooltip: string) {
|
||||
// if (tooltip) {
|
||||
// const tray = await useTray()
|
||||
// if (!tray)
|
||||
// return
|
||||
// tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`)
|
||||
// tray.setTitle(`EasyTier\n${pkg.version}\n${tooltip}`)
|
||||
// }
|
||||
// }
|
||||
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}`);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
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";
|
||||
export default async (
|
||||
label: WebviewLabel,
|
||||
options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
|
||||
afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
|
||||
beforeCloseFunc?: () => void | null
|
||||
) => {
|
||||
let unListenlogClose: UnlistenFn | null = null;
|
||||
let unlistenLogCreated: UnlistenFn | null = null;
|
||||
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 monitor = await currentMonitor();
|
||||
// console.error(monitor)
|
||||
const factor = await appWindow.scaleFactor();
|
||||
const appPosition = await appWindow.outerPosition();
|
||||
// console.error((appPosition.x + appSize.width) / 1.25);
|
||||
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;
|
||||
}
|
||||
dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
|
||||
unlistenLogCreated = await dialog.once("tauri://webview-created", async () => {
|
||||
if (dialog) {
|
||||
afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
|
||||
await dialog.show();
|
||||
}
|
||||
});
|
||||
unListenlogClose = await dialog.onCloseRequested(async () => {
|
||||
beforeCloseFunc && (await beforeCloseFunc());
|
||||
unListenlogClose && (await unListenlogClose());
|
||||
});
|
||||
} else {
|
||||
const visible = await dialog.isVisible();
|
||||
if (visible) {
|
||||
await dialog.close();
|
||||
unlistenLogCreated && (await (unlistenLogCreated as Function)());
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,4 @@
|
||||
VITE_CONFIG_PATH=easytier/config/
|
||||
VITE_CONFIG_FILE_NAME=easytier/config.json
|
||||
VITE_LOG_PATH=easytier/logs/
|
||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||
@@ -0,0 +1,4 @@
|
||||
VITE_CONFIG_PATH=easytier/config/
|
||||
VITE_CONFIG_FILE_NAME=easytier/config.json
|
||||
VITE_LOG_PATH=easytier/logs/
|
||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||
@@ -5,6 +5,8 @@
|
||||
<script setup lang="tsx">
|
||||
//屏蔽右键菜单
|
||||
document.addEventListener("contextmenu", (e: MouseEvent) => {
|
||||
e.preventDefault();
|
||||
if (import.meta.env.PROD) {
|
||||
e.preventDefault();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -1,16 +1,7 @@
|
||||
import { defineNuxtConfig } from "nuxt/config";
|
||||
import fs from "fs";
|
||||
import path from "path";
|
||||
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({
|
||||
ssr: false,
|
||||
|
||||
@@ -22,8 +13,19 @@ export default defineNuxtConfig({
|
||||
autoImport: false
|
||||
},
|
||||
|
||||
css: ["~/assets/css/main.css"],
|
||||
modules: ["@element-plus/nuxt", "@pinia/nuxt", "@pinia-plugin-persistedstate/nuxt", "@nuxtjs/tailwindcss"],
|
||||
css: ["~/assets/css/main.css", "element-plus/theme-chalk/dark/css-vars.css"],
|
||||
modules: [
|
||||
"@element-plus/nuxt",
|
||||
"@pinia/nuxt",
|
||||
[
|
||||
"pinia-plugin-persistedstate/nuxt",
|
||||
{
|
||||
key: "__glj_persisted_%id",
|
||||
storage: "localStorage"
|
||||
}
|
||||
],
|
||||
"@nuxtjs/tailwindcss"
|
||||
],
|
||||
|
||||
alias: {
|
||||
"@": path.resolve(__dirname, "./")
|
||||
@@ -44,12 +46,10 @@ export default defineNuxtConfig({
|
||||
},
|
||||
|
||||
vite: {
|
||||
plugins: [
|
||||
vueJSX({}),
|
||||
],
|
||||
plugins: [vueJSX({})],
|
||||
envDir: "env",
|
||||
optimizeDeps: {
|
||||
include: [...optimizeDepsElementPlusIncludes]
|
||||
// include: [...optimizeDepsElementPlusIncludes]
|
||||
},
|
||||
// prevent vite from obscuring rust errors
|
||||
clearScreen: false,
|
||||
@@ -70,7 +70,7 @@ export default defineNuxtConfig({
|
||||
sourcemap: !!process.env.TAURI_DEBUG
|
||||
},
|
||||
esbuild: {
|
||||
pure: ["console.log"],
|
||||
// pure: ["console.log"],
|
||||
drop: ["debugger"]
|
||||
}
|
||||
},
|
||||
@@ -84,7 +84,7 @@ export default defineNuxtConfig({
|
||||
|
||||
app: {
|
||||
rootId: "__easytier",
|
||||
cdnURL: "./",
|
||||
cdnURL: "./",
|
||||
buildAssetsDir: "__easytier/",
|
||||
head: {
|
||||
meta: [
|
||||
@@ -102,5 +102,6 @@ export default defineNuxtConfig({
|
||||
// script: [],
|
||||
// noscript: []
|
||||
}
|
||||
}
|
||||
},
|
||||
compatibilityDate: "2024-11-12"
|
||||
});
|
||||
|
||||
@@ -3,39 +3,37 @@
|
||||
"private": true,
|
||||
"author": "leizi97",
|
||||
"description": "A simple network initiator based on Easytier",
|
||||
"version": "1.0.5",
|
||||
"version": "1.2.3",
|
||||
"scripts": {
|
||||
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
|
||||
"build": "nuxt generate --dotenv env/.env.prod"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@element-plus/icons-vue": "^2.3.1",
|
||||
"@element-plus/nuxt": "^1.0.9",
|
||||
"@element-plus/nuxt": "^1.1.0",
|
||||
"@nuxtjs/tailwindcss": "^6.12.0",
|
||||
"@pinia-plugin-persistedstate/nuxt": "^1.2.0",
|
||||
"@pinia/nuxt": "^0.5.1",
|
||||
"@tauri-apps/api": "^2.0.2",
|
||||
"@tauri-apps/cli": "^2.0.2",
|
||||
"@pinia/nuxt": "^0.7.0",
|
||||
"@tauri-apps/api": "^2.1.1",
|
||||
"@tauri-apps/cli": "^2.1.0",
|
||||
"@tauri-apps/plugin-autostart": "~2",
|
||||
"@tauri-apps/plugin-cli": "^2.0.0",
|
||||
"@tauri-apps/plugin-http": "^2.0.0",
|
||||
"@tinymce/tinymce-vue": "^5.1.1",
|
||||
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
|
||||
"@tauri-apps/plugin-fs": "~2",
|
||||
"@tauri-apps/plugin-http": "^2.0.1",
|
||||
"@tauri-apps/plugin-log": "^2.0.0",
|
||||
"@tauri-apps/plugin-shell": "~2",
|
||||
"@tauri-apps/plugin-window-state": "~2",
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@types/qs": "^6.9.15",
|
||||
"@vitejs/plugin-vue-jsx": "^3.1.0",
|
||||
"dayjs": "^1.11.10",
|
||||
"defu": "^6.1.4",
|
||||
"element-plus": "^2.7.1",
|
||||
"javascript-obfuscator": "^4.1.0",
|
||||
"@vitejs/plugin-vue-jsx": "^4.1.0",
|
||||
"@vueuse/core": "^11.2.0",
|
||||
"element-plus": "^2.8.7",
|
||||
"less": "^4.2.0",
|
||||
"lodash-es": "^4.17.21",
|
||||
"nuxt": "^3.11.2",
|
||||
"pinia": "^2.1.7",
|
||||
"nuxt": "^3.13.2",
|
||||
"pinia": "^2.2.6",
|
||||
"pinia-plugin-persistedstate": "^4.1.3",
|
||||
"postcss": "^8.4.38",
|
||||
"qs": "^6.12.0",
|
||||
"typescript": "^5.4.5",
|
||||
"vue": "^3.4.24",
|
||||
"vue-clipboard3": "^2.0.0",
|
||||
"xlsx": "^0.18.5",
|
||||
"@tauri-apps/plugin-shell": "~2"
|
||||
"typescript": "^5.6.3",
|
||||
"vue-clipboard3": "^2.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
<template>
|
||||
<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
|
||||
<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
|
||||
<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口,只连接到对等节点</ElCheckbox></div>
|
||||
<div class="flex items-center gap-[15px] flex-nowrap">
|
||||
<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
|
||||
<div class="w-[140px]">
|
||||
<ElSelect
|
||||
size="small"
|
||||
v-model="mainStore.config.logLevel"
|
||||
placeholder="请选择日志等级"
|
||||
class="ml-[5px]"
|
||||
>
|
||||
<ElOption
|
||||
v-for="item in data"
|
||||
:key="item"
|
||||
:label="`level - ${item}`"
|
||||
:value="item"
|
||||
></ElOption>
|
||||
</ElSelect>
|
||||
</div>
|
||||
<ElButton
|
||||
@click="openLogDir"
|
||||
size="small"
|
||||
>
|
||||
打开日志目录
|
||||
</ElButton>
|
||||
</div>
|
||||
<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后,自动"启动联机"(搭配开机自启,无感联机)</ElCheckbox></div>
|
||||
<div class="flex items-center gap-[15px] flex-nowrap">
|
||||
<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
|
||||
<ElButton
|
||||
@click="openConfigJsonDir"
|
||||
size="small"
|
||||
>
|
||||
打开config.json目录
|
||||
</ElButton>
|
||||
</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>
|
||||
<ElDivider />
|
||||
|
||||
<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
|
||||
<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式,将尝试使用最低延迟路径转发流量,默认使用最短路径</ElCheckbox></div>
|
||||
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
|
||||
<div>
|
||||
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包,即使对等节点不在转发网络白名单内</ElCheckbox>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import useMainStore from "@/stores/index";
|
||||
import { QuestionFilled } from "@element-plus/icons-vue";
|
||||
import { getCurrentWindow } from "@tauri-apps/api/window";
|
||||
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
||||
import { Command } from "@tauri-apps/plugin-shell";
|
||||
import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
|
||||
import { ElMessage } from "element-plus";
|
||||
|
||||
const mainStore = useMainStore();
|
||||
const appWindow = getCurrentWindow();
|
||||
const data = ["trace", "debug", "info", "warn", "error", "off"];
|
||||
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的目录不存在");
|
||||
}
|
||||
};
|
||||
mainStore.$subscribe(async (...a) => {
|
||||
// console.error("subscribe", a);
|
||||
await appWindow.emitTo("main", "config", { config: { ...mainStore.config }, createConfigInEasytier: mainStore.createConfigInEasytier });
|
||||
// if(mainStore.createConfigInEasytier) {
|
||||
// updateConfigJson();
|
||||
// }
|
||||
});
|
||||
</script>
|
||||
@@ -0,0 +1,25 @@
|
||||
<template>
|
||||
<div class="h-full flex flex-col gap-[10px]">
|
||||
<ElRadioGroup v-model="mainStore.cidrEnable">
|
||||
<ElRadioButton :value="true">开启</ElRadioButton>
|
||||
<ElRadioButton :value="false">关闭</ElRadioButton>
|
||||
</ElRadioGroup>
|
||||
<div class="flex-1 overflow-auto">
|
||||
<ElInput
|
||||
placeholder="例如: 192.168.1.0/24 一行一个"
|
||||
v-model="mainStore.config.proxyNetworks"
|
||||
type="textarea"
|
||||
:rows="30"
|
||||
resize="none"></ElInput>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import useMainStore from "@/stores/index";
|
||||
import { getCurrentWindow } from "@tauri-apps/api/window";
|
||||
const mainStore = useMainStore();
|
||||
const appWindow = getCurrentWindow();
|
||||
mainStore.$subscribe((...a) => {
|
||||
appWindow.emitTo("main", "config", { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } });
|
||||
});
|
||||
</script>
|
||||
@@ -1,11 +1,11 @@
|
||||
<template>
|
||||
<ElInput
|
||||
type="textarea"
|
||||
rows="17"
|
||||
:rows="17"
|
||||
v-model="data.log"
|
||||
resize="none"
|
||||
readonly
|
||||
placeholder="等待日志中..."
|
||||
placeholder="等待日志中,请先'启动联机'..."
|
||||
/>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
|
||||
@@ -4,28 +4,59 @@
|
||||
<span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span>
|
||||
<ElTable
|
||||
stripe
|
||||
border
|
||||
:data="data.member"
|
||||
v-else
|
||||
>
|
||||
v-else>
|
||||
<ElTableColumn
|
||||
v-for="prop in showTableHeader"
|
||||
:label="prop[1]"
|
||||
:key="prop[0]"
|
||||
>
|
||||
sortable
|
||||
width="140"
|
||||
label="主机名"
|
||||
prop="hostname"></ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="90"
|
||||
prop="cost"
|
||||
label="路由">
|
||||
<template #default="{ row }">
|
||||
<span v-if="prop[0] == 'loss_rate'">
|
||||
{{ row[prop[0]] && row[prop[0]] != "-" ? Number(row[prop[0]] * 100).toFixed(2) + "%" : row[prop[0]] }}
|
||||
</span>
|
||||
<span v-else-if="prop[0] != 'cost'">{{ row[prop[0]] }}</span>
|
||||
<ElTag
|
||||
v-else
|
||||
effect="dark"
|
||||
:type="row[prop[0]] == 'p2p' ? 'success' : 'info'"
|
||||
>
|
||||
{{ row[prop[0]] }}
|
||||
:type="row.cost == 'p2p' ? 'success' : 'info'">
|
||||
{{ row.cost }}
|
||||
</ElTag>
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="120"
|
||||
prop="ipv4"
|
||||
label="虚拟网IP"></ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
prop="lat_ms"
|
||||
width="130"
|
||||
label="延迟/ms"></ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="120"
|
||||
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="120"
|
||||
label="nat_type"
|
||||
prop="NAT类型">
|
||||
<template #default="{ row }">
|
||||
{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
prop="version"
|
||||
label="版本"></ElTableColumn>
|
||||
</ElTable>
|
||||
</div>
|
||||
</div>
|
||||
@@ -33,149 +64,61 @@
|
||||
<script setup lang="ts">
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { reactive, onMounted, onBeforeUnmount } from "vue";
|
||||
import { parsePeerInfo } from "@/utils";
|
||||
// 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: any[] }>({
|
||||
member: []
|
||||
member: [],
|
||||
});
|
||||
|
||||
const showTableHeader = [
|
||||
["ipv4", "虚拟网IP"],
|
||||
const _showTableHeader = [
|
||||
["hostname", "主机名"],
|
||||
["cost", "方式"],
|
||||
["cost", "路由"],
|
||||
["ipv4", "虚拟网IP"],
|
||||
["lat_ms", "延迟/ms"],
|
||||
["loss_rate", "丢包率"],
|
||||
["version", "版本"]
|
||||
["nat_type", "NAT类型"],
|
||||
["version", "版本"],
|
||||
];
|
||||
const headers = [
|
||||
"ipv4",
|
||||
"hostname",
|
||||
"cost",
|
||||
"lat_ms",
|
||||
"loss_rate",
|
||||
"rx_bytes",
|
||||
"rx_unit",
|
||||
"tx_bytes",
|
||||
"tx_unit",
|
||||
"tunnel_proto",
|
||||
"nat_type",
|
||||
"id",
|
||||
"version"
|
||||
];
|
||||
|
||||
const formatData = (data: any[]) => {
|
||||
if (!data) return [];
|
||||
const result = [];
|
||||
let obj: any = {};
|
||||
let length = data.length;
|
||||
for (let idx = 0; idx < length; idx++) {
|
||||
let headersIdx = idx % headers.length;
|
||||
if (headersIdx === 0) {
|
||||
console.log(idx, [...data]);
|
||||
obj = {};
|
||||
result.push(obj);
|
||||
}
|
||||
if (["ipv4"].includes(headers[headersIdx]) && !/\d+\.\d+\.\d+\.\d\/\d+/.test(data[idx]) && data[idx]) {
|
||||
const next = data[idx];
|
||||
data[idx] = "-";
|
||||
const head = data.slice(0, idx);
|
||||
const latest = data.slice(idx);
|
||||
data = [...head, next, ...latest];
|
||||
length = data.length;
|
||||
} else if (["rx_bytes", "tx_bytes"].includes(headers[headersIdx]) && data[idx] == "-") {
|
||||
const head = data.slice(0, idx);
|
||||
const latest = data.slice(idx);
|
||||
data = [...head, "-", ...latest];
|
||||
length = data.length;
|
||||
} else if (
|
||||
["tunnel_proto"].includes(headers[headersIdx]) &&
|
||||
![
|
||||
"tcp",
|
||||
"udp",
|
||||
"ws",
|
||||
"wss",
|
||||
"wg",
|
||||
"-",
|
||||
"tcp,udp",
|
||||
"ws,wss",
|
||||
"tcp,udp,ws,wss,wg",
|
||||
"tcp,ws,wss,wg",
|
||||
"udp,ws,wss,wg",
|
||||
"tcp,wg",
|
||||
"udp,wg",
|
||||
"tcp,ws",
|
||||
"tcp,wss",
|
||||
"udp,ws",
|
||||
"udp,wss",
|
||||
"tcp,udp,ws",
|
||||
"tcp,udp,wss",
|
||||
"tcp,udp,ws,wss",
|
||||
"tcp,udp,ws,wss,wg",
|
||||
"tcp,udp,wg",
|
||||
"tcp,udp,ws,wg",
|
||||
"udp,tcp",
|
||||
"udp,tcp,ws",
|
||||
"udp,tcp,wss",
|
||||
"udp,tcp,ws,wss",
|
||||
"udp,tcp,ws,wss,wg",
|
||||
"udp,tcp,wg",
|
||||
"udp,tcp,ws,wg",
|
||||
"tcp,udp,wss,wg",
|
||||
"tcp,udp,ws,wg",
|
||||
"tcp,udp,wss,wg",
|
||||
"ws,tcp",
|
||||
"ws,udp",
|
||||
"ws,tcp,udp",
|
||||
"ws,tcp,udp,ws",
|
||||
"ws,tcp,udp,wss",
|
||||
"ws,tcp,udp,ws,wss",
|
||||
"ws,tcp,udp,ws,wss,wg",
|
||||
"ws,tcp,udp,wg",
|
||||
"ws,tcp,udp,ws,wg",
|
||||
"ws,udp,tcp",
|
||||
"ws,udp,tcp,ws",
|
||||
"ws,udp,tcp,wss",
|
||||
"ws,udp,tcp,ws,wss",
|
||||
"wss,tcp",
|
||||
"wss,udp",
|
||||
"wss,tcp,udp",
|
||||
"wss,tcp,udp,ws",
|
||||
"wss,tcp,udp,wss",
|
||||
"wss,tcp,udp,ws,wss",
|
||||
"wss,tcp,udp,ws,wss,wg",
|
||||
"wss,tcp,udp,wg",
|
||||
"wg,tcp",
|
||||
"wg,udp",
|
||||
"wg,tcp,udp",
|
||||
"wg,tcp,udp,ws",
|
||||
"wg,tcp,udp,wss",
|
||||
"wg,tcp,udp,ws,wss",
|
||||
"wg,tcp,udp,ws,wss,wg",
|
||||
"wg,tcp,udp,wg",
|
||||
"wg,udp,tcp"
|
||||
].includes(data[idx])
|
||||
) {
|
||||
const head = data.slice(0, idx);
|
||||
const latest = data.slice(idx);
|
||||
data = [...head, "-", ...latest];
|
||||
length = data.length;
|
||||
}
|
||||
obj[headers[headersIdx]] = data[idx];
|
||||
}
|
||||
return result;
|
||||
};
|
||||
|
||||
const listenOutput = async () => {
|
||||
const member = await invoke("get_members_by_cli");
|
||||
let memberData = ((member as string) || "")
|
||||
.replace(/[\│\├\┌\└\─\┬\┴\┼\┤\┐\┘]+/g, "")
|
||||
.split(" ")
|
||||
.filter(el => el && !["\n", "\n\n"].includes(el))
|
||||
.slice(11);
|
||||
if (memberData.length <= 0) {
|
||||
return;
|
||||
}
|
||||
const result = formatData(memberData);
|
||||
data.member = result;
|
||||
console.log({ member: data.member });
|
||||
const member = await invoke<string>("get_members_by_cli");
|
||||
const peerInfo = parsePeerInfo(member);
|
||||
peerInfo.forEach((value) => {
|
||||
if (value.cost === "Local") {
|
||||
value.cost = "本机";
|
||||
}
|
||||
if (value.ipv4 && value.ipv4.includes("/")) {
|
||||
value.ipv4 = value.ipv4.split("/")[0];
|
||||
}
|
||||
});
|
||||
// console.error(peerInfo);
|
||||
data.member = peerInfo;
|
||||
};
|
||||
|
||||
let timer: NodeJS.Timeout | null = null;
|
||||
|
||||
@@ -0,0 +1,341 @@
|
||||
<template>
|
||||
<div class="h-full overflow-auto">
|
||||
<ElTabs
|
||||
v-model="data.activeTab"
|
||||
@tab-change="handleTabsChange"
|
||||
class="h-full"
|
||||
>
|
||||
<ElTabPane
|
||||
label="联机失败解决办法"
|
||||
name="netcard"
|
||||
class="flex flex-col h-full"
|
||||
>
|
||||
<div>
|
||||
<div>
|
||||
<ElTooltip
|
||||
content="找不到游戏房间时,就开启它后再尝试搜索房间(默认开启)
|
||||
例如: 一个游戏玩家,有时通过本地局域网联机,有时通过某些联机工具进行联机,但是他只能在其中一个联机方式里看到朋友的游戏房间,而另一个里看不到,这时就可以使用这个工具,让他在两个地方都能看到游戏房间"
|
||||
>
|
||||
<ElText>
|
||||
方案1
|
||||
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
|
||||
</ElText>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
<ElLink
|
||||
class="!text-[15px] mr-[10px]"
|
||||
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="设置网卡的跃点,提升网卡优先级,尝试将您联机使用的网卡跃点设置为最小,请先查询网卡信息">
|
||||
<ElText>
|
||||
方案2
|
||||
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
|
||||
</ElText>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
<div class="flex items-center mt-[5px]">
|
||||
<ElButton
|
||||
@click="initNetCardInfo"
|
||||
size="small"
|
||||
type="primary"
|
||||
>
|
||||
查询网卡信息
|
||||
</ElButton>
|
||||
<div
|
||||
v-if="data.row.name"
|
||||
class="ml-auto flex items-center flex-nowrap 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="flex-1 overflow-auto mt-[5px]">
|
||||
<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 flex-col h-full"
|
||||
>
|
||||
<div class="flex flex-col items-center">
|
||||
<div class="mb-[10px]">
|
||||
<ElButton
|
||||
type="warning"
|
||||
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 { 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 { getCurrentWindow } from "@tauri-apps/api/window";
|
||||
import { isValidIP } from "~/utils";
|
||||
|
||||
const mainStore = useMainStore();
|
||||
const data = reactive({
|
||||
activeTab: "netcard",
|
||||
winipBcPid: 0,
|
||||
pingNum: 1,
|
||||
winipBcStart: false,
|
||||
pingIp: "",
|
||||
isPing: false,
|
||||
pingLog: "",
|
||||
firewallStatus: {
|
||||
domain: false,
|
||||
public: false,
|
||||
dedicated: false
|
||||
},
|
||||
row: {
|
||||
name: "",
|
||||
metric: ""
|
||||
},
|
||||
netcardList: []
|
||||
});
|
||||
|
||||
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 appWindow = getCurrentWindow();
|
||||
mainStore.$subscribe((...a) => {
|
||||
// console.error("subscribe", a);
|
||||
appWindow.emitTo("main", "config", { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } });
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
data.pingIp = mainStore.config.ipv4;
|
||||
initStartWinIpBroadcast();
|
||||
});
|
||||
</script>
|
||||
@@ -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}`
|
||||
})
|
||||
);
|
||||
});
|
||||
@@ -2,5 +2,5 @@
|
||||
# will have compiled files and executables
|
||||
/target/
|
||||
/gen/schemas
|
||||
/easytier-windows-x86_64-v2.0.3.zip
|
||||
/easytier-windows-x86_64/
|
||||
/easytier/logs
|
||||
/easytier/logs/*.*
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "easytier-game"
|
||||
version = "1.0.5"
|
||||
version = "1.2.3"
|
||||
homepage = "https://github.com/EasyTier/EasyTier"
|
||||
repository = "https://github.com/EasyTier/EasytierGame"
|
||||
description = "A simple network initiator based on Easytier"
|
||||
@@ -12,30 +12,42 @@ rust-version = "1.77.2"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
|
||||
[lib]
|
||||
name = "app_lib"
|
||||
crate-type = ["staticlib", "cdylib", "rlib"]
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "2.0.1", features = [] }
|
||||
tauri-build = { version = "2.0.3", features = [] }
|
||||
# prost-build = "0.13.2"
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
log = "0.4"
|
||||
tauri = { version = "2.0.2", features = [
|
||||
tauri = { version = "2.1.1", features = [
|
||||
"tray-icon",
|
||||
"image-png",
|
||||
"image-ico",
|
||||
] }
|
||||
tauri-plugin-log = "2.0.0-rc"
|
||||
tauri-plugin-shell = "2"
|
||||
|
||||
tauri-plugin-log = "2.0.2"
|
||||
tauri-plugin-shell = "2.0.2"
|
||||
reqwest = { version = "0.12", features = ["json"] }
|
||||
zip = "2.2.0"
|
||||
sysinfo = '0.32.0'
|
||||
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
|
||||
whoami = "1.5.2"
|
||||
tauri-plugin-fs = "2"
|
||||
tauri-plugin-clipboard-manager = "2.0.2"
|
||||
# prost = "0.13"
|
||||
# prost-types = "0.13"
|
||||
|
||||
[dependencies.windows]
|
||||
version = "0.58.0"
|
||||
features = ["Win32_System_TaskScheduler"]
|
||||
|
||||
[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
|
||||
tauri-plugin-single-instance = "2"
|
||||
tauri-plugin-autostart = "2.0.1"
|
||||
tauri-plugin-single-instance = "2.0.1"
|
||||
tauri-plugin-window-state = "2"
|
||||
|
||||
@@ -1,44 +1,100 @@
|
||||
{
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "default",
|
||||
"description": "enables the default permissions",
|
||||
"windows": ["main", "log"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-minimize",
|
||||
"core:window:allow-hide",
|
||||
"core:window:allow-close",
|
||||
"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",
|
||||
{
|
||||
"identifier": "shell:allow-spawn",
|
||||
"allow": [
|
||||
{
|
||||
"args": ["run"],
|
||||
"cmd": "WinIPBroadcast",
|
||||
"name": "WinIPBroadcast"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"identifier": "shell:allow-execute",
|
||||
"allow": [
|
||||
{
|
||||
"args": ["run"],
|
||||
"cmd": "WinIPBroadcast",
|
||||
"name": "WinIPBroadcast"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "default",
|
||||
"description": "enables the default permissions",
|
||||
"windows": [
|
||||
"main",
|
||||
"log",
|
||||
"member",
|
||||
"cidr",
|
||||
"advance",
|
||||
"tool"
|
||||
],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-minimize",
|
||||
"core:window:allow-hide",
|
||||
"core:window:allow-close",
|
||||
"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",
|
||||
"autostart:default",
|
||||
"autostart:allow-enable",
|
||||
"autostart:allow-disable",
|
||||
"autostart:allow-is-enabled",
|
||||
"core:tray:allow-get-by-id",
|
||||
"core:tray:allow-set-icon",
|
||||
"core:tray:allow-new",
|
||||
{
|
||||
"identifier": "shell:allow-spawn",
|
||||
"allow": [
|
||||
{
|
||||
"args": [
|
||||
"run"
|
||||
],
|
||||
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
|
||||
"name": "WinIPBroadcast"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"identifier": "shell:allow-execute",
|
||||
"allow": [
|
||||
{
|
||||
"args": [
|
||||
"run"
|
||||
],
|
||||
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
|
||||
"name": "WinIPBroadcast"
|
||||
},
|
||||
{
|
||||
"args": true,
|
||||
"cmd": "$RESOURCE/easytier/tool/nssm",
|
||||
"name": "nssm"
|
||||
},
|
||||
{
|
||||
"args": true,
|
||||
"cmd": "explorer",
|
||||
"name": "explorer"
|
||||
},
|
||||
{
|
||||
"args": true,
|
||||
"cmd": "netsh",
|
||||
"name": "netsh"
|
||||
},
|
||||
{
|
||||
"args": true,
|
||||
"cmd": "ping",
|
||||
"name": "ping"
|
||||
}
|
||||
]
|
||||
},
|
||||
"fs:default",
|
||||
"fs:allow-read-dir",
|
||||
"fs:allow-exists",
|
||||
"fs:allow-open",
|
||||
"fs:allow-resource-read",
|
||||
"fs:allow-resource-read-recursive",
|
||||
"fs:allow-resource-write",
|
||||
"fs:allow-resource-write-recursive",
|
||||
"clipboard-manager:allow-clear",
|
||||
"clipboard-manager:allow-read-text",
|
||||
"clipboard-manager:allow-write-text",
|
||||
|
||||
"window-state:default",
|
||||
"window-state:allow-save-window-state",
|
||||
"window-state:allow-restore-state",
|
||||
|
||||
"log:default",
|
||||
"log:allow-log"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
这里存放每次打包需要用到的最新版本的easytier 和 相关工具
|
||||
@@ -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,23 @@
|
||||
hostname = "Test1"
|
||||
instance_name = "default"
|
||||
instance_id = "8803362c-e4f1-4df1-93e8-721653945f77"
|
||||
dhcp = true
|
||||
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_portal = "0.0.0.0:15888"
|
||||
|
||||
[network_identity]
|
||||
network_name = "default"
|
||||
network_secret = ""
|
||||
|
||||
[[peer]]
|
||||
uri = "tcp://public.easytier.top:11010"
|
||||
|
||||
[[peer]]
|
||||
uri = "udp://public.easytier.top:11010"
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
// 如果您的配置过于复杂,可以参考 使用配置文件进行联机的办法,以下是基础的界面配置,用于快速分享联机
|
||||
"protocol": [
|
||||
"tcp",
|
||||
"udp"
|
||||
], // 协议类型
|
||||
|
||||
// easytier服务地址 - 可填写多个 方式1,逗号分隔,"xxxx.cn,yyyy.com" 方式2,数组 ["xxxx.cn","yyyy.com"] (默认选中第一个)
|
||||
"serverUrl": "public.easytier.top:11010",
|
||||
"networkName": "", // 网络名
|
||||
"networkPassword": "", // 网络密码
|
||||
"hostname": "configTest", // 主机名
|
||||
"ipv4": "10.126.126.1", // IP地址(选填,下面有dhcp)
|
||||
"disableIpv6": false, // 禁用ipv6
|
||||
"disbleListenner": true, // 禁用端口监听
|
||||
"disableEncryption": false, // 禁用加密
|
||||
"noTun": false, // 禁用tun
|
||||
"latencyfirst": false, // 延迟优先
|
||||
"disableUdpHolePunching": false, // 禁用udp打洞
|
||||
"disbleP2p": false, // 禁用p2p, 强制中转
|
||||
"dhcp": false, // 动态分配IP
|
||||
"devName": false, // 是否启用自定义网卡名
|
||||
"devNameValue": "", // 网卡名(启用devName之后才生效)
|
||||
"enableNetCardMetric": false, // 自定义easytier每次生成的网卡跃点
|
||||
"netCardMetricValue": 1 // 网卡跃点数量(1-9999)
|
||||
}
|
||||
|
After Width: | Height: | Size: 66 KiB |
|
After Width: | Height: | Size: 68 KiB |
@@ -0,0 +1,16 @@
|
||||
[如果界面无法打开]
|
||||
|
||||
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文件夹
|
||||
@@ -1,3 +1,7 @@
|
||||
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 serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
@@ -14,6 +18,12 @@ use sysinfo::System;
|
||||
use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
|
||||
use tauri::Emitter;
|
||||
use tauri::Manager;
|
||||
use tauri_plugin_autostart::MacosLauncher;
|
||||
use windows::core::{BSTR, VARIANT};
|
||||
use windows::Win32::Foundation::VARIANT_BOOL;
|
||||
use windows::Win32::System::Com::*;
|
||||
use windows::Win32::System::TaskScheduler::*;
|
||||
|
||||
// 定义GitHub Release的结构体
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct Release {
|
||||
@@ -50,7 +60,8 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
fn get_core_version() -> String {
|
||||
match Command::new("easytier-core.exe")
|
||||
let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
|
||||
match Command::new(&core_path)
|
||||
.arg("--version")
|
||||
.creation_flags(0x08000000)
|
||||
.output()
|
||||
@@ -59,23 +70,34 @@ fn get_core_version() -> String {
|
||||
let output_str = String::from_utf8_lossy(&output.stdout);
|
||||
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")]
|
||||
fn get_cli_version() -> String {
|
||||
match Command::new("easytier-cli.exe")
|
||||
.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(),
|
||||
}
|
||||
// #[tauri::command(rename_all = "snake_case")]
|
||||
// #[warn(dead_code)]
|
||||
// fn get_cli_version() -> String {
|
||||
// let cli_path = get_tool_exe_path(String::from("\\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: String) -> String {
|
||||
let cur_vec = get_exe_directory();
|
||||
let tool_path = cur_vec[1].to_string() + &path.to_string();
|
||||
return tool_path;
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
@@ -112,7 +134,8 @@ struct MyResponse {
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
fn get_members_by_cli() -> String {
|
||||
match Command::new("easytier-cli.exe")
|
||||
let cli_path = get_tool_exe_path(String::from("\\easytier\\easytier-cli.exe"));
|
||||
match Command::new(&cli_path)
|
||||
.arg("peer")
|
||||
.arg("list")
|
||||
.creation_flags(0x08000000)
|
||||
@@ -128,12 +151,21 @@ fn get_members_by_cli() -> String {
|
||||
|
||||
#[tauri::command(rename_all = "snake_case")]
|
||||
async fn download_easytier_zip(download_url: String, file_name: String) {
|
||||
let target = format!("https://ghp.ci/{}", download_url);
|
||||
let target = format!("{}", download_url);
|
||||
let response = reqwest::get(target)
|
||||
.await
|
||||
.expect("error to download easytier url");
|
||||
let file_path = format!("./{}", file_name);
|
||||
let easytier_path = get_tool_exe_path(String::from("\\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);
|
||||
println!("download easytier to {}", path.display());
|
||||
|
||||
let mut file = match File::create(&path) {
|
||||
Err(why) => panic!("couldn't create {}", why),
|
||||
@@ -147,7 +179,7 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
|
||||
unzip(path);
|
||||
match fs::remove_file(path) {
|
||||
Ok(_) => println!("删除zip文件成功"),
|
||||
Err(_) => println!("删除zip文件失败"),
|
||||
Err(_) => log::error!("删除zip文件失败"),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,7 +213,14 @@ fn unzip(fname: &path::Path) {
|
||||
// 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(String::from("\\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());
|
||||
let mut outfile = fs::File::create(&out_file_path).unwrap();
|
||||
std::io::copy(&mut file, &mut outfile).unwrap();
|
||||
@@ -194,10 +233,6 @@ fn run_command(
|
||||
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();
|
||||
stop_signal.store(false, Ordering::Relaxed);
|
||||
let app_handle1 = app_handle.clone();
|
||||
@@ -206,7 +241,9 @@ fn run_command(
|
||||
let stop_signal2 = Arc::clone(&stop_signal);
|
||||
let args2 = args.clone();
|
||||
thread::spawn(move || {
|
||||
let mut child = Command::new("easytier-core.exe")
|
||||
let core_path = get_tool_exe_path(String::from("\\easytier\\easytier-core.exe"));
|
||||
// trace, debug, info, warn, error, off
|
||||
let mut child = Command::new(&core_path)
|
||||
.args(args)
|
||||
.creation_flags(0x08000000)
|
||||
.stdout(Stdio::piped())
|
||||
@@ -229,7 +266,7 @@ fn run_command(
|
||||
tx.send(line).expect("failed to send line");
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("error reading line: {}", e);
|
||||
log::error!("error reading line: {}", e);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -267,7 +304,7 @@ fn stop_command(child_id: u32) {
|
||||
} else {
|
||||
eprintln!("Failed to terminate process {}.", child_id);
|
||||
}
|
||||
}else {
|
||||
} else {
|
||||
println!("child id is 0");
|
||||
}
|
||||
}
|
||||
@@ -330,27 +367,202 @@ fn search_pid_by_pname(target_process_name: String) -> 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)]
|
||||
pub fn run() {
|
||||
// 获取命令行参数
|
||||
let args: Vec<String> = std::env::args().collect();
|
||||
|
||||
let stop_signal = Arc::new(AtomicBool::new(false)); // 创建一个原子布尔值,用于控制命令的停止
|
||||
let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆,用于传递给命令
|
||||
let context = tauri::generate_context!();
|
||||
tauri::Builder::default()
|
||||
.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_autostart::init(
|
||||
MacosLauncher::LaunchAgent,
|
||||
Some(vec![AUTOSTART_ARG]),
|
||||
))
|
||||
.plugin(tauri_plugin_shell::init())
|
||||
.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
|
||||
let _ = app
|
||||
.get_webview_window("main")
|
||||
.expect("no main window")
|
||||
.set_focus();
|
||||
.set_focus()
|
||||
.expect("failed to set focus");
|
||||
}))
|
||||
.setup(|app| {
|
||||
if cfg!(debug_assertions) {
|
||||
app.handle().plugin(
|
||||
tauri_plugin_log::Builder::default()
|
||||
.level(log::LevelFilter::Info)
|
||||
.build(),
|
||||
)?;
|
||||
}
|
||||
.setup(move |app| {
|
||||
let args = args.clone();
|
||||
// if cfg!(debug_assertions) {
|
||||
let log_path = get_tool_exe_path(String::from("\\easytier\\guiLogs"));
|
||||
app.handle().plugin(
|
||||
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"))]
|
||||
let _tray_menu = TrayIconBuilder::with_id("main")
|
||||
.menu_on_left_click(false)
|
||||
@@ -370,6 +582,14 @@ pub fn run() {
|
||||
))?)
|
||||
.icon_as_template(false)
|
||||
.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(())
|
||||
})
|
||||
.manage(stop_signal_clone)
|
||||
@@ -379,9 +599,11 @@ pub fn run() {
|
||||
get_core_version,
|
||||
fetch_easytier_list,
|
||||
download_easytier_zip,
|
||||
get_cli_version,
|
||||
get_members_by_cli,
|
||||
search_pid_by_pname
|
||||
search_pid_by_pname,
|
||||
get_exe_directory,
|
||||
spawn_autostart,
|
||||
autostart_is_enabled
|
||||
])
|
||||
.run(context)
|
||||
.expect("error while running tauri application");
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||
"productName": "easytier-game",
|
||||
"version": "1.0.5",
|
||||
"version": "1.2.3",
|
||||
"identifier": "com.tauri.easytier-game",
|
||||
|
||||
"build": {
|
||||
@@ -13,14 +13,20 @@
|
||||
"app": {
|
||||
"windows": [
|
||||
{
|
||||
"title": "easytier-game",
|
||||
"width": 331,
|
||||
"height": 285,
|
||||
"resizable": false,
|
||||
"title": "easytier-game 1.2.3",
|
||||
"label": "main",
|
||||
"minWidth": 340,
|
||||
"width": 340,
|
||||
"height": 305,
|
||||
"minHeight": 305,
|
||||
"maxHeight": 305,
|
||||
"maxWidth": 360,
|
||||
"resizable": true,
|
||||
"fullscreen": false,
|
||||
"decorations": true,
|
||||
"maximizable": false,
|
||||
"center": true,
|
||||
"visible": false,
|
||||
"maximizable": false,
|
||||
"transparent": false
|
||||
}
|
||||
],
|
||||
@@ -28,12 +34,29 @@
|
||||
"csp": null
|
||||
}
|
||||
},
|
||||
|
||||
"plugins": {},
|
||||
"bundle": {
|
||||
"active": false,
|
||||
"targets": "all",
|
||||
"externalBin": ["WinIPBroadcast"],
|
||||
"resources": [
|
||||
"easytier/config/",
|
||||
"easytier/icons/",
|
||||
"easytier/config_template.json",
|
||||
"easytier/tool/WinIPBroadcast.exe",
|
||||
"easytier/tool/MicrosoftEdgeWebview2Setup.exe",
|
||||
"easytier/easytier-cli.exe",
|
||||
"easytier/easytier-core.exe",
|
||||
"easytier/Packet.dll",
|
||||
"easytier/wintun.dll",
|
||||
"easytier/clear_local_data.bat",
|
||||
"easytier/帮助.txt"
|
||||
],
|
||||
"windows": {
|
||||
"webviewInstallMode": {
|
||||
"type": "embedBootstrapper"
|
||||
}
|
||||
},
|
||||
"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"]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,26 +9,82 @@ export default defineStore("main", {
|
||||
networkPassword: "",
|
||||
hostname: "",
|
||||
ipv4: "",
|
||||
proxyNetworks: "", // 子网代理
|
||||
autoStart: false, // 是否自动启动
|
||||
connectAfterStart: false, //软件打开后,是否自动连接
|
||||
disableIpv6: false, // 是否禁用IPv6
|
||||
disbleListenner: false, // 是否禁用监听
|
||||
disbleP2p: true, // 是否使用P2P
|
||||
disableEncryption: false, // 是否禁用加密
|
||||
multiThread: false, //使用多线程
|
||||
enablExitNode: false, // 是否启用退出节点
|
||||
noTun: false, // 是否使用TUN
|
||||
latencyfirst: false, // 是否优先延迟
|
||||
useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
|
||||
disableUdpHolePunching: false, // 是否禁用UDP打洞
|
||||
relayAllPeerrpc: false, // 是否启用所有对等RPC
|
||||
disbleP2p: false, // 是否使用P2P
|
||||
dhcp: true, // 是否使用DHCP
|
||||
saveErrorLog: true, // 是否保存错误日志
|
||||
logLevel: "error", //日志等级
|
||||
devName: false, //自定义网卡名
|
||||
devNameValue: "", //自定义网卡名
|
||||
enableNetCardMetric: false, //启用网卡自定义跃点
|
||||
netCardMetricValue: 1 //自定义网卡跃点值
|
||||
},
|
||||
cidrEnable: false,
|
||||
basePeers: ["public.easytier.top:11010"],
|
||||
theme: false, //主题 false light true dark
|
||||
configStartEnable: false, //使用配置文件启动
|
||||
configPath: "", //配置文件路径
|
||||
winIpBcAutoStart: true,
|
||||
createConfigInEasytier: false, //在easytier目录生成config.json文件吗
|
||||
githubFastUrl: "https://ghproxy.cc/",
|
||||
|
||||
winipBcPid: 0,
|
||||
winipBcStart: false
|
||||
};
|
||||
},
|
||||
persist: {
|
||||
paths: [
|
||||
"basePeers",
|
||||
// 防止持久化保存 用户使用config.json输入的无用的字段
|
||||
pick: [
|
||||
"config.protocol",
|
||||
"config.serverUrl",
|
||||
"config.networkName",
|
||||
"config.protocol",
|
||||
"config.networkPassword",
|
||||
"config.disbleP2p",
|
||||
"config.hostname",
|
||||
"config.ipv4",
|
||||
"config.proxyNetworks",
|
||||
"config.autoStart",
|
||||
"config.connectAfterStart",
|
||||
"config.disableIpv6",
|
||||
"config.disbleListenner",
|
||||
"config.hostname",
|
||||
"config.disableEncryption",
|
||||
"config.multiThread",
|
||||
"config.enablExitNode",
|
||||
"config.noTun",
|
||||
"config.latencyfirst",
|
||||
"config.useSmoltcp",
|
||||
"config.disableUdpHolePunching",
|
||||
"config.relayAllPeerrpc",
|
||||
"config.disbleP2p",
|
||||
"config.dhcp",
|
||||
"config.saveErrorLog",
|
||||
"config.logLevel",
|
||||
"config.devName",
|
||||
"config.devNameValue",
|
||||
"config.enableNetCardMetric",
|
||||
"config.netCardMetricValue",
|
||||
|
||||
"cidrEnable",
|
||||
"basePeers",
|
||||
"theme",
|
||||
"configStartEnable",
|
||||
"configPath",
|
||||
"winIpBcAutoStart",
|
||||
"createConfigInEasytier",
|
||||
"githubFastUrl"
|
||||
],
|
||||
},
|
||||
// // 除了这些,其他都要存下来
|
||||
// omit: ["winipBcPid", "winipBcStart"]
|
||||
}
|
||||
});
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
"components/**/*.ts",
|
||||
"components/**/*.js",
|
||||
"components/**/*.vue",
|
||||
"composables/**/*.ts",
|
||||
"app.vue",
|
||||
"pages/**/*.ts",
|
||||
"pages/**/*.js",
|
||||
"pages/**/*.vue",
|
||||
@@ -27,16 +29,16 @@
|
||||
"compilerOptions": {
|
||||
"target": "ESNext",
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "Node",
|
||||
// "types": ["element-plus/global"]
|
||||
"resolveJsonModule": true,
|
||||
// 从 Vue 3.4 开始,Vue 不再隐式注册全局 JSX 命名空间。要指示 TypeScript 使用 Vue 的 JSX 类型定义,请确保在你的 tsconfig.json 中包含以下内容
|
||||
"jsx": "preserve",
|
||||
"jsxImportSource": "vue",
|
||||
"types": ["@pinia/nuxt", "vite/client", "element-plus/global"],
|
||||
"types": ["@pinia/nuxt", "vite/client", "element-plus/global", "pinia-plugin-persistedstate"],
|
||||
"allowJs": true, // 允许编译器编译JS,JSX文件
|
||||
"checkJs": true, // 允许在JS文件中报错,通常与allowJS一起使用
|
||||
"checkJs": false, // 允许在JS文件中报错,通常与allowJS一起使用
|
||||
"esModuleInterop": true, // 允许export=导出,由import from 导入
|
||||
|
||||
"lib": ["DOM", "ESNext"],
|
||||
"allowSyntheticDefaultImports": true
|
||||
}
|
||||
|
||||
@@ -1 +1,8 @@
|
||||
interface ImportMetaEnv {
|
||||
readonly VITE_CONFIG_PATH: string;
|
||||
readonly VITE_CONFIG_FILE_NAME: string;
|
||||
}
|
||||
|
||||
interface ImportMeta {
|
||||
readonly env: ImportMetaEnv;
|
||||
}
|
||||
|
||||
@@ -1,19 +1,6 @@
|
||||
|
||||
import { ElMessage } from "element-plus";
|
||||
import Clipboard from "vue-clipboard3";
|
||||
|
||||
import { open } from "@tauri-apps/plugin-shell";
|
||||
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) => {
|
||||
let bounceTimer: NodeJS.Timeout | null = null;
|
||||
@@ -63,8 +50,8 @@ export const numRemoveZero = (num: Number) => {
|
||||
// await-to-js
|
||||
export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefined) => {
|
||||
return promise
|
||||
.then(data => [null, data])
|
||||
.catch(err => {
|
||||
.then((data) => [null, data])
|
||||
.catch((err) => {
|
||||
if (errorExt) {
|
||||
if (typeof errorExt !== "object") {
|
||||
return [errorExt, undefined];
|
||||
@@ -77,7 +64,49 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
|
||||
});
|
||||
};
|
||||
|
||||
export const openBrowser = (key: string) => {
|
||||
// logger.info(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`)
|
||||
// _launcherApi.openBrowser(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`);
|
||||
export const parsePeerInfo = (content: string) => {
|
||||
// 将表格字符串分割成行
|
||||
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 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);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
import useMainStore from "@/stores/index";
|
||||
import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
|
||||
import { open, Command } from "@tauri-apps/plugin-shell";
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// 兼容autostart插件
|
||||
const compatibleAutoStart = async () => {
|
||||
const config = useMainStore().config;
|
||||
const is_enable = await tauriAutoStart.isEnabled();
|
||||
if (is_enable) {
|
||||
try {
|
||||
await tauriAutoStart.disable();
|
||||
config.autoStart = false;
|
||||
} catch (err) {
|
||||
// ElMessage.error(`取消自启失败`);
|
||||
}
|
||||
}
|
||||
const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
|
||||
console.log(serverStatus);
|
||||
};
|
||||