mirror of
https://github.com/EasyTier/EasytierGame.git
synced 2025-05-19 10:27:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
affce1125b | ||
|
|
2b87747fe5 | ||
|
|
423d3ba243 | ||
|
|
0ce2595833 | ||
|
|
9eb0e5b7ac | ||
|
|
6fde1c2236 | ||
|
|
6fd3b999d7 | ||
|
|
3773e11b24 | ||
|
|
987541ab52 | ||
|
|
d800a414c0 | ||
|
|
922ba3f1ea | ||
|
|
a5954744a1 | ||
|
|
8ed652ee26 | ||
|
|
9d976707ac | ||
|
|
0b54a623a8 | ||
|
|
7501a5661c | ||
|
|
539092d769 | ||
|
|
cefcc930b8 | ||
|
|
e7d92cce47 | ||
|
|
76bdec0e1d | ||
|
|
997f3798ae |
@@ -56,6 +56,9 @@ Releases: [https://github.com/EasyTier/EasytierGame/releases](https://github.c
|
||||
- 1.2.6重写 自建服务器功能,可以自行搭建服务器,但是需要一些网络知识,具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html),也可查看帮助.txt
|
||||

|
||||
|
||||
- 1.3.5 增强工具 新增了forceBindIP
|
||||

|
||||
|
||||
## 特性
|
||||
|
||||
- 基于easytier组网工具开发,界面清晰简单
|
||||
|
||||
@@ -52,4 +52,15 @@ html.dark body {
|
||||
|
||||
.el-table {
|
||||
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;
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
@@ -0,0 +1,11 @@
|
||||
rustup default nightly
|
||||
rem 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录
|
||||
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
|
||||
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
|
||||
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
|
||||
rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
|
||||
pnpm tauri build -- -Z build-std --target x86_64-win7-windows-msvc
|
||||
rustup default stable
|
||||
pnpm tauri build
|
||||
pnpm run release
|
||||
pnpm run release-win7
|
||||
+15
-2
@@ -7,7 +7,7 @@ import useMainStore from "@/stores/index";
|
||||
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
// import { ElConfirmPrimary } from "~/utils/element";
|
||||
// import { open } from "@tauri-apps/plugin-shell";
|
||||
import { open } from "@tauri-apps/plugin-shell";
|
||||
|
||||
const DEFAULT_TRAY_NAME = "main";
|
||||
|
||||
@@ -46,7 +46,7 @@ export async function useTray(init: boolean = false, beforExit: Function, handle
|
||||
|
||||
if (init) {
|
||||
tray.setTooltip(`EasyTierGame\n${pkg.version}`);
|
||||
tray.setMenuOnLeftClick(false);
|
||||
tray.setShowMenuOnLeftClick(false);
|
||||
tray.setMenu(
|
||||
await Menu.new({
|
||||
id: "main",
|
||||
@@ -64,6 +64,8 @@ export async function generateMenuItem(beforExit: Function, handleConnection:Fun
|
||||
await MenuItemExchangeConnection("联机 / 断开", handleConnection),
|
||||
await MenuItemTheme(),
|
||||
await PredefinedMenuItem.new({ item: "Separator" }),
|
||||
await MenuItemPublicPeers(),
|
||||
await PredefinedMenuItem.new({ item: "Separator" }),
|
||||
await MenuItemExit("退出", beforExit),
|
||||
];
|
||||
}
|
||||
@@ -81,6 +83,17 @@ export async function MenuItemExit(text: string, beforExit: Function) {
|
||||
});
|
||||
}
|
||||
|
||||
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) {
|
||||
return await MenuItem.new({
|
||||
id: "show",
|
||||
|
||||
Vendored
+2
@@ -1,5 +1,7 @@
|
||||
VITE_CONFIG_PATH=easytier/config/
|
||||
VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
|
||||
VITE_CONFIG_FILE_NAME=easytier/config.json
|
||||
VITE_LOG_PATH=easytier/logs/
|
||||
VITE_CACHE_PATH=easytier/cache/
|
||||
VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
|
||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||
Vendored
+2
@@ -1,5 +1,7 @@
|
||||
VITE_CONFIG_PATH=easytier/config/
|
||||
VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
|
||||
VITE_CONFIG_FILE_NAME=easytier/config.json
|
||||
VITE_LOG_PATH=easytier/logs/
|
||||
VITE_CACHE_PATH=easytier/cache/
|
||||
VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier
|
||||
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
|
||||
+18
-18
@@ -3,39 +3,39 @@
|
||||
"private": true,
|
||||
"author": "leizi97",
|
||||
"description": "A simple network initiator based on Easytier",
|
||||
"version": "1.3.2",
|
||||
"version": "1.3.8",
|
||||
"scripts": {
|
||||
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
|
||||
"build": "nuxt generate --dotenv env/.env.prod",
|
||||
"release": "node zip.js"
|
||||
"release": "node zip.js",
|
||||
"release-win7": "node zip.js win7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@element-plus/icons-vue": "^2.3.1",
|
||||
"@element-plus/nuxt": "^1.1.0",
|
||||
"@nuxtjs/tailwindcss": "^6.12.0",
|
||||
"@element-plus/nuxt": "^1.1.1",
|
||||
"@nuxtjs/tailwindcss": "6.13.1",
|
||||
"@pinia/nuxt": "0.9.0",
|
||||
"@tauri-apps/api": "^2.1.1",
|
||||
"@tauri-apps/cli": "^2.1.0",
|
||||
"@tauri-apps/plugin-cli": "^2.0.0",
|
||||
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
|
||||
"@tauri-apps/api": "^2.2.0",
|
||||
"@tauri-apps/cli": "2.2.5",
|
||||
"@tauri-apps/plugin-cli": "^2.2.0",
|
||||
"@tauri-apps/plugin-clipboard-manager": "2.2.0",
|
||||
"@tauri-apps/plugin-dialog": "2.2.0",
|
||||
"@tauri-apps/plugin-fs": "^2.2.0",
|
||||
"@tauri-apps/plugin-log": "^2.2.0",
|
||||
"@tauri-apps/plugin-shell": "^2.2.0",
|
||||
"@tauri-apps/plugin-window-state": "^2.2.0",
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@vitejs/plugin-vue-jsx": "^4.1.0",
|
||||
"@vueuse/core": "12.0.0",
|
||||
"@vitejs/plugin-vue-jsx": "^4.1.1",
|
||||
"@vueuse/core": "12.4.0",
|
||||
"archiver": "^7.0.1",
|
||||
"element-plus": "^2.8.7",
|
||||
"less": "^4.2.0",
|
||||
"element-plus": "2.9.3",
|
||||
"less": "4.2.1",
|
||||
"lodash-es": "^4.17.21",
|
||||
"nuxt": "^3.14.1592",
|
||||
"nuxt": "3.15.2",
|
||||
"pinia": "^2.3.0",
|
||||
"pinia-plugin-persistedstate": "^4.1.3",
|
||||
"pinia-plugin-persistedstate": "^4.2.0",
|
||||
"postcss": "^8.4.38",
|
||||
"prettier": "^3.4.1",
|
||||
"prettier-plugin-tailwindcss": "^0.6.9",
|
||||
"typescript": "^5.6.3",
|
||||
"vue-clipboard3": "^2.0.0"
|
||||
"prettier": "3.4.2",
|
||||
"prettier-plugin-tailwindcss": "0.6.10"
|
||||
}
|
||||
}
|
||||
|
||||
+59
-34
@@ -1,9 +1,8 @@
|
||||
<template>
|
||||
<div class="flex h-full flex-col items-start overflow-auto px-[25px]">
|
||||
<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
|
||||
<div class="flex flex-nowrap items-center gap-[15px]">
|
||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.enableCustomProtocol">自定义联机时使用的默认协议</ElCheckbox>
|
||||
<ElCheckbox v-model="mainStore.config.enableCustomProtocol">默认直连(p2p)使用的协议</ElCheckbox>
|
||||
<ElTooltip content="如果没有支持该协议的节点地址,程序会自动处理,请放心使用">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
@@ -24,29 +23,8 @@
|
||||
</ElSelect>
|
||||
</div>
|
||||
</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>
|
||||
<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]">
|
||||
@@ -58,7 +36,14 @@
|
||||
打开config.json目录
|
||||
</ElButton>
|
||||
</div>
|
||||
<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止休眠</ElCheckbox></div>
|
||||
<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止系统休眠(比如:屏幕会一直亮着)</ElCheckbox></div>
|
||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||
<ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式,将尝试使用最低延迟路径转发流量</ElCheckbox>
|
||||
<ElTooltip content="视网络质量进行选择,可能会出现中转与直连(p2p)来回切换的情况">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</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>
|
||||
@@ -86,7 +71,7 @@
|
||||
:disabled="mainStore.config.disbleListenner"
|
||||
v-model="mainStore.config.enableCustomListener"
|
||||
>
|
||||
自定义IPV4监听地址
|
||||
自定义监听地址
|
||||
</ElCheckbox>
|
||||
<ElButton
|
||||
size="small"
|
||||
@@ -188,7 +173,7 @@
|
||||
<div><ElCheckbox v-model="mainStore.config.multiThread">启用多线程运行</ElCheckbox></div>
|
||||
<div class="flex items-center gap-[10px]">
|
||||
<ElText>压缩算法</ElText>
|
||||
<div class="w-[90px]">
|
||||
<div class="w-[160px]">
|
||||
<ElSelect
|
||||
size="small"
|
||||
v-model="mainStore.config.compression"
|
||||
@@ -196,7 +181,7 @@
|
||||
>
|
||||
<ElOption
|
||||
v-for="item in [
|
||||
['none', '默认'],
|
||||
['none', '不压缩(游戏联机推荐)'],
|
||||
['zstd', 'zstd算法']
|
||||
]"
|
||||
:key="item[0]"
|
||||
@@ -210,10 +195,30 @@
|
||||
<ElDivider />
|
||||
|
||||
<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
|
||||
<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式,将尝试使用最低延迟路径转发流量</ElCheckbox></div>
|
||||
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
|
||||
<div>
|
||||
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包,即使对等节点不在转发网络白名单内</ElCheckbox>
|
||||
<div class="flex 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>
|
||||
@@ -222,12 +227,13 @@
|
||||
import { QuestionFilled } from "@element-plus/icons-vue";
|
||||
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
||||
import { Command } from "@tauri-apps/plugin-shell";
|
||||
import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
|
||||
import { exists, mkdir, BaseDirectory, remove } from "@tauri-apps/plugin-fs";
|
||||
import { ElMessage } from "element-plus";
|
||||
import { reactive } from "vue";
|
||||
import { dataSubscribe } from "@/composables/windows";
|
||||
import { supportProtocols } from "~/utils";
|
||||
import { ATJ, supportProtocols } from "~/utils";
|
||||
import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
|
||||
import { ElConfirmDanger } from "~/utils/element";
|
||||
|
||||
const protocols = supportProtocols();
|
||||
const listenerDialogData = reactive<{ [key: string]: any }>({
|
||||
@@ -269,6 +275,25 @@
|
||||
};
|
||||
|
||||
dataSubscribe(async (...a) => {
|
||||
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("删除失败,请打开目录手动删除");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return {
|
||||
config: { ...mainStore.config },
|
||||
createConfigInEasytier: mainStore.createConfigInEasytier
|
||||
|
||||
+388
-93
@@ -11,8 +11,13 @@
|
||||
>
|
||||
<template #label>
|
||||
<div class="flex flex-nowrap items-center gap-[0_5px]">
|
||||
<div>服务器</div>
|
||||
<span>-</span>
|
||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||
<div>服务器</div>
|
||||
<ElTooltip content="服务器是什么协议,中转就是什么协议">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
<div class="h-[fit-content]">-</div>
|
||||
<ElTag
|
||||
effect="dark"
|
||||
:type="data.isSuccessGetIp ? 'success' : 'info'"
|
||||
@@ -27,10 +32,13 @@
|
||||
</ElButton>
|
||||
<div
|
||||
v-else
|
||||
class="flex-1 truncate"
|
||||
class="flex-1 truncate !leading-[1em]"
|
||||
>
|
||||
<ElTooltip :content="data.coreVersion">
|
||||
<ElTag type="info">
|
||||
<ElTooltip :content="`内核版本:${data.coreVersion}(不是软件的版本)`">
|
||||
<ElTag
|
||||
size="small"
|
||||
type="info"
|
||||
>
|
||||
{{ data.coreVersion }}
|
||||
</ElTag>
|
||||
</ElTooltip>
|
||||
@@ -55,6 +63,7 @@
|
||||
placeholder="请选择服务器地址"
|
||||
default-first-option
|
||||
v-model="config.serverUrl"
|
||||
no-data-text="无服务器地址"
|
||||
@change="handleServerUrlChange"
|
||||
>
|
||||
<template #prefix>
|
||||
@@ -76,6 +85,18 @@
|
||||
</ElSelect>
|
||||
</div>
|
||||
</template>
|
||||
<template #footer>
|
||||
<div class="text-center">
|
||||
<ElLink
|
||||
type="primary"
|
||||
size="small"
|
||||
:underline="false"
|
||||
@click.stop="open(publicPeersLink)"
|
||||
>
|
||||
其他公共服务器
|
||||
</ElLink>
|
||||
</div>
|
||||
</template>
|
||||
<ElOption
|
||||
v-for="item in mainStore.basePeers"
|
||||
:key="item"
|
||||
@@ -98,7 +119,7 @@
|
||||
</p>
|
||||
<div class="ml-auto flex-shrink-0">
|
||||
<ElButton
|
||||
@click.stop="copyServerUrl(item)"
|
||||
@click.stop="copyText(item)"
|
||||
circle
|
||||
size="small"
|
||||
title="复制"
|
||||
@@ -120,36 +141,36 @@
|
||||
</ElFormItem>
|
||||
<div class="flex flex-wrap items-center gap-[0_10px]">
|
||||
<div class="flex-1">
|
||||
<ElFormItem label="网络名">
|
||||
<ElFormItem label="房间名">
|
||||
<template #label>
|
||||
<div class="flex items-center">
|
||||
网络名
|
||||
<ElTooltip content="对应命令行参数 --network-name">
|
||||
房间名
|
||||
<!-- <ElTooltip content="对应命令行参数 --network-name">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</ElTooltip> -->
|
||||
</div>
|
||||
</template>
|
||||
<ElInput
|
||||
maxlength="100"
|
||||
placeholder="请输入网络名"
|
||||
placeholder="请输入房间名"
|
||||
v-model="config.networkName"
|
||||
></ElInput>
|
||||
</ElFormItem>
|
||||
</div>
|
||||
<div class="flex-1">
|
||||
<ElFormItem label="网络密码">
|
||||
<ElFormItem label="房间密码">
|
||||
<template #label>
|
||||
<div class="flex items-center">
|
||||
网络密码
|
||||
<ElTooltip content="对应命令行参数 --network-secret">
|
||||
房间密码
|
||||
<!-- <ElTooltip content="对应命令行参数 --network-secret">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</ElTooltip> -->
|
||||
</div>
|
||||
</template>
|
||||
<ElInput
|
||||
show-password
|
||||
maxlength="100"
|
||||
placeholder="请输入网络密码"
|
||||
placeholder="请输入房间密码"
|
||||
v-model="config.networkPassword"
|
||||
type="password"
|
||||
></ElInput>
|
||||
@@ -157,13 +178,13 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex gap-[0_10px]">
|
||||
<ElFormItem label="主机名">
|
||||
<ElFormItem label="成员名">
|
||||
<template #label>
|
||||
<div class="flex items-center">
|
||||
主机名
|
||||
<ElTooltip content="对应命令行参数 --hostname">
|
||||
成员名
|
||||
<!-- <ElTooltip content="对应命令行参数 --hostname">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</ElTooltip> -->
|
||||
</div>
|
||||
</template>
|
||||
<ElInput
|
||||
@@ -177,38 +198,61 @@
|
||||
label="局域网IP"
|
||||
>
|
||||
<template #label>
|
||||
<div class="flex h-[20px] items-center">
|
||||
<div class="flex h-[20px] items-center gap-[3px]">
|
||||
虚拟网IP
|
||||
<ElTooltip content="对应命令行参数 --ipv4">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
<ElButton
|
||||
@click.stop="handleCopyIp"
|
||||
type="primary"
|
||||
text
|
||||
size="small"
|
||||
title="复制IP"
|
||||
:icon="CopyDocument"
|
||||
></ElButton>
|
||||
<ElSwitch
|
||||
v-model="config.dhcp"
|
||||
class="ml-[5px]"
|
||||
inline-prompt
|
||||
inactive-text="固定IP"
|
||||
active-text="动态获取IP"
|
||||
active-text="动态获取"
|
||||
size="small"
|
||||
></ElSwitch>
|
||||
<!-- <ElTooltip content="对应命令行参数 --ipv4">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip> -->
|
||||
</div>
|
||||
</template>
|
||||
<ElInput
|
||||
maxlength="100"
|
||||
:disabled="config.dhcp"
|
||||
:readonly="config.dhcp"
|
||||
:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
|
||||
v-model="config.ipv4"
|
||||
></ElInput>
|
||||
>
|
||||
<template #prefix>
|
||||
<ElTooltip
|
||||
class="!text-[10px]"
|
||||
placement="top-end"
|
||||
:content="config.dhcp ? '动态获取无法手动填写' : '固定IP可以手动填写'"
|
||||
>
|
||||
<ElTag
|
||||
size="small"
|
||||
:type="config.dhcp ? 'info' : 'success'"
|
||||
>
|
||||
{{ config.dhcp ? "只读" : "可填" }}
|
||||
</ElTag>
|
||||
</ElTooltip>
|
||||
</template>
|
||||
</ElInput>
|
||||
</ElFormItem>
|
||||
</div>
|
||||
</ElForm>
|
||||
<div class="mt-auto flex items-start">
|
||||
<div>
|
||||
<div>
|
||||
<div class="pt-[4px]">
|
||||
<ElDropdown
|
||||
@command="handleStartCommand"
|
||||
split-button
|
||||
trigger="click"
|
||||
size="default"
|
||||
placement="right-end"
|
||||
:type="!data.isStart ? 'primary' : 'danger'"
|
||||
:disabled="data.startLoading || !data.coreVersion || data.update"
|
||||
@click="handleConnection"
|
||||
@@ -220,13 +264,13 @@
|
||||
command="import_config"
|
||||
:icon="Link"
|
||||
>
|
||||
导入配置
|
||||
导入联机配置
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
command="share_config"
|
||||
:icon="Share"
|
||||
>
|
||||
分享联机相关配置
|
||||
分享联机配置
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem disabled>
|
||||
<ElDivider class="!m-0 !h-[2px]" />
|
||||
@@ -251,11 +295,26 @@
|
||||
>
|
||||
使用外部配置文件
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem disabled>
|
||||
<ElDivider class="!m-0 !h-[2px]" />
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
command="config_admin"
|
||||
:icon="Platform"
|
||||
>
|
||||
配置管理
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
command="save_config_admin"
|
||||
:icon="CirclePlusFilled"
|
||||
>
|
||||
保存当前配置
|
||||
</ElDropdownItem>
|
||||
</ElDropdownMenu>
|
||||
</template>
|
||||
</ElDropdown>
|
||||
</div>
|
||||
<div class="mt-[6px] pl-[2px]">
|
||||
<div class="mt-[10px] pl-[2px]">
|
||||
<ElTooltip
|
||||
placement="left"
|
||||
content="日志"
|
||||
@@ -268,18 +327,20 @@
|
||||
plain
|
||||
></ElButton>
|
||||
</ElTooltip>
|
||||
<ElTooltip
|
||||
<!-- <ElTooltip
|
||||
placement="left"
|
||||
content="成员"
|
||||
content="房间信息"
|
||||
> -->
|
||||
<ElButton
|
||||
class="!ml-[7px]"
|
||||
@click="handleShowMemberDialog"
|
||||
plain
|
||||
type="success"
|
||||
size="small"
|
||||
>
|
||||
<ElButton
|
||||
@click="handleShowMemberDialog"
|
||||
:icon="UserFilled"
|
||||
plain
|
||||
type="success"
|
||||
size="small"
|
||||
></ElButton>
|
||||
</ElTooltip>
|
||||
房间信息
|
||||
</ElButton>
|
||||
<!-- </ElTooltip> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="ml-auto">
|
||||
@@ -484,7 +545,7 @@
|
||||
@click="openConfigDir"
|
||||
size="small"
|
||||
>
|
||||
打开配置目录
|
||||
打开存储目录
|
||||
</ElButton>
|
||||
<ElButton
|
||||
@click="handleStartCommand('toml')"
|
||||
@@ -522,6 +583,70 @@
|
||||
</div>
|
||||
</template>
|
||||
</ElDialog>
|
||||
<ElDialog
|
||||
width="95%"
|
||||
top="30px"
|
||||
append-to-body
|
||||
:z-index="10"
|
||||
class="!mb-0"
|
||||
v-model="configAdminData.visible"
|
||||
:close-on-press-escape="false"
|
||||
title="配置管理"
|
||||
>
|
||||
<div class="flex items-center gap-[0_4px]">
|
||||
<ElButton
|
||||
@click="openConfigAdminDir"
|
||||
size="small"
|
||||
>
|
||||
打开存储目录
|
||||
</ElButton>
|
||||
<ElButton
|
||||
@click="handleStartCommand('config_admin')"
|
||||
type="primary"
|
||||
:icon="RefreshRight"
|
||||
size="small"
|
||||
>
|
||||
刷新
|
||||
</ElButton>
|
||||
</div>
|
||||
<div class="mt-[5px]">
|
||||
<ElSelect
|
||||
v-model="configAdminData.fileName"
|
||||
no-data-text="目录没有配置文件"
|
||||
placeholder="选择配置文件"
|
||||
filterable
|
||||
>
|
||||
<ElOption
|
||||
v-for="item in configAdminData.list"
|
||||
:key="item.path"
|
||||
:value="item.path"
|
||||
:label="item.name"
|
||||
>
|
||||
</ElOption>
|
||||
</ElSelect>
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="text-right">
|
||||
<div class="mb-[5px]">
|
||||
<ElAlert show-icon type="warning" title="打开目录删除文件即可删除配置"></ElAlert>
|
||||
</div>
|
||||
<ElButton
|
||||
size="small"
|
||||
@click="handleExchangeAdminConfig"
|
||||
type="primary"
|
||||
>
|
||||
切换选中配置
|
||||
</ElButton>
|
||||
<ElButton
|
||||
size="small"
|
||||
@click="configAdminData.visible = false"
|
||||
type="danger"
|
||||
>
|
||||
关闭
|
||||
</ElButton>
|
||||
</div>
|
||||
</template>
|
||||
</ElDialog>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
@@ -531,7 +656,7 @@
|
||||
QuestionFilled,
|
||||
Delete,
|
||||
List,
|
||||
UserFilled,
|
||||
CirclePlusFilled,
|
||||
Setting,
|
||||
Share,
|
||||
RefreshRight,
|
||||
@@ -540,28 +665,29 @@
|
||||
MagicStick,
|
||||
SetUp,
|
||||
Folder,
|
||||
CopyDocument
|
||||
CopyDocument,
|
||||
Platform
|
||||
} from "@element-plus/icons-vue";
|
||||
import { reactive, onBeforeUnmount, onMounted, ref } from "vue";
|
||||
import { reactive, onBeforeUnmount, onMounted, ref, toRaw } from "vue";
|
||||
import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion } from "~/composables/tray";
|
||||
import { getMatches } from "@tauri-apps/plugin-cli";
|
||||
import { initStartWinIpBroadcast } from "~/composables/netcard";
|
||||
import useMainStore from "@/stores/index";
|
||||
import { ElMessage, ElMessageBox } from "element-plus";
|
||||
import { ElMessage, ElMessageBox, ElTooltip } from "element-plus";
|
||||
import { getCurrentWindow, type Window } from "@tauri-apps/api/window";
|
||||
import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
|
||||
import etWindows from "@/composables/windows";
|
||||
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
||||
import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile } from "@tauri-apps/plugin-fs";
|
||||
import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile } from "@tauri-apps/plugin-fs";
|
||||
import { updateConfigJson } from "~/composables/configJson";
|
||||
import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
|
||||
import { sortedUniq, uniq } from "lodash-es";
|
||||
import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ } from "~/utils";
|
||||
import { bounce, addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName } from "~/utils";
|
||||
import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
|
||||
import { getServerArgs } from "@/composables/server";
|
||||
|
||||
let is_close = false;
|
||||
|
||||
const publicPeersLink = import.meta.env.VITE_PUBLIC_PEERS_URL;
|
||||
const tray = await useTray(
|
||||
true,
|
||||
async () => {
|
||||
@@ -569,6 +695,7 @@
|
||||
await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
|
||||
await invoke("stop_command", { child_id: data.winipBcPid || 0 });
|
||||
await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
|
||||
await stopPreventSleep(); //关闭防休眠
|
||||
},
|
||||
async () => {
|
||||
await handleConnection();
|
||||
@@ -580,7 +707,7 @@
|
||||
const config = mainStore.config;
|
||||
// console.error(config);
|
||||
const protocols = supportProtocols();
|
||||
const data = reactive<{ [key: string]: any; releaseList: Array<Array<string>> }>({
|
||||
const data = reactive({
|
||||
hasNewVersion: false, //easytierGame有没有新版
|
||||
logVisible: false,
|
||||
cidrVisible: false,
|
||||
@@ -593,7 +720,7 @@
|
||||
log: "",
|
||||
serverLog: "", //服务端日志
|
||||
update: false,
|
||||
releaseList: [],
|
||||
releaseList: [[]],
|
||||
coreVersion: "-",
|
||||
isSuccessGetIp: false,
|
||||
startLoading: false,
|
||||
@@ -608,6 +735,13 @@
|
||||
list: [] //配置文件列表
|
||||
});
|
||||
|
||||
const configAdminData = reactive<{ fileName: string; list: Array<{ path: string; name: string }>; [key: string]: any }>({
|
||||
visible: false,
|
||||
loading: false,
|
||||
list: [],
|
||||
fileName: ""
|
||||
});
|
||||
|
||||
const importConfigData = reactive<{ data: ""; [key: string]: any }>({
|
||||
visible: false,
|
||||
loading: false,
|
||||
@@ -620,17 +754,6 @@
|
||||
data: ""
|
||||
});
|
||||
|
||||
const copyServerUrl = async (serverUrl: string) => {
|
||||
const [err, _] = await ATJ(writeText(serverUrl));
|
||||
|
||||
if (!err) {
|
||||
ElMessage.success("地址已复制");
|
||||
} else {
|
||||
console.error(err);
|
||||
ElMessage.success("复制失败");
|
||||
}
|
||||
};
|
||||
|
||||
const closePrevent = async () => {
|
||||
const appWindow = getCurrentWindow();
|
||||
if (appWindow.label == "main") {
|
||||
@@ -645,6 +768,15 @@
|
||||
}
|
||||
};
|
||||
|
||||
const handleCopyIp = async () => {
|
||||
if (!config.ipv4?.trim()) return;
|
||||
if (data.isStart || !config.dhcp) {
|
||||
await copyText(mainStore.config.ipv4);
|
||||
} else {
|
||||
await copyText(mainStore.config.ipv4, "复制成功,联机后IP可能会变化");
|
||||
}
|
||||
};
|
||||
|
||||
const handleOpenCache = async () => {
|
||||
const cache_path = import.meta.env.VITE_CACHE_PATH;
|
||||
const resourceDir = await getResourceDir();
|
||||
@@ -905,7 +1037,7 @@
|
||||
// console.log(el, el[0], el[2]);
|
||||
return el && el[0] && el[2] && !el[2].includes("gui");
|
||||
})
|
||||
];
|
||||
] as any;
|
||||
coreManagementData.loading = false;
|
||||
// console.log(data.releaseList);
|
||||
};
|
||||
@@ -981,14 +1113,14 @@
|
||||
console.error(err);
|
||||
ElMessage.error(`config.json格式或编码错误`);
|
||||
} finally {
|
||||
mainStore.$patch({
|
||||
createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
|
||||
});
|
||||
// mainStore.$patch({
|
||||
// createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
|
||||
// });
|
||||
}
|
||||
}
|
||||
}
|
||||
const b = bounce(600);
|
||||
mainStore.$subscribe((...a) => {
|
||||
mainStore.$subscribe(async (...a) => {
|
||||
if (mainStore.createConfigInEasytier) {
|
||||
b(async () => {
|
||||
await updateConfigJson(data.configJsonSeverUrl);
|
||||
@@ -1135,8 +1267,8 @@
|
||||
args.push("-l", ...customListener);
|
||||
}
|
||||
}
|
||||
if (!config.disbleListenner && config.enableCustomListenerV6 && config.customListenerV6Data){
|
||||
args.push("--ipv6-listener", config.customListenerV6Data)
|
||||
if (!config.disbleListenner && config.enableCustomListenerV6 && config.customListenerV6Data) {
|
||||
args.push("--ipv6-listener", config.customListenerV6Data);
|
||||
}
|
||||
if (!config.disbleListenner && !config.enableCustomListener && config.port) {
|
||||
args.push("-l", config.port);
|
||||
@@ -1183,6 +1315,9 @@
|
||||
if (config.devName && config.devNameValue) {
|
||||
args.push("--dev-name", config.devNameValue);
|
||||
}
|
||||
if (config.compression && config.compression != "none") {
|
||||
args.push("--compression", config.compression);
|
||||
}
|
||||
return args;
|
||||
};
|
||||
|
||||
@@ -1240,39 +1375,101 @@
|
||||
configStart.visible = true;
|
||||
const path = import.meta.env.VITE_CONFIG_PATH;
|
||||
const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
|
||||
if (isExists) {
|
||||
const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
|
||||
configStart.list = entries
|
||||
.filter(item => item.isFile)
|
||||
.map(item => ({
|
||||
name: item.name,
|
||||
path: `${path}${item.name}`
|
||||
})) as any;
|
||||
} else {
|
||||
if (!isExists) {
|
||||
mainStore.configStartEnable = false;
|
||||
mainStore.configPath = "";
|
||||
try {
|
||||
await mkdir(path, { baseDir: BaseDirectory.Resource });
|
||||
} catch (err) {}
|
||||
await mkdir(path, { baseDir: BaseDirectory.Resource, recursive: true });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
return;
|
||||
}
|
||||
}
|
||||
const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
|
||||
configStart.list = entries
|
||||
.filter(item => {
|
||||
const nameLower = item.name.toLowerCase();
|
||||
return item.isFile && (nameLower.endsWith(".toml") || nameLower.endsWith(".yaml"));
|
||||
})
|
||||
.map(item => ({
|
||||
name: item.name,
|
||||
path: `${path}${item.name}`
|
||||
})) as any;
|
||||
}
|
||||
if (command === "share_config") {
|
||||
try {
|
||||
const {
|
||||
proxyNetworks,
|
||||
autoStart,
|
||||
connectAfterStart,
|
||||
protocol,
|
||||
serverUrl,
|
||||
networkName,
|
||||
networkPassword,
|
||||
dhcp,
|
||||
disableIpv6,
|
||||
disbleP2p,
|
||||
enableCustomProtocol,
|
||||
customProtocol,
|
||||
disbleListenner,
|
||||
port,
|
||||
enableCustomListener,
|
||||
customListenerData,
|
||||
enableCustomListenerV6,
|
||||
customListenerV6Data,
|
||||
devName,
|
||||
devNameValue,
|
||||
enableNetCardMetric,
|
||||
netCardMetricValue,
|
||||
disableEncryption,
|
||||
multiThread,
|
||||
hostname,
|
||||
enablExitNode,
|
||||
useSmoltcp,
|
||||
saveErrorLog,
|
||||
logLevel,
|
||||
ipv4,
|
||||
...otherConfig
|
||||
latencyfirst,
|
||||
disableUdpHolePunching,
|
||||
relayAllPeerrpc,
|
||||
compression,
|
||||
enablePreventSleep
|
||||
} = mainStore.config;
|
||||
const WT = btoa(encodeURIComponent(JSON.stringify({ config: otherConfig })));
|
||||
const WT = btoa(
|
||||
encodeURIComponent(
|
||||
JSON.stringify({
|
||||
config: {
|
||||
protocol,
|
||||
serverUrl,
|
||||
networkName,
|
||||
networkPassword,
|
||||
dhcp,
|
||||
disableIpv6,
|
||||
disbleP2p,
|
||||
enableCustomProtocol,
|
||||
customProtocol,
|
||||
disbleListenner,
|
||||
port,
|
||||
enableCustomListener,
|
||||
customListenerData,
|
||||
enableCustomListenerV6,
|
||||
customListenerV6Data,
|
||||
devName,
|
||||
devNameValue,
|
||||
enableNetCardMetric,
|
||||
netCardMetricValue,
|
||||
disableEncryption,
|
||||
multiThread,
|
||||
latencyfirst,
|
||||
disableUdpHolePunching,
|
||||
relayAllPeerrpc,
|
||||
compression,
|
||||
enablePreventSleep
|
||||
}
|
||||
})
|
||||
)
|
||||
);
|
||||
await writeText(WT);
|
||||
await ElConfirmPrimary(
|
||||
`{action} 虚拟网IP,主机名,子网代理,为子网代理启用smoltcp堆栈,开机自启,软件启动自动联机,出口节点,不生成Tun网卡,错误日志相关配置`,
|
||||
"提示",
|
||||
{
|
||||
confirmButtonText: "知道了",
|
||||
showCancelButton: false,
|
||||
action: "不会分享"
|
||||
}
|
||||
);
|
||||
ElMessage.success("配置已复制");
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
@@ -1286,6 +1483,97 @@
|
||||
if (command === "create_server") {
|
||||
await handleShowServerDialog();
|
||||
}
|
||||
if (command === "config_admin") {
|
||||
configAdminData.visible = true;
|
||||
const path = import.meta.env.VITE_CONFIG_ADMIN_PATH;
|
||||
const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
|
||||
if (!isExists) {
|
||||
try {
|
||||
await mkdir(path, { baseDir: BaseDirectory.Resource, recursive: true });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
return;
|
||||
}
|
||||
}
|
||||
const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
|
||||
configAdminData.list = entries
|
||||
.filter(item => item.isFile)
|
||||
.map(item => ({
|
||||
name: item.name,
|
||||
path: `${path}${item.name}`
|
||||
})) as any;
|
||||
}
|
||||
if (command === "save_config_admin") {
|
||||
const config = btoa(encodeURIComponent(JSON.stringify(mainStore.$state)));
|
||||
const [error, { value = "" } = {}] = await ATJ(
|
||||
ElMessageBox.prompt("请输入配置的存储名", "提示", {
|
||||
confirmButtonText: "保存",
|
||||
cancelButtonText: "取消",
|
||||
inputPlaceholder: "请输入2个字以上的存储名",
|
||||
inputValidator: (value: string) => {
|
||||
const result = isValidWindowsFileName(value);
|
||||
if (result) {
|
||||
return true;
|
||||
}
|
||||
return "文件名不合法";
|
||||
}
|
||||
})
|
||||
);
|
||||
if (!error) {
|
||||
const dir = import.meta.env.VITE_CONFIG_ADMIN_PATH;
|
||||
const filePath = `${dir}${value}`;
|
||||
const isExistsDir = await exists(dir, { baseDir: BaseDirectory.Resource });
|
||||
if (!isExistsDir) {
|
||||
try {
|
||||
await mkdir(dir, { baseDir: BaseDirectory.Resource, recursive: true });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
return;
|
||||
}
|
||||
}
|
||||
const isExists = await exists(filePath, { baseDir: BaseDirectory.Resource });
|
||||
let allowWrite = true;
|
||||
if (isExists) {
|
||||
const [err] = await ElConfirmPrimary("配置名已存在,是否覆盖?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消"
|
||||
});
|
||||
if (err) {
|
||||
allowWrite = false;
|
||||
}
|
||||
}
|
||||
if (allowWrite) {
|
||||
let encoder = new TextEncoder();
|
||||
let data = encoder.encode(config);
|
||||
// console.log(filePath, data);
|
||||
await writeFile(filePath, data, { baseDir: BaseDirectory.Resource });
|
||||
ElMessage.success("保存成功");
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const handleExchangeAdminConfig = async () => {
|
||||
const path = configAdminData.fileName;
|
||||
if (!path) return ElMessage.warning("请选择配置");
|
||||
// import.meta.env.VITE_CONFIG_ADMIN_PATH
|
||||
const [err] = await ElConfirmPrimary("会覆盖当前配置,确定切换吗?");
|
||||
if (err) return;
|
||||
const base64U8Arrray = await readFile(path, { baseDir: BaseDirectory.Resource });
|
||||
const decoder = new TextDecoder("utf-8");
|
||||
try {
|
||||
if (data.isStart) {
|
||||
ElMessage.warning("停止联机..");
|
||||
await reset();
|
||||
}
|
||||
const json: typeof mainStore.$state = JSON.parse(decodeURIComponent(atob(decoder.decode(base64U8Arrray))));
|
||||
mainStore.$patch(json);
|
||||
ElMessage.success("切换成功");
|
||||
configAdminData.visible = false;
|
||||
} catch (err) {
|
||||
ElMessage.error("读取配置失败");
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const handleStartImport = async () => {
|
||||
@@ -1295,6 +1583,7 @@
|
||||
});
|
||||
if (!err) {
|
||||
const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
|
||||
payload.config.serverUrl = payload?.config?.serverUrl?.trim() || config.serverUrl;
|
||||
mainStore.$patch({
|
||||
config: {
|
||||
...mainStore.config,
|
||||
@@ -1303,7 +1592,7 @@
|
||||
});
|
||||
ElMessage.success("导入成功");
|
||||
importConfigData.visible = false;
|
||||
mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
|
||||
mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers].filter(el => el.trim()));
|
||||
} else {
|
||||
console.error(err);
|
||||
if (err !== "cancel") {
|
||||
@@ -1332,6 +1621,12 @@
|
||||
// console.error(configPath);
|
||||
await Command.create("explorer", [configPath]).execute();
|
||||
};
|
||||
const openConfigAdminDir = async () => {
|
||||
const resourceDir = await getResourceDir();
|
||||
const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_ADMIN_PATH);
|
||||
// console.error(configPath);
|
||||
await Command.create("explorer", [configPath]).execute();
|
||||
};
|
||||
|
||||
const handleShowMemberDialog = async () => {
|
||||
if (!data.isStart) {
|
||||
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="140"
|
||||
label="主机名"
|
||||
label="成员名"
|
||||
prop="hostname"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
@@ -39,7 +39,7 @@
|
||||
effect="dark"
|
||||
:type="row.cost == 'p2p' ? 'success' : 'info'"
|
||||
>
|
||||
{{ row.cost }}
|
||||
{{ row.cost ? row.cost.replace("relay", "中转") : row.cost }}
|
||||
</ElTag>
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
|
||||
+174
-9
@@ -8,7 +8,7 @@
|
||||
<ElTabPane
|
||||
label="联机失败解决办法"
|
||||
name="netcard"
|
||||
class="flex flex-col h-full"
|
||||
class="flex h-full flex-col"
|
||||
>
|
||||
<div>
|
||||
<div>
|
||||
@@ -23,7 +23,7 @@
|
||||
</ElTooltip>
|
||||
</div>
|
||||
<ElLink
|
||||
class="!text-[15px] mr-[10px]"
|
||||
class="mr-[10px] !text-[15px]"
|
||||
type="info"
|
||||
:underline="false"
|
||||
@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
|
||||
@@ -41,14 +41,102 @@
|
||||
></ElSwitch>
|
||||
</div>
|
||||
<div>
|
||||
<ElTooltip content="设置网卡的跃点,提升网卡优先级,尝试将您联机使用的网卡跃点设置为最小,请先查询网卡信息">
|
||||
<ElTooltip
|
||||
content="使用ForceBindIP启动应用 (强制绑定IP或者网卡),如果还有没启动联机,请先启动联机,联机成功后,点击刷新获取easytier生成的网卡"
|
||||
>
|
||||
<ElText>
|
||||
方案2
|
||||
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
|
||||
</ElText>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
<div class="flex items-center mt-[5px]">
|
||||
<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"
|
||||
@@ -58,7 +146,7 @@
|
||||
</ElButton>
|
||||
<div
|
||||
v-if="data.row.name"
|
||||
class="ml-auto flex items-center flex-nowrap gap-[10px]"
|
||||
class="ml-auto flex flex-nowrap items-center gap-[10px]"
|
||||
>
|
||||
<ElTooltip content="跃点越小,网卡优先级越高,范围(1-9999)">
|
||||
<ElInput
|
||||
@@ -78,7 +166,7 @@
|
||||
</ElButton>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-1 overflow-auto mt-[5px]">
|
||||
<div class="mt-[5px] flex-1 overflow-auto">
|
||||
<ElTable
|
||||
height="100%"
|
||||
empty-text="暂无数据"
|
||||
@@ -103,7 +191,7 @@
|
||||
<ElTabPane
|
||||
label="防火墙"
|
||||
name="firewall"
|
||||
class="flex flex-col h-full"
|
||||
class="flex h-full flex-col"
|
||||
>
|
||||
<div class="flex flex-col items-center">
|
||||
<div class="mb-[10px]">
|
||||
@@ -113,6 +201,13 @@
|
||||
>
|
||||
一键关闭防火墙
|
||||
</ElButton>
|
||||
<ElButton
|
||||
@click="handleCustomFireWall"
|
||||
type="danger"
|
||||
size="small"
|
||||
>
|
||||
自定义防火墙策略
|
||||
</ElButton>
|
||||
</div>
|
||||
<div class="mb-[10px]">
|
||||
<ElText class="!mx-[10px]">域防火墙</ElText>
|
||||
@@ -176,6 +271,7 @@
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { open, Command } from "@tauri-apps/plugin-shell";
|
||||
import { open as dialogOpen } from "@tauri-apps/plugin-dialog";
|
||||
import { ElMessage, type TabPaneName } from "element-plus";
|
||||
import { QuestionFilled } from "@element-plus/icons-vue";
|
||||
import { onMounted, reactive } from "vue";
|
||||
@@ -183,9 +279,11 @@
|
||||
import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
|
||||
import { isValidIP } from "~/utils";
|
||||
import { dataSubscribe } from "~/composables/windows";
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { BaseDirectory, exists } from "@tauri-apps/plugin-fs";
|
||||
|
||||
const mainStore = useMainStore();
|
||||
const data = reactive({
|
||||
const data = reactive<{ guids: string[][]; [key: string]: any }>({
|
||||
activeTab: "netcard",
|
||||
winipBcPid: 0,
|
||||
pingNum: 1,
|
||||
@@ -202,9 +300,15 @@
|
||||
name: "",
|
||||
metric: ""
|
||||
},
|
||||
netcardList: []
|
||||
netcardList: [],
|
||||
guids: [],
|
||||
forceBindStart: false
|
||||
});
|
||||
|
||||
const handleCustomFireWall = async () => {
|
||||
await open("wf.msc");
|
||||
}
|
||||
|
||||
const handleTabsChange = async (tabPaneName: TabPaneName) => {
|
||||
if (tabPaneName === "netcard") {
|
||||
// await initNetCardInfo();
|
||||
@@ -328,17 +432,78 @@
|
||||
}
|
||||
};
|
||||
|
||||
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;
|
||||
}
|
||||
};
|
||||
|
||||
dataSubscribe(async (...a) => {
|
||||
return {
|
||||
winIpBcAutoStart: mainStore.winIpBcAutoStart,
|
||||
winipBcStart: mainStore.winipBcStart,
|
||||
winipBcPid: mainStore.winipBcPid,
|
||||
forceBindIpBit: mainStore.forceBindIpBit,
|
||||
delayInjectDll: mainStore.delayInjectDll,
|
||||
forceBindInput: mainStore.forceBindInput,
|
||||
forceBindFile: mainStore.forceBindFile,
|
||||
config: { ...mainStore.config }
|
||||
};
|
||||
});
|
||||
|
||||
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();
|
||||
});
|
||||
</script>
|
||||
|
||||
Generated
+1291
-1128
File diff suppressed because it is too large
Load Diff
Generated
+1121
-485
File diff suppressed because it is too large
Load Diff
+22
-20
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "easytier-game"
|
||||
version = "1.3.2"
|
||||
version = "1.3.8"
|
||||
homepage = "https://github.com/EasyTier/EasyTier"
|
||||
repository = "https://github.com/EasyTier/EasytierGame"
|
||||
description = "A simple network initiator based on Easytier"
|
||||
@@ -8,7 +8,7 @@ authors = ["leizi97"]
|
||||
license = "LICENSE"
|
||||
|
||||
edition = "2021"
|
||||
rust-version = "1.77.2"
|
||||
# rust-version = "1.77.2"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
@@ -18,39 +18,41 @@ name = "app_lib"
|
||||
crate-type = ["staticlib", "cdylib", "rlib"]
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "2.0.3", features = [] }
|
||||
tauri-build = { version = "2.0.5", features = [] }
|
||||
# prost-build = "0.13.2"
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
log = "0.4"
|
||||
tauri = { version = "2.1.1", features = [
|
||||
serde_json = "1.0.137"
|
||||
serde = { version = "1.0.217", features = ["derive"] }
|
||||
log = "0.4.25"
|
||||
tauri = { version = "2.2.3", features = [
|
||||
"tray-icon",
|
||||
"image-png",
|
||||
"image-ico",
|
||||
"devtools"
|
||||
] }
|
||||
|
||||
tauri-plugin-log = "2.0.2"
|
||||
tauri-plugin-shell = "2.0.2"
|
||||
reqwest = { version = "0.12", features = ["json"] }
|
||||
zip = "2.2"
|
||||
sysinfo = '0.32.0'
|
||||
tauri-plugin-log = "2.2.0"
|
||||
tauri-plugin-shell = "2.2.0"
|
||||
reqwest = { version = "0.12.12", features = ["json"] }
|
||||
zip = "2.2.2"
|
||||
sysinfo = '0.33.1'
|
||||
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
|
||||
whoami = "1.5.2"
|
||||
tauri-plugin-fs = "2"
|
||||
tauri-plugin-clipboard-manager = "2.0.2"
|
||||
tauri-plugin-fs = "2.2.0"
|
||||
tauri-plugin-clipboard-manager = "2.2.0"
|
||||
rand = "0.8.5"
|
||||
tokio = { version = "1.41.1", features = ["process"] }
|
||||
tokio = { version = "1.43.0", features = ["process"] }
|
||||
tauri-plugin-dialog = "2.2.0"
|
||||
# prost = "0.13"
|
||||
# prost-types = "0.13"
|
||||
|
||||
hashbrown = "0.15.2"
|
||||
|
||||
[dependencies.windows]
|
||||
version = "0.58.0"
|
||||
features = ["Win32_System_TaskScheduler", "Win32_System_Power"]
|
||||
features = ["Win32_System_TaskScheduler", "Win32_System_Power", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"]
|
||||
|
||||
[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
|
||||
tauri-plugin-cli = "2"
|
||||
tauri-plugin-single-instance = "2.0.1"
|
||||
tauri-plugin-window-state = "2"
|
||||
tauri-plugin-cli = "2.2.0"
|
||||
tauri-plugin-single-instance = "2.2.1"
|
||||
tauri-plugin-window-state = "2.2.1"
|
||||
|
||||
+114
-103
@@ -1,104 +1,115 @@
|
||||
{
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "default",
|
||||
"description": "enables the default permissions",
|
||||
"windows": [
|
||||
"main",
|
||||
"log",
|
||||
"member",
|
||||
"cidr",
|
||||
"advance",
|
||||
"tool",
|
||||
"server"
|
||||
],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-minimize",
|
||||
"core:window:allow-unminimize",
|
||||
"core:window:allow-hide",
|
||||
"core:window:allow-close",
|
||||
"core:window:allow-set-focus",
|
||||
"core:window:allow-is-visible",
|
||||
"shell:allow-open",
|
||||
"core:window:allow-show",
|
||||
"core:window:allow-create",
|
||||
"core:window:allow-set-position",
|
||||
"core:window:allow-destroy",
|
||||
"core:webview:allow-create-webview-window",
|
||||
"core:webview:allow-set-webview-size",
|
||||
"core:webview:allow-set-webview-position",
|
||||
"core:webview:allow-create-webview",
|
||||
"core:webview:allow-webview-show",
|
||||
"core:webview:allow-webview-hide",
|
||||
"core:webview:allow-webview-close",
|
||||
"core:tray:allow-get-by-id",
|
||||
"core:tray:allow-set-icon",
|
||||
"core:tray:allow-new",
|
||||
{
|
||||
"identifier": "shell:allow-spawn",
|
||||
"allow": [
|
||||
{
|
||||
"args": [
|
||||
"run"
|
||||
],
|
||||
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
|
||||
"name": "WinIPBroadcast"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"identifier": "shell:allow-execute",
|
||||
"allow": [
|
||||
{
|
||||
"args": [
|
||||
"run"
|
||||
],
|
||||
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
|
||||
"name": "WinIPBroadcast"
|
||||
},
|
||||
{
|
||||
"args": true,
|
||||
"cmd": "$RESOURCE/easytier/tool/nssm",
|
||||
"name": "nssm"
|
||||
},
|
||||
{
|
||||
"args": true,
|
||||
"cmd": "explorer",
|
||||
"name": "explorer"
|
||||
},
|
||||
{
|
||||
"args": true,
|
||||
"cmd": "netsh",
|
||||
"name": "netsh"
|
||||
},
|
||||
{
|
||||
"args": true,
|
||||
"cmd": "ping",
|
||||
"name": "ping"
|
||||
}
|
||||
]
|
||||
},
|
||||
"fs:default",
|
||||
"fs:allow-read-dir",
|
||||
"fs:allow-exists",
|
||||
"fs:allow-open",
|
||||
"fs:allow-resource-read",
|
||||
"fs:allow-resource-read-recursive",
|
||||
"fs:allow-resource-write",
|
||||
"fs:allow-resource-write-recursive",
|
||||
"clipboard-manager:allow-clear",
|
||||
"clipboard-manager:allow-read-text",
|
||||
"clipboard-manager:allow-write-text",
|
||||
|
||||
"window-state:default",
|
||||
"window-state:allow-save-window-state",
|
||||
"window-state:allow-restore-state",
|
||||
|
||||
|
||||
"cli:default",
|
||||
"cli:allow-cli-matches",
|
||||
|
||||
"log:default",
|
||||
"log:allow-log"
|
||||
]
|
||||
}
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "default",
|
||||
"description": "enables the default permissions",
|
||||
"windows": ["main", "log", "member", "cidr", "advance", "tool", "server"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-minimize",
|
||||
"core:window:allow-unminimize",
|
||||
"core:window:allow-hide",
|
||||
"core:window:allow-close",
|
||||
"core:window:allow-set-focus",
|
||||
"core:window:allow-is-visible",
|
||||
"shell:allow-open",
|
||||
"core:window:allow-show",
|
||||
"core:window:allow-create",
|
||||
"core:window:allow-set-position",
|
||||
"core:window:allow-destroy",
|
||||
"core:webview:allow-create-webview-window",
|
||||
"core:webview:allow-set-webview-size",
|
||||
"core:webview:allow-set-webview-position",
|
||||
"core:webview:allow-create-webview",
|
||||
"core:webview:allow-webview-show",
|
||||
"core:webview:allow-webview-hide",
|
||||
"core:webview:allow-webview-close",
|
||||
"core:tray:allow-get-by-id",
|
||||
"core:tray:allow-set-icon",
|
||||
"core:tray:allow-new",
|
||||
{
|
||||
"identifier": "shell:allow-spawn",
|
||||
"allow": [
|
||||
{
|
||||
"args": ["run"],
|
||||
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
|
||||
"name": "WinIPBroadcast"
|
||||
},
|
||||
{
|
||||
"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"
|
||||
}
|
||||
]
|
||||
},
|
||||
"fs:default",
|
||||
"fs:allow-read-dir",
|
||||
"fs:allow-exists",
|
||||
"fs:allow-open",
|
||||
"fs:allow-resource-read",
|
||||
"fs:allow-resource-read-recursive",
|
||||
"fs:allow-resource-write",
|
||||
"fs:allow-resource-write-recursive",
|
||||
"clipboard-manager:allow-clear",
|
||||
"clipboard-manager:allow-read-text",
|
||||
"clipboard-manager:allow-write-text",
|
||||
"window-state:default",
|
||||
"window-state:allow-save-window-state",
|
||||
"window-state:allow-restore-state",
|
||||
"cli:default",
|
||||
"cli:allow-cli-matches",
|
||||
"log:default",
|
||||
"log:allow-log",
|
||||
"dialog:default",
|
||||
"dialog:allow-open"
|
||||
]
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+59
-3
@@ -9,6 +9,7 @@ use std::fs::{self, File};
|
||||
use std::io::{BufRead, BufReader, Write};
|
||||
use std::os::windows::process::CommandExt;
|
||||
use std::process::{Command, Stdio};
|
||||
use std::ptr;
|
||||
use std::sync::mpsc;
|
||||
use std::{path, thread};
|
||||
use sysinfo::System;
|
||||
@@ -17,16 +18,69 @@ use tauri::Emitter;
|
||||
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 tokio::process::Command as tokioCommand;
|
||||
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![
|
||||
@@ -664,6 +718,7 @@ pub fn run() {
|
||||
|
||||
let context = tauri::generate_context!();
|
||||
tauri::Builder::default()
|
||||
.plugin(tauri_plugin_dialog::init())
|
||||
.plugin(tauri_plugin_cli::init())
|
||||
.plugin(
|
||||
tauri_plugin_window_state::Builder::new()
|
||||
@@ -699,7 +754,7 @@ pub fn run() {
|
||||
// }
|
||||
#[cfg(not(target_os = "android"))]
|
||||
let _tray_menu = TrayIconBuilder::with_id("main")
|
||||
.menu_on_left_click(false)
|
||||
.show_menu_on_left_click(false)
|
||||
.on_tray_icon_event(|tray, event| {
|
||||
if let TrayIconEvent::Click {
|
||||
button: MouseButton::Left,
|
||||
@@ -740,7 +795,8 @@ pub fn run() {
|
||||
spawn_autostart,
|
||||
autostart_is_enabled,
|
||||
prevent_sleep,
|
||||
allow_sleep
|
||||
allow_sleep,
|
||||
get_network_adapter_guids
|
||||
])
|
||||
.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.3.2",
|
||||
"version": "1.3.8",
|
||||
"identifier": "com.tauri.easytier-game",
|
||||
|
||||
"build": {
|
||||
@@ -13,7 +13,7 @@
|
||||
"app": {
|
||||
"windows": [
|
||||
{
|
||||
"title": "easytier-game 1.3.2",
|
||||
"title": "easytier-game 1.3.8",
|
||||
"label": "main",
|
||||
"minWidth": 340,
|
||||
"width": 340,
|
||||
@@ -53,13 +53,18 @@
|
||||
"easytier/icons/",
|
||||
"easytier/config_template.json",
|
||||
"easytier/tool/WinIPBroadcast.exe",
|
||||
"easytier/tool/ForceBindIP.exe",
|
||||
"easytier/tool/ForceBindIP64.exe",
|
||||
"easytier/tool/BindIP.dll",
|
||||
"easytier/tool/BindIP64.dll",
|
||||
"easytier/tool/MicrosoftEdgeWebview2Setup.exe",
|
||||
"easytier/easytier-cli.exe",
|
||||
"easytier/easytier-core.exe",
|
||||
"easytier/Packet.dll",
|
||||
"easytier/wintun.dll",
|
||||
"easytier/clear_local_data.bat",
|
||||
"帮助.txt"
|
||||
"帮助.txt",
|
||||
"uninstall.exe"
|
||||
],
|
||||
"windows": {
|
||||
"webviewInstallMode": {
|
||||
|
||||
Binary file not shown.
+25
-14
@@ -3,7 +3,7 @@ const store = defineStore("main", {
|
||||
state() {
|
||||
return {
|
||||
config: {
|
||||
protocol: ["tcp", "udp"], // 网络协议
|
||||
protocol: ["tcp"], // 网络协议
|
||||
serverUrl: "public.easytier.top:11010",
|
||||
networkName: "",
|
||||
networkPassword: "",
|
||||
@@ -14,28 +14,28 @@ const store = defineStore("main", {
|
||||
connectAfterStart: false, //软件打开后,是否自动连接
|
||||
disableIpv6: false, // 是否禁用IPv6
|
||||
port: "11010", // 监听端口号
|
||||
enableCustomListener: false, // 是否自定义监听
|
||||
customListenerV6Data: "", //自定义ipv6监听
|
||||
enableCustomListenerV6: false, // 是否自定义监听
|
||||
customListenerData: "", // 自定义监听地址
|
||||
enableCustomListener: true, // 是否自定义监听
|
||||
customListenerV6Data: "udp://[::]:11010", //自定义ipv6监听
|
||||
enableCustomListenerV6: true, // 是否自定义监听
|
||||
customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
|
||||
disbleListenner: false, // 是否禁用监听
|
||||
disableEncryption: true, // 是否禁用加密
|
||||
disableEncryption: false, // 是否禁用加密
|
||||
multiThread: false, //使用多线程
|
||||
enablExitNode: false, // 是否启用退出节点
|
||||
noTun: false, // 是否使用TUN
|
||||
latencyfirst: false, // 是否优先延迟
|
||||
useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
|
||||
disableUdpHolePunching: false, // 是否禁用UDP打洞
|
||||
relayAllPeerrpc: false, // 是否启用所有对等RPC
|
||||
relayAllPeerrpc: true, // 是否启用所有对等RPC
|
||||
disbleP2p: false, // 是否使用P2P
|
||||
dhcp: true, // 是否使用DHCP
|
||||
saveErrorLog: true, // 是否保存错误日志
|
||||
logLevel: "error", //日志等级
|
||||
devName: false, //自定义网卡名
|
||||
devNameValue: "", //自定义网卡名
|
||||
enableCustomProtocol: false, //自定义默认协议
|
||||
devName: true, //自定义网卡名
|
||||
devNameValue: "etgame", //自定义网卡名
|
||||
enableCustomProtocol: true, //自定义默认协议
|
||||
customProtocol: "tcp", //自定义默认协议
|
||||
enableNetCardMetric: false, //启用网卡自定义跃点
|
||||
enableNetCardMetric: true, //启用网卡自定义跃点
|
||||
netCardMetricValue: 1, //自定义网卡跃点值
|
||||
enablePreventSleep: false, //组织系统休眠
|
||||
compression: "none", //加密算法
|
||||
@@ -49,7 +49,7 @@ const store = defineStore("main", {
|
||||
port: "11010" // 服务器端口
|
||||
},
|
||||
cidrEnable: false,
|
||||
basePeers: ["public.easytier.top:11010"],
|
||||
basePeers: ["public.easytier.top:11010","public.easytier.net:11010"],
|
||||
theme: false, //主题 false light true dark
|
||||
configStartEnable: false, //使用配置文件启动
|
||||
configPath: "", //配置文件路径
|
||||
@@ -57,6 +57,12 @@ const store = defineStore("main", {
|
||||
createConfigInEasytier: false, //在easytier目录生成config.json文件吗
|
||||
githubFastUrl: "https://ghproxy.cc/",
|
||||
|
||||
// forceBindIp配置
|
||||
forceBindIpBit: "64",
|
||||
delayInjectDll: false,
|
||||
forceBindInput: "",
|
||||
forceBindFile: "",
|
||||
|
||||
winipBcPid: 0,
|
||||
winipBcStart: false
|
||||
};
|
||||
@@ -98,7 +104,7 @@ const store = defineStore("main", {
|
||||
"config.enableCustomListenerV6",
|
||||
"config.customListenerV6Data",
|
||||
|
||||
"config.enableCustonProtocol",
|
||||
"config.enableCustomProtocol",
|
||||
"config.customProtocol",
|
||||
"config.enablePreventSleep",
|
||||
"config.compression",
|
||||
@@ -117,7 +123,12 @@ const store = defineStore("main", {
|
||||
"configPath",
|
||||
"winIpBcAutoStart",
|
||||
"createConfigInEasytier",
|
||||
"githubFastUrl"
|
||||
"githubFastUrl",
|
||||
|
||||
"forceBindIpBit",
|
||||
"delayInjectDll",
|
||||
"forceBindInput",
|
||||
"forceBindFile"
|
||||
]
|
||||
// // 除了这些,其他都要存下来
|
||||
// omit: ["winipBcPid", "winipBcStart"]
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/** @type {import('tailwindcss').Config} */
|
||||
/** @type {import('tailwindcss/plugin')} */
|
||||
|
||||
const plugin = require("tailwindcss/plugin");
|
||||
module.exports = {
|
||||
import plugin from "tailwindcss/plugin"
|
||||
// const plugin = require("tailwindcss/plugin");
|
||||
export default {
|
||||
content: ["./components/**/*.{js,vue,ts}", "./layouts/**/*.vue", "./pages/**/*.vue", "./plugins/**/*.{js,ts}", "./app.vue", "./error.vue"],
|
||||
theme: {
|
||||
extend: {}
|
||||
Vendored
+3
@@ -1,6 +1,9 @@
|
||||
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;
|
||||
}
|
||||
|
||||
interface ImportMeta {
|
||||
|
||||
+7
-5
@@ -1,10 +1,10 @@
|
||||
import { ElMessageBox } from "element-plus";
|
||||
import { ATJ } from "./index";
|
||||
import { h, type VNode } from "vue";
|
||||
type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null }
|
||||
type Opt = { action?: string; confirmButtonText?: string; cancelButtonText?: string; VNode?: VNode | null, showCancelButton?:boolean }
|
||||
export const ElConfirmDanger = (
|
||||
content: string,
|
||||
title: string,
|
||||
title: string = "提示",
|
||||
opt: Opt = {
|
||||
action: "",
|
||||
confirmButtonText: "确定",
|
||||
@@ -40,7 +40,7 @@ export const ElConfirmDanger = (
|
||||
|
||||
export const ElConfirmSucces = (
|
||||
content: string,
|
||||
title: string,
|
||||
title: string = "提示",
|
||||
opt: Opt = {
|
||||
action: "",
|
||||
confirmButtonText: "确定",
|
||||
@@ -76,15 +76,16 @@ export const ElConfirmSucces = (
|
||||
|
||||
export const ElConfirmPrimary = (
|
||||
content: string,
|
||||
title: string,
|
||||
title: string = "提示",
|
||||
opt: Opt = {
|
||||
action: "",
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
showCancelButton: true,
|
||||
VNode: null
|
||||
}
|
||||
): Promise<any | [any, any]> => {
|
||||
const { action = "", confirmButtonText = "确定", cancelButtonText = "取消", VNode = null } = opt;
|
||||
const { action = "", confirmButtonText = "确定", cancelButtonText = "取消", VNode = null, showCancelButton = true } = opt;
|
||||
const formatContentArr = content.split("{action}");
|
||||
const action_length = formatContentArr.length - 1;
|
||||
const messageArr = [];
|
||||
@@ -103,6 +104,7 @@ export const ElConfirmPrimary = (
|
||||
ElMessageBox.confirm(message, title, {
|
||||
closeOnClickModal: false, // 点击遮罩层不关闭弹窗
|
||||
closeOnPressEscape: false, // 按下Esc键不关闭弹窗
|
||||
showCancelButton,
|
||||
cancelButtonText,
|
||||
confirmButtonText,
|
||||
confirmButtonClass: "el-button--primary"
|
||||
|
||||
+39
-11
@@ -1,5 +1,7 @@
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { writeText } from "@tauri-apps/plugin-clipboard-manager";
|
||||
import { open } from "@tauri-apps/plugin-shell";
|
||||
import { ElMessage } from "element-plus";
|
||||
export const ENV = import.meta.env;
|
||||
|
||||
//防抖
|
||||
@@ -51,8 +53,8 @@ export const numRemoveZero = (num: Number) => {
|
||||
// await-to-js
|
||||
export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefined) => {
|
||||
return promise
|
||||
.then((data) => [null, data])
|
||||
.catch((err) => {
|
||||
.then(data => [null, data])
|
||||
.catch(err => {
|
||||
if (errorExt) {
|
||||
if (typeof errorExt !== "object") {
|
||||
return [errorExt, undefined];
|
||||
@@ -69,25 +71,26 @@ const _supportProtocols = ["tcp", "udp", "ws", "wss", "quic"];
|
||||
|
||||
export const supportProtocols = () => {
|
||||
return _supportProtocols.slice();
|
||||
}
|
||||
};
|
||||
|
||||
let _prevent_timer: NodeJS.Timeout| null = null;
|
||||
let _prevent_timer: NodeJS.Timeout | null = null;
|
||||
let _prevent_timer_count = 15; // 秒
|
||||
export const preventSleep = () => {
|
||||
_prevent_timer && clearInterval(_prevent_timer);
|
||||
_prevent_timer = setInterval(async () => {
|
||||
const result = await invoke('prevent_sleep');
|
||||
const result = await invoke("prevent_sleep");
|
||||
// console.log(`trigger prevent sleep ${result}`);
|
||||
}, _prevent_timer_count * 1000);
|
||||
}
|
||||
};
|
||||
|
||||
export const stopPreventSleep = () => {
|
||||
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 [];
|
||||
if (!content) return [];
|
||||
// 将表格字符串分割成行
|
||||
const lines = content.split("\n");
|
||||
|
||||
@@ -95,7 +98,7 @@ export const parseCliInfo = (content: string) => {
|
||||
const headers = lines[1]
|
||||
.split("│")
|
||||
.slice(1, -1)
|
||||
.map((h) => h.trim());
|
||||
.map(h => h.trim());
|
||||
|
||||
// 初始化结果数组
|
||||
const result: any[] = [];
|
||||
@@ -108,7 +111,7 @@ export const parseCliInfo = (content: string) => {
|
||||
const values = lines[i]
|
||||
.split("│")
|
||||
.slice(1, -1)
|
||||
.map((v) => v.trim());
|
||||
.map(v => v.trim());
|
||||
|
||||
// 创建对象并添加到结果数组
|
||||
const obj: any = {};
|
||||
@@ -123,6 +126,20 @@ export const parseCliInfo = (content: string) => {
|
||||
return result;
|
||||
};
|
||||
|
||||
export function isValidWindowsFileName(name: string) {
|
||||
if(name.length > 255) return false;
|
||||
const reserved_names = [
|
||||
"CON", "PRN", "AUX", "NUL",
|
||||
"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
|
||||
"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"
|
||||
];
|
||||
if(reserved_names.includes(name.toUpperCase())) {
|
||||
return false;
|
||||
}
|
||||
return /^[^<>:"/\\|?*\x00-\x1F]+[^<>:"/\\|?*\x00-\x1F .]$/g.test(name);
|
||||
|
||||
}
|
||||
|
||||
export const addQQGroup = () => {
|
||||
open("https://qm.qq.com/q/Yo3HmaEIWC");
|
||||
};
|
||||
@@ -133,3 +150,14 @@ export function isValidIP(ip: string) {
|
||||
const ipv6Pattern = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$/;
|
||||
return ipv4Pattern.test(ip) || ipv6Pattern.test(ip);
|
||||
}
|
||||
|
||||
export const copyText = async (text: string, message: string = "复制成功") => {
|
||||
const [err, _] = await ATJ(writeText(text));
|
||||
|
||||
if (!err) {
|
||||
ElMessage.success(message);
|
||||
} else {
|
||||
console.error(err);
|
||||
ElMessage.success("复制失败");
|
||||
}
|
||||
};
|
||||
|
||||
Binary file not shown.
@@ -1,14 +1,15 @@
|
||||
/**
|
||||
* 生成 release 发布包 zip 文件
|
||||
*/
|
||||
|
||||
const releaseDir = "./src-tauri/target/release";
|
||||
const pkg = require("./package.json");
|
||||
const isWin7 = process.argv[2] == 'win7';
|
||||
const releaseDir = isWin7 ? "./src-tauri/target/x86_64-win7-windows-msvc/release" : "./src-tauri/target/release";
|
||||
const fileName = isWin7 ? `easytier-game_windows7_fix_${pkg.version}.zip` : `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
|
||||
const releaseDirEasytier = `${releaseDir}/easytier/`;
|
||||
const releaseExe = `${releaseDir}/easytier-game.exe`;
|
||||
const releaseHelp = `${releaseDir}/帮助.txt`;
|
||||
const releaseUninstall = `${releaseDir}/uninstall.exe`;
|
||||
const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
|
||||
const pkg = require("./package.json");
|
||||
const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
|
||||
const releaseZipDir = "./release";
|
||||
const releaseZip = `${releaseZipDir}/${fileName}`;
|
||||
|
||||
@@ -62,5 +63,6 @@ archive.pipe(output);
|
||||
archive
|
||||
.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
|
||||
.append(fs.createReadStream(path.join(__dirname, releaseHelp)), { name: "帮助.txt" })
|
||||
.append(fs.createReadStream(path.join(__dirname, releaseUninstall)), { name: "uninstall.exe" })
|
||||
.directory(path.join(__dirname, releaseDirEasytier), "easytier")
|
||||
.finalize();
|
||||
|
||||
Reference in New Issue
Block a user