Compare commits

...
9 Commits
Author SHA1 Message Date
黑先森 8ed652ee26 托盘菜单新增公共节点 2025-01-03 17:16:06 +08:00
黑先森 9d976707ac 增强工具 内 新增forceBindIP方案 2025-01-03 16:55:47 +08:00
黑先森 0b54a623a8 版本号 -> 1.3.5
+ 优化字段信息
2025-01-03 11:42:52 +08:00
黑先森 7501a5661c 修复不启用config.json,但是本地存在config.json,无法取消勾选的bug,增加删除config.json的提示 2025-01-03 10:39:54 +08:00
黑先森 539092d769 升级nuxt -> 3.15.0 修复防止休眠无法停止的问题 2024-12-31 11:46:04 +08:00
黑先森 cefcc930b8 打包最新版easytier内核 2.1.1 2024-12-25 15:32:42 +08:00
黑先森 e7d92cce47 更新包版本,优化分享配置操作,增加不进行分享的配置提示
Cargo.toml
+ tauri-plugin-single-instance 2.2.0
+ tauri-plugin-cli 2.2.0
+ tauri-plugin-window-state 2.2.0
+ tauri-plugin-fs 2.2.0
+ tauri-plugin-log 2.2.0
+ tauri-plugin-shell 2.2.0

