Compare commits

..
9 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
24 changed files with 1510 additions and 191 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 -4
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,11 +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;
}
+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 ? "easytier/icons/icon-inactive.ico" : "easytier/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}`);
}
}
+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: {
+5 -2
View File
@@ -3,7 +3,7 @@
"private": true,
"author": "leizi97",
"description": "A simple network initiator based on Easytier",
"version": "1.0.8",
"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,6 +23,7 @@
"@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.8.6",
@@ -38,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"
}
}
+45 -3
View File
@@ -1,26 +1,68 @@
<template>
<div class="h-full overflow-auto flex flex-col items-start px-[25px]">
<div>
<ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox>
<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>
<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 } });
+353 -78
View File
@@ -2,36 +2,42 @@
<ElForm
size="small"
label-position="top"
:model="config">
:model="config"
>
<ElFormItem
label="服务器"
prop="serverUrl">
prop="serverUrl"
>
<template #label>
<div class="flex items-center gap-[0_5px]">
<div>服务器</div>
<span>-</span>
<ElTag
effect="dark"
:type="data.isSuccessGetIp ? 'success' : 'info'">
:type="data.isSuccessGetIp ? 'success' : 'info'"
>
{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
</ElTag>
<ElButton
v-if="!data.coreVersion"
@click="getCoreVersion(true)">
@click="getCoreVersion(true)"
>
获取工具版本
</ElButton>
<ElTag
v-else
type="info">
core-{{ data.coreVersion }}
type="info"
>
{{ data.coreVersion }}
</ElTag>
<ElButton
:disabled="data.isStart"
:loading="data.update"
type="warning"
@click="handleUpdateCore"
size="small">
{{ data.coreVersion ? "更新" : "下载" }}
size="small"
>
{{ data.coreVersion ? "更新插件" : "下载插件" }}
</ElButton>
</div>
</template>
@@ -40,7 +46,8 @@
filterable
default-first-option
v-model="config.serverUrl"
@change="handleServerUrlChange">
@change="handleServerUrlChange"
>
<template #prefix>
<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
<ElSelect
@@ -49,12 +56,14 @@
collapse-tags
@click.stop
v-model="config.protocol"
@change="handleServerUrlChange">
@change="handleServerUrlChange"
>
<ElOption
v-for="item in protocols"
:key="item"
:label="item"
:value="item"></ElOption>
:value="item"
></ElOption>
</ElSelect>
</div>
</template>
@@ -62,14 +71,16 @@
v-for="item in mainStore.basePeers"
:key="item"
:label="item"
:value="item">
:value="item"
>
<div class="flex items-center justify-between">
<span style="float: left">{{ item }}</span>
<ElButton
@click.stop="handleDeleteServerUrl(item)"
round
:icon="Delete"
type="danger"></ElButton>
type="danger"
></ElButton>
</div>
</ElOption>
</ElSelect>
@@ -88,7 +99,8 @@
<ElInput
maxlength="100"
placeholder="请输入网络名"
v-model="config.networkName"></ElInput>
v-model="config.networkName"
></ElInput>
</ElFormItem>
</div>
<div class="flex-1">
@@ -106,7 +118,8 @@
maxlength="100"
placeholder="请输入网络密码"
v-model="config.networkPassword"
type="password"></ElInput>
type="password"
></ElInput>
</ElFormItem>
</div>
</div>
@@ -123,11 +136,13 @@
<ElInput
maxlength="100"
placeholder="例如: Player1"
v-model="config.hostname"></ElInput>
v-model="config.hostname"
></ElInput>
</ElFormItem>
<ElFormItem
class="w-[70%]"
label="局域网IP">
label="局域网IP"
>
<template #label>
<div class="flex items-center h-[20px]">
虚拟网IP
@@ -140,87 +155,109 @@
inline-prompt
inactive-text="固定IP"
active-text="动态获取IP"
size="small"></ElSwitch>
size="small"
></ElSwitch>
</div>
</template>
<ElInput
maxlength="100"
:disabled="config.dhcp"
:placeholder="data.isStart ? '等待动态分配IP...' : '例如: 10.126.126.1'"
v-model="config.ipv4"></ElInput>
v-model="config.ipv4"
></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] pl-[2px]">
<!-- <ElButtonGroup> -->
<ElTooltip
placement="left"
content="日志">
content="日志"
>
<ElButton
:type="!data.logVisible ? 'info' : 'warning'"
@click="handleShowLogDialog"
:icon="List"
size="small"
plain></ElButton>
plain
></ElButton>
</ElTooltip>
<ElTooltip
placement="left"
content="成员">
content="成员"
>
<ElButton
@click="handleShowMemberDialog"
:icon="UserFilled"
plain
type="success"
size="small"></ElButton>
size="small"
></ElButton>
</ElTooltip>
<!-- </ElButtonGroup> -->
</div>
</div>
<div>
<ElCheckbox
v-model="config.disbleP2p"
size="small">
强制中转
</ElCheckbox>
<!-- <ElCheckbox
v-model="config.disableIpv6"
size="small"
>
禁用ipv6
</ElCheckbox> -->
强制中转
</ElCheckbox>
<ElCheckbox
@change="handleAutoStart"
:model-value="config.autoStart"
size="small">
开机自启
</ElCheckbox>
<!-- <ElCheckbox
v-model="config.disbleListenner"
size="small"
>
禁用端口监听
</ElCheckbox> -->
开机自启
</ElCheckbox>
<div>
<ElButton
@click="handleShowCidrDialog"
:icon="Share"
>子网代理</ElButton
>
子网代理
</ElButton>
<ElButton
@click="handleShowAdvanceDialog"
:icon="Setting"
>高级选项</ElButton
>
高级选项
</ElButton>
</div>
<div class="flex items-center gap-[0_5px]">
<div>
@@ -228,7 +265,8 @@
class="!text-[11px]"
type="info"
:underline="false"
@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')">
@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
>
WinIPBroadcast
<ElTooltip content="找不到游戏房间时,就开启它后再刷新尝试(默认开启)">
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
@@ -241,33 +279,122 @@
size="small"
label="WinIPBroadcast"
active-text="开启"
inactive-text="关闭"></ElSwitch>
inactive-text="关闭"
></ElSwitch>
</div>
<ElLink
class="!text-[11px] pb-[2px] ml-[15px]"
type="info"
:underline="false"
@click="open('https://github.com/EasyTier/EasytierGame')">
@click="open('https://github.com/EasyTier/EasytierGame')"
>
主页
</ElLink>
</div>
</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 } from "@tauri-apps/api/event";
import { open, Command } from "@tauri-apps/plugin-shell";
import { QuestionFilled, Delete, List, UserFilled, Setting, Share } 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, PhysicalPosition } from "@tauri-apps/api/window";
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;
@@ -295,14 +422,28 @@
isSuccessGetIp: false,
startLoading: 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);
appWindow.onCloseRequested(async event => {
// console.log(appWindow.label);
if (!is_close) {
// console.log(1);
event.preventDefault();
appWindow.hide();
}
@@ -333,15 +474,24 @@
thread_id: null,
async listenOutput() {
const appWindow = getCurrentWindow();
const unListen = await listen("command-output", async (event) => {
const unListen = await listen("command-output", async event => {
data.isStart = true;
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);
@@ -350,7 +500,7 @@
this.unListenOutPut = unListen;
},
async listenThreadId() {
const unListen = await listen("thread-id", (event) => {
const unListen = await listen("thread-id", event => {
if (event.payload) {
this.thread_id = event.payload;
}
@@ -358,14 +508,14 @@
this.unListenThreadId = unListen;
},
async listenConfigStart() {
const unListen = await listen("config", (event) => {
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;
},
}
};
const unListenAll = async () => {
@@ -386,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];
@@ -499,15 +649,47 @@
}
};
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();
});
@@ -518,9 +700,17 @@
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");
}
@@ -538,7 +728,7 @@
}
if (config.serverUrl) {
const formatUrl = config.serverUrl.replace(/\\/g, "/");
args.push("--peers", ...config.protocol.map((protocol) => `${protocol}://${formatUrl}`));
args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
}
if (config.disbleP2p) {
args.push("--disable-p2p");
@@ -554,8 +744,8 @@
const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
const formatProxyNetworks = config.proxyNetworks
.split("\n")
.map((item) => item.trim())
.filter((item) => item && reg.test(item));
.map(item => item.trim())
.filter(item => item && reg.test(item));
args.push("--proxy-networks", ...formatProxyNetworks);
config.proxyNetworks = formatProxyNetworks.join("\n");
}
@@ -583,6 +773,12 @@
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;
};
@@ -593,7 +789,7 @@
config.ipv4 = "";
}
const memberDialog = await getAllWebviewWindows();
const memberDialogs = memberDialog.filter((item) => item.label === "member");
const memberDialogs = memberDialog.filter(item => item.label === "member");
if (memberDialogs && memberDialogs.length > 0) {
data.memberVisible = false;
for (const memberDialog of memberDialogs) {
@@ -604,6 +800,7 @@
}
}
await setTrayRunState(tray, false);
await setTrayTooltip(tray);
await unListenAll();
};
@@ -611,17 +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,
args
});
}
};
//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("请先开始联机");
@@ -636,7 +911,7 @@
title: "成员列表",
width: 470,
height: 380,
url: "#/member",
url: "#/member"
},
() => {
data.memberVisible = true;
@@ -655,13 +930,13 @@
width: 600,
height: 380,
resizable: false,
url: "#/log",
url: "#/log"
},
(_, appWindow) => {
data.logVisible = true;
logsTimer && clearInterval(logsTimer);
logsTimer = setInterval(() => {
appWindow.emitTo("log", "logs", data.log);
appWindow.emitTo("log", "logs", data.log ? (data.log as string).split("\n").slice(-1000).join("\n") : "");
}, 600);
},
() => {
@@ -678,7 +953,7 @@
width: 600,
height: 380,
resizable: false,
url: "#/cidr",
url: "#/cidr"
},
(_, appWindow) => {
data.cidrVisible = true;
@@ -697,7 +972,7 @@
width: 600,
height: 380,
resizable: false,
url: "#/advance",
url: "#/advance"
},
(_, appWindow) => {
data.advanceVisible = true;
+10 -11
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>
@@ -35,22 +32,23 @@
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 listenOutput = async () => {
const member = await invoke("get_members_by_cli");
const peerInfo = parsePeerInfo(member as string);
peerInfo.forEach(value => {
peerInfo.forEach((value) => {
if (value.cost === "Local") {
value.cost = "本机";
}
@@ -58,6 +56,7 @@
value.ipv4 = value.ipv4.split("/")[0];
}
});
// console.log(peerInfo);
data.member = peerInfo;
};
+66
View File
@@ -11,6 +11,12 @@ importers:
'@tauri-apps/plugin-autostart':
specifier: ~2
version: 2.0.0
'@tauri-apps/plugin-clipboard-manager':
specifier: ^2.0.0
version: 2.0.0
'@tauri-apps/plugin-fs':
specifier: ~2
version: 2.0.1
devDependencies:
'@element-plus/icons-vue':
specifier: ^2.3.1
@@ -54,6 +60,9 @@ importers:
'@vitejs/plugin-vue-jsx':
specifier: ^3.1.0
version: 3.1.0(vite@5.2.10(@types/node@20.12.7)(less@4.2.0)(terser@5.30.4))(vue@3.4.24(typescript@5.4.5))
'@vueuse/core':
specifier: ^11.2.0
version: 11.2.0(vue@3.4.24(typescript@5.4.5))
dayjs:
specifier: ^1.11.10
version: 1.11.10
@@ -1008,6 +1017,12 @@ packages:
'@tauri-apps/plugin-cli@2.0.0':
resolution: {integrity: sha512-glQmlL1IiCGEa1FHYa/PTPSeYhfu56omLRgHXWlJECDt6DbJyRuJWVgtkQfUxtqnVdYnnU+DGIGeiInoEqtjLw==}
'@tauri-apps/plugin-clipboard-manager@2.0.0':
resolution: {integrity: sha512-V1sXmbjnwfXt/r48RJMwfUmDMSaP/8/YbH4CLNxt+/sf1eHlIP8PRFdFDQwLN0cNQKu2rqQVbG/Wc/Ps6cDUhw==}
'@tauri-apps/plugin-fs@2.0.1':
resolution: {integrity: sha512-PkeZG2WAob9Xpmr66aPvj+McDVgFjV2a7YBzYVZjiCvbGeMs6Yk09tlXhCe3EyZdT/pwWMSi8lXUace+hlsjsw==}
'@tauri-apps/plugin-http@2.0.0':
resolution: {integrity: sha512-UfKAICL25ayluV/SjiEQujz8q/2uyAzp3u9uaHFkaIyKS5usBL8DoqSwi4eKz2mEjkbxTwldhDEXG4CEfTE0JQ==}
@@ -1282,6 +1297,9 @@ packages:
'@vueuse/core@10.9.0':
resolution: {integrity: sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==}
'@vueuse/core@11.2.0':
resolution: {integrity: sha512-JIUwRcOqOWzcdu1dGlfW04kaJhW3EXnnjJJfLTtddJanymTL7lF1C0+dVVZ/siLfc73mWn+cGP1PE1PKPruRSA==}
'@vueuse/core@9.13.0':
resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
@@ -1329,12 +1347,18 @@ packages:
'@vueuse/metadata@10.9.0':
resolution: {integrity: sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==}
'@vueuse/metadata@11.2.0':
resolution: {integrity: sha512-L0ZmtRmNx+ZW95DmrgD6vn484gSpVeRbgpWevFKXwqqQxW9hnSi2Ppuh2BzMjnbv4aJRiIw8tQatXT9uOB23dQ==}
'@vueuse/metadata@9.13.0':
resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
'@vueuse/shared@10.9.0':
resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==}
'@vueuse/shared@11.2.0':
resolution: {integrity: sha512-VxFjie0EanOudYSgMErxXfq6fo8vhr5ICI+BuE3I9FnX7ePllEsVrRQ7O6Q1TLgApeLuPKcHQxAXpP+KnlrJsg==}
'@vueuse/shared@9.13.0':
resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
@@ -4127,6 +4151,17 @@ packages:
vue-clipboard3@2.0.0:
resolution: {integrity: sha512-Q9S7dzWGax7LN5iiSPcu/K1GGm2gcBBlYwmMsUc5/16N6w90cbKow3FnPmPs95sungns4yvd9/+JhbAznECS2A==}
vue-demi@0.14.10:
resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
engines: {node: '>=12'}
hasBin: true
peerDependencies:
'@vue/composition-api': ^1.0.0-rc.1
vue: ^3.0.0-0 || ^2.6.0
peerDependenciesMeta:
'@vue/composition-api':
optional: true
vue-demi@0.14.7:
resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
engines: {node: '>=12'}
@@ -5363,6 +5398,14 @@ snapshots:
dependencies:
'@tauri-apps/api': 2.0.2
'@tauri-apps/plugin-clipboard-manager@2.0.0':
dependencies:
'@tauri-apps/api': 2.0.2
'@tauri-apps/plugin-fs@2.0.1':
dependencies:
'@tauri-apps/api': 2.0.2
'@tauri-apps/plugin-http@2.0.0':
dependencies:
'@tauri-apps/api': 2.0.2
@@ -5848,6 +5891,16 @@ snapshots:
- '@vue/composition-api'
- vue
'@vueuse/core@11.2.0(vue@3.4.24(typescript@5.4.5))':
dependencies:
'@types/web-bluetooth': 0.0.20
'@vueuse/metadata': 11.2.0
'@vueuse/shared': 11.2.0(vue@3.4.24(typescript@5.4.5))
vue-demi: 0.14.10(vue@3.4.24(typescript@5.4.5))
transitivePeerDependencies:
- '@vue/composition-api'
- vue
'@vueuse/core@9.13.0(vue@3.4.24(typescript@5.4.5))':
dependencies:
'@types/web-bluetooth': 0.0.16
@@ -5872,6 +5925,8 @@ snapshots:
'@vueuse/metadata@10.9.0': {}
'@vueuse/metadata@11.2.0': {}
'@vueuse/metadata@9.13.0': {}
'@vueuse/shared@10.9.0(vue@3.4.24(typescript@5.4.5))':
@@ -5881,6 +5936,13 @@ snapshots:
- '@vue/composition-api'
- vue
'@vueuse/shared@11.2.0(vue@3.4.24(typescript@5.4.5))':
dependencies:
vue-demi: 0.14.10(vue@3.4.24(typescript@5.4.5))
transitivePeerDependencies:
- '@vue/composition-api'
- vue
'@vueuse/shared@9.13.0(vue@3.4.24(typescript@5.4.5))':
dependencies:
vue-demi: 0.14.7(vue@3.4.24(typescript@5.4.5))
@@ -8999,6 +9061,10 @@ snapshots:
dependencies:
clipboard: 2.0.11
vue-demi@0.14.10(vue@3.4.24(typescript@5.4.5)):
dependencies:
vue: 3.4.24(typescript@5.4.5)
vue-demi@0.14.7(vue@3.4.24(typescript@5.4.5)):
dependencies:
vue: 3.4.24(typescript@5.4.5)
+2 -1
View File
@@ -1,4 +1,5 @@
# Generated by Cargo
# will have compiled files and executables
/target/
/gen/schemas
/gen/schemas
/easytier/
+572 -12
View File
@@ -48,6 +48,12 @@ dependencies = [
"memchr",
]
[[package]]
name = "aligned-vec"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
[[package]]
name = "alloc-no-stdlib"
version = "2.0.4"
@@ -97,9 +103,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.89"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
[[package]]
name = "arbitrary"
@@ -110,6 +116,35 @@ dependencies = [
"derive_arbitrary",
]
[[package]]
name = "arboard"
version = "3.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
dependencies = [
"clipboard-win",
"core-graphics 0.23.2",
"image",
"log",
"objc2",
"objc2-app-kit",
"objc2-foundation",
"parking_lot",
"windows-sys 0.48.0",
"x11rb",
]
[[package]]
name = "arg_enum_proc_macro"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.79",
]
[[package]]
name = "arrayvec"
version = "0.7.6"
@@ -305,6 +340,29 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "av1-grain"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
dependencies = [
"anyhow",
"arrayvec",
"log",
"nom",
"num-rational",
"v_frame",
]
[[package]]
name = "avif-serialize"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62"
dependencies = [
"arrayvec",
]
[[package]]
name = "backtrace"
version = "0.3.74"
@@ -332,6 +390,12 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bit_field"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -347,6 +411,12 @@ dependencies = [
"serde",
]
[[package]]
name = "bitstream-io"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
[[package]]
name = "bitvec"
version = "1.0.1"
@@ -441,6 +511,12 @@ dependencies = [
"alloc-stdlib",
]
[[package]]
name = "built"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
[[package]]
name = "bumpalo"
version = "3.16.0"
@@ -492,6 +568,12 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "byteorder-lite"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]]
name = "bytes"
version = "1.7.2"
@@ -668,6 +750,15 @@ dependencies = [
"inout",
]
[[package]]
name = "clipboard-win"
version = "5.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
dependencies = [
"error-code",
]
[[package]]
name = "cocoa"
version = "0.26.0"
@@ -678,7 +769,7 @@ dependencies = [
"block",
"cocoa-foundation",
"core-foundation 0.10.0",
"core-graphics",
"core-graphics 0.24.0",
"foreign-types 0.5.0",
"libc",
"objc",
@@ -693,11 +784,17 @@ dependencies = [
"bitflags 2.6.0",
"block",
"core-foundation 0.10.0",
"core-graphics-types",
"core-graphics-types 0.2.0",
"libc",
"objc",
]
[[package]]
name = "color_quant"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "combine"
version = "4.6.7"
@@ -755,6 +852,19 @@ version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "core-graphics"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [
"bitflags 1.3.2",
"core-foundation 0.9.4",
"core-graphics-types 0.1.3",
"foreign-types 0.5.0",
"libc",
]
[[package]]
name = "core-graphics"
version = "0.24.0"
@@ -763,11 +873,22 @@ checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
dependencies = [
"bitflags 2.6.0",
"core-foundation 0.10.0",
"core-graphics-types",
"core-graphics-types 0.2.0",
"foreign-types 0.5.0",
"libc",
]
[[package]]
name = "core-graphics-types"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
dependencies = [
"bitflags 1.3.2",
"core-foundation 0.9.4",
"libc",
]
[[package]]
name = "core-graphics-types"
version = "0.2.0"
@@ -846,6 +967,12 @@ version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "crunchy"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-common"
version = "0.1.6"
@@ -1109,7 +1236,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]]
name = "easytier-game"
version = "1.0.8"
version = "1.1.4"
dependencies = [
"log",
"planif",
@@ -1120,9 +1247,13 @@ dependencies = [
"tauri",
"tauri-build",
"tauri-plugin-autostart",
"tauri-plugin-clipboard-manager",
"tauri-plugin-fs",
"tauri-plugin-log",
"tauri-plugin-shell",
"tauri-plugin-single-instance",
"whoami",
"windows 0.58.0",
"zip",
]
@@ -1224,6 +1355,12 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "error-code"
version = "3.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
[[package]]
name = "event-listener"
version = "5.3.1"
@@ -1245,6 +1382,21 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "exr"
version = "1.73.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
dependencies = [
"bit_field",
"half",
"lebe",
"miniz_oxide",
"rayon-core",
"smallvec",
"zune-inflate",
]
[[package]]
name = "fastrand"
version = "2.1.1"
@@ -1574,6 +1726,16 @@ dependencies = [
"version_check",
]
[[package]]
name = "gethostname"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
dependencies = [
"libc",
"windows-targets 0.48.5",
]
[[package]]
name = "getrandom"
version = "0.1.16"
@@ -1596,6 +1758,16 @@ dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
name = "gif"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
dependencies = [
"color_quant",
"weezl",
]
[[package]]
name = "gimli"
version = "0.31.1"
@@ -1769,6 +1941,16 @@ dependencies = [
"tracing",
]
[[package]]
name = "half"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
dependencies = [
"cfg-if",
"crunchy",
]
[[package]]
name = "hashbrown"
version = "0.12.3"
@@ -2000,16 +2182,43 @@ dependencies = [
[[package]]
name = "image"
version = "0.25.1"
version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
dependencies = [
"bytemuck",
"byteorder",
"byteorder-lite",
"color_quant",
"exr",
"gif",
"image-webp",
"num-traits",
"png",
"qoi",
"ravif",
"rayon",
"rgb",
"tiff",
"zune-core",
"zune-jpeg",
]
[[package]]
name = "image-webp"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
dependencies = [
"byteorder-lite",
"quick-error",
]
[[package]]
name = "imgref"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -2059,6 +2268,17 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "interpolate_name"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.79",
]
[[package]]
name = "ipnet"
version = "2.10.1"
@@ -2084,6 +2304,15 @@ dependencies = [
"once_cell",
]
[[package]]
name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "0.4.8"
@@ -2150,6 +2379,12 @@ dependencies = [
"libc",
]
[[package]]
name = "jpeg-decoder"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
[[package]]
name = "js-sys"
version = "0.3.70"
@@ -2234,6 +2469,12 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "lebe"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]]
name = "libappindicator"
version = "0.9.0"
@@ -2264,6 +2505,17 @@ version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libfuzzer-sys"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
dependencies = [
"arbitrary",
"cc",
"once_cell",
]
[[package]]
name = "libloading"
version = "0.7.4"
@@ -2315,6 +2567,15 @@ dependencies = [
"value-bag",
]
[[package]]
name = "loop9"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
dependencies = [
"imgref",
]
[[package]]
name = "lzma-rs"
version = "0.3.0"
@@ -2360,6 +2621,15 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "maybe-rayon"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
dependencies = [
"cfg-if",
]
[[package]]
name = "memchr"
version = "2.7.4"
@@ -2381,6 +2651,12 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
version = "0.8.0"
@@ -2494,6 +2770,22 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "nom"
version = "7.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
dependencies = [
"memchr",
"minimal-lexical",
]
[[package]]
name = "noop_proc_macro"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
[[package]]
name = "ntapi"
version = "0.4.1"
@@ -2503,12 +2795,53 @@ dependencies = [
"winapi",
]
[[package]]
name = "num-bigint"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
dependencies = [
"num-integer",
"num-traits",
]
[[package]]
name = "num-conv"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
name = "num-derive"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.79",
]
[[package]]
name = "num-integer"
version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
dependencies = [
"num-traits",
]
[[package]]
name = "num-rational"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
dependencies = [
"num-bigint",
"num-integer",
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.19"
@@ -2925,6 +3258,12 @@ dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "paste"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "pathdiff"
version = "0.2.2"
@@ -3239,6 +3578,25 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "profiling"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
dependencies = [
"profiling-procmacros",
]
[[package]]
name = "profiling-procmacros"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
dependencies = [
"quote",
"syn 2.0.79",
]
[[package]]
name = "ptr_meta"
version = "0.1.4"
@@ -3259,6 +3617,21 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "qoi"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
dependencies = [
"bytemuck",
]
[[package]]
name = "quick-error"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quick-xml"
version = "0.32.0"
@@ -3364,6 +3737,55 @@ dependencies = [
"rand_core 0.5.1",
]
[[package]]
name = "rav1e"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9"
dependencies = [
"arbitrary",
"arg_enum_proc_macro",
"arrayvec",
"av1-grain",
"bitstream-io",
"built",
"cfg-if",
"interpolate_name",
"itertools",
"libc",
"libfuzzer-sys",
"log",
"maybe-rayon",
"new_debug_unreachable",
"noop_proc_macro",
"num-derive",
"num-traits",
"once_cell",
"paste",
"profiling",
"rand 0.8.5",
"rand_chacha 0.3.1",
"simd_helpers",
"system-deps",
"thiserror",
"v_frame",
"wasm-bindgen",
]
[[package]]
name = "ravif"
version = "0.11.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2413fd96bd0ea5cdeeb37eaf446a22e6ed7b981d792828721e74ded1980a45c6"
dependencies = [
"avif-serialize",
"imgref",
"loop9",
"quick-error",
"rav1e",
"rgb",
]
[[package]]
name = "raw-window-handle"
version = "0.6.2"
@@ -3493,6 +3915,12 @@ dependencies = [
"windows-registry",
]
[[package]]
name = "rgb"
version = "0.8.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
[[package]]
name = "ring"
version = "0.17.8"
@@ -3936,6 +4364,15 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
[[package]]
name = "simd_helpers"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
dependencies = [
"quote",
]
[[package]]
name = "simdutf8"
version = "0.1.5"
@@ -3981,7 +4418,7 @@ checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
dependencies = [
"bytemuck",
"cfg_aliases 0.2.1",
"core-graphics",
"core-graphics 0.24.0",
"foreign-types 0.5.0",
"js-sys",
"log",
@@ -4188,7 +4625,7 @@ dependencies = [
"bitflags 2.6.0",
"cocoa",
"core-foundation 0.10.0",
"core-graphics",
"core-graphics 0.24.0",
"crossbeam-channel",
"dispatch",
"dlopen2",
@@ -4387,6 +4824,43 @@ dependencies = [
"thiserror",
]
[[package]]
name = "tauri-plugin-clipboard-manager"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b7d556886c15849198c0948fd7f4c880492f0461539176da0a8a70272e2904"
dependencies = [
"arboard",
"image",
"log",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
"thiserror",
]
[[package]]
name = "tauri-plugin-fs"
version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96ba7d46e86db8c830d143ef90ab5a453328365b0cc834c24edea4267b16aba0"
dependencies = [
"anyhow",
"dunce",
"glob",
"percent-encoding",
"schemars",
"serde",
"serde_json",
"serde_repr",
"tauri",
"tauri-plugin",
"thiserror",
"url",
"uuid",
]
[[package]]
name = "tauri-plugin-log"
version = "2.0.1"
@@ -4586,6 +5060,17 @@ dependencies = [
"syn 2.0.79",
]
[[package]]
name = "tiff"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
dependencies = [
"flate2",
"jpeg-decoder",
"weezl",
]
[[package]]
name = "time"
version = "0.3.36"
@@ -4785,7 +5270,7 @@ version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f"
dependencies = [
"core-graphics",
"core-graphics 0.24.0",
"crossbeam-channel",
"dirs 5.0.1",
"libappindicator",
@@ -4949,6 +5434,17 @@ dependencies = [
"serde",
]
[[package]]
name = "v_frame"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
dependencies = [
"aligned-vec",
"num-traits",
"wasm-bindgen",
]
[[package]]
name = "value-bag"
version = "1.9.0"
@@ -5024,6 +5520,12 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasite"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
[[package]]
name = "wasm-bindgen"
version = "0.2.93"
@@ -5194,6 +5696,23 @@ dependencies = [
"windows-core 0.58.0",
]
[[package]]
name = "weezl"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]]
name = "whoami"
version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
dependencies = [
"redox_syscall",
"wasite",
"web-sys",
]
[[package]]
name = "winapi"
version = "0.3.9"
@@ -5707,6 +6226,23 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "x11rb"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
dependencies = [
"gethostname",
"rustix",
"x11rb-protocol",
]
[[package]]
name = "x11rb-protocol"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
[[package]]
name = "xdg-home"
version = "1.3.0"
@@ -5893,6 +6429,30 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "zune-core"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
[[package]]
name = "zune-inflate"
version = "0.2.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
dependencies = [
"simd-adler32",
]
[[package]]
name = "zune-jpeg"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
dependencies = [
"zune-core",
]
[[package]]
name = "zvariant"
version = "4.0.0"
+9 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.0.8"
version = "1.1.4"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier"
@@ -30,15 +30,23 @@ tauri = { version = "2.0.6", features = [
"image-png",
"image-ico",
] }
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.0.1"
tauri-plugin-single-instance = "2.0.1"
+79 -50
View File
@@ -1,51 +1,80 @@
{
"$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"
}
]
}
]
}
"$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"
]
}
+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"
+164 -2
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)]
@@ -209,7 +217,6 @@ fn run_command(
args: Vec<String>,
stop_signal: tauri::State<Arc<AtomicBool>>,
) {
let (tx, rx) = mpsc::channel();
stop_signal.store(false, Ordering::Relaxed);
let app_handle1 = app_handle.clone();
@@ -218,6 +225,7 @@ fn run_command(
let stop_signal2 = Arc::clone(&stop_signal);
let args2 = args.clone();
thread::spawn(move || {
// trace, debug, info, warn, error, off
let mut child = Command::new("easytier/easytier-core.exe")
.args(args)
.creation_flags(0x08000000)
@@ -342,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)]
@@ -350,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]),
@@ -399,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");
+5 -5
View File
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.0.8",
"version": "1.1.4",
"identifier": "com.tauri.easytier-game",
"build": {
@@ -13,8 +13,8 @@
"app": {
"windows": [
{
"title": "easytier-game",
"width": 331,
"title": "easytier-game 1.1.4",
"width": 335,
"height": 305,
"resizable": false,
"fullscreen": false,
@@ -33,9 +33,9 @@
"active": false,
"targets": "all",
"resources": [
"easytier/config/",
"easytier/icons/",
"easytier/tool/WinIPBroadcast.exe",
"easytier/icons/icon-inactive.ico",
"easytier/icons/icon.ico",
"easytier/easytier-cli.exe",
"easytier/easytier-core.exe",
"easytier/Packet.dll",
+15
View File
@@ -11,6 +11,7 @@ export default defineStore("main", {
ipv4: "",
proxyNetworks: "", // 子网代理
autoStart: false, // 是否自动启动
coonectAfterStart: false, //软件打开后,是否自动连接
disableIpv6: false, // 是否禁用IPv6
disbleListenner: false, // 是否禁用监听
disableEncryption: false, // 是否禁用加密
@@ -23,7 +24,14 @@ export default defineStore("main", {
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"],
};
@@ -32,6 +40,7 @@ export default defineStore("main", {
paths: [
"basePeers",
"cidrEnable",
"theme",
"config.proxyNetworks",
"config.serverUrl",
"config.networkName",
@@ -39,6 +48,7 @@ export default defineStore("main", {
"config.networkPassword",
"config.disbleP2p",
"config.autoStart",
"config.coonectAfterStart",
"config.disableIpv6",
"config.disbleListenner",
"config.disableEncryption",
@@ -50,7 +60,12 @@ export default defineStore("main", {
"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;
}
+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);
};