mirror of
https://github.com/EasyTier/EasytierGame.git
synced 2025-05-19 10:27:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
41f58f1df6 | ||
|
|
0a17c269ea | ||
|
|
6fd3b999d7 | ||
|
|
3773e11b24 | ||
|
|
987541ab52 | ||
|
|
d800a414c0 | ||
|
|
922ba3f1ea | ||
|
|
a5954744a1 | ||
|
|
8ed652ee26 | ||
|
|
9d976707ac | ||
|
|
0b54a623a8 | ||
|
|
7501a5661c | ||
|
|
539092d769 |
@@ -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.2.6重写 自建服务器功能,可以自行搭建服务器,但是需要一些网络知识,具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html),也可查看帮助.txt
|
||||||

|

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

|
||||||
|
|
||||||
## 特性
|
## 特性
|
||||||
|
|
||||||
- 基于easytier组网工具开发,界面清晰简单
|
- 基于easytier组网工具开发,界面清晰简单
|
||||||
|
|||||||
@@ -52,4 +52,8 @@ html.dark body {
|
|||||||
|
|
||||||
.el-table {
|
.el-table {
|
||||||
font-size: 12px!important;
|
font-size: 12px!important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-select-dropdown__wrap {
|
||||||
|
max-height: 150px!important;
|
||||||
}
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
@@ -0,0 +1,11 @@
|
|||||||
|
rustup default nightly
|
||||||
|
@echo 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录
|
||||||
|
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
|
||||||
|
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
|
||||||
|
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
|
||||||
|
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
|
||||||
|
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
|
||||||
+14
-1
@@ -7,7 +7,7 @@ import useMainStore from "@/stores/index";
|
|||||||
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
||||||
import { invoke } from "@tauri-apps/api/core";
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
// import { ElConfirmPrimary } from "~/utils/element";
|
// import { ElConfirmPrimary } from "~/utils/element";
|
||||||
// import { open } from "@tauri-apps/plugin-shell";
|
import { open } from "@tauri-apps/plugin-shell";
|
||||||
|
|
||||||
const DEFAULT_TRAY_NAME = "main";
|
const DEFAULT_TRAY_NAME = "main";
|
||||||
|
|
||||||
@@ -64,6 +64,8 @@ export async function generateMenuItem(beforExit: Function, handleConnection:Fun
|
|||||||
await MenuItemExchangeConnection("联机 / 断开", handleConnection),
|
await MenuItemExchangeConnection("联机 / 断开", handleConnection),
|
||||||
await MenuItemTheme(),
|
await MenuItemTheme(),
|
||||||
await PredefinedMenuItem.new({ item: "Separator" }),
|
await PredefinedMenuItem.new({ item: "Separator" }),
|
||||||
|
await MenuItemPublicPeers(),
|
||||||
|
await PredefinedMenuItem.new({ item: "Separator" }),
|
||||||
await MenuItemExit("退出", beforExit),
|
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("https://easytier.gd.nkbpal.cn/status/easytier")
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export async function MenuItemShow(text: string) {
|
export async function MenuItemShow(text: string) {
|
||||||
return await MenuItem.new({
|
return await MenuItem.new({
|
||||||
id: "show",
|
id: "show",
|
||||||
|
|||||||
+17
-16
@@ -3,39 +3,40 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"author": "leizi97",
|
"author": "leizi97",
|
||||||
"description": "A simple network initiator based on Easytier",
|
"description": "A simple network initiator based on Easytier",
|
||||||
"version": "1.3.4",
|
"version": "1.3.7",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
|
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
|
||||||
"build": "nuxt generate --dotenv env/.env.prod",
|
"build": "nuxt generate --dotenv env/.env.prod",
|
||||||
"release": "node zip.js"
|
"release": "node zip.js",
|
||||||
|
"release-win7": "node zip.js win7"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@element-plus/icons-vue": "^2.3.1",
|
"@element-plus/icons-vue": "^2.3.1",
|
||||||
"@element-plus/nuxt": "^1.1.0",
|
"@element-plus/nuxt": "^1.1.1",
|
||||||
"@nuxtjs/tailwindcss": "^6.12.0",
|
"@nuxtjs/tailwindcss": "6.13.1",
|
||||||
"@pinia/nuxt": "0.9.0",
|
"@pinia/nuxt": "0.9.0",
|
||||||
"@tauri-apps/api": "^2.1.1",
|
"@tauri-apps/api": "^2.2.0",
|
||||||
"@tauri-apps/cli": "^2.1.0",
|
"@tauri-apps/cli": "2.2.4",
|
||||||
"@tauri-apps/plugin-cli": "^2.2.0",
|
"@tauri-apps/plugin-cli": "^2.2.0",
|
||||||
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
|
"@tauri-apps/plugin-clipboard-manager": "2.2.0",
|
||||||
"@tauri-apps/plugin-fs": "^2.2.0",
|
"@tauri-apps/plugin-fs": "^2.2.0",
|
||||||
"@tauri-apps/plugin-log": "^2.2.0",
|
"@tauri-apps/plugin-log": "^2.2.0",
|
||||||
"@tauri-apps/plugin-shell": "^2.2.0",
|
"@tauri-apps/plugin-shell": "^2.2.0",
|
||||||
"@tauri-apps/plugin-window-state": "^2.2.0",
|
"@tauri-apps/plugin-window-state": "^2.2.0",
|
||||||
|
"@tauri-apps/plugin-dialog": "2.2.0",
|
||||||
"@types/lodash-es": "^4.17.12",
|
"@types/lodash-es": "^4.17.12",
|
||||||
"@vitejs/plugin-vue-jsx": "^4.1.0",
|
"@vitejs/plugin-vue-jsx": "^4.1.1",
|
||||||
"@vueuse/core": "12.0.0",
|
"@vueuse/core": "12.4.0",
|
||||||
"archiver": "^7.0.1",
|
"archiver": "^7.0.1",
|
||||||
"element-plus": "^2.8.7",
|
"element-plus": "2.9.3",
|
||||||
"less": "^4.2.0",
|
"less": "4.2.1",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"nuxt": "^3.14.1592",
|
"nuxt": "3.15.2",
|
||||||
"pinia": "^2.3.0",
|
"pinia": "^2.3.0",
|
||||||
"pinia-plugin-persistedstate": "^4.1.3",
|
"pinia-plugin-persistedstate": "^4.2.0",
|
||||||
"postcss": "^8.4.38",
|
"postcss": "^8.4.38",
|
||||||
"prettier": "^3.4.1",
|
"prettier": "3.4.2",
|
||||||
"prettier-plugin-tailwindcss": "^0.6.9",
|
"prettier-plugin-tailwindcss": "0.6.10",
|
||||||
"typescript": "^5.6.3",
|
|
||||||
"vue-clipboard3": "^2.0.0"
|
"vue-clipboard3": "^2.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+55
-30
@@ -1,9 +1,8 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex h-full flex-col items-start overflow-auto px-[25px]">
|
<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-[15px]">
|
||||||
<div class="flex flex-nowrap items-center gap-[5px]">
|
<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="如果没有支持该协议的节点地址,程序会自动处理,请放心使用">
|
<ElTooltip content="如果没有支持该协议的节点地址,程序会自动处理,请放心使用">
|
||||||
<ElIcon><QuestionFilled /></ElIcon>
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
@@ -24,29 +23,8 @@
|
|||||||
</ElSelect>
|
</ElSelect>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-nowrap items-center gap-[15px]">
|
<div>
|
||||||
<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
|
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">帮助对等节点建立直连(p2p)通信</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>
|
||||||
<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后,自动"启动联机"(搭配开机自启,无感联机)</ElCheckbox></div>
|
<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后,自动"启动联机"(搭配开机自启,无感联机)</ElCheckbox></div>
|
||||||
<div class="flex flex-nowrap items-center gap-[15px]">
|
<div class="flex flex-nowrap items-center gap-[15px]">
|
||||||
@@ -59,6 +37,13 @@
|
|||||||
</ElButton>
|
</ElButton>
|
||||||
</div>
|
</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 />
|
<ElDivider />
|
||||||
<div class="flex items-center gap-[10px]">
|
<div class="flex items-center gap-[10px]">
|
||||||
<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口,只连接到对等节点</ElCheckbox>
|
<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口,只连接到对等节点</ElCheckbox>
|
||||||
@@ -210,10 +195,30 @@
|
|||||||
<ElDivider />
|
<ElDivider />
|
||||||
|
|
||||||
<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
|
<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.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
|
||||||
<div>
|
<div class="flex flex-nowrap items-center gap-[15px]">
|
||||||
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包,即使对等节点不在转发网络白名单内</ElCheckbox>
|
<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>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -222,12 +227,13 @@
|
|||||||
import { QuestionFilled } from "@element-plus/icons-vue";
|
import { QuestionFilled } from "@element-plus/icons-vue";
|
||||||
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
|
||||||
import { Command } from "@tauri-apps/plugin-shell";
|
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 { ElMessage } from "element-plus";
|
||||||
import { reactive } from "vue";
|
import { reactive } from "vue";
|
||||||
import { dataSubscribe } from "@/composables/windows";
|
import { dataSubscribe } from "@/composables/windows";
|
||||||
import { supportProtocols } from "~/utils";
|
import { ATJ, supportProtocols } from "~/utils";
|
||||||
import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
|
import CoreVersionWarning from "@/components/CoreVersionWarning.vue";
|
||||||
|
import { ElConfirmDanger } from "~/utils/element";
|
||||||
|
|
||||||
const protocols = supportProtocols();
|
const protocols = supportProtocols();
|
||||||
const listenerDialogData = reactive<{ [key: string]: any }>({
|
const listenerDialogData = reactive<{ [key: string]: any }>({
|
||||||
@@ -269,6 +275,25 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
dataSubscribe(async (...a) => {
|
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 {
|
return {
|
||||||
config: { ...mainStore.config },
|
config: { ...mainStore.config },
|
||||||
createConfigInEasytier: mainStore.createConfigInEasytier
|
createConfigInEasytier: mainStore.createConfigInEasytier
|
||||||
|
|||||||
+38
-27
@@ -11,7 +11,12 @@
|
|||||||
>
|
>
|
||||||
<template #label>
|
<template #label>
|
||||||
<div class="flex flex-nowrap items-center gap-[0_5px]">
|
<div class="flex flex-nowrap items-center gap-[0_5px]">
|
||||||
<div>服务器</div>
|
<div class="flex flex-nowrap items-center gap-[5px]">
|
||||||
|
<div>服务器</div>
|
||||||
|
<ElTooltip content="服务器是什么协议,中转就是什么协议">
|
||||||
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
|
</ElTooltip>
|
||||||
|
</div>
|
||||||
<span>-</span>
|
<span>-</span>
|
||||||
<ElTag
|
<ElTag
|
||||||
effect="dark"
|
effect="dark"
|
||||||
@@ -29,7 +34,7 @@
|
|||||||
v-else
|
v-else
|
||||||
class="flex-1 truncate"
|
class="flex-1 truncate"
|
||||||
>
|
>
|
||||||
<ElTooltip :content="data.coreVersion">
|
<ElTooltip :content="`内核版本:${data.coreVersion}(不是软件的版本)`">
|
||||||
<ElTag type="info">
|
<ElTag type="info">
|
||||||
{{ data.coreVersion }}
|
{{ data.coreVersion }}
|
||||||
</ElTag>
|
</ElTag>
|
||||||
@@ -121,10 +126,10 @@
|
|||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<div class="flex flex-wrap items-center gap-[0_10px]">
|
<div class="flex flex-wrap items-center gap-[0_10px]">
|
||||||
<div class="flex-1">
|
<div class="flex-1">
|
||||||
<ElFormItem label="网络名">
|
<ElFormItem label="房间名">
|
||||||
<template #label>
|
<template #label>
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
网络名
|
房间名
|
||||||
<ElTooltip content="对应命令行参数 --network-name">
|
<ElTooltip content="对应命令行参数 --network-name">
|
||||||
<ElIcon><QuestionFilled /></ElIcon>
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
@@ -132,16 +137,16 @@
|
|||||||
</template>
|
</template>
|
||||||
<ElInput
|
<ElInput
|
||||||
maxlength="100"
|
maxlength="100"
|
||||||
placeholder="请输入网络名"
|
placeholder="请输入房间名"
|
||||||
v-model="config.networkName"
|
v-model="config.networkName"
|
||||||
></ElInput>
|
></ElInput>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-1">
|
<div class="flex-1">
|
||||||
<ElFormItem label="网络密码">
|
<ElFormItem label="房间密码">
|
||||||
<template #label>
|
<template #label>
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
网络密码
|
房间密码
|
||||||
<ElTooltip content="对应命令行参数 --network-secret">
|
<ElTooltip content="对应命令行参数 --network-secret">
|
||||||
<ElIcon><QuestionFilled /></ElIcon>
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
@@ -150,7 +155,7 @@
|
|||||||
<ElInput
|
<ElInput
|
||||||
show-password
|
show-password
|
||||||
maxlength="100"
|
maxlength="100"
|
||||||
placeholder="请输入网络密码"
|
placeholder="请输入房间密码"
|
||||||
v-model="config.networkPassword"
|
v-model="config.networkPassword"
|
||||||
type="password"
|
type="password"
|
||||||
></ElInput>
|
></ElInput>
|
||||||
@@ -158,10 +163,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex gap-[0_10px]">
|
<div class="flex gap-[0_10px]">
|
||||||
<ElFormItem label="主机名">
|
<ElFormItem label="成员名">
|
||||||
<template #label>
|
<template #label>
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
主机名
|
成员名
|
||||||
<ElTooltip content="对应命令行参数 --hostname">
|
<ElTooltip content="对应命令行参数 --hostname">
|
||||||
<ElIcon><QuestionFilled /></ElIcon>
|
<ElIcon><QuestionFilled /></ElIcon>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
@@ -269,18 +274,18 @@
|
|||||||
plain
|
plain
|
||||||
></ElButton>
|
></ElButton>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
<ElTooltip
|
<!-- <ElTooltip
|
||||||
placement="left"
|
placement="left"
|
||||||
content="成员"
|
content="房间信息"
|
||||||
>
|
> -->
|
||||||
<ElButton
|
<ElButton
|
||||||
|
class="!ml-[7px]"
|
||||||
@click="handleShowMemberDialog"
|
@click="handleShowMemberDialog"
|
||||||
:icon="UserFilled"
|
|
||||||
plain
|
plain
|
||||||
type="success"
|
type="success"
|
||||||
size="small"
|
size="small"
|
||||||
></ElButton>
|
>房间信息</ElButton>
|
||||||
</ElTooltip>
|
<!-- </ElTooltip> -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ml-auto">
|
<div class="ml-auto">
|
||||||
@@ -548,7 +553,7 @@
|
|||||||
import { getMatches } from "@tauri-apps/plugin-cli";
|
import { getMatches } from "@tauri-apps/plugin-cli";
|
||||||
import { initStartWinIpBroadcast } from "~/composables/netcard";
|
import { initStartWinIpBroadcast } from "~/composables/netcard";
|
||||||
import useMainStore from "@/stores/index";
|
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 { getCurrentWindow, type Window } from "@tauri-apps/api/window";
|
||||||
import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
|
import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
|
||||||
import etWindows from "@/composables/windows";
|
import etWindows from "@/composables/windows";
|
||||||
@@ -570,6 +575,7 @@
|
|||||||
await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
|
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: data.winipBcPid || 0 });
|
||||||
await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
|
await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
|
||||||
|
await stopPreventSleep(); //关闭防休眠
|
||||||
},
|
},
|
||||||
async () => {
|
async () => {
|
||||||
await handleConnection();
|
await handleConnection();
|
||||||
@@ -982,14 +988,14 @@
|
|||||||
console.error(err);
|
console.error(err);
|
||||||
ElMessage.error(`config.json格式或编码错误`);
|
ElMessage.error(`config.json格式或编码错误`);
|
||||||
} finally {
|
} finally {
|
||||||
mainStore.$patch({
|
// mainStore.$patch({
|
||||||
createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
|
// createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const b = bounce(600);
|
const b = bounce(600);
|
||||||
mainStore.$subscribe((...a) => {
|
mainStore.$subscribe(async (...a) => {
|
||||||
if (mainStore.createConfigInEasytier) {
|
if (mainStore.createConfigInEasytier) {
|
||||||
b(async () => {
|
b(async () => {
|
||||||
await updateConfigJson(data.configJsonSeverUrl);
|
await updateConfigJson(data.configJsonSeverUrl);
|
||||||
@@ -1288,7 +1294,7 @@
|
|||||||
disableUdpHolePunching,
|
disableUdpHolePunching,
|
||||||
relayAllPeerrpc,
|
relayAllPeerrpc,
|
||||||
compression,
|
compression,
|
||||||
enablePreventSleep,
|
enablePreventSleep
|
||||||
} = mainStore.config;
|
} = mainStore.config;
|
||||||
const WT = btoa(
|
const WT = btoa(
|
||||||
encodeURIComponent(
|
encodeURIComponent(
|
||||||
@@ -1325,16 +1331,21 @@
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
await writeText(WT);
|
await writeText(WT);
|
||||||
|
await ElConfirmPrimary(
|
||||||
|
`{action} 虚拟网IP,主机名,子网代理,为子网代理启用smoltcp堆栈,开机自启,软件启动自动联机,出口节点,不生成Tun网卡,错误日志相关配置`,
|
||||||
|
"提示",
|
||||||
|
{
|
||||||
|
confirmButtonText: "知道了",
|
||||||
|
showCancelButton: false,
|
||||||
|
action: "不会分享"
|
||||||
|
}
|
||||||
|
);
|
||||||
ElMessage.success("配置已复制");
|
ElMessage.success("配置已复制");
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
ElMessage.error("分享失败");
|
ElMessage.error("分享失败");
|
||||||
}
|
}
|
||||||
ElConfirmPrimary(`{action} 虚拟网IP,主机名,子网代理,为子网代理启用smoltcp堆栈,开机自启,软件启动自动联机,出口节点,不生成Tun网卡,错误日志相关配置`, "提示", {
|
|
||||||
confirmButtonText: "知道了",
|
|
||||||
showCancelButton: false,
|
|
||||||
action: "不会分享"
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
if (command === "import_config") {
|
if (command === "import_config") {
|
||||||
importConfigData.data = "";
|
importConfigData.data = "";
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@
|
|||||||
<ElTableColumn
|
<ElTableColumn
|
||||||
sortable
|
sortable
|
||||||
width="140"
|
width="140"
|
||||||
label="主机名"
|
label="成员名"
|
||||||
prop="hostname"
|
prop="hostname"
|
||||||
>
|
>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
|
|||||||
+174
-9
@@ -8,7 +8,7 @@
|
|||||||
<ElTabPane
|
<ElTabPane
|
||||||
label="联机失败解决办法"
|
label="联机失败解决办法"
|
||||||
name="netcard"
|
name="netcard"
|
||||||
class="flex flex-col h-full"
|
class="flex h-full flex-col"
|
||||||
>
|
>
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
</div>
|
</div>
|
||||||
<ElLink
|
<ElLink
|
||||||
class="!text-[15px] mr-[10px]"
|
class="mr-[10px] !text-[15px]"
|
||||||
type="info"
|
type="info"
|
||||||
:underline="false"
|
:underline="false"
|
||||||
@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
|
@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
|
||||||
@@ -41,14 +41,102 @@
|
|||||||
></ElSwitch>
|
></ElSwitch>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<ElTooltip content="设置网卡的跃点,提升网卡优先级,尝试将您联机使用的网卡跃点设置为最小,请先查询网卡信息">
|
<ElTooltip
|
||||||
|
content="使用ForceBindIP启动应用 (强制绑定IP或者网卡),如果还有没启动联机,请先启动联机,联机成功后,点击刷新获取easytier生成的网卡"
|
||||||
|
>
|
||||||
<ElText>
|
<ElText>
|
||||||
方案2
|
方案2
|
||||||
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
|
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
|
||||||
</ElText>
|
</ElText>
|
||||||
</ElTooltip>
|
</ElTooltip>
|
||||||
</div>
|
</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
|
<ElButton
|
||||||
@click="initNetCardInfo"
|
@click="initNetCardInfo"
|
||||||
size="small"
|
size="small"
|
||||||
@@ -58,7 +146,7 @@
|
|||||||
</ElButton>
|
</ElButton>
|
||||||
<div
|
<div
|
||||||
v-if="data.row.name"
|
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)">
|
<ElTooltip content="跃点越小,网卡优先级越高,范围(1-9999)">
|
||||||
<ElInput
|
<ElInput
|
||||||
@@ -78,7 +166,7 @@
|
|||||||
</ElButton>
|
</ElButton>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-1 overflow-auto mt-[5px]">
|
<div class="mt-[5px] flex-1 overflow-auto">
|
||||||
<ElTable
|
<ElTable
|
||||||
height="100%"
|
height="100%"
|
||||||
empty-text="暂无数据"
|
empty-text="暂无数据"
|
||||||
@@ -103,7 +191,7 @@
|
|||||||
<ElTabPane
|
<ElTabPane
|
||||||
label="防火墙"
|
label="防火墙"
|
||||||
name="firewall"
|
name="firewall"
|
||||||
class="flex flex-col h-full"
|
class="flex h-full flex-col"
|
||||||
>
|
>
|
||||||
<div class="flex flex-col items-center">
|
<div class="flex flex-col items-center">
|
||||||
<div class="mb-[10px]">
|
<div class="mb-[10px]">
|
||||||
@@ -113,6 +201,13 @@
|
|||||||
>
|
>
|
||||||
一键关闭防火墙
|
一键关闭防火墙
|
||||||
</ElButton>
|
</ElButton>
|
||||||
|
<ElButton
|
||||||
|
@click="handleCustomFireWall"
|
||||||
|
type="danger"
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
自定义防火墙策略
|
||||||
|
</ElButton>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-[10px]">
|
<div class="mb-[10px]">
|
||||||
<ElText class="!mx-[10px]">域防火墙</ElText>
|
<ElText class="!mx-[10px]">域防火墙</ElText>
|
||||||
@@ -176,6 +271,7 @@
|
|||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { open, Command } from "@tauri-apps/plugin-shell";
|
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 { ElMessage, type TabPaneName } from "element-plus";
|
||||||
import { QuestionFilled } from "@element-plus/icons-vue";
|
import { QuestionFilled } from "@element-plus/icons-vue";
|
||||||
import { onMounted, reactive } from "vue";
|
import { onMounted, reactive } from "vue";
|
||||||
@@ -183,9 +279,11 @@
|
|||||||
import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
|
import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
|
||||||
import { isValidIP } from "~/utils";
|
import { isValidIP } from "~/utils";
|
||||||
import { dataSubscribe } from "~/composables/windows";
|
import { dataSubscribe } from "~/composables/windows";
|
||||||
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
|
import { BaseDirectory, exists } from "@tauri-apps/plugin-fs";
|
||||||
|
|
||||||
const mainStore = useMainStore();
|
const mainStore = useMainStore();
|
||||||
const data = reactive({
|
const data = reactive<{ guids: string[][]; [key: string]: any }>({
|
||||||
activeTab: "netcard",
|
activeTab: "netcard",
|
||||||
winipBcPid: 0,
|
winipBcPid: 0,
|
||||||
pingNum: 1,
|
pingNum: 1,
|
||||||
@@ -202,9 +300,15 @@
|
|||||||
name: "",
|
name: "",
|
||||||
metric: ""
|
metric: ""
|
||||||
},
|
},
|
||||||
netcardList: []
|
netcardList: [],
|
||||||
|
guids: [],
|
||||||
|
forceBindStart: false
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const handleCustomFireWall = async () => {
|
||||||
|
await open("wf.msc");
|
||||||
|
}
|
||||||
|
|
||||||
const handleTabsChange = async (tabPaneName: TabPaneName) => {
|
const handleTabsChange = async (tabPaneName: TabPaneName) => {
|
||||||
if (tabPaneName === "netcard") {
|
if (tabPaneName === "netcard") {
|
||||||
// await initNetCardInfo();
|
// 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) => {
|
dataSubscribe(async (...a) => {
|
||||||
return {
|
return {
|
||||||
winIpBcAutoStart: mainStore.winIpBcAutoStart,
|
winIpBcAutoStart: mainStore.winIpBcAutoStart,
|
||||||
winipBcStart: mainStore.winipBcStart,
|
winipBcStart: mainStore.winipBcStart,
|
||||||
winipBcPid: mainStore.winipBcPid,
|
winipBcPid: mainStore.winipBcPid,
|
||||||
|
forceBindIpBit: mainStore.forceBindIpBit,
|
||||||
|
delayInjectDll: mainStore.delayInjectDll,
|
||||||
|
forceBindInput: mainStore.forceBindInput,
|
||||||
|
forceBindFile: mainStore.forceBindFile,
|
||||||
config: { ...mainStore.config }
|
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(() => {
|
onMounted(() => {
|
||||||
data.pingIp = mainStore.config.ipv4;
|
data.pingIp = mainStore.config.ipv4;
|
||||||
initStartWinIpBroadcast();
|
initStartWinIpBroadcast();
|
||||||
|
getGuids();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Generated
+1286
-1082
File diff suppressed because it is too large
Load Diff
Generated
+1109
-475
File diff suppressed because it is too large
Load Diff
+17
-15
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "easytier-game"
|
name = "easytier-game"
|
||||||
version = "1.3.4"
|
version = "1.3.7"
|
||||||
homepage = "https://github.com/EasyTier/EasyTier"
|
homepage = "https://github.com/EasyTier/EasyTier"
|
||||||
repository = "https://github.com/EasyTier/EasytierGame"
|
repository = "https://github.com/EasyTier/EasytierGame"
|
||||||
description = "A simple network initiator based on Easytier"
|
description = "A simple network initiator based on Easytier"
|
||||||
@@ -8,7 +8,7 @@ authors = ["leizi97"]
|
|||||||
license = "LICENSE"
|
license = "LICENSE"
|
||||||
|
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.77.2"
|
# rust-version = "1.77.2"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
@@ -18,39 +18,41 @@ name = "app_lib"
|
|||||||
crate-type = ["staticlib", "cdylib", "rlib"]
|
crate-type = ["staticlib", "cdylib", "rlib"]
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tauri-build = { version = "2.0.3", features = [] }
|
tauri-build = { version = "2.0.5", features = [] }
|
||||||
# prost-build = "0.13.2"
|
# prost-build = "0.13.2"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
serde_json = "1.0"
|
serde_json = "1.0.135"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0.217", features = ["derive"] }
|
||||||
log = "0.4"
|
log = "0.4.25"
|
||||||
tauri = { version = "2.1.1", features = [
|
tauri = { version = "2.2.2", features = [
|
||||||
"tray-icon",
|
"tray-icon",
|
||||||
"image-png",
|
"image-png",
|
||||||
"image-ico",
|
"image-ico",
|
||||||
|
"devtools"
|
||||||
] }
|
] }
|
||||||
|
|
||||||
tauri-plugin-log = "2.2.0"
|
tauri-plugin-log = "2.2.0"
|
||||||
tauri-plugin-shell = "2.2.0"
|
tauri-plugin-shell = "2.2.0"
|
||||||
reqwest = { version = "0.12", features = ["json"] }
|
reqwest = { version = "0.12.12", features = ["json"] }
|
||||||
zip = "2.2"
|
zip = "2.2.2"
|
||||||
sysinfo = '0.32.0'
|
sysinfo = '0.33.1'
|
||||||
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
|
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
|
||||||
whoami = "1.5.2"
|
whoami = "1.5.2"
|
||||||
tauri-plugin-fs = "2.2.0"
|
tauri-plugin-fs = "2.2.0"
|
||||||
tauri-plugin-clipboard-manager = "2.0.2"
|
tauri-plugin-clipboard-manager = "2.2.0"
|
||||||
rand = "0.8.5"
|
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 = "0.13"
|
||||||
# prost-types = "0.13"
|
# prost-types = "0.13"
|
||||||
|
hashbrown = "0.15.2"
|
||||||
|
|
||||||
[dependencies.windows]
|
[dependencies.windows]
|
||||||
version = "0.58.0"
|
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]
|
[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
|
||||||
tauri-plugin-cli = "2.2.0"
|
tauri-plugin-cli = "2.2.0"
|
||||||
tauri-plugin-single-instance = "2.2.0"
|
tauri-plugin-single-instance = "2.2.1"
|
||||||
tauri-plugin-window-state = "2.2.0"
|
tauri-plugin-window-state = "2.2.0"
|
||||||
|
|||||||
+114
-103
@@ -1,104 +1,115 @@
|
|||||||
{
|
{
|
||||||
"$schema": "../gen/schemas/desktop-schema.json",
|
"$schema": "../gen/schemas/desktop-schema.json",
|
||||||
"identifier": "default",
|
"identifier": "default",
|
||||||
"description": "enables the default permissions",
|
"description": "enables the default permissions",
|
||||||
"windows": [
|
"windows": ["main", "log", "member", "cidr", "advance", "tool", "server"],
|
||||||
"main",
|
"permissions": [
|
||||||
"log",
|
"core:default",
|
||||||
"member",
|
"core:window:allow-minimize",
|
||||||
"cidr",
|
"core:window:allow-unminimize",
|
||||||
"advance",
|
"core:window:allow-hide",
|
||||||
"tool",
|
"core:window:allow-close",
|
||||||
"server"
|
"core:window:allow-set-focus",
|
||||||
],
|
"core:window:allow-is-visible",
|
||||||
"permissions": [
|
"shell:allow-open",
|
||||||
"core:default",
|
"core:window:allow-show",
|
||||||
"core:window:allow-minimize",
|
"core:window:allow-create",
|
||||||
"core:window:allow-unminimize",
|
"core:window:allow-set-position",
|
||||||
"core:window:allow-hide",
|
"core:window:allow-destroy",
|
||||||
"core:window:allow-close",
|
"core:webview:allow-create-webview-window",
|
||||||
"core:window:allow-set-focus",
|
"core:webview:allow-set-webview-size",
|
||||||
"core:window:allow-is-visible",
|
"core:webview:allow-set-webview-position",
|
||||||
"shell:allow-open",
|
"core:webview:allow-create-webview",
|
||||||
"core:window:allow-show",
|
"core:webview:allow-webview-show",
|
||||||
"core:window:allow-create",
|
"core:webview:allow-webview-hide",
|
||||||
"core:window:allow-set-position",
|
"core:webview:allow-webview-close",
|
||||||
"core:window:allow-destroy",
|
"core:tray:allow-get-by-id",
|
||||||
"core:webview:allow-create-webview-window",
|
"core:tray:allow-set-icon",
|
||||||
"core:webview:allow-set-webview-size",
|
"core:tray:allow-new",
|
||||||
"core:webview:allow-set-webview-position",
|
{
|
||||||
"core:webview:allow-create-webview",
|
"identifier": "shell:allow-spawn",
|
||||||
"core:webview:allow-webview-show",
|
"allow": [
|
||||||
"core:webview:allow-webview-hide",
|
{
|
||||||
"core:webview:allow-webview-close",
|
"args": ["run"],
|
||||||
"core:tray:allow-get-by-id",
|
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
|
||||||
"core:tray:allow-set-icon",
|
"name": "WinIPBroadcast"
|
||||||
"core:tray:allow-new",
|
},
|
||||||
{
|
{
|
||||||
"identifier": "shell:allow-spawn",
|
"args": true,
|
||||||
"allow": [
|
"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
|
||||||
{
|
"name": "ForceBindIP"
|
||||||
"args": [
|
},
|
||||||
"run"
|
{
|
||||||
],
|
"args": true,
|
||||||
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
|
"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
|
||||||
"name": "WinIPBroadcast"
|
"name": "ForceBindIP64"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"identifier": "shell:allow-execute",
|
"identifier": "shell:allow-execute",
|
||||||
"allow": [
|
"allow": [
|
||||||
{
|
{
|
||||||
"args": [
|
"args": ["run"],
|
||||||
"run"
|
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
|
||||||
],
|
"name": "WinIPBroadcast"
|
||||||
"cmd": "$RESOURCE/easytier/tool/WinIPBroadcast",
|
},
|
||||||
"name": "WinIPBroadcast"
|
{
|
||||||
},
|
"args": true,
|
||||||
{
|
"cmd": "$RESOURCE/easytier/tool/ForceBindIP",
|
||||||
"args": true,
|
"name": "ForceBindIP"
|
||||||
"cmd": "$RESOURCE/easytier/tool/nssm",
|
},
|
||||||
"name": "nssm"
|
{
|
||||||
},
|
"args": true,
|
||||||
{
|
"cmd": "$RESOURCE/easytier/tool/ForceBindIP64",
|
||||||
"args": true,
|
"name": "ForceBindIP64"
|
||||||
"cmd": "explorer",
|
},
|
||||||
"name": "explorer"
|
{
|
||||||
},
|
"args": true,
|
||||||
{
|
"cmd": "$RESOURCE/easytier/tool/nssm",
|
||||||
"args": true,
|
"name": "nssm"
|
||||||
"cmd": "netsh",
|
},
|
||||||
"name": "netsh"
|
{
|
||||||
},
|
"args": true,
|
||||||
{
|
"cmd": "explorer",
|
||||||
"args": true,
|
"name": "explorer"
|
||||||
"cmd": "ping",
|
},
|
||||||
"name": "ping"
|
{
|
||||||
}
|
"args": true,
|
||||||
]
|
"cmd": "wf.msc",
|
||||||
},
|
"name": "wf.msc"
|
||||||
"fs:default",
|
},
|
||||||
"fs:allow-read-dir",
|
{
|
||||||
"fs:allow-exists",
|
"args": true,
|
||||||
"fs:allow-open",
|
"cmd": "netsh",
|
||||||
"fs:allow-resource-read",
|
"name": "netsh"
|
||||||
"fs:allow-resource-read-recursive",
|
},
|
||||||
"fs:allow-resource-write",
|
{
|
||||||
"fs:allow-resource-write-recursive",
|
"args": true,
|
||||||
"clipboard-manager:allow-clear",
|
"cmd": "ping",
|
||||||
"clipboard-manager:allow-read-text",
|
"name": "ping"
|
||||||
"clipboard-manager:allow-write-text",
|
}
|
||||||
|
]
|
||||||
"window-state:default",
|
},
|
||||||
"window-state:allow-save-window-state",
|
"fs:default",
|
||||||
"window-state:allow-restore-state",
|
"fs:allow-read-dir",
|
||||||
|
"fs:allow-exists",
|
||||||
|
"fs:allow-open",
|
||||||
"cli:default",
|
"fs:allow-resource-read",
|
||||||
"cli:allow-cli-matches",
|
"fs:allow-resource-read-recursive",
|
||||||
|
"fs:allow-resource-write",
|
||||||
"log:default",
|
"fs:allow-resource-write-recursive",
|
||||||
"log:allow-log"
|
"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::io::{BufRead, BufReader, Write};
|
||||||
use std::os::windows::process::CommandExt;
|
use std::os::windows::process::CommandExt;
|
||||||
use std::process::{Command, Stdio};
|
use std::process::{Command, Stdio};
|
||||||
|
use std::ptr;
|
||||||
use std::sync::mpsc;
|
use std::sync::mpsc;
|
||||||
use std::{path, thread};
|
use std::{path, thread};
|
||||||
use sysinfo::System;
|
use sysinfo::System;
|
||||||
@@ -17,16 +18,69 @@ use tauri::Emitter;
|
|||||||
use tauri::Manager;
|
use tauri::Manager;
|
||||||
use windows::core::{BSTR, VARIANT};
|
use windows::core::{BSTR, VARIANT};
|
||||||
use windows::Win32::Foundation::VARIANT_BOOL;
|
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::Com::*;
|
||||||
use windows::Win32::System::TaskScheduler::*;
|
use windows::Win32::System::TaskScheduler::*;
|
||||||
|
// use std::ffi::CStr;
|
||||||
|
|
||||||
use windows::Win32::System::Power::SetThreadExecutionState;
|
use windows::Win32::System::Power::SetThreadExecutionState;
|
||||||
use windows::Win32::System::Power::{
|
use windows::Win32::System::Power::{
|
||||||
ES_CONTINUOUS, ES_DISPLAY_REQUIRED, ES_SYSTEM_REQUIRED, EXECUTION_STATE,
|
ES_CONTINUOUS, ES_DISPLAY_REQUIRED, ES_SYSTEM_REQUIRED, EXECUTION_STATE,
|
||||||
};
|
};
|
||||||
|
|
||||||
use tokio::process::Command as tokioCommand;
|
|
||||||
use rand::Rng;
|
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 {
|
fn generate_random_user_agent() -> String {
|
||||||
let user_agents = vec![
|
let user_agents = vec![
|
||||||
@@ -664,6 +718,7 @@ pub fn run() {
|
|||||||
|
|
||||||
let context = tauri::generate_context!();
|
let context = tauri::generate_context!();
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
|
.plugin(tauri_plugin_dialog::init())
|
||||||
.plugin(tauri_plugin_cli::init())
|
.plugin(tauri_plugin_cli::init())
|
||||||
.plugin(
|
.plugin(
|
||||||
tauri_plugin_window_state::Builder::new()
|
tauri_plugin_window_state::Builder::new()
|
||||||
@@ -699,7 +754,7 @@ pub fn run() {
|
|||||||
// }
|
// }
|
||||||
#[cfg(not(target_os = "android"))]
|
#[cfg(not(target_os = "android"))]
|
||||||
let _tray_menu = TrayIconBuilder::with_id("main")
|
let _tray_menu = TrayIconBuilder::with_id("main")
|
||||||
.menu_on_left_click(false)
|
.show_menu_on_left_click(false)
|
||||||
.on_tray_icon_event(|tray, event| {
|
.on_tray_icon_event(|tray, event| {
|
||||||
if let TrayIconEvent::Click {
|
if let TrayIconEvent::Click {
|
||||||
button: MouseButton::Left,
|
button: MouseButton::Left,
|
||||||
@@ -740,7 +795,8 @@ pub fn run() {
|
|||||||
spawn_autostart,
|
spawn_autostart,
|
||||||
autostart_is_enabled,
|
autostart_is_enabled,
|
||||||
prevent_sleep,
|
prevent_sleep,
|
||||||
allow_sleep
|
allow_sleep,
|
||||||
|
get_network_adapter_guids
|
||||||
])
|
])
|
||||||
.run(context)
|
.run(context)
|
||||||
.expect("error while running tauri application");
|
.expect("error while running tauri application");
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||||
"productName": "easytier-game",
|
"productName": "easytier-game",
|
||||||
"version": "1.3.4",
|
"version": "1.3.7",
|
||||||
"identifier": "com.tauri.easytier-game",
|
"identifier": "com.tauri.easytier-game",
|
||||||
|
|
||||||
"build": {
|
"build": {
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
"app": {
|
"app": {
|
||||||
"windows": [
|
"windows": [
|
||||||
{
|
{
|
||||||
"title": "easytier-game 1.3.4",
|
"title": "easytier-game 1.3.7",
|
||||||
"label": "main",
|
"label": "main",
|
||||||
"minWidth": 340,
|
"minWidth": 340,
|
||||||
"width": 340,
|
"width": 340,
|
||||||
@@ -53,13 +53,18 @@
|
|||||||
"easytier/icons/",
|
"easytier/icons/",
|
||||||
"easytier/config_template.json",
|
"easytier/config_template.json",
|
||||||
"easytier/tool/WinIPBroadcast.exe",
|
"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/tool/MicrosoftEdgeWebview2Setup.exe",
|
||||||
"easytier/easytier-cli.exe",
|
"easytier/easytier-cli.exe",
|
||||||
"easytier/easytier-core.exe",
|
"easytier/easytier-core.exe",
|
||||||
"easytier/Packet.dll",
|
"easytier/Packet.dll",
|
||||||
"easytier/wintun.dll",
|
"easytier/wintun.dll",
|
||||||
"easytier/clear_local_data.bat",
|
"easytier/clear_local_data.bat",
|
||||||
"帮助.txt"
|
"帮助.txt",
|
||||||
|
"uninstall.exe"
|
||||||
],
|
],
|
||||||
"windows": {
|
"windows": {
|
||||||
"webviewInstallMode": {
|
"webviewInstallMode": {
|
||||||
|
|||||||
Binary file not shown.
+24
-13
@@ -3,7 +3,7 @@ const store = defineStore("main", {
|
|||||||
state() {
|
state() {
|
||||||
return {
|
return {
|
||||||
config: {
|
config: {
|
||||||
protocol: ["tcp", "udp"], // 网络协议
|
protocol: ["tcp"], // 网络协议
|
||||||
serverUrl: "public.easytier.top:11010",
|
serverUrl: "public.easytier.top:11010",
|
||||||
networkName: "",
|
networkName: "",
|
||||||
networkPassword: "",
|
networkPassword: "",
|
||||||
@@ -14,28 +14,28 @@ const store = defineStore("main", {
|
|||||||
connectAfterStart: false, //软件打开后,是否自动连接
|
connectAfterStart: false, //软件打开后,是否自动连接
|
||||||
disableIpv6: false, // 是否禁用IPv6
|
disableIpv6: false, // 是否禁用IPv6
|
||||||
port: "11010", // 监听端口号
|
port: "11010", // 监听端口号
|
||||||
enableCustomListener: false, // 是否自定义监听
|
enableCustomListener: true, // 是否自定义监听
|
||||||
customListenerV6Data: "", //自定义ipv6监听
|
customListenerV6Data: "udp://[::]:11010", //自定义ipv6监听
|
||||||
enableCustomListenerV6: false, // 是否自定义监听
|
enableCustomListenerV6: true, // 是否自定义监听
|
||||||
customListenerData: "", // 自定义监听地址
|
customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010\ntcp://[::]:11010", // 自定义监听地址
|
||||||
disbleListenner: false, // 是否禁用监听
|
disbleListenner: false, // 是否禁用监听
|
||||||
disableEncryption: true, // 是否禁用加密
|
disableEncryption: false, // 是否禁用加密
|
||||||
multiThread: false, //使用多线程
|
multiThread: false, //使用多线程
|
||||||
enablExitNode: false, // 是否启用退出节点
|
enablExitNode: false, // 是否启用退出节点
|
||||||
noTun: false, // 是否使用TUN
|
noTun: false, // 是否使用TUN
|
||||||
latencyfirst: false, // 是否优先延迟
|
latencyfirst: false, // 是否优先延迟
|
||||||
useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
|
useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
|
||||||
disableUdpHolePunching: false, // 是否禁用UDP打洞
|
disableUdpHolePunching: false, // 是否禁用UDP打洞
|
||||||
relayAllPeerrpc: false, // 是否启用所有对等RPC
|
relayAllPeerrpc: true, // 是否启用所有对等RPC
|
||||||
disbleP2p: false, // 是否使用P2P
|
disbleP2p: false, // 是否使用P2P
|
||||||
dhcp: true, // 是否使用DHCP
|
dhcp: true, // 是否使用DHCP
|
||||||
saveErrorLog: true, // 是否保存错误日志
|
saveErrorLog: true, // 是否保存错误日志
|
||||||
logLevel: "error", //日志等级
|
logLevel: "error", //日志等级
|
||||||
devName: false, //自定义网卡名
|
devName: true, //自定义网卡名
|
||||||
devNameValue: "", //自定义网卡名
|
devNameValue: "etgame", //自定义网卡名
|
||||||
enableCustomProtocol: false, //自定义默认协议
|
enableCustomProtocol: true, //自定义默认协议
|
||||||
customProtocol: "tcp", //自定义默认协议
|
customProtocol: "tcp", //自定义默认协议
|
||||||
enableNetCardMetric: false, //启用网卡自定义跃点
|
enableNetCardMetric: true, //启用网卡自定义跃点
|
||||||
netCardMetricValue: 1, //自定义网卡跃点值
|
netCardMetricValue: 1, //自定义网卡跃点值
|
||||||
enablePreventSleep: false, //组织系统休眠
|
enablePreventSleep: false, //组织系统休眠
|
||||||
compression: "none", //加密算法
|
compression: "none", //加密算法
|
||||||
@@ -49,7 +49,7 @@ const store = defineStore("main", {
|
|||||||
port: "11010" // 服务器端口
|
port: "11010" // 服务器端口
|
||||||
},
|
},
|
||||||
cidrEnable: false,
|
cidrEnable: false,
|
||||||
basePeers: ["public.easytier.top:11010"],
|
basePeers: ["public.easytier.top:11010","public.easytier.net:11010"],
|
||||||
theme: false, //主题 false light true dark
|
theme: false, //主题 false light true dark
|
||||||
configStartEnable: false, //使用配置文件启动
|
configStartEnable: false, //使用配置文件启动
|
||||||
configPath: "", //配置文件路径
|
configPath: "", //配置文件路径
|
||||||
@@ -57,6 +57,12 @@ const store = defineStore("main", {
|
|||||||
createConfigInEasytier: false, //在easytier目录生成config.json文件吗
|
createConfigInEasytier: false, //在easytier目录生成config.json文件吗
|
||||||
githubFastUrl: "https://ghproxy.cc/",
|
githubFastUrl: "https://ghproxy.cc/",
|
||||||
|
|
||||||
|
// forceBindIp配置
|
||||||
|
forceBindIpBit: "64",
|
||||||
|
delayInjectDll: false,
|
||||||
|
forceBindInput: "",
|
||||||
|
forceBindFile: "",
|
||||||
|
|
||||||
winipBcPid: 0,
|
winipBcPid: 0,
|
||||||
winipBcStart: false
|
winipBcStart: false
|
||||||
};
|
};
|
||||||
@@ -117,7 +123,12 @@ const store = defineStore("main", {
|
|||||||
"configPath",
|
"configPath",
|
||||||
"winIpBcAutoStart",
|
"winIpBcAutoStart",
|
||||||
"createConfigInEasytier",
|
"createConfigInEasytier",
|
||||||
"githubFastUrl"
|
"githubFastUrl",
|
||||||
|
|
||||||
|
"forceBindIpBit",
|
||||||
|
"delayInjectDll",
|
||||||
|
"forceBindInput",
|
||||||
|
"forceBindFile"
|
||||||
]
|
]
|
||||||
// // 除了这些,其他都要存下来
|
// // 除了这些,其他都要存下来
|
||||||
// omit: ["winipBcPid", "winipBcStart"]
|
// omit: ["winipBcPid", "winipBcStart"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
/** @type {import('tailwindcss').Config} */
|
/** @type {import('tailwindcss').Config} */
|
||||||
/** @type {import('tailwindcss/plugin')} */
|
/** @type {import('tailwindcss/plugin')} */
|
||||||
|
import plugin from "tailwindcss/plugin"
|
||||||
const plugin = require("tailwindcss/plugin");
|
// const plugin = require("tailwindcss/plugin");
|
||||||
module.exports = {
|
export default {
|
||||||
content: ["./components/**/*.{js,vue,ts}", "./layouts/**/*.vue", "./pages/**/*.vue", "./plugins/**/*.{js,ts}", "./app.vue", "./error.vue"],
|
content: ["./components/**/*.{js,vue,ts}", "./layouts/**/*.vue", "./pages/**/*.vue", "./plugins/**/*.{js,ts}", "./app.vue", "./error.vue"],
|
||||||
theme: {
|
theme: {
|
||||||
extend: {}
|
extend: {}
|
||||||
Vendored
+3
@@ -1,6 +1,9 @@
|
|||||||
interface ImportMetaEnv {
|
interface ImportMetaEnv {
|
||||||
readonly VITE_CONFIG_PATH: string;
|
readonly VITE_CONFIG_PATH: string;
|
||||||
readonly VITE_CONFIG_FILE_NAME: 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 {
|
interface ImportMeta {
|
||||||
|
|||||||
+2
-1
@@ -81,9 +81,10 @@ export const preventSleep = () => {
|
|||||||
}, _prevent_timer_count * 1000);
|
}, _prevent_timer_count * 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
export const stopPreventSleep = () => {
|
export const stopPreventSleep = async () => {
|
||||||
_prevent_timer && clearInterval(_prevent_timer);
|
_prevent_timer && clearInterval(_prevent_timer);
|
||||||
_prevent_timer = null;
|
_prevent_timer = null;
|
||||||
|
const _result = await invoke('allow_sleep');
|
||||||
}
|
}
|
||||||
|
|
||||||
export const parseCliInfo = (content: string) => {
|
export const parseCliInfo = (content: string) => {
|
||||||
|
|||||||
Binary file not shown.
@@ -1,14 +1,15 @@
|
|||||||
/**
|
/**
|
||||||
* 生成 release 发布包 zip 文件
|
* 生成 release 发布包 zip 文件
|
||||||
*/
|
*/
|
||||||
|
const pkg = require("./package.json");
|
||||||
const releaseDir = "./src-tauri/target/release";
|
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 releaseDirEasytier = `${releaseDir}/easytier/`;
|
||||||
const releaseExe = `${releaseDir}/easytier-game.exe`;
|
const releaseExe = `${releaseDir}/easytier-game.exe`;
|
||||||
const releaseHelp = `${releaseDir}/帮助.txt`;
|
const releaseHelp = `${releaseDir}/帮助.txt`;
|
||||||
|
const releaseUninstall = `${releaseDir}/uninstall.exe`;
|
||||||
const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
|
const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
|
||||||
const pkg = require("./package.json");
|
|
||||||
const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
|
|
||||||
const releaseZipDir = "./release";
|
const releaseZipDir = "./release";
|
||||||
const releaseZip = `${releaseZipDir}/${fileName}`;
|
const releaseZip = `${releaseZipDir}/${fileName}`;
|
||||||
|
|
||||||
@@ -62,5 +63,6 @@ archive.pipe(output);
|
|||||||
archive
|
archive
|
||||||
.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
|
.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, releaseHelp)), { name: "帮助.txt" })
|
||||||
|
.append(fs.createReadStream(path.join(__dirname, releaseUninstall)), { name: "uninstall.exe" })
|
||||||
.directory(path.join(__dirname, releaseDirEasytier), "easytier")
|
.directory(path.join(__dirname, releaseDirEasytier), "easytier")
|
||||||
.finalize();
|
.finalize();
|
||||||
|
|||||||
Reference in New Issue
Block a user