package.json
+ "@tauri-apps/plugin-cli" -> ^2.2.0
2024-12-25 15:26:27 +08:00
黑先森 76bdec0e1d 修复自定义协议勾选后没持久化存储的bug 2024-12-21 17:53:55 +08:00
黑先森 997f3798ae 优化文字提示,修复压缩算法选择不生效问题 2024-12-20 22:29:04 +08:00
23 changed files with 1443 additions and 996 deletions
+4
View File
@@ -52,4 +52,8 @@ html.dark body {
.el-table {
font-size: 12px!important;
}
.el-select-dropdown__wrap {
max-height: 150px!important;
}
+14 -1
View File
@@ -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";
@@ -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("https://easytier.gd.nkbpal.cn/status/easytier")
},
});
}
export async function MenuItemShow(text: string) {
return await MenuItem.new({
id: "show",
+12 -10
View File
@@ -3,7 +3,7 @@
"private": true,
"author": "leizi97",
"description": "A simple network initiator based on Easytier",
"version": "1.3.2",
"version": "1.3.5",
"scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod",
@@ -11,31 +11,33 @@
},
"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.12.2",
"@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-cli": "^2.2.0",
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
"@tauri-apps/plugin-fs": "^2.2.0",
"@tauri-apps/plugin-log": "^2.2.0",
"@tauri-apps/plugin-shell": "^2.2.0",
"@tauri-apps/plugin-window-state": "^2.2.0",
"@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.2.0",
"archiver": "^7.0.1",
"element-plus": "^2.8.7",
"element-plus": "^2.9.1",
"less": "^4.2.0",
"lodash-es": "^4.17.21",
"nuxt": "^3.14.1592",
"nuxt": "3.15.0",
"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"
},
"dependencies": {
"@tauri-apps/plugin-dialog": "~2"
}
}
+26 -6
View File
@@ -58,7 +58,7 @@
打开config.json目录
</ElButton>
</div>
<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止休眠</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.enablePreventSleep">防止系统休眠(比如:屏幕会一直亮着)</ElCheckbox></div>
<ElDivider />
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口只连接到对等节点</ElCheckbox>
@@ -86,7 +86,7 @@
:disabled="mainStore.config.disbleListenner"
v-model="mainStore.config.enableCustomListener"
>
自定义IPV4监听地址
自定义监听地址
</ElCheckbox>
<ElButton
size="small"
@@ -188,7 +188,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 +196,7 @@
>
<ElOption
v-for="item in [
['none', '默认'],
['none', '不压缩(游戏联机推荐)'],
['zstd', 'zstd算法']
]"
:key="item[0]"
@@ -222,12 +222,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 +270,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
+79 -19
View File
@@ -55,6 +55,7 @@
placeholder="请选择服务器地址"
default-first-option
v-model="config.serverUrl"
no-data-text="无服务器地址"
@change="handleServerUrlChange"
>
<template #prefix>
@@ -542,7 +543,7 @@
Folder,
CopyDocument
} 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";
@@ -569,6 +570,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();
@@ -981,14 +983,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);
@@ -1047,6 +1049,7 @@
mountedShow(); // 不需要await
closePrevent();
data.hasNewVersion = await checkNewVersion();
});
onBeforeUnmount(() => {
@@ -1135,8 +1138,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 +1186,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;
};
@@ -1259,25 +1265,78 @@
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);
ElMessage.success("配置已复制");
} catch (err) {
console.error(err);
ElMessage.error("分享失败");
}
ElConfirmPrimary(`{action} 虚拟网IP,主机名,子网代理,为子网代理启用smoltcp堆栈,开机自启,软件启动自动联机,出口节点,不生成Tun网卡,错误日志相关配置`, "提示", {
confirmButtonText: "知道了",
showCancelButton: false,
action: "不会分享"
});
}
if (command === "import_config") {
importConfigData.data = "";
@@ -1295,6 +1354,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 +1363,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") {
+1 -1
View File
@@ -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>
+163 -9
View File
@@ -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]">
@@ -176,6 +264,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 +272,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,7 +293,9 @@
name: "",
metric: ""
},
netcardList: []
netcardList: [],
guids: [],
forceBindStart: false
});
const handleTabsChange = async (tabPaneName: TabPaneName) => {
@@ -328,17 +421,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>
+757 -806
View File
File diff suppressed because it is too large Load Diff
+181 -22
View File
@@ -183,6 +183,27 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "ashpd"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9"
dependencies = [
"enumflags2",
"futures-channel",
"futures-util",
"rand 0.8.5",
"raw-window-handle",
"serde",
"serde_repr",
"tokio",
"url",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"zbus",
]
[[package]]
name = "async-broadcast"
version = "0.7.1"
@@ -1166,6 +1187,15 @@ dependencies = [
"syn 2.0.87",
]
[[package]]
name = "dlib"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [
"libloading",
]
[[package]]
name = "dlopen2"
version = "0.7.0"
@@ -1189,6 +1219,12 @@ dependencies = [
"syn 2.0.87",
]
[[package]]
name = "downcast-rs"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
[[package]]
name = "dpi"
version = "0.1.1"
@@ -1227,7 +1263,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]]
name = "easytier-game"
version = "1.3.2"
version = "1.3.5"
dependencies = [
"log",
"planif",
@@ -1240,6 +1276,7 @@ dependencies = [
"tauri-build",
"tauri-plugin-cli",
"tauri-plugin-clipboard-manager",
"tauri-plugin-dialog",
"tauri-plugin-fs",
"tauri-plugin-log",
"tauri-plugin-shell",
@@ -2788,6 +2825,7 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
"bitflags 2.6.0",
"block2",
"dispatch",
"libc",
"objc2",
]
@@ -3248,7 +3286,7 @@ checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
dependencies = [
"base64 0.22.1",
"indexmap 2.6.0",
"quick-xml",
"quick-xml 0.32.0",
"serde",
"time",
]
@@ -3390,6 +3428,15 @@ dependencies = [
"memchr",
]
[[package]]
name = "quick-xml"
version = "0.36.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
dependencies = [
"memchr",
]
[[package]]
name = "quote"
version = "1.0.37"
@@ -3615,6 +3662,29 @@ dependencies = [
"windows-registry",
]
[[package]]
name = "rfd"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e"
dependencies = [
"ashpd",
"block2",
"glib-sys",
"gobject-sys",
"gtk-sys",
"js-sys",
"log",
"objc2",
"objc2-app-kit",
"objc2-foundation",
"raw-window-handle",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
"windows-sys 0.48.0",
]
[[package]]
name = "ring"
version = "0.17.8"
@@ -3793,6 +3863,12 @@ dependencies = [
"syn 2.0.87",
]
[[package]]
name = "scoped-tls"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
[[package]]
name = "scopeguard"
version = "1.2.0"
@@ -4496,9 +4572,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-cli"
version = "2.0.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bccd4692b56822a60874542c7655546c8e7aed3c2e2926166e1498e595bd2a2"
checksum = "e5458ae16eac81bdbe8d9da2a9f3e01e8cdedbc381cc1727c01127542c8a61c5"
dependencies = [
"clap",
"log",
@@ -4506,7 +4582,7 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
"thiserror 1.0.64",
"thiserror 2.0.3",
]
[[package]]
@@ -4525,10 +4601,28 @@ dependencies = [
]
[[package]]
name = "tauri-plugin-fs"
version = "2.0.3"
name = "tauri-plugin-dialog"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96ba7d46e86db8c830d143ef90ab5a453328365b0cc834c24edea4267b16aba0"
checksum = "8b59fd750551b1066744ab956a1cd6b1ea3e1b3763b0b9153ac27a044d596426"
dependencies = [
"log",
"raw-window-handle",
"rfd",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
"tauri-plugin-fs",
"thiserror 2.0.3",
"url",
]
[[package]]
name = "tauri-plugin-fs"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1a1edf18000f02903a7c2e5997fb89aca455ecbc0acc15c6535afbb883be223"
dependencies = [
"anyhow",
"dunce",
@@ -4540,16 +4634,18 @@ dependencies = [
"serde_repr",
"tauri",
"tauri-plugin",
"thiserror 1.0.64",
"tauri-utils",
"thiserror 2.0.3",
"toml 0.8.2",
"url",
"uuid",
]
[[package]]
name = "tauri-plugin-log"
version = "2.0.2"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8aa13d15daf90230ba26d5a9b4a4612975fa64ce17290cb7f6e0f89bb6997d82"
checksum = "eddd784c138c08a43954bc3e735402e6b2b2ee8d8c254a7391f4e77c01273dd5"
dependencies = [
"android_logger",
"byte-unit",
@@ -4563,15 +4659,15 @@ dependencies = [
"swift-rs",
"tauri",
"tauri-plugin",
"thiserror 1.0.64",
"thiserror 2.0.3",
"time",
]
[[package]]
name = "tauri-plugin-shell"
version = "2.0.2"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ad7880c5586b6b2104be451e3d7fc0f3800c84bda69e9ba81c828f87cb34267"
checksum = "bb2c50a63e60fb8925956cc5b7569f4b750ac197a4d39f13b8dd46ea8e2bad79"
dependencies = [
"encoding_rs",
"log",
@@ -4584,30 +4680,30 @@ dependencies = [
"shared_child",
"tauri",
"tauri-plugin",
"thiserror 1.0.64",
"thiserror 2.0.3",
"tokio",
]
[[package]]
name = "tauri-plugin-single-instance"
version = "2.0.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a25ac834491d089699a2bc9266a662faf373c9f779f05a2235bc6e4d9e61769a"
checksum = "0f36019ee9832dc99e4450bb55a21cfad8633b19c2c18bd17c7741939b070ede"
dependencies = [
"log",
"serde",
"serde_json",
"tauri",
"thiserror 1.0.64",
"thiserror 2.0.3",
"tracing",
"windows-sys 0.59.0",
"zbus",
]
[[package]]
name = "tauri-plugin-window-state"
version = "2.0.2"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "683c8764751fbbcebf3a594bcee24cf84c62773fa0080d1b40fc80698472421e"
checksum = "234dd891cc7960fa28f93ea911f3e0d9ce8375ebf9ff303831bdd7a3443d5714"
dependencies = [
"bitflags 2.6.0",
"log",
@@ -4615,7 +4711,7 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
"thiserror 1.0.64",
"thiserror 2.0.3",
]
[[package]]
@@ -4852,6 +4948,7 @@ dependencies = [
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tracing",
"windows-sys 0.52.0",
]
@@ -5322,6 +5419,66 @@ dependencies = [
"web-sys",
]
[[package]]
name = "wayland-backend"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
dependencies = [
"cc",
"downcast-rs",
"rustix",
"scoped-tls",
"smallvec",
"wayland-sys",
]
[[package]]
name = "wayland-client"
version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
dependencies = [
"bitflags 2.6.0",
"rustix",
"wayland-backend",
"wayland-scanner",
]
[[package]]
name = "wayland-protocols"
version = "0.32.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
"wayland-client",
"wayland-scanner",
]
[[package]]
name = "wayland-scanner"
version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
dependencies = [
"proc-macro2",
"quick-xml 0.36.2",
"quote",
]
[[package]]
name = "wayland-sys"
version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
dependencies = [
"dlib",
"log",
"pkg-config",
]
[[package]]
name = "web-sys"
version = "0.3.70"
@@ -5992,6 +6149,7 @@ dependencies = [
"serde_repr",
"sha1",
"static_assertions",
"tokio",
"tracing",
"uds_windows",
"windows-sys 0.52.0",
@@ -6148,6 +6306,7 @@ dependencies = [
"enumflags2",
"serde",
"static_assertions",
"url",
"zvariant_derive",
]
+9 -8
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.3.2"
version = "1.3.5"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier"
@@ -31,26 +31,27 @@ tauri = { version = "2.1.1", features = [
"image-ico",
] }
tauri-plugin-log = "2.0.2"
tauri-plugin-shell = "2.0.2"
tauri-plugin-log = "2.2.0"
tauri-plugin-shell = "2.2.0"
reqwest = { version = "0.12", features = ["json"] }
zip = "2.2"
sysinfo = '0.32.0'
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
whoami = "1.5.2"
tauri-plugin-fs = "2"
tauri-plugin-fs = "2.2.0"
tauri-plugin-clipboard-manager = "2.0.2"
rand = "0.8.5"
tokio = { version = "1.41.1", features = ["process"] }
tauri-plugin-dialog = "2"
# prost = "0.13"
# prost-types = "0.13"
[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.0"
tauri-plugin-window-state = "2.2.0"
+109 -103
View File
@@ -1,104 +1,110 @@
{
"$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": "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.
+58 -2
View File
@@ -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()
@@ -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");
+6 -2
View File
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.3.2",
"version": "1.3.5",
"identifier": "com.tauri.easytier-game",
"build": {
@@ -13,7 +13,7 @@
"app": {
"windows": [
{
"title": "easytier-game 1.3.2",
"title": "easytier-game 1.3.5",
"label": "main",
"minWidth": 340,
"width": 340,
@@ -53,6 +53,10 @@
"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",
+15 -4
View File
@@ -3,7 +3,7 @@ const store = defineStore("main", {
state() {
return {
config: {
protocol: ["tcp", "udp"], // 网络协议
protocol: ["tcp"], // 网络协议
serverUrl: "public.easytier.top:11010",
networkName: "",
networkPassword: "",
@@ -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"]
+3
View File
@@ -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 {
+4 -2
View File
@@ -1,7 +1,7 @@
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,
@@ -81,10 +81,11 @@ export const ElConfirmPrimary = (
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"
+2 -1
View File
@@ -81,9 +81,10 @@ export const preventSleep = () => {
}, _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) => {