Compare commits

...
14 Commits
Author SHA1 Message Date
黑先森 ef172e4d4c 增加base64编码分享和导入 界面配置 #1
优化是否联机成功的判断,优化本地存储日志数量
2024-11-05 18:30:08 +08:00
leizi97 1a5d2cc8fc 托盘图标增加主题切换功能,调整成员列表延迟至前方,增加nat类型查看,修复自定义网卡无法保存信息的问题 2024-11-04 22:38:53 +08:00
leizi97 cf351b8708 增加根据windows主题切换主题颜色的功能,优化高级配置界面显示,增加网卡名称配置 2024-11-04 21:23:20 +08:00
leizi97 ddf4c32ae6 主题颜色跟随window进行切换 2024-11-04 01:05:51 +08:00
leizi97 3adf64e251 增加标题版本号,系统托盘按钮顺序切换 2024-11-03 23:09:13 +08:00
leizi97 4e4ebf1246 UAC开机自启版本回退 2024-11-03 22:17:59 +08:00
黑先森 4296f4a338 修复与功能更新
1.解决UAC开机自启失败的问题
2.联机成功后右下角图标增加 ip地址的 tooltip提示
3.高级选项: 新增软件启动自动联机的功能开关,搭配修复后的开机自启功能,可实现类windows服务的无感联机
4.高级选项:增加日志配置
2024-11-01 18:36:56 +08:00
leizi97 60078f00f7 增加宽度,减少间隔,避免个别电脑出现布局错误 2024-10-29 23:31:11 +08:00
leizi97 d0567e96b5 新增配置文件启动,修复部分文本缺失 2024-10-29 22:48:56 +08:00
黑先森 8c911f47f9 优化日志输出和提示 成员列表显示bug修复 优化打包后的目录结构,清爽干净 2024-10-25 18:40:47 +08:00
leizi97 f3fc37957c 增加子网代理和部分高级配置功能 升级tauri到2.0.6 2024-10-23 21:58:36 +08:00
黑先森 a4d6fe6e95 封装二级弹窗方法,新增子网代理和高级配置按钮,新增子网代理页面 2024-10-23 18:37:11 +08:00
黑先森 9b883d686d 优化界面css,增加部分页面autostart权限
-- 更新 element-plus 2.7.1 -> 2.8.6 并修复升级后的问题
-- 升级autostart插件为2.0.1 win10测试开机自启成功
2024-10-22 19:09:45 +08:00
黑先森 2ac0afb847 插件版本更新,rust打包使用1.77.2,支持win7 2024-10-21 10:51:16 +08:00
37 changed files with 1984 additions and 888 deletions
+5
View File
@@ -4,4 +4,9 @@
</NuxtLayout>
</template>
<script setup lang="ts">
import useMainStore from "@/stores/index";
import { initTheme } from "@/composables/theme";
const mainStore = useMainStore();
// console.log(mainStore.theme)
initTheme(mainStore.theme);
</script>
+9 -18
View File
@@ -1,14 +1,14 @@
@tailwind base;
/* @tailwind base; */
/*
用于进行主题更换,如果要更换elemenet-plus-ui的主题记得加上!important,不然更换会失败
*/
@layer base {
/* @layer base {
html {
font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", STHeiti, "Microsoft YaHei";
}
}
} */
html,
body {
@@ -19,25 +19,16 @@ body {
* {
outline: none;
}
body {
background-color: #fff;
}
html.dark body {
background-color: #000;
}
#__easytier {
height: 100%;
overflow: hidden;
background-color: #fff;
box-sizing: border-box;
padding: 3px 5px;
}
::-webkit-scrollbar {
width: 6px;
}
::-webkit-scrollbar-thumb {
background-color: #0003;
border-radius: 10px;
transition: all 0.2s ease-in-out;
}
::-webkit-scrollbar-track {
border-radius: 10px;
}
+21
View File
@@ -0,0 +1,21 @@
import { useDark, useToggle, usePreferredDark } from "@vueuse/core";
import { isFunction } from "lodash-es";
// const isDark = usePreferredDark();
const darkConfig = useDark({
selector: "html",
attribute: "class",
valueDark: "dark",
valueLight: "",
});
const toggleDark = useToggle(darkConfig);
export const initTheme = (isDark: boolean) => {
if (isDark && isFunction(toggleDark)) {
toggleDark(isDark);
}
};
export const setTheme = (dark: boolean) => {
if (isFunction(toggleDark)) {
toggleDark(dark);
}
}
+40 -20
View File
@@ -2,6 +2,8 @@ import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
import { TrayIcon } from "@tauri-apps/api/tray";
import { getCurrentWindow } from "@tauri-apps/api/window";
import pkg from "@/package.json";
import { setTheme } from "~/composables/theme";
import useMainStore from "@/stores/index";
const DEFAULT_TRAY_NAME = "main";
@@ -20,16 +22,16 @@ export async function useTray(init: boolean = false, beforExit: Function) {
tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
if (!tray) {
tray = await TrayIcon.new({
tooltip: `EasyTier\n${pkg.version}`,
title: `EasyTier\n${pkg.version}`,
tooltip: `EasyTierGame\n${pkg.version}`,
title: `EasyTierGame\n${pkg.version}`,
id: DEFAULT_TRAY_NAME,
menu: await Menu.new({
id: "main",
items: await generateMenuItem(beforExit)
items: await generateMenuItem(beforExit),
}),
action: async e => {
action: async (e) => {
toggleVisibility();
}
},
});
}
} catch (error) {
@@ -38,12 +40,12 @@ export async function useTray(init: boolean = false, beforExit: Function) {
}
if (init) {
tray.setTooltip(`EasyTier\n${pkg.version}`);
tray.setTooltip(`EasyTierGame\n${pkg.version}`);
tray.setMenuOnLeftClick(false);
tray.setMenu(
await Menu.new({
id: "main",
items: await generateMenuItem(beforExit)
items: await generateMenuItem(beforExit),
})
);
}
@@ -52,7 +54,12 @@ export async function useTray(init: boolean = false, beforExit: Function) {
}
export async function generateMenuItem(beforExit: Function) {
return [await MenuItemExit("退出", beforExit), await PredefinedMenuItem.new({ item: "Separator" }), await MenuItemShow("显示 / 隐藏")];
return [
await MenuItemShow("显示 / 隐藏"),
await MenuItemTheme(),
await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemExit("退出", beforExit),
];
}
export async function MenuItemExit(text: string, beforExit: Function) {
@@ -64,7 +71,7 @@ export async function MenuItemExit(text: string, beforExit: Function) {
await beforExit();
}
await getCurrentWindow().close();
}
},
});
}
@@ -74,7 +81,21 @@ export async function MenuItemShow(text: string) {
text,
action: async () => {
await toggleVisibility();
}
},
});
}
export async function MenuItemTheme() {
return await MenuItem.new({
id: "theme",
text: "主题切换",
action: async () => {
const mainStore = useMainStore();
mainStore.theme = !mainStore.theme;
// const appWindow = getCurrentWindow();
// appWindow.emitTo("main", "config", { theme: mainStore.theme });
await setTheme(mainStore.theme);
},
});
}
@@ -92,15 +113,14 @@ export async function MenuItemShow(text: string) {
export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean = false) {
if (!tray) return;
tray.setIcon(isRunning ? "icons/icon-inactive.ico" : "icons/icon.ico");
await tray.setIcon(isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico");
}
// export async function setTrayTooltip(tooltip: string) {
// if (tooltip) {
// const tray = await useTray()
// if (!tray)
// return
// tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`)
// tray.setTitle(`EasyTier\n${pkg.version}\n${tooltip}`)
// }
// }
export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) {
if (!tray) return;
if (tooltip) {
await tray.setTooltip(`EasyTierGame\n${pkg.version}\n${tooltip}`);
} else {
await tray.setTooltip(`EasyTierGame\n${pkg.version}`);
}
}
+53
View File
@@ -0,0 +1,53 @@
import { type UnlistenFn } from "@tauri-apps/api/event";
import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window } from "@tauri-apps/api/window";
import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
import type { WebviewLabel, WebviewOptions, } from "@tauri-apps/api/webview";
export default async (
label: WebviewLabel,
options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
beforeCloseFunc?: () => void | null
) => {
let defaultOpts = {
parent: undefined,
closable: true,
resizable: true,
decorations: true,
maximizable: false,
minimizable: false,
x: 0,
y: 0
};
const appWindow = getCurrentWindow();
if (appWindow) {
const appSize = await appWindow.outerSize();
const factor = await appWindow.scaleFactor();
const appPosition = await appWindow.outerPosition();
const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
defaultOpts.parent = appWindow as any;
defaultOpts.x = logicalPosition.x;
defaultOpts.y = logicalPosition.y;
}
let unListenlogClose: UnlistenFn | null = null;
let unlistenLogCreated: UnlistenFn | null = null;
let dialog = await WebviewWindow.getByLabel(label);
if (!dialog) {
dialog = new WebviewWindow(label, {...defaultOpts, ...options});
unlistenLogCreated = await dialog.once("tauri://webview-created", async () => {
if (dialog) {
afterCreatedFunc && (await afterCreatedFunc(dialog, appWindow));
await dialog.show();
}
});
unListenlogClose = await dialog.onCloseRequested(async () => {
beforeCloseFunc && (await beforeCloseFunc());
unListenlogClose && (await unListenlogClose());
});
} else {
const visible = await dialog.isVisible();
if (visible) {
await dialog.close();
unlistenLogCreated && (await (unlistenLogCreated as Function)());
}
}
};
+3
View File
@@ -0,0 +1,3 @@
VITE_CONFIG_PATH=easytier/config/
VITE_LOG_PATH=easytier/logs/
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
+3
View File
@@ -0,0 +1,3 @@
VITE_CONFIG_PATH=easytier/config/
VITE_LOG_PATH=easytier/logs/
VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart
+3 -1
View File
@@ -5,6 +5,8 @@
<script setup lang="tsx">
//屏蔽右键菜单
document.addEventListener("contextmenu", (e: MouseEvent) => {
e.preventDefault();
if (import.meta.env.PROD) {
e.preventDefault();
}
});
</script>
+1 -1
View File
@@ -22,7 +22,7 @@ export default defineNuxtConfig({
autoImport: false
},
css: ["~/assets/css/main.css"],
css: ["~/assets/css/main.css", 'element-plus/theme-chalk/dark/css-vars.css'],
modules: ["@element-plus/nuxt", "@pinia/nuxt", "@pinia-plugin-persistedstate/nuxt", "@nuxtjs/tailwindcss"],
alias: {
+6 -4
View File
@@ -3,7 +3,7 @@
"private": true,
"author": "leizi97",
"description": "A simple network initiator based on Easytier",
"version": "1.0.6",
"version": "1.1.4",
"scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod"
@@ -23,10 +23,10 @@
"@types/lodash-es": "^4.17.12",
"@types/qs": "^6.9.15",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"@vueuse/core": "^11.2.0",
"dayjs": "^1.11.10",
"defu": "^6.1.4",
"element-plus": "^2.7.1",
"javascript-obfuscator": "^4.1.0",
"element-plus": "^2.8.6",
"less": "^4.2.0",
"lodash-es": "^4.17.21",
"nuxt": "^3.11.2",
@@ -39,6 +39,8 @@
"xlsx": "^0.18.5"
},
"dependencies": {
"@tauri-apps/plugin-autostart": "~2"
"@tauri-apps/plugin-autostart": "~2",
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
"@tauri-apps/plugin-fs": "~2"
}
}
+70
View File
@@ -0,0 +1,70 @@
<template>
<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
<div class="flex items-center gap-[10px]">
<ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
<ElInput maxlength="10" v-model="mainStore.config.devNameValue" placeholder="请输入网卡名"/>
</div>
<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口只连接到对等节点</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后自动"启动联机"(搭配开机自启无感联机)</ElCheckbox></div>
<div class="flex items-center gap-[15px] flex-nowrap">
<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
<div class="w-[140px]">
<ElSelect
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>
<ElDivider />
<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密默认为false必须与对等节点相同</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时默认为单线程</ElCheckbox></div>
<ElDivider />
<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备可以使用子网代理访问节点</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.relayAllPeerrpc">转发所有对等节点的RPC数据包即使对等节点不在转发网络白名单内</ElCheckbox>
</div>
</div>
</template>
<script setup lang="ts">
import useMainStore from "@/stores/index";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
import { Command } from "@tauri-apps/plugin-shell";
import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
const mainStore = useMainStore();
const appWindow = getCurrentWindow();
const data = ["trace", "debug", "info", "warn", "error", "off"];
const openLogDir = async () => {
const resourceDir = await getResourceDir();
const logPath = import.meta.env.VITE_LOG_PATH;
const logDirPath = await join(resourceDir, logPath);
const isExists = await exists(logPath, { baseDir: BaseDirectory.Resource });
if (!isExists) {
try {
await mkdir(logPath, { baseDir: BaseDirectory.Resource });
} catch (err) {}
}
await Command.create("explorer", [logDirPath]).execute();
};
mainStore.$subscribe((...a) => {
// console.log("subscribe", a);
appWindow.emitTo("main", "config", { config: { ...mainStore.config } });
});
</script>
+25
View File
@@ -0,0 +1,25 @@
<template>
<div class="h-full flex flex-col gap-[10px]">
<ElRadioGroup v-model="mainStore.cidrEnable">
<ElRadioButton :value="true">开启</ElRadioButton>
<ElRadioButton :value="false">关闭</ElRadioButton>
</ElRadioGroup>
<div class="flex-1 overflow-auto">
<ElInput
placeholder="例如: 192.168.1.0/24 一行一个"
v-model="mainStore.config.proxyNetworks"
type="textarea"
:rows="30"
resize="none"></ElInput>
</div>
</div>
</template>
<script setup lang="ts">
import useMainStore from "@/stores/index";
import { getCurrentWindow } from "@tauri-apps/api/window";
const mainStore = useMainStore();
const appWindow = getCurrentWindow();
mainStore.$subscribe((...a) => {
appWindow.emitTo("main", "config", { cidrEnable: mainStore.cidrEnable, config: { ...mainStore.config } });
});
</script>
+429 -130
View File
@@ -16,7 +16,7 @@
effect="dark"
:type="data.isSuccessGetIp ? 'success' : 'info'"
>
{{ data.isSuccessGetIp ? "联机成功" : "联机中" }}
{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
</ElTag>
<ElButton
v-if="!data.coreVersion"
@@ -28,7 +28,7 @@
v-else
type="info"
>
core-{{ data.coreVersion }}
{{ data.coreVersion }}
</ElTag>
<ElButton
:disabled="data.isStart"
@@ -37,7 +37,7 @@
@click="handleUpdateCore"
size="small"
>
{{ data.coreVersion ? "更新" : "下载" }}
{{ data.coreVersion ? "更新插件" : "下载插件" }}
</ElButton>
</div>
</template>
@@ -54,6 +54,7 @@
placeholder="协议"
multiple
collapse-tags
@click.stop
v-model="config.protocol"
@change="handleServerUrlChange"
>
@@ -166,22 +167,47 @@
></ElInput>
</ElFormItem>
</div>
<div class="flex items-start gap-[0_30px]">
<div class="w-[95px]">
<div class="flex items-start gap-[0_10px]">
<div class="w-[122px]">
<div>
<ElButton
<ElDropdown
@command="handleStartCommand"
split-button
size="default"
:type="!data.isStart ? 'primary' : 'danger'"
:disabled="data.startLoading || !data.coreVersion || data.update"
@click="handleConnection"
size="default"
>
{{ !data.isStart ? "启动联机" : "停止联机" }}
</ElButton>
<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]">
<div class="mt-[6px] pl-[2px]">
<ElTooltip
placement="right"
:content="data.logVisible ? '关闭日志' : '打开日志'"
placement="left"
content="日志"
>
<ElButton
:type="!data.logVisible ? 'info' : 'warning'"
@@ -193,7 +219,7 @@
</ElTooltip>
<ElTooltip
placement="left"
content="成员信息"
content="成员"
>
<ElButton
@click="handleShowMemberDialog"
@@ -210,13 +236,7 @@
v-model="config.disbleP2p"
size="small"
>
禁用p2p
</ElCheckbox>
<ElCheckbox
v-model="config.disableIpv6"
size="small"
>
禁用ipv6
强制中转
</ElCheckbox>
<ElCheckbox
@change="handleAutoStart"
@@ -225,12 +245,20 @@
>
开机自启
</ElCheckbox>
<ElCheckbox
v-model="config.disbleListenner"
size="small"
>
禁用端口监听
</ElCheckbox>
<div>
<ElButton
@click="handleShowCidrDialog"
:icon="Share"
>
子网代理
</ElButton>
<ElButton
@click="handleShowAdvanceDialog"
:icon="Setting"
>
高级选项
</ElButton>
</div>
<div class="flex items-center gap-[0_5px]">
<div>
<ElLink
@@ -266,19 +294,107 @@
</div>
</div>
</ElForm>
<ElDialog
width="95%"
top="10px"
class="!mb-0"
v-model="importConfigData.visible"
:close-on-press-escape="false"
title="导入分享"
>
<ElInput
type="textarea"
:rows="6"
placeholder="请粘贴分享的配置"
v-model="importConfigData.data"
></ElInput>
<template #footer>
<div>
<el-text type="danger">导入成功后您当前的配置将被完全替换</el-text>
</div>
<div class="text-right">
<ElButton
size="small"
@click="handleStartImport"
type="primary"
>
导入
</ElButton>
</div>
</template>
</ElDialog>
<ElDialog
width="95%"
top="30px"
class="!mb-0"
v-model="configStart.visible"
:close-on-press-escape="false"
title="配置文件启动"
>
<div class="flex items-center gap-[0_4px]">
<span>启用</span>
<ElSwitch v-model="mainStore.configStartEnable"></ElSwitch>
<ElTooltip content="启用后将完全使用选中的配置文件作为联机配置,其余界面配置不会生效">
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
</ElTooltip>
<ElButton
@click="openConfigDir"
size="small"
>
打开配置目录
</ElButton>
<ElButton
@click="handleStartCommand('toml')"
type="primary"
:icon="RefreshRight"
size="small"
>
刷新
</ElButton>
</div>
<div class="mt-[5px]">
<ElSelect
v-model="mainStore.configPath"
no-data-text="目录没有配置文件"
placeholder="选择配置文件"
>
<ElOption
v-for="item in configStart.list"
:key="item.path"
:value="item.path"
:label="item.name"
></ElOption>
</ElSelect>
</div>
<template #footer>
<div class="text-right">
<ElButton
size="small"
@click="configStart.visible = false"
type="danger"
>
关闭
</ElButton>
</div>
</template>
</ElDialog>
</template>
<script setup lang="ts">
import { invoke } from "@tauri-apps/api/core";
import { listen, type UnlistenFn } from "@tauri-apps/api/event";
import { listen } from "@tauri-apps/api/event";
import { open, Command } from "@tauri-apps/plugin-shell";
import { QuestionFilled, Delete, List, UserFilled } from "@element-plus/icons-vue";
import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools } from "@element-plus/icons-vue";
import { reactive, onBeforeUnmount, onMounted } from "vue";
import { useTray, setTrayRunState } from "~/composables/tray";
import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
import useMainStore from "@/stores/index";
import { ElMessage } from "element-plus";
import { getCurrentWindow, LogicalPosition, PhysicalPosition } from "@tauri-apps/api/window";
import { WebviewWindow, getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
import { ElDropdownMenu, ElMessage, ElMessageBox } from "element-plus";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
import etWindows from "@/composables/windows";
import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
import { readDir, exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
let is_close = false;
@@ -290,9 +406,12 @@
const mainStore = useMainStore();
const config = mainStore.config;
// console.log(config);
const protocols = ["tcp", "udp", "ws", "wss", "wg"];
const data = reactive({
logVisible: false,
cidrVisible: false,
advanceVisible: false,
winipBcPid: 0, //WinIPBroadcast进程id
winipBcStart: false,
memberVisible: false,
@@ -302,15 +421,29 @@
coreVersion: "",
isSuccessGetIp: false,
startLoading: false,
isStart: false
isStart: false,
connectionSuccess: false
});
const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
visible: false,
loading: false,
list: [] //配置文件列表
});
const importConfigData = reactive<{ data: ""; [key: string]: any }>({
visible: false,
loading: false,
data: ""
});
const closePrevent = async () => {
const appWindow = getCurrentWindow();
if (appWindow.label == "main") {
appWindow.onCloseRequested(async event => {
console.log(appWindow.label);
// console.log(appWindow.label);
if (!is_close) {
// console.log(1);
event.preventDefault();
appWindow.hide();
}
@@ -337,6 +470,7 @@
const listenObj: { [key: string]: any } = {
unListenOutPut: null,
unListenThreadId: null,
unListenConfigStart: null,
thread_id: null,
async listenOutput() {
const appWindow = getCurrentWindow();
@@ -345,10 +479,19 @@
if (event.payload) {
data.startLoading = false;
let ipv4 = /new: Some\((\d+\.\d+\.\d+\.\d+)\/.*\)/g.exec(event.payload as string)?.[1];
if (ipv4) {
data.isSuccessGetIp = true;
await setTrayRunState(tray, true);
config.ipv4 = ipv4;
if (config.dhcp) {
if (ipv4) {
config.ipv4 = ipv4;
await setTrayRunState(tray, true);
data.isSuccessGetIp = true;
await setTrayTooltip(tray, `IP: ${ipv4}`);
}
} else {
if ((event.payload as string).includes("new peer connection added")) {
await setTrayRunState(tray, true);
data.isSuccessGetIp = true;
await setTrayTooltip(tray, `IP: ${config.ipv4}`);
}
}
}
appWindow.emitTo("log", "logs", data.log);
@@ -363,6 +506,15 @@
}
});
this.unListenThreadId = unListen;
},
async listenConfigStart() {
const unListen = await listen("config", event => {
// console.log("config", event.payload);
const ipv4 = config.ipv4;
mainStore.$patch(event.payload as any);
config.ipv4 = ipv4;
});
this.unListenConfigStart = unListen;
}
};
@@ -384,11 +536,11 @@
await getReleaseList();
const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
if (latestVersionFileName) {
console.log(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
// console.log(latestVersionFileName, /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName));
const latestVersion = /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName)?.[1];
const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1];
if (latestVersion && currentVersion != latestVersion) {
console.log({ currentVersion, latestVersion });
// console.log({ currentVersion, latestVersion });
ElMessage.success(`更新 -> ${latestVersion}`);
const downloadUrl = data.releaseList?.[0]?.[0]?.[2];
return [true, downloadUrl, latestVersionFileName];
@@ -497,25 +649,68 @@
}
};
const handleAutoStartByTask = async () => {
await invoke("spawn_autostart", { enabled: !config.autoStart });
const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
config.autoStart = is_enable_by_task;
};
const compatibleInitAutoStart = async () => {
try {
const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
if (is_enable_by_task) {
await tauriAutoStart.enable();
await invoke("spawn_autostart", { enabled: false });
}
const is_enable = await tauriAutoStart.isEnabled();
config.autoStart = is_enable;
} catch (err) {
await invoke("spawn_autostart", { enabled: false });
await tauriAutoStart.disable();
config.autoStart = false;
}
};
const initConnectAfterStart = async () => {
if (config.coonectAfterStart && data.coreVersion) {
await reset();
await handleConnection();
}
};
let logsTimer: NodeJS.Timeout | null = null;
onMounted(async () => {
// await handleUpdateCore(); //默认不自动更新
await initAutoStart();
await compatibleInitAutoStart();
// await initAutoStart();
await initStartWinIpBroadcast();
await getCoreVersion();
await listenObj.listenThreadId();
await listenObj.listenConfigStart();
await initConfigDir();
await initConnectAfterStart();
closePrevent();
});
onBeforeUnmount(() => {
unListenAll();
listenObj.unListenReleaseList && listenObj.unListenReleaseList();
listenObj.unListenConfigStart && listenObj.unListenConfigStart();
logsTimer && clearInterval(logsTimer);
});
const getArgs = () => {
const getArgs = async () => {
// console.log(config.proxyNetworks);
const args = [];
if (mainStore.configStartEnable && mainStore.configPath) {
// const resourceDir = await getResourceDir();
// const configPath = await join(resourceDir, mainStore.configPath);
// args.push("-c", configPath);
args.push("-c", mainStore.configPath);
return args;
}
if (config.dhcp) {
args.push("-d");
}
@@ -544,6 +739,46 @@
if (config.disbleListenner) {
args.push("--no-listener");
}
if (mainStore.cidrEnable && config.proxyNetworks) {
// console.log(config.proxyNetworks);
const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
const formatProxyNetworks = config.proxyNetworks
.split("\n")
.map(item => item.trim())
.filter(item => item && reg.test(item));
args.push("--proxy-networks", ...formatProxyNetworks);
config.proxyNetworks = formatProxyNetworks.join("\n");
}
if (config.disableEncryption) {
args.push("--disable-encryption");
}
if (config.multiThread) {
args.push("--multi-thread");
}
if (config.enablExitNode) {
args.push("--enable-exit-node");
}
if (config.noTun) {
args.push("--no-tun");
}
if (config.latencyfirst) {
args.push("--latency-first");
}
if (config.useSmoltcp) {
args.push("--use-smoltcp");
}
if (config.disableUdpHolePunching) {
args.push("--disable-udp-hole-punching");
}
if (config.relayAllPeerrpc) {
args.push("--relay-all-peer-rpc");
}
if (config.saveErrorLog) {
args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
}
if (config.devName && config.devNameValue) {
args.push("--dev-name", config.devNameValue);
}
return args;
};
@@ -565,6 +800,7 @@
}
}
await setTrayRunState(tray, false);
await setTrayTooltip(tray);
await unListenAll();
};
@@ -572,18 +808,95 @@
if (data.isStart) {
await reset();
} else {
const args = await getArgs();
if (!args || args.length <= 0) {
return ElMessage.error("无配置");
}
data.log = ""; //清空日志
data.startLoading = true;
await unListenAll();
await listenObj.listenOutput();
const args = getArgs();
await invoke("run_command", {
args
});
}
};
let unListenMemberClose: UnlistenFn | null = null;
let unlistenMemberCreated: UnlistenFn | null = null;
//configStart
const handleStartCommand = async (command: string | number | object) => {
if (command === "toml") {
configStart.visible = true;
const path = import.meta.env.VITE_CONFIG_PATH;
const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
if (isExists) {
const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
configStart.list = entries
.filter(item => item.isFile)
.map(item => ({
name: item.name,
path: `${path}${item.name}`
})) as any;
} else {
mainStore.configStartEnable = false;
mainStore.configPath = "";
try {
await mkdir(path, { baseDir: BaseDirectory.Resource });
} catch (err) {}
}
}
if (command === "share_config") {
try {
await writeText(btoa(JSON.stringify({ config: mainStore.config })));
ElMessage.success("配置已复制");
} catch (err) {
ElMessage.error("分享失败");
}
}
if (command === "import_config") {
importConfigData.data = "";
importConfigData.visible = true;
}
};
const handleStartImport = async () => {
try {
await ElMessageBox.confirm("确定导入?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消"
});
const payload = JSON.parse(atob(importConfigData.data));
mainStore.$patch(payload);
ElMessage.success("导入成功");
importConfigData.visible = false;
mainStore.basePeers = [...new Set([config.serverUrl, ...mainStore.basePeers])];
} catch (err) {
if (err !== "cancel") {
ElMessage.error("导入失败");
}
}
};
const initConfigDir = async () => {
const path = import.meta.env.VITE_CONFIG_PATH;
const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
if (!isExists) {
mainStore.configStartEnable = false;
mainStore.configPath = "";
try {
await mkdir(path, { baseDir: BaseDirectory.Resource });
} catch (err) {}
}
};
const openConfigDir = async () => {
const resourceDir = await getResourceDir();
const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_PATH);
// console.log(configPath);
await Command.create("explorer", [configPath]).execute();
};
const handleShowMemberDialog = async () => {
if (!data.isStart) {
return ElMessage.warning("请先开始联机");
@@ -591,96 +904,82 @@
if (!mainStore.config.ipv4) {
return ElMessage.warning("请等待获取IP");
}
const appWindow = getCurrentWindow();
if (appWindow) {
const appSize = await appWindow.outerSize();
const factor = await appWindow.scaleFactor();
const appPosition = await appWindow.outerPosition();
const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
let memberDialog = await WebviewWindow.getByLabel("member");
if (!memberDialog) {
memberDialog = new WebviewWindow("member", {
title: "成员列表",
width: 470,
height: 380,
parent: appWindow,
closable: true,
resizable: true,
decorations: true,
maximizable: false,
minimizable: false,
x: logicalPosition.x,
y: logicalPosition.y,
url: "#/member"
});
unlistenMemberCreated = await memberDialog.once("tauri://webview-created", async () => {
if (memberDialog) {
data.logVisible = true;
await memberDialog.show();
}
});
unListenMemberClose = await memberDialog.onCloseRequested(() => {
data.logVisible = false;
unListenMemberClose && unListenMemberClose();
});
} else {
const visible = await memberDialog.isVisible();
if (visible) {
data.memberVisible = false;
await memberDialog.close();
unlistenMemberCreated && unlistenMemberCreated();
}
await etWindows(
"member",
{
title: "成员列表",
width: 470,
height: 380,
url: "#/member"
},
() => {
data.memberVisible = true;
},
() => {
data.memberVisible = false;
}
}
);
};
let unListenlogClose: UnlistenFn | null = null;
let unlistenLogCreated: UnlistenFn | null = null;
const handleShowLogDialog = async () => {
logsTimer && clearInterval(logsTimer);
const appWindow = getCurrentWindow();
if (appWindow) {
const appSize = await appWindow.outerSize();
const factor = await appWindow.scaleFactor();
const appPosition = await appWindow.outerPosition();
const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
let infoDialog = await WebviewWindow.getByLabel("log");
if (!infoDialog) {
infoDialog = new WebviewWindow("log", {
title: "日志",
width: 600,
height: 380,
parent: appWindow,
closable: true,
resizable: false,
decorations: true,
maximizable: false,
minimizable: false,
x: logicalPosition.x,
y: logicalPosition.y,
url: "#/log"
});
unlistenLogCreated = await infoDialog.once("tauri://webview-created", async () => {
if (infoDialog) {
data.logVisible = true;
logsTimer = setInterval(() => {
appWindow.emitTo("log", "logs", data.log);
}, 3000);
await infoDialog.show();
}
});
unListenlogClose = await infoDialog.onCloseRequested(() => {
data.logVisible = false;
unListenlogClose && unListenlogClose();
});
} else {
const visible = await infoDialog.isVisible();
if (visible) {
data.logVisible = false;
await infoDialog.close();
unlistenLogCreated && unlistenLogCreated();
}
await etWindows(
"log",
{
title: "联机日志",
width: 600,
height: 380,
resizable: false,
url: "#/log"
},
(_, appWindow) => {
data.logVisible = true;
logsTimer && clearInterval(logsTimer);
logsTimer = setInterval(() => {
appWindow.emitTo("log", "logs", data.log ? (data.log as string).split("\n").slice(-1000).join("\n") : "");
}, 600);
},
() => {
data.logVisible = false;
}
}
);
};
const handleShowCidrDialog = async () => {
await etWindows(
"cidr",
{
title: "子网代理",
width: 600,
height: 380,
resizable: false,
url: "#/cidr"
},
(_, appWindow) => {
data.cidrVisible = true;
},
() => {
data.cidrVisible = false;
}
);
};
const handleShowAdvanceDialog = async () => {
await etWindows(
"advance",
{
title: "高级选项",
width: 600,
height: 380,
resizable: false,
url: "#/advance"
},
(_, appWindow) => {
data.advanceVisible = true;
},
() => {
data.advanceVisible = false;
}
);
};
</script>
+2 -2
View File
@@ -1,11 +1,11 @@
<template>
<ElInput
type="textarea"
rows="17"
:rows="17"
v-model="data.log"
resize="none"
readonly
placeholder="等待日志中..."
placeholder="等待日志中,请先'启动联机'..."
/>
</template>
<script setup lang="ts">
+20 -138
View File
@@ -5,13 +5,11 @@
<ElTable
stripe
:data="data.member"
v-else
>
v-else>
<ElTableColumn
v-for="prop in showTableHeader"
:label="prop[1]"
:key="prop[0]"
>
:key="prop[0]">
<template #default="{ row }">
<span v-if="prop[0] == 'loss_rate'">
{{ row[prop[0]] && row[prop[0]] != "-" ? Number(row[prop[0]] * 100).toFixed(2) + "%" : row[prop[0]] }}
@@ -20,8 +18,7 @@
<ElTag
v-else
effect="dark"
:type="row[prop[0]] == 'p2p' ? 'success' : 'info'"
>
:type="row[prop[0]] == 'p2p' ? 'success' : 'info'">
{{ row[prop[0]] }}
</ElTag>
</template>
@@ -33,149 +30,34 @@
<script setup lang="ts">
import { invoke } from "@tauri-apps/api/core";
import { reactive, onMounted, onBeforeUnmount } from "vue";
import { parsePeerInfo } from "@/utils";
const data = reactive<{ member: any[] }>({
member: []
member: [],
});
const showTableHeader = [
["ipv4", "虚拟网IP"],
["hostname", "主机名"],
["cost", "路由"],
["lat_ms", "延迟/ms"],
["ipv4", "虚拟网IP"],
["cost", "路由"],
["loss_rate", "丢包率"],
["version", "版本"]
["nat_type", "NAT类型"],
["version", "版本"],
];
const headers = [
"ipv4",
"hostname",
"cost",
"lat_ms",
"loss_rate",
"rx_bytes",
"rx_unit",
"tx_bytes",
"tx_unit",
"tunnel_proto",
"nat_type",
"id",
"version"
];
const formatData = (data: any[]) => {
if (!data) return [];
const result = [];
let obj: any = {};
let length = data.length;
for (let idx = 0; idx < length; idx++) {
let headersIdx = idx % headers.length;
if (headersIdx === 0) {
console.log(idx, [...data]);
obj = {};
result.push(obj);
}
if (["ipv4"].includes(headers[headersIdx]) && !/\d+\.\d+\.\d+\.\d\/\d+/.test(data[idx]) && data[idx]) {
const next = data[idx];
data[idx] = "-";
const head = data.slice(0, idx);
const latest = data.slice(idx);
data = [...head, next, ...latest];
length = data.length;
} else if (["rx_bytes", "tx_bytes"].includes(headers[headersIdx]) && data[idx] == "-") {
const head = data.slice(0, idx);
const latest = data.slice(idx);
data = [...head, "-", ...latest];
length = data.length;
} else if (
["tunnel_proto"].includes(headers[headersIdx]) &&
![
"tcp",
"udp",
"ws",
"wss",
"wg",
"-",
"tcp,udp",
"ws,wss",
"tcp,udp,ws,wss,wg",
"tcp,ws,wss,wg",
"udp,ws,wss,wg",
"tcp,wg",
"udp,wg",
"tcp,ws",
"tcp,wss",
"udp,ws",
"udp,wss",
"tcp,udp,ws",
"tcp,udp,wss",
"tcp,udp,ws,wss",
"tcp,udp,ws,wss,wg",
"tcp,udp,wg",
"tcp,udp,ws,wg",
"udp,tcp",
"udp,tcp,ws",
"udp,tcp,wss",
"udp,tcp,ws,wss",
"udp,tcp,ws,wss,wg",
"udp,tcp,wg",
"udp,tcp,ws,wg",
"tcp,udp,wss,wg",
"tcp,udp,ws,wg",
"tcp,udp,wss,wg",
"ws,tcp",
"ws,udp",
"ws,tcp,udp",
"ws,tcp,udp,ws",
"ws,tcp,udp,wss",
"ws,tcp,udp,ws,wss",
"ws,tcp,udp,ws,wss,wg",
"ws,tcp,udp,wg",
"ws,tcp,udp,ws,wg",
"ws,udp,tcp",
"ws,udp,tcp,ws",
"ws,udp,tcp,wss",
"ws,udp,tcp,ws,wss",
"wss,tcp",
"wss,udp",
"wss,tcp,udp",
"wss,tcp,udp,ws",
"wss,tcp,udp,wss",
"wss,tcp,udp,ws,wss",
"wss,tcp,udp,ws,wss,wg",
"wss,tcp,udp,wg",
"wg,tcp",
"wg,udp",
"wg,tcp,udp",
"wg,tcp,udp,ws",
"wg,tcp,udp,wss",
"wg,tcp,udp,ws,wss",
"wg,tcp,udp,ws,wss,wg",
"wg,tcp,udp,wg",
"wg,udp,tcp"
].includes(data[idx])
) {
const head = data.slice(0, idx);
const latest = data.slice(idx);
data = [...head, "-", ...latest];
length = data.length;
}
obj[headers[headersIdx]] = data[idx];
}
return result;
};
const listenOutput = async () => {
const member = await invoke("get_members_by_cli");
let memberData = ((member as string) || "")
.replace(/[\│\├\┌\└\─\┬\┴\┼\┤\┐\┘]+/g, "")
.split(" ")
.filter(el => el && !["\n", "\n\n"].includes(el))
.slice(11);
if (memberData.length <= 0) {
return;
}
const result = formatData(memberData);
data.member = result;
console.log({ member: data.member });
const peerInfo = parsePeerInfo(member as string);
peerInfo.forEach((value) => {
if (value.cost === "Local") {
value.cost = "本机";
}
if (value.ipv4 && value.ipv4.includes("/")) {
value.ipv4 = value.ipv4.split("/")[0];
}
});
// console.log(peerInfo);
data.member = peerInfo;
};
let timer: NodeJS.Timeout | null = null;
+75 -430
View File
File diff suppressed because it is too large Load Diff
+1 -2
View File
@@ -2,5 +2,4 @@
# will have compiled files and executables
/target/
/gen/schemas
/easytier-windows-x86_64-v2.0.3.zip
/easytier-windows-x86_64/
/easytier/
+751 -50
View File
File diff suppressed because it is too large Load Diff
+17 -7
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.0.6"
version = "1.1.4"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier"
@@ -12,31 +12,41 @@ rust-version = "1.77.2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
name = "app_lib"
crate-type = ["staticlib", "cdylib", "rlib"]
[build-dependencies]
tauri-build = { version = "2.0.1", features = [] }
tauri-build = { version = "2.0.2", features = [] }
# prost-build = "0.13.2"
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
log = "0.4"
tauri = { version = "2.0.2", features = [
tauri = { version = "2.0.6", features = [
"tray-icon",
"image-png",
"image-ico",
] }
tauri-plugin-log = "2.0.0-rc"
tauri-plugin-shell = "2"
tauri-plugin-log = "2.0.1"
tauri-plugin-shell = "2.0.2"
reqwest = { version = "0.12", features = ["json"] }
zip = "2.2.0"
sysinfo = '0.32.0'
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
whoami = "1.5.2"
tauri-plugin-fs = "2"
tauri-plugin-clipboard-manager = "2.0.0-rc"
# prost = "0.13"
# prost-types = "0.13"
[dependencies.windows]
version = "0.58.0"
features = ["Win32_System_TaskScheduler"]
[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
tauri-plugin-autostart = "2"
tauri-plugin-single-instance = "2"
tauri-plugin-autostart = "2.0.1"
tauri-plugin-single-instance = "2.0.1"
+79 -49
View File
@@ -1,50 +1,80 @@
{
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "enables the default permissions",
"windows": ["main", "log"],
"permissions": [
"core:default",
"core:window:allow-minimize",
"core:window:allow-hide",
"core:window:allow-close",
"shell:allow-open",
"core:window:allow-show",
"core:window:allow-create",
"core:window:allow-set-position",
"core:window:allow-destroy",
"core:webview:allow-create-webview-window",
"core:webview:allow-set-webview-size",
"core:webview:allow-set-webview-position",
"core:webview:allow-create-webview",
"core:webview:allow-webview-show",
"core:webview:allow-webview-hide",
"core:webview:allow-webview-close",
"autostart:allow-enable",
"autostart:allow-disable",
"autostart:allow-is-enabled",
"core:tray:allow-get-by-id",
"core:tray:allow-set-icon",
"core:tray:allow-new",
{
"identifier": "shell:allow-spawn",
"allow": [
{
"args": ["run"],
"cmd": "WinIPBroadcast",
"name": "WinIPBroadcast"
}
]
},
{
"identifier": "shell:allow-execute",
"allow": [
{
"args": ["run"],
"cmd": "WinIPBroadcast",
"name": "WinIPBroadcast"
}
]
}
]
}
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "enables the default permissions",
"windows": [
"main",
"log",
"member",
"cidr",
"advance"
],
"permissions": [
"core:default",
"core:window:allow-minimize",
"core:window:allow-hide",
"core:window:allow-close",
"shell:allow-open",
"core:window:allow-show",
"core:window:allow-create",
"core:window:allow-set-position",
"core:window:allow-destroy",
"core:webview:allow-create-webview-window",
"core:webview:allow-set-webview-size",
"core:webview:allow-set-webview-position",
"core:webview:allow-create-webview",
"core:webview:allow-webview-show",
"core:webview:allow-webview-hide",
"core:webview:allow-webview-close",
"autostart:default",
"autostart:allow-enable",
"autostart:allow-disable",
"autostart:allow-is-enabled",
"core:tray:allow-get-by-id",
"core:tray:allow-set-icon",
"core:tray:allow-new",
{
"identifier": "shell:allow-spawn",
"allow": [
{
"args": [
"run"
],
"cmd": "easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
}
]
},
{
"identifier": "shell:allow-execute",
"allow": [
{
"args": [
"run"
],
"cmd": "easytier/tool/WinIPBroadcast",
"name": "WinIPBroadcast"
},
{
"args": true,
"cmd": "easytier/tool/nssm",
"name": "nssm"
},
{
"args": true,
"cmd": "explorer",
"name": "explorer"
}
]
},
"fs:default",
"fs:allow-read-dir",
"fs:allow-exists",
"fs:allow-open",
"fs:allow-resource-read",
"fs:allow-resource-read-recursive",
"clipboard-manager:allow-clear",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text"
]
}
-11
View File
@@ -1,11 +0,0 @@
{
"identifier": "desktop-capability",
"platforms": [
"macOS",
"windows",
"linux"
],
"permissions": [
"autostart:default"
]
}
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
这里存放每次打包需要用到的最新版本的easytier 和 相关工具
+23
View File
@@ -0,0 +1,23 @@
hostname = "Test1"
instance_name = "default"
instance_id = "8803362c-e4f1-4df1-93e8-721653945f77"
dhcp = true
listeners = [
"tcp://0.0.0.0:11010",
"udp://0.0.0.0:11010",
"wg://0.0.0.0:11011",
"ws://0.0.0.0:11011/",
"wss://0.0.0.0:11012/",
]
exit_nodes = []
rpc_portal = "0.0.0.0:15888"
[network_identity]
network_name = "default"
network_secret = ""
[[peer]]
uri = "tcp://public.easytier.top:11010"
[[peer]]
uri = "udp://public.easytier.top:11010"
Binary file not shown.
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.
+184 -12
View File
@@ -1,3 +1,7 @@
use planif::enums::TaskCreationFlags;
use planif::schedule::TaskScheduler as planIfTaskScheduler;
use planif::schedule_builder::{Action, ScheduleBuilder};
use planif::settings::{Duration, LogonType, PrincipalSettings, RunLevel};
use reqwest::{Client, Error};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
@@ -15,6 +19,10 @@ use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent}
use tauri::Emitter;
use tauri::Manager;
use tauri_plugin_autostart::MacosLauncher;
use windows::core::{BSTR, VARIANT};
use windows::Win32::Foundation::VARIANT_BOOL;
use windows::Win32::System::Com::*;
use windows::Win32::System::TaskScheduler::*;
// 定义GitHub Release的结构体
#[derive(Debug, Deserialize)]
@@ -52,7 +60,7 @@ pub async fn fetch_releases() -> Result<Vec<Release>, Error> {
#[tauri::command(rename_all = "snake_case")]
fn get_core_version() -> String {
match Command::new("easytier-core.exe")
match Command::new("easytier/easytier-core.exe")
.arg("--version")
.creation_flags(0x08000000)
.output()
@@ -67,7 +75,7 @@ fn get_core_version() -> String {
#[tauri::command(rename_all = "snake_case")]
fn get_cli_version() -> String {
match Command::new("easytier-cli.exe")
match Command::new("easytier/easytier-cli.exe")
.arg("--version")
.creation_flags(0x08000000)
.output()
@@ -114,7 +122,7 @@ struct MyResponse {
#[tauri::command(rename_all = "snake_case")]
fn get_members_by_cli() -> String {
match Command::new("easytier-cli.exe")
match Command::new("easytier/easytier-cli.exe")
.arg("peer")
.arg("list")
.creation_flags(0x08000000)
@@ -130,11 +138,17 @@ fn get_members_by_cli() -> String {
#[tauri::command(rename_all = "snake_case")]
async fn download_easytier_zip(download_url: String, file_name: String) {
let target = format!("https://ghp.ci/{}", download_url);
let target = format!("{}", download_url);
let response = reqwest::get(target)
.await
.expect("error to download easytier url");
let file_path = format!("./{}", file_name);
let file_path = format!("./easytier/{}", file_name);
let easytier_dir = path::Path::new("./easytier");
if !easytier_dir.exists() {
fs::create_dir_all(&easytier_dir).unwrap();
}
let path = path::Path::new(&file_path);
let mut file = match File::create(&path) {
@@ -183,7 +197,14 @@ fn unzip(fname: &path::Path) {
// fs::create_dir_all(p).unwrap();
// }
// }
let out_file_path = path::Path::new("./").join(outpath.file_name().clone().unwrap());
let easytier_dir = path::Path::new("./easytier");
// if !easytier_dir.exists() {
// fs::create_dir_all(&easytier_dir).unwrap();
// }
// let out_file_path = path::Path::new("./").join(outpath.file_name().clone().unwrap());
let out_file_path = easytier_dir.join(outpath.file_name().clone().unwrap());
println!("outFilePath: {}", out_file_path.display());
let mut outfile = fs::File::create(&out_file_path).unwrap();
std::io::copy(&mut file, &mut outfile).unwrap();
@@ -196,10 +217,6 @@ fn run_command(
args: Vec<String>,
stop_signal: tauri::State<Arc<AtomicBool>>,
) {
// if !path::Path::new("easytier-core.exe").exists() {
// app_handle.emit("command-output", "easytier-core.exe 不存在");
// return
// }
let (tx, rx) = mpsc::channel();
stop_signal.store(false, Ordering::Relaxed);
let app_handle1 = app_handle.clone();
@@ -208,7 +225,8 @@ fn run_command(
let stop_signal2 = Arc::clone(&stop_signal);
let args2 = args.clone();
thread::spawn(move || {
let mut child = Command::new("easytier-core.exe")
// trace, debug, info, warn, error, off
let mut child = Command::new("easytier/easytier-core.exe")
.args(args)
.creation_flags(0x08000000)
.stdout(Stdio::piped())
@@ -332,6 +350,155 @@ fn search_pid_by_pname(target_process_name: String) -> u32 {
return 0;
}
#[tauri::command]
fn get_exe_directory() -> Vec<String> {
let mut ret_vec: Vec<String> = Vec::new();
match std::env::current_exe() {
Ok(exe_path) => {
println!("Path of this executable is: {}", exe_path.display());
ret_vec.push(exe_path.display().to_string());
ret_vec.push(exe_path.parent().unwrap().display().to_string());
return ret_vec;
}
Err(e) => {
println!("failed to get current exe path: {e}");
ret_vec.push("".to_string());
ret_vec.push("".to_string());
return ret_vec;
}
};
}
#[tauri::command]
fn spawn_autostart(enabled: bool) {
let (tx, rx) = mpsc::channel();
thread::spawn(move || match autostart(enabled) {
Ok(_) => {
let _ = tx.send(true);
}
Err(e) => {
println!("Error: {}", e);
let _ = tx.send(false);
}
});
match rx.recv() {
Ok(_) => {
// println!("autostart enabled: {}", enabled);
}
Err(_e) => {}
}
}
fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
unsafe {
let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
task_service.Connect(
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
)?;
// 指定要删除的任务文件夹路径
let folder_path = BSTR::from("\\easytierGame");
// let root = BSTR::from("\\");
let task_name = BSTR::from("auto start");
let mut penabled = VARIANT_BOOL::from(false);
let bool_ptr: *mut VARIANT_BOOL = &mut penabled;
// 获取任务文件夹F
let task_folder: ITaskFolder = task_service.GetFolder(&folder_path)?;
let task = task_folder.GetTask(&task_name)?;
task.Definition()?
.Triggers()?
.get_Item(1)?
.Enabled(bool_ptr)?;
// 释放 COM 库
CoUninitialize();
// return penabled.as_bool();
Ok(penabled.as_bool())
}
}
#[tauri::command]
fn autostart_is_enabled() -> bool {
match autostart_enabled() {
Ok(enabled) => {
println!("autostart enabled: {}", enabled);
return enabled;
}
Err(e) => {
println!("autostart enabled: false -> {}", e);
return false;
}
}
}
fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error>> {
if !enabled {
unsafe {
let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
task_service.Connect(
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
&VARIANT::default(),
)?;
// 指定要删除的任务文件夹路径
let folder_path = BSTR::from("\\easytierGame");
let root = BSTR::from("\\");
let task_name = BSTR::from("auto start");
// 获取任务文件夹
let task_folder: ITaskFolder = task_service.GetFolder(&folder_path)?;
task_folder.DeleteTask(&task_name, 0)?;
println!("Task AutoStart Task deleted successfully.");
let task_folder: ITaskFolder = task_service.GetFolder(&root)?;
// 删除任务文件夹
task_folder.DeleteFolder(&folder_path, 0)?;
println!("Task folder easytierGame deleted successfully.");
// 释放 COM 库
CoUninitialize();
}
} else {
let ts = planIfTaskScheduler::new()?;
let com = ts.get_com();
let sb = ScheduleBuilder::new(&com).unwrap();
let exe = std::env::current_exe()?;
let exe = exe.to_str().unwrap();
let settings = PrincipalSettings {
display_name: "".to_string(),
group_id: None,
id: "".to_string(),
logon_type: LogonType::InteractiveToken,
run_level: RunLevel::Highest,
user_id: Some(whoami::username()),
};
sb.create_logon()
.author("heixiansen")?
.trigger("trigger", enabled)?
.action(Action::new("auto start", exe, "", ""))?
.in_folder("easytierGame")?
.principal(settings)?
.delay(Duration {
seconds: Some(6),
..Default::default()
})?
.build()?
.register("auto start", TaskCreationFlags::CreateOrUpdate as i32)?;
}
Ok(())
}
pub const AUTOSTART_ARG: &str = "--autostart";
#[cfg_attr(mobile, tauri::mobile_entry_point)]
@@ -340,6 +507,8 @@ pub fn run() {
let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆,用于传递给命令
let context = tauri::generate_context!();
tauri::Builder::default()
.plugin(tauri_plugin_clipboard_manager::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_autostart::init(
MacosLauncher::LaunchAgent,
Some(vec![AUTOSTART_ARG]),
@@ -389,7 +558,10 @@ pub fn run() {
download_easytier_zip,
get_cli_version,
get_members_by_cli,
search_pid_by_pname
search_pid_by_pname,
get_exe_directory,
spawn_autostart,
autostart_is_enabled
])
.run(context)
.expect("error while running tauri application");
+16 -9
View File
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.0.6",
"version": "1.1.4",
"identifier": "com.tauri.easytier-game",
"build": {
@@ -13,14 +13,14 @@
"app": {
"windows": [
{
"title": "easytier-game",
"width": 331,
"height": 285,
"title": "easytier-game 1.1.4",
"width": 335,
"height": 305,
"resizable": false,
"fullscreen": false,
"decorations": true,
"maximizable": false,
"center": true,
"maximizable": false,
"transparent": false
}
],
@@ -28,18 +28,25 @@
"csp": null
}
},
"plugins": {},
"bundle": {
"active": false,
"targets": "all",
"externalBin": ["WinIPBroadcast"],
"resources": ["icons/icon-inactive.ico", "icons/icon.ico"],
"resources": [
"easytier/config/",
"easytier/icons/",
"easytier/tool/WinIPBroadcast.exe",
"easytier/easytier-cli.exe",
"easytier/easytier-core.exe",
"easytier/Packet.dll",
"easytier/wintun.dll"
],
"windows": {
"webviewInstallMode": {
"type": "embedBootstrapper"
}
},
"createUpdaterArtifacts": false,
"icon": ["icons/icon.png", "icons/icon.rgba", "icons/icon.icns", "icons/icon.ico", "icons/icon-inactive.ico"]
"icon": ["icons/icon.png", "icons/icon.rgba", "icons/icon.icns", "icons/icon.ico"]
}
}
+35
View File
@@ -9,28 +9,63 @@ export default defineStore("main", {
networkPassword: "",
hostname: "",
ipv4: "",
proxyNetworks: "", // 子网代理
autoStart: false, // 是否自动启动
coonectAfterStart: false, //软件打开后,是否自动连接
disableIpv6: false, // 是否禁用IPv6
disbleListenner: false, // 是否禁用监听
disableEncryption: false, // 是否禁用加密
multiThread: false, //使用多线程
enablExitNode: false, // 是否启用退出节点
noTun: false, // 是否使用TUN
latencyfirst: false, // 是否优先延迟
useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
disableUdpHolePunching: false, // 是否禁用UDP打洞
relayAllPeerrpc: false, // 是否启用所有对等RPC
disbleP2p: false, // 是否使用P2P
dhcp: true, // 是否使用DHCP
saveErrorLog: true, // 是否保存错误日志
logLevel: "error", //日志等级
devName: false, //自定义网卡名
devNameValue: "", //自定义网卡名
},
theme: false, //主题 false light true dark
configStartEnable: false, //使用配置文件启动
configPath: "", //配置文件路径
cidrEnable: false,
basePeers: ["public.easytier.top:11010"],
};
},
persist: {
paths: [
"basePeers",
"cidrEnable",
"theme",
"config.proxyNetworks",
"config.serverUrl",
"config.networkName",
"config.protocol",
"config.networkPassword",
"config.disbleP2p",
"config.autoStart",
"config.coonectAfterStart",
"config.disableIpv6",
"config.disbleListenner",
"config.disableEncryption",
"config.multiThread",
"config.enablExitNode",
"config.noTun",
"config.latencyfirst",
"config.useSmoltcp",
"config.disableUdpHolePunching",
"config.relayAllPeerrpc",
"config.hostname",
"config.ipv4",
"config.dhcp",
"config.saveErrorLog",
"config.logLevel",
"config.devName",
"config.devNameValue",
],
},
});
+1
View File
@@ -6,6 +6,7 @@
"components/**/*.ts",
"components/**/*.js",
"components/**/*.vue",
"app.vue",
"pages/**/*.ts",
"pages/**/*.js",
"pages/**/*.vue",
+6
View File
@@ -1 +1,7 @@
interface ImportMetaEnv {
readonly VITE_CONFIG_PATH: string;
}
interface ImportMeta {
readonly env: ImportMetaEnv;
}
+35 -4
View File
@@ -77,7 +77,38 @@ export const ATJ = (promise: Promise<any>, errorExt: string | undefined = undefi
});
};
export const openBrowser = (key: string) => {
// logger.info(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`)
// _launcherApi.openBrowser(`${import.meta.env.VITE_BROWSER_JOB_URL}${key}`);
};
export const parsePeerInfo = (content: string) => {
// 将表格字符串分割成行
const lines = content.split('\n')
// 提取表头(keys
const headers = lines[1]
.split('│')
.slice(1, -1)
.map((h) => h.trim())
// 初始化结果数组
const result: any[] = []
// 遍历数据行
for (let i = 3; i < lines.length - 1; i += 2) {
if (lines[i].trim() === '') continue // 跳过空行
// 分割每一行的数据
const values = lines[i]
.split('│')
.slice(1, -1)
.map((v) => v.trim())
// 创建对象并添加到结果数组
const obj: any = {}
headers.forEach((header, index) => {
obj[header] = values[index] === '-' || values[index] === '' ? null : values[index]
})
// 每行数据都作为一个新对象添加到结果数组中
result.push(obj)
}
return result
}
+70
View File
@@ -0,0 +1,70 @@
import useMainStore from "@/stores/index";
import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
import { open, Command } from "@tauri-apps/plugin-shell";
import { invoke } from "@tauri-apps/api/core";
const getExeAbsPath = async () => {
const aExePath = (await invoke("get_exe_directory")) as [string, string];
return aExePath;
};
const checkServerOnWindows = async () => {
try {
const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
if (serverStatus.stderr.includes("Can't open service")) {
return false;
}
return true;
} catch (err) {
return false;
}
};
const handleAutoStartByNssm = async () => {
const config = useMainStore().config;
const [exeAbsPath, parentDir] = await getExeAbsPath();
const isExist = await checkServerOnWindows();
if (isExist) {
const outputStop = await Command.create("nssm", ["stop", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
console.log({ outputStop });
const outputRemove = await Command.create("nssm", ["remove", import.meta.env.VITE_AUTO_START_SERVICE_NAME, "confirm"]).execute();
console.log({ outputRemove });
}
if (exeAbsPath) {
const output = await Command.create("nssm", ["install", import.meta.env.VITE_AUTO_START_SERVICE_NAME, exeAbsPath]).execute();
console.log(output);
if (output.stdout && output.stdout.includes("installed successfully")) {
const outputAppDirectory = await Command.create("nssm", [
"set",
import.meta.env.VITE_AUTO_START_SERVICE_NAME,
"AppDirectory",
parentDir
]).execute();
console.log({ outputAppDirectory });
const outputStart = await Command.create("nssm", [
"set",
import.meta.env.VITE_AUTO_START_SERVICE_NAME,
"Start",
"SERVICE_AUTO_START"
]).execute();
console.log({ outputStart });
config.autoStart = true;
}
}
};
// 兼容autostart插件
const compatibleAutoStart = async () => {
const config = useMainStore().config;
const is_enable = await tauriAutoStart.isEnabled();
if (is_enable) {
try {
await tauriAutoStart.disable();
config.autoStart = false;
} catch (err) {
// ElMessage.error(`取消自启失败`);
}
}
const serverStatus = await Command.create("nssm", ["status", import.meta.env.VITE_AUTO_START_SERVICE_NAME]).execute();
console.log(serverStatus);
};