mirror of
https://github.com/EasyTier/EasytierGame.git
synced 2025-05-19 10:27:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 黑先森
|
8120b65c9b | ||
|
黑先森
|
7af0683775 | ||
|
黑先森
|
4191a0a12d | ||
|
黑先森
|
66d8bff8b4 | ||
|
黑先森
|
c740039325 | ||
|
黑先森
|
589511e356 |
@@ -49,6 +49,9 @@ Releases： [https://github.com/EasyTier/EasytierGame/releases](https://github.c
|
||||
- 1.2.3新增了帮助.txt 位于“easytier/帮助.txt" 内含 无法打开界面和卸载EasytierGame的办法，新增 "easytier/clear_local_data.bat" 用于清除easytierGame的本地缓存数据（需要管理员模式运行）
|
||||
|
||||
|
||||
- 1.2.5新增 自建服务器功能，可以自行搭建服务器，但是需要一些网络知识，具体可以查看文档[自建服务器](https://www.easytier.top/guide/network/host-public-server.html)
|
||||
|
||||
|
||||
## 特性
|
||||
|
||||
- 基于easytier组网工具开发，界面清晰简单
|
||||
|
||||
@@ -27,6 +27,9 @@ html.dark body {
|
||||
}
|
||||
|
||||
#__easytier {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-wrap: nowrap;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
box-sizing: border-box;
|
||||
@@ -36,4 +39,11 @@ html.dark body {
|
||||
.full-label .el-form-item__label {
|
||||
width: 100%;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.full-content .el-form-item__content {
|
||||
/* height: 100%; */
|
||||
align-items: flex-start;
|
||||
overflow: auto;
|
||||
flex: 1;
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
+5
-3
@@ -3,10 +3,11 @@
|
||||
"private": true,
|
||||
"author": "leizi97",
|
||||
"description": "A simple network initiator based on Easytier",
|
||||
"version": "1.2.4",
|
||||
"version": "1.2.6",
|
||||
"scripts": {
|
||||
"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"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@element-plus/icons-vue": "^2.3.1",
|
||||
@@ -26,10 +27,11 @@
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@vitejs/plugin-vue-jsx": "^4.1.0",
|
||||
"@vueuse/core": "^11.2.0",
|
||||
"archiver": "^7.0.1",
|
||||
"element-plus": "^2.8.7",
|
||||
"less": "^4.2.0",
|
||||
"lodash-es": "^4.17.21",
|
||||
"nuxt": "^3.13.2",
|
||||
"nuxt": "^3.14.1592",
|
||||
"pinia": "^2.2.6",
|
||||
"pinia-plugin-persistedstate": "^4.1.3",
|
||||
"postcss": "^8.4.38",
|
||||
|
||||
+1
-1
@@ -77,7 +77,7 @@
|
||||
<ElDivider />
|
||||
<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
|
||||
<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密，默认为启用，必须与对等节点相同</ElCheckbox></div>
|
||||
<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时，默认为单线程</ElCheckbox></div>
|
||||
<div><ElCheckbox v-model="mainStore.config.multiThread">启用多线程运行</ElCheckbox></div>
|
||||
<ElDivider />
|
||||
|
||||
<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
|
||||
|
||||
+266
-147
@@ -1,14 +1,10 @@
|
||||
<template>
|
||||
<ElForm
|
||||
v-if="!mainStore.enableCreateServer"
|
||||
size="small"
|
||||
label-position="top"
|
||||
:model="config"
|
||||
>
|
||||
<!-- element-loading-custom-class="config-start"
|
||||
v-loading="mainStore.configStartEnable"
|
||||
:element-loading-spinner="'<path />'"
|
||||
element-loading-text="-------已经启用配置文件，界面配置不再生效-------" -->
|
||||
<!-- <div> -->
|
||||
<ElFormItem
|
||||
label="服务器"
|
||||
prop="serverUrl"
|
||||
@@ -40,16 +36,6 @@
|
||||
</ElTag>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
|
||||
<!-- <ElPopconfirm
|
||||
width="325"
|
||||
cancel-button-text="取消"
|
||||
confirm-button-text="继续"
|
||||
title="内核从github下载，需要出国工具，可能下载缓慢或失败，是否继续?
|
||||
也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
|
||||
@confirm="handleCoreManagement"
|
||||
>
|
||||
<template #reference> -->
|
||||
<ElButton
|
||||
class="ml-auto"
|
||||
:disabled="data.isStart"
|
||||
@@ -59,10 +45,7 @@
|
||||
size="small"
|
||||
>
|
||||
内核管理
|
||||
<!-- {{ data.coreVersion ? "更新内核" : "下载内核" }} -->
|
||||
</ElButton>
|
||||
<!-- </template>
|
||||
</ElPopconfirm> -->
|
||||
</div>
|
||||
</template>
|
||||
<ElSelect
|
||||
@@ -196,129 +179,223 @@
|
||||
></ElInput>
|
||||
</ElFormItem>
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
<div class="flex items-start">
|
||||
<div>
|
||||
<div>
|
||||
<ElDropdown
|
||||
@command="handleStartCommand"
|
||||
split-button
|
||||
trigger="click"
|
||||
size="default"
|
||||
:type="!data.isStart ? 'primary' : 'danger'"
|
||||
:disabled="data.startLoading || !data.coreVersion || data.update"
|
||||
@click="handleConnection"
|
||||
</ElForm>
|
||||
<ElForm
|
||||
v-else
|
||||
size="small"
|
||||
label-position="top"
|
||||
class="flex-1 overflow-hidden pb-[5px]"
|
||||
:model="config"
|
||||
>
|
||||
<ElFormItem
|
||||
label="白名单"
|
||||
prop="ServerWhiteList"
|
||||
class="full-label full-content overflow-hidden !flex flex-col h-full !mb-[0]"
|
||||
>
|
||||
<template #label>
|
||||
<div class="flex items-center flex-nowrap gap-[0_5px]">
|
||||
<div>白名单</div>
|
||||
<span>-</span>
|
||||
<ElTag
|
||||
effect="dark"
|
||||
:type="data.isStart ? 'success' : 'info'"
|
||||
>
|
||||
{{ !data.isStart ? "启动联机" : "停止联机" }}
|
||||
<template #dropdown>
|
||||
<ElDropdownMenu>
|
||||
<ElDropdownItem
|
||||
command="import_config"
|
||||
:icon="Link"
|
||||
>
|
||||
导入配置
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
command="share_config"
|
||||
:icon="Share"
|
||||
>
|
||||
分享配置
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
:icon="Tools"
|
||||
command="toml"
|
||||
:disabled="data.isStart"
|
||||
>
|
||||
使用外部配置文件
|
||||
</ElDropdownItem>
|
||||
</ElDropdownMenu>
|
||||
</template>
|
||||
</ElDropdown>
|
||||
</div>
|
||||
<div class="mt-[6px] pl-[2px]">
|
||||
<ElTooltip
|
||||
placement="left"
|
||||
content="日志"
|
||||
{{ data.isSuccessGetIp ? "运行成功" : data.isStart && !data.isSuccessGetIp ? "运行中" : "未启动" }}
|
||||
</ElTag>
|
||||
<ElButton
|
||||
v-if="!data.coreVersion"
|
||||
@click="getCoreVersion(true)"
|
||||
>
|
||||
<ElButton
|
||||
:type="!data.logVisible ? 'info' : 'warning'"
|
||||
@click="handleShowLogDialog"
|
||||
:icon="List"
|
||||
size="small"
|
||||
plain
|
||||
></ElButton>
|
||||
</ElTooltip>
|
||||
<ElTooltip
|
||||
placement="left"
|
||||
content="成员"
|
||||
获取内核版本
|
||||
</ElButton>
|
||||
<div
|
||||
v-else
|
||||
class="flex-1 truncate"
|
||||
>
|
||||
<ElButton
|
||||
@click="handleShowMemberDialog"
|
||||
:icon="UserFilled"
|
||||
plain
|
||||
type="success"
|
||||
size="small"
|
||||
></ElButton>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ml-auto">
|
||||
<ElCheckbox
|
||||
v-model="config.disbleP2p"
|
||||
size="small"
|
||||
>
|
||||
强制中转
|
||||
</ElCheckbox>
|
||||
<ElTooltip
|
||||
placement="top-start"
|
||||
content="自启后隐藏于托盘，不显示界面"
|
||||
>
|
||||
<ElCheckbox
|
||||
@change="handleAutoStartByTask"
|
||||
:model-value="config.autoStart"
|
||||
<ElTooltip :content="data.coreVersion">
|
||||
<ElTag type="info">
|
||||
{{ data.coreVersion }}
|
||||
</ElTag>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
<ElButton
|
||||
class="ml-auto"
|
||||
:disabled="data.isStart"
|
||||
@click="handleCoreManagement"
|
||||
:loading="data.update"
|
||||
type="primary"
|
||||
size="small"
|
||||
>
|
||||
开机自启
|
||||
</ElCheckbox>
|
||||
</ElTooltip>
|
||||
<div>
|
||||
<ElButton
|
||||
@click="handleShowCidrDialog"
|
||||
:icon="Share"
|
||||
>
|
||||
子网代理
|
||||
</ElButton>
|
||||
<ElButton
|
||||
@click="handleShowAdvanceDialog"
|
||||
:icon="Setting"
|
||||
>
|
||||
高级选项
|
||||
内核管理
|
||||
</ElButton>
|
||||
</div>
|
||||
<div class="flex items-center gap-[0_5px]">
|
||||
<div>
|
||||
<ElButton
|
||||
plain
|
||||
type="primary"
|
||||
size="small"
|
||||
:icon="MagicStick"
|
||||
@click="handleShowToolDialog"
|
||||
>
|
||||
增强工具
|
||||
</ElButton>
|
||||
</div>
|
||||
<ElLink
|
||||
class="!text-[9px] pb-[2px] ml-[8px] truncate"
|
||||
type="info"
|
||||
:underline="false"
|
||||
@click="open('https://github.com/EasyTier/EasytierGame')"
|
||||
>
|
||||
EasytierGame主页
|
||||
</ElLink>
|
||||
</template>
|
||||
<div class="h-full w-full flex flex-col overflow-hidden">
|
||||
<div class="flex-1 overflow-auto">
|
||||
<ElInput
|
||||
:disabled="!mainStore.enableWhiteList"
|
||||
placeholder="一行一个，支持通配符列表，如（ab*）。当该参数的列表为空时，就不会为所有其他网络提供转发服务。"
|
||||
:maxlength="1000"
|
||||
v-model="mainStore.ServerWhiteList"
|
||||
type="textarea"
|
||||
:autosize="{
|
||||
minRows: 9
|
||||
}"
|
||||
resize="none"
|
||||
></ElInput>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<ElCheckbox v-model="mainStore.enableWhiteList">启用白名单</ElCheckbox>
|
||||
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包</ElCheckbox>
|
||||
<ElTooltip content="帮助其他虚拟网建立P2P链接">
|
||||
<ElIcon><QuestionFilled /></ElIcon>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ElFormItem>
|
||||
</ElForm>
|
||||
<div class="flex items-start mt-auto">
|
||||
<div>
|
||||
<div>
|
||||
<ElDropdown
|
||||
@command="handleStartCommand"
|
||||
split-button
|
||||
trigger="click"
|
||||
size="default"
|
||||
:type="!data.isStart ? 'primary' : 'danger'"
|
||||
:disabled="data.startLoading || !data.coreVersion || data.update"
|
||||
@click="handleConnection"
|
||||
>
|
||||
{{
|
||||
!data.isStart
|
||||
? mainStore.enableCreateServer
|
||||
? "启动服务"
|
||||
: "启动联机"
|
||||
: mainStore.enableCreateServer
|
||||
? "停止服务"
|
||||
: "停止联机"
|
||||
}}
|
||||
<template #dropdown>
|
||||
<ElDropdownMenu>
|
||||
<ElDropdownItem
|
||||
command="import_config"
|
||||
:icon="Link"
|
||||
>
|
||||
导入配置
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
command="share_config"
|
||||
:icon="Share"
|
||||
>
|
||||
分享联机相关配置
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
disabled
|
||||
>
|
||||
<ElDivider class="!h-[2px] !m-0" />
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
:icon="SetUp"
|
||||
command="create_server"
|
||||
>
|
||||
{{ mainStore.enableCreateServer ? "我要联机" : "我要开服(自建)" }}
|
||||
</ElDropdownItem>
|
||||
<ElDropdownItem
|
||||
:icon="Tools"
|
||||
command="toml"
|
||||
:disabled="data.isStart"
|
||||
>
|
||||
使用外部配置文件
|
||||
</ElDropdownItem>
|
||||
</ElDropdownMenu>
|
||||
</template>
|
||||
</ElDropdown>
|
||||
</div>
|
||||
<div class="mt-[6px] pl-[2px]">
|
||||
<ElTooltip
|
||||
placement="left"
|
||||
content="日志"
|
||||
>
|
||||
<ElButton
|
||||
:type="!data.logVisible ? 'info' : 'warning'"
|
||||
@click="handleShowLogDialog"
|
||||
:icon="List"
|
||||
size="small"
|
||||
plain
|
||||
></ElButton>
|
||||
</ElTooltip>
|
||||
<ElTooltip
|
||||
placement="left"
|
||||
content="成员"
|
||||
>
|
||||
<ElButton
|
||||
@click="handleShowMemberDialog"
|
||||
:icon="UserFilled"
|
||||
plain
|
||||
type="success"
|
||||
size="small"
|
||||
></ElButton>
|
||||
</ElTooltip>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ml-auto">
|
||||
<ElCheckbox
|
||||
v-model="config.disbleP2p"
|
||||
size="small"
|
||||
>
|
||||
强制中转
|
||||
</ElCheckbox>
|
||||
<ElTooltip
|
||||
placement="top-start"
|
||||
content="自启后隐藏于托盘，不显示界面"
|
||||
>
|
||||
<ElCheckbox
|
||||
@change="handleAutoStartByTask"
|
||||
:model-value="config.autoStart"
|
||||
size="small"
|
||||
>
|
||||
开机自启
|
||||
</ElCheckbox>
|
||||
</ElTooltip>
|
||||
<div>
|
||||
<ElButton
|
||||
@click="handleShowCidrDialog"
|
||||
:icon="Share"
|
||||
size="small"
|
||||
>
|
||||
子网代理
|
||||
</ElButton>
|
||||
<ElButton
|
||||
@click="handleShowAdvanceDialog"
|
||||
:icon="Setting"
|
||||
size="small"
|
||||
>
|
||||
高级选项
|
||||
</ElButton>
|
||||
</div>
|
||||
<div class="flex items-center gap-[0_5px]">
|
||||
<div>
|
||||
<ElButton
|
||||
plain
|
||||
type="primary"
|
||||
size="small"
|
||||
:icon="MagicStick"
|
||||
@click="handleShowToolDialog"
|
||||
>
|
||||
增强工具
|
||||
</ElButton>
|
||||
</div>
|
||||
<ElLink
|
||||
class="!text-[9px] pb-[2px] ml-[8px] truncate"
|
||||
type="info"
|
||||
:underline="false"
|
||||
@click="open('https://github.com/EasyTier/EasytierGame')"
|
||||
>
|
||||
EasytierGame主页
|
||||
</ElLink>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<ElDialog
|
||||
width="95%"
|
||||
top="10px"
|
||||
@@ -485,7 +562,7 @@
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { listen } from "@tauri-apps/api/event";
|
||||
import { open, Command } from "@tauri-apps/plugin-shell";
|
||||
import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools, MagicStick } from "@element-plus/icons-vue";
|
||||
import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools, MagicStick, SetUp } from "@element-plus/icons-vue";
|
||||
import { reactive, onBeforeUnmount, onMounted } from "vue";
|
||||
import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
|
||||
import { initStartWinIpBroadcast } from "~/composables/netcard";
|
||||
@@ -501,17 +578,22 @@
|
||||
import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
|
||||
import { sortedUniq, uniq } from "lodash-es";
|
||||
import { bounce, addQQGroup } from "~/utils";
|
||||
import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
|
||||
|
||||
let is_close = false;
|
||||
|
||||
const tray = await useTray(true, async () => {
|
||||
is_close = true;
|
||||
await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
|
||||
await invoke("stop_command", { child_id: data.winipBcPid || 0 });
|
||||
}, async () => {
|
||||
await handleConnection();
|
||||
return data.isStart
|
||||
});
|
||||
const tray = await useTray(
|
||||
true,
|
||||
async () => {
|
||||
is_close = true;
|
||||
await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
|
||||
await invoke("stop_command", { child_id: data.winipBcPid || 0 });
|
||||
},
|
||||
async () => {
|
||||
await handleConnection();
|
||||
return data.isStart;
|
||||
}
|
||||
);
|
||||
|
||||
const mainStore = useMainStore();
|
||||
const config = mainStore.config;
|
||||
@@ -934,6 +1016,25 @@
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
if (mainStore.enableCreateServer) {
|
||||
if (config.relayAllPeerrpc) {
|
||||
args.push("--relay-all-peer-rpc");
|
||||
}
|
||||
const whiteList = mainStore.ServerWhiteList.trim()
|
||||
.split("\n")
|
||||
.map(el => el.trim())
|
||||
.filter(el => el)
|
||||
.join(" ");
|
||||
if (whiteList && mainStore.enableWhiteList) {
|
||||
args.push("--relay-network-whitelist", whiteList);
|
||||
}
|
||||
if (!whiteList && mainStore.enableWhiteList) {
|
||||
args.push("--relay-network-whitelist");
|
||||
}
|
||||
return args;
|
||||
}
|
||||
|
||||
if (config.dhcp) {
|
||||
args.push("-d");
|
||||
}
|
||||
@@ -1103,14 +1204,32 @@
|
||||
importConfigData.data = "";
|
||||
importConfigData.visible = true;
|
||||
}
|
||||
if (command === "create_server") {
|
||||
if (data.isStart) {
|
||||
const [error] = await ElConfirmDanger("切换会停止{action}，是否继续?", "提示", {
|
||||
action: "`联机/服务`",
|
||||
confirmButtonText: "继续",
|
||||
cancelButtonText: "取消"
|
||||
});
|
||||
if (!error) await reset();
|
||||
}
|
||||
mainStore.enableCreateServer = !mainStore.enableCreateServer;
|
||||
if (mainStore.config.relayAllPeerrpc && !mainStore.enableCreateServer) {
|
||||
const [error] = await ElConfirmPrimary("是否关闭RPC流量转发?", "提示", {
|
||||
confirmButtonText: "关闭",
|
||||
cancelButtonText: "取消"
|
||||
});
|
||||
if (!error) mainStore.config.relayAllPeerrpc = false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const handleStartImport = async () => {
|
||||
try {
|
||||
await ElMessageBox.confirm("确定导入?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消"
|
||||
});
|
||||
const [err] = await ElConfirmPrimary("确定导入?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消"
|
||||
});
|
||||
if (!err) {
|
||||
const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
|
||||
mainStore.$patch({
|
||||
config: {
|
||||
@@ -1121,7 +1240,7 @@
|
||||
ElMessage.success("导入成功");
|
||||
importConfigData.visible = false;
|
||||
mainStore.basePeers = uniq([config.serverUrl, ...mainStore.basePeers]);
|
||||
} catch (err) {
|
||||
} else {
|
||||
console.error(err);
|
||||
if (err !== "cancel") {
|
||||
ElMessage.error("导入失败");
|
||||
@@ -1190,7 +1309,7 @@
|
||||
logsTimer && clearInterval(logsTimer);
|
||||
logsTimer = setInterval(() => {
|
||||
appWindow.emitTo("log", "logs", data.log);
|
||||
}, 600);
|
||||
}, 650);
|
||||
},
|
||||
() => {
|
||||
data.logVisible = false;
|
||||
|
||||
+30
-14
@@ -6,21 +6,25 @@
|
||||
stripe
|
||||
border
|
||||
:data="data.member"
|
||||
v-else>
|
||||
v-else
|
||||
>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="140"
|
||||
label="主机名"
|
||||
prop="hostname"></ElTableColumn>
|
||||
prop="hostname"
|
||||
></ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="90"
|
||||
prop="cost"
|
||||
label="路由">
|
||||
label="路由"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<ElTag
|
||||
effect="dark"
|
||||
:type="row.cost == 'p2p' ? 'success' : 'info'">
|
||||
:type="row.cost == 'p2p' ? 'success' : 'info'"
|
||||
>
|
||||
{{ row.cost }}
|
||||
</ElTag>
|
||||
</template>
|
||||
@@ -29,17 +33,20 @@
|
||||
sortable
|
||||
width="120"
|
||||
prop="ipv4"
|
||||
label="虚拟网IP"></ElTableColumn>
|
||||
label="虚拟网IP"
|
||||
></ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
prop="lat_ms"
|
||||
width="130"
|
||||
label="延迟/ms"></ElTableColumn>
|
||||
label="延迟/ms"
|
||||
></ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="120"
|
||||
prop="loss_rate"
|
||||
label="丢包率">
|
||||
label="丢包率"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
{{ row.loss_rate && row.loss_rate != "-" ? Number(row.loss_rate * 100).toFixed(2) + "%" : row.loss_rate }}
|
||||
</template>
|
||||
@@ -48,15 +55,23 @@
|
||||
sortable
|
||||
width="120"
|
||||
label="nat_type"
|
||||
prop="NAT类型">
|
||||
prop="NAT类型"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
{{ natMaps[row.nat_type.toLowerCase() as natKyes] || row.nat_type || "-" }}
|
||||
</template>
|
||||
</ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
width="120"
|
||||
prop="version"
|
||||
label="版本"></ElTableColumn>
|
||||
label="版本"
|
||||
></ElTableColumn>
|
||||
<ElTableColumn
|
||||
sortable
|
||||
prop="tunnel_proto"
|
||||
label="隧道协议"
|
||||
></ElTableColumn>
|
||||
</ElTable>
|
||||
</div>
|
||||
</div>
|
||||
@@ -86,14 +101,14 @@
|
||||
restricted: "nat2",
|
||||
portrestricted: "nat3",
|
||||
symmetric: "nat4",
|
||||
SymmetricEasyDec: "nat4-easydec",
|
||||
SymmetricEasyInc: "nat4-easyinc",
|
||||
SymUdpFirewall: "nat4-udpfirewall",
|
||||
symmetriceasydec: "nat4-easydec",
|
||||
symmetriceasyinc: "nat4-easyinc",
|
||||
symUdpfirewall: "nat4-udpfirewall"
|
||||
};
|
||||
type natKyes = keyof typeof natMaps;
|
||||
|
||||
const data = reactive<{ member: any[] }>({
|
||||
member: [],
|
||||
member: []
|
||||
});
|
||||
|
||||
const _showTableHeader = [
|
||||
@@ -104,12 +119,13 @@
|
||||
["loss_rate", "丢包率"],
|
||||
["nat_type", "NAT类型"],
|
||||
["version", "版本"],
|
||||
["tunnel_proto", "隧道协议"]
|
||||
];
|
||||
|
||||
const listenOutput = async () => {
|
||||
const member = await invoke<string>("get_members_by_cli");
|
||||
const peerInfo = parsePeerInfo(member);
|
||||
peerInfo.forEach((value) => {
|
||||
peerInfo.forEach(value => {
|
||||
if (value.cost === "Local") {
|
||||
value.cost = "本机";
|
||||
}
|
||||
|
||||
Generated
+485
-153
File diff suppressed because it is too large
Load Diff
Generated
+1
-1
@@ -1176,7 +1176,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
|
||||
|
||||
[[package]]
|
||||
name = "easytier-game"
|
||||
version = "1.2.4"
|
||||
version = "1.2.6"
|
||||
dependencies = [
|
||||
"log",
|
||||
"planif",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "easytier-game"
|
||||
version = "1.2.4"
|
||||
version = "1.2.6"
|
||||
homepage = "https://github.com/EasyTier/EasyTier"
|
||||
repository = "https://github.com/EasyTier/EasytierGame"
|
||||
description = "A simple network initiator based on Easytier"
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
# 实例名称，用于在同一台机器上标识此节点
|
||||
instance_name = ""
|
||||
# 主机名，用于标识此设备的主机名
|
||||
hostname = ""
|
||||
# 实例 ID，一般为 UUID，在同一个虚拟网络中唯一
|
||||
instance_id = ""
|
||||
# 此节点的虚拟网 IPv4 地址，如果为空，则此节点将仅转发数据包，不会创建 TUN 设备
|
||||
ipv4 = ""
|
||||
# 由 Easytier 自动确定并设置IP地址，默认从10.0.0.1开始。警告：在使用 DHCP 时，如果网络中出现 IP 冲突，IP 将自动更改
|
||||
dhcp = false
|
||||
|
||||
# 监听器列表，用于接受连接
|
||||
listeners = [
|
||||
"tcp://0.0.0.0:11010",
|
||||
"udp://0.0.0.0:11010",
|
||||
"wg://0.0.0.0:11011",
|
||||
"ws://0.0.0.0:11011/",
|
||||
"wss://0.0.0.0:11012/",
|
||||
]
|
||||
|
||||
# 退出节点列表
|
||||
exit_nodes = [
|
||||
]
|
||||
|
||||
# 用于管理的 RPC 门户地址
|
||||
rpc_portal = "127.0.0.1:15888"
|
||||
|
||||
[network_identity]
|
||||
# 网络名称，用于标识虚拟网络
|
||||
network_name = ""
|
||||
# 网络密钥，用于验证此节点属于虚拟网络
|
||||
network_secret = ""
|
||||
|
||||
# 这里是对等连接节点配置，可以多段配置
|
||||
[[peer]]
|
||||
uri = "tcp://public.easytier.top:11010"
|
||||
|
||||
[[peer]]
|
||||
uri = "udp://public.easytier.top:11010"
|
||||
|
||||
# 这里是子网代理节点配置，可以有多段配置
|
||||
[[proxy_network]]
|
||||
cidr = "10.0.1.0/24"
|
||||
|
||||
[[proxy_network]]
|
||||
cidr = "10.0.2.0/24"
|
||||
|
||||
# WireGuard 配置信息
|
||||
[vpn_portal_config]
|
||||
# WireGuard 客户端所在的网段，下面为示例
|
||||
client_cidr = "10.14.14.0/24"
|
||||
#wg所监听的端口(请勿和listeners的wg冲突)
|
||||
wireguard_listen = "0.0.0.0:11012"
|
||||
|
||||
[flags]
|
||||
# 连接到对等节点使用的默认协议
|
||||
default_protocol = "tcp"
|
||||
# TUN 设备名称，如果为空，则使用默认名称
|
||||
dev_name = ""
|
||||
# 禁用p2p
|
||||
disable_p2p = false
|
||||
# 是否启用加密
|
||||
enable_encryption = true
|
||||
# 是否启用 IPv6 支持
|
||||
enable_ipv6 = true
|
||||
# TUN 设备的 MTU
|
||||
mtu = 1380
|
||||
# 延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径
|
||||
latency_first = false
|
||||
# 将本节点配置为退出节点
|
||||
enable_exit_node = false
|
||||
# 禁用 TUN 设备
|
||||
no_tun = false
|
||||
# 为子网代理启用 smoltcp 堆栈
|
||||
use_smoltcp = false
|
||||
# 仅转发白名单网络的流量，支持通配符字符串。多个网络名称间可以使用英文空格间隔。如果该参数为空，则禁用转发。默认允许所有网络。例如：'*'（所有网络），'def*'（以def为前缀的网络），'net1 net2'（只允许net1和net2）
|
||||
foreign_network_whitelist = "*"
|
||||
@@ -1,23 +0,0 @@
|
||||
hostname = "Test1"
|
||||
instance_name = "default"
|
||||
instance_id = "8803362c-e4f1-4df1-93e8-721653945f77"
|
||||
dhcp = true
|
||||
listeners = [
|
||||
"tcp://0.0.0.0:11010",
|
||||
"udp://0.0.0.0:11010",
|
||||
"wg://0.0.0.0:11011",
|
||||
"ws://0.0.0.0:11011/",
|
||||
"wss://0.0.0.0:11012/",
|
||||
]
|
||||
exit_nodes = []
|
||||
rpc_portal = "0.0.0.0:15888"
|
||||
|
||||
[network_identity]
|
||||
network_name = "default"
|
||||
network_secret = ""
|
||||
|
||||
[[peer]]
|
||||
uri = "tcp://public.easytier.top:11010"
|
||||
|
||||
[[peer]]
|
||||
uri = "udp://public.easytier.top:11010"
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||
"productName": "easytier-game",
|
||||
"version": "1.2.4",
|
||||
"version": "1.2.6",
|
||||
"identifier": "com.tauri.easytier-game",
|
||||
|
||||
"build": {
|
||||
@@ -13,7 +13,7 @@
|
||||
"app": {
|
||||
"windows": [
|
||||
{
|
||||
"title": "easytier-game 1.2.4",
|
||||
"title": "easytier-game 1.2.6",
|
||||
"label": "main",
|
||||
"minWidth": 340,
|
||||
"width": 340,
|
||||
@@ -49,7 +49,7 @@
|
||||
"easytier/Packet.dll",
|
||||
"easytier/wintun.dll",
|
||||
"easytier/clear_local_data.bat",
|
||||
"easytier/帮助.txt"
|
||||
"帮助.txt"
|
||||
],
|
||||
"windows": {
|
||||
"webviewInstallMode": {
|
||||
|
||||
+9
-2
@@ -14,7 +14,7 @@ export default defineStore("main", {
|
||||
connectAfterStart: false, //软件打开后，是否自动连接
|
||||
disableIpv6: false, // 是否禁用IPv6
|
||||
disbleListenner: false, // 是否禁用监听
|
||||
disableEncryption: false, // 是否禁用加密
|
||||
disableEncryption: true, // 是否禁用加密
|
||||
multiThread: false, //使用多线程
|
||||
enablExitNode: false, // 是否启用退出节点
|
||||
noTun: false, // 是否使用TUN
|
||||
@@ -39,6 +39,9 @@ export default defineStore("main", {
|
||||
winIpBcAutoStart: true,
|
||||
createConfigInEasytier: false, //在easytier目录生成config.json文件吗
|
||||
githubFastUrl: "https://ghproxy.cc/",
|
||||
enableCreateServer: false, // 自建服务器
|
||||
enableWhiteList: true, // 是否启用白名单
|
||||
ServerWhiteList: "", // 服务器流量转发白名单
|
||||
|
||||
winipBcPid: 0,
|
||||
winipBcStart: false
|
||||
@@ -82,7 +85,11 @@ export default defineStore("main", {
|
||||
"configPath",
|
||||
"winIpBcAutoStart",
|
||||
"createConfigInEasytier",
|
||||
"githubFastUrl"
|
||||
"githubFastUrl",
|
||||
|
||||
"enableCreateServer",
|
||||
"enableWhiteList",
|
||||
"ServerWhiteList"
|
||||
],
|
||||
// // 除了这些，其他都要存下来
|
||||
// omit: ["winipBcPid", "winipBcStart"]
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
/**
|
||||
* 生成 release 发布包 zip 文件
|
||||
*/
|
||||
|
||||
const releaseDir = "./src-tauri/target/release";
|
||||
const releaseDirEasytier = `${releaseDir}/easytier/`;
|
||||
const releaseExe = `${releaseDir}/easytier-game.exe`;
|
||||
const releaseHelp = `${releaseDir}/帮助.txt`;
|
||||
const deleteEasytierFiles = ["logs/", "guiLogs/"];
|
||||
const pkg = require("./package.json");
|
||||
const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
|
||||
const releaseZipDir = "./release";
|
||||
const releaseZip = `${releaseZipDir}/${fileName}`;
|
||||
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
const archiver = require("archiver");
|
||||
|
||||
const output = fs.createWriteStream(path.join(__dirname, releaseZip));
|
||||
const archive = archiver("zip", {
|
||||
zlib: { level: 8 } // Sets the compression level.
|
||||
});
|
||||
|
||||
// listen for all archive data to be written
|
||||
// 'close' event is fired only when a file descriptor is involved
|
||||
output.on("close", function () {
|
||||
console.log(archive.pointer() + " total bytes");
|
||||
console.log(`archiver has been finalized and the output ${releaseZip}`);
|
||||
});
|
||||
|
||||
// This event is fired when the data source is drained no matter what was the data source.
|
||||
// It is not part of this library but rather from the NodeJS Stream API.
|
||||
// @see: https://nodejs.org/api/stream.html#stream_event_end
|
||||
output.on("end", function () {
|
||||
console.log("Data has been drained");
|
||||
});
|
||||
|
||||
// good practice to catch warnings (ie stat failures and other non-blocking errors)
|
||||
archive.on("warning", function (err) {
|
||||
if (err.code === "ENOENT") {
|
||||
// log warning
|
||||
} else {
|
||||
// throw error
|
||||
throw err;
|
||||
}
|
||||
});
|
||||
|
||||
archive.on("error", function (err) {
|
||||
throw err;
|
||||
});
|
||||
|
||||
for (const f of deleteEasytierFiles) {
|
||||
fs.rmSync(path.join(__dirname, releaseDirEasytier + f), { recursive: true, force: true });
|
||||
}
|
||||
const r = path.join(__dirname, releaseZipDir);
|
||||
if (!fs.existsSync(r)) {
|
||||
fs.mkdirSync(r);
|
||||
}
|
||||
|
||||
// pipe archive data to the file
|
||||
archive.pipe(output);
|
||||
archive
|
||||
.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
|
||||
.append(fs.createReadStream(path.join(__dirname, releaseHelp)), { name: "帮助.txt" })
|
||||
.directory(path.join(__dirname, releaseDirEasytier), "easytier")
|
||||
.finalize();
|
||||
Reference in New Issue
Block a user