Compare commits

..
Author SHA1 Message Date
黑先森 f556e17f85 固定窗口高度 2024-11-12 11:21:03 +08:00
黑先森 c7170967ec 给予一定的宽度可变调整 2024-11-12 11:04:21 +08:00
黑先森 1801082601 修复与优化
- 没有自动保存配置文件启动的bug
- 修复配置文件启动无法打开成员列表的bug
- 修复动态ipv4获取后,没有正确赋值到界面上的bug
- 增加使用配置文件启动时的提示
2024-11-11 18:19:28 +08:00
黑先森 189f3467c3 Merge branch 'dev_1.1.5'
# Conflicts:
#	README.md
2024-11-11 16:56:48 +08:00
黑先森 bf1403bf07 修复winIp无法自启的bug 2024-11-11 16:50:18 +08:00
黑先森 7a181200f3 增加下载内核的提示 2024-11-11 16:28:23 +08:00
黑先森 9413449c8e 合并 内核外工具 到 增强工具窗口, 新增防火墙关闭 跃点修改 ping测试功能 2024-11-11 16:01:41 +08:00
黑先森 2eb69352f7 优化readme 2024-11-08 12:17:38 +08:00
黑先森 9ea0eea0ac Merge branch 'dev_1.1.4' 2024-11-05 18:30:29 +08:00
黑先森 ef172e4d4c 增加base64编码分享和导入 界面配置 #1
优化是否联机成功的判断,优化本地存储日志数量
2024-11-05 18:30:08 +08:00
leizi97 c572925a0d Merge branch 'dev_1.1.3' 2024-11-04 22:46:28 +08:00
leizi97 e4fbaa921c Merge branch 'dev_1.1.2' 2024-11-04 21:29:29 +08:00
leizi97 76d29cbeeb Merge branch 'dev_1.1.1' 2024-11-03 23:13:43 +08:00
leizi97 6f57a866a4 Merge branch 'dev_1.1.0' 2024-11-03 22:09:58 +08:00
leizi97 fe9f1c01b7 Merge branch 'dev_1.0.9' 2024-10-29 23:32:48 +08:00
leizi97 43d681e888 Merge branch 'dev_1.0.9' 2024-10-29 22:51:34 +08:00
黑先森 d402f107b0 Merge branch 'dev_1.0.8' 2024-10-25 18:42:52 +08:00
leizi97 74fbfed7be Merge branch 'dev_1.0.7' 2024-10-23 22:04:58 +08:00
黑先森 5b9eed9520 Merge branch 'dev_1.0.6' 2024-10-17 19:35:37 +08:00
黑先森andGitHub 1ae122ab2a Update README.md 2024-10-16 17:41:44 +08:00
黑先森 3db962f3dc #improvement 增加说明图 2024-10-16 17:35:24 +08:00
黑先森 a7f1292067 Merge branch 'dev_1.0.5' 2024-10-16 17:22:00 +08:00
黑先森 022e71de01 Merge branch 'dev_1.0.5' 2024-10-16 16:41:30 +08:00
黑先森 5350af87ed Merge branch 'dev_1.0.4' 2024-10-16 09:52:35 +08:00
leizi97 5d6b7bdf13 Merge branch 'main' of https://github.com/EasyTier/EasytierGame 2024-10-13 21:37:27 +08:00
黑先森andGitHub 5740bd08c1 Update README.md 2024-10-13 21:28:41 +08:00
23 changed files with 1501 additions and 361 deletions
+58 -8
View File
@@ -1,10 +1,60 @@
# EasyiterGame # [EasyTier游戏联机启动器](https://github.com/EasyTier/EasytierGame)
基于easytier的简易游戏联机客户端
1. 开发环境如何运行 ## 简介
拉取仓库,使用命令行 pnpm install 安装包
安装完成后, 使用 pnpm tauri dev 进行rust编译 等待启动 EasyTierGame游戏联机启动器,由`nuxt3` `typescript` `rust` `tauri` 开发
具有简易的界面,附带最新版easytier内核,联机游玩的时候无论是心理上和使用上都能给予您最舒服的体验,同时支持自定义配置文件启动,满足各种需求
## 下载
Github
Releases [https://github.com/EasyTier/EasytierGame/releases](https://github.com/EasyTier/EasytierGame/releases)
- 只有绿色zip包,个人不喜欢安装包各种写注册表,解压即用就行,目录清爽干净
![game-step1](/assets/game-step1.png)
## 使用教程
- 第一次使用,输入一个“主机名”点击启动联机即可,后续可以自建服务器或者使用爱心群友提供的服务器
![game-step2](/assets/game-step2.png)
![game-step3](/assets/game-step3.png)
- 高级选项里有一些特殊配置,可以自行选择
![game-step4](/assets/game-step4.png)
- 如果还是无法满足您的需求,可以使用配置文件进行启动,具体如何配置,可以查看文档[配置文件](/guide/network/config-file.html)
![game-step5](/assets/game-step5.png)
- easytier内核升级后,可以点击更新插件按钮就可以进行更新,但是需要出国,如果无法更新,可以在群里获取
![game-step6](/assets/game-step6.png)
- 1.1.4更新了 配置分享功能 可以与朋友之间分享配置,方便联机
![game-step7](/assets/game-step7.png)
- 1.1.5 合并额外插件于 "增强工具" 窗口 新增了网卡跃点设置 关闭防火墙功能 ping功能
![game-step8](/assets/game-step8.png)
![game-step9](/assets/game-step9.png)
## 特性
- 基于easytier组网工具开发,界面清晰简单
- 自带“更新”按钮,在easytier组网工具发布新版本时,点击更新即可(需要出国工具)
- 第一次使用,输入一个“主机名”点击启动联机即可,后续可以自建服务器或者使用群友的服务器
- 配置简单,也含有高级功能,同时也支持自定义配置文件启动
- 默认开启 **WinIPBroadcast** 不再怕联机找不到房间(例如:无主之地3)
- 已经测试 **艾尔登法环学习版**,**无主之地3**,**深岩银河**,**怪物猎人世界** 等都可稳定联机游玩
## 系统支持
支持Windows 11 、Windows 10 、 Windows 7
## 请不要将本程序和仓库代码用于任何违法用途,由此产生的一切后果,仓库所有者和参与开发的人员不承担任何责任
2. 生产环境发布
执行 pnpm tauri build
产物位于 src-tauri/target/release 下 easytier-game.exe
Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

+48
View File
@@ -0,0 +1,48 @@
import { invoke } from "@tauri-apps/api/core";
import { Command } from "@tauri-apps/plugin-shell";
import { ElMessage, type TabPaneName } from "element-plus";
import useMainStore from "@/stores/index";
const getWinIpBroadcastPid = async () => {
const mainStore = useMainStore();
const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
mainStore.winipBcPid = (pid as number) || 0;
if (mainStore.winipBcPid && mainStore.winipBcPid > 0) {
mainStore.winipBcStart = true;
} else {
mainStore.winipBcStart = false;
}
};
export const handleWinipBcStart = async () => {
const mainStore = useMainStore();
if (!mainStore.winipBcStart) {
try {
await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
mainStore.winipBcPid = child.pid || 0;
if (mainStore.winipBcPid) {
mainStore.winipBcStart = true;
mainStore.winIpBcAutoStart = true;
} else {
ElMessage.error(`启动失败`);
}
} catch (err) {
ElMessage.error(`启动失败`);
console.log(err);
}
} else {
mainStore.winIpBcAutoStart = false;
await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
await getWinIpBroadcastPid();
}
};
export const initStartWinIpBroadcast = async () => {
const mainStore = useMainStore();
await getWinIpBroadcastPid();
// console.log(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
await handleWinipBcStart();
}
};
+2 -1
View File
@@ -3,7 +3,7 @@
"private": true, "private": true,
"author": "leizi97", "author": "leizi97",
"description": "A simple network initiator based on Easytier", "description": "A simple network initiator based on Easytier",
"version": "1.1.3", "version": "1.1.6",
"scripts": { "scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod" "build": "nuxt generate --dotenv env/.env.prod"
@@ -40,6 +40,7 @@
}, },
"dependencies": { "dependencies": {
"@tauri-apps/plugin-autostart": "~2", "@tauri-apps/plugin-autostart": "~2",
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
"@tauri-apps/plugin-fs": "~2" "@tauri-apps/plugin-fs": "~2"
} }
} }
+336 -248
View File
@@ -4,171 +4,187 @@
label-position="top" label-position="top"
:model="config" :model="config"
> >
<ElFormItem <!-- element-loading-custom-class="config-start"
label="服务器" v-loading="mainStore.configStartEnable"
prop="serverUrl" :element-loading-spinner="'<path />'"
> element-loading-text="-------已经启用配置文件,界面配置不再生效-------" -->
<template #label> <!-- <div> -->
<div class="flex items-center gap-[0_5px]">
<div>服务器</div>
<span>-</span>
<ElTag
effect="dark"
:type="data.isSuccessGetIp ? 'success' : 'info'"
>
{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
</ElTag>
<ElButton
v-if="!data.coreVersion"
@click="getCoreVersion(true)"
>
获取工具版本
</ElButton>
<ElTag
v-else
type="info"
>
{{ data.coreVersion }}
</ElTag>
<ElButton
:disabled="data.isStart"
:loading="data.update"
type="warning"
@click="handleUpdateCore"
size="small"
>
{{ data.coreVersion ? "更新插件" : "下载插件" }}
</ElButton>
</div>
</template>
<ElSelect
allow-create
filterable
default-first-option
v-model="config.serverUrl"
@change="handleServerUrlChange"
>
<template #prefix>
<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
<ElSelect
placeholder="协议"
multiple
collapse-tags
@click.stop
v-model="config.protocol"
@change="handleServerUrlChange"
>
<ElOption
v-for="item in protocols"
:key="item"
:label="item"
:value="item"
></ElOption>
</ElSelect>
</div>
</template>
<ElOption
v-for="item in mainStore.basePeers"
:key="item"
:label="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>
</div>
</ElOption>
</ElSelect>
</ElFormItem>
<div class="flex flex-wrap gap-[0_10px] items-center">
<div class="flex-1">
<ElFormItem label="网络名">
<template #label>
<div class="flex items-center">
网络名
<ElTooltip content="对应命令行参数 --network-name">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
</template>
<ElInput
maxlength="100"
placeholder="请输入网络名"
v-model="config.networkName"
></ElInput>
</ElFormItem>
</div>
<div class="flex-1">
<ElFormItem label="网络密码">
<template #label>
<div class="flex items-center">
网络密码
<ElTooltip content="对应命令行参数 --network-secret">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
</template>
<ElInput
show-password
maxlength="100"
placeholder="请输入网络密码"
v-model="config.networkPassword"
type="password"
></ElInput>
</ElFormItem>
</div>
</div>
<div class="flex gap-[0_10px]">
<ElFormItem label="主机名">
<template #label>
<div class="flex items-center">
主机名
<ElTooltip content="对应命令行参数 --hostname">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
</template>
<ElInput
maxlength="100"
placeholder="例如: Player1"
v-model="config.hostname"
></ElInput>
</ElFormItem>
<ElFormItem <ElFormItem
class="w-[70%]" label="服务器"
label="局域网IP" prop="serverUrl"
> >
<template #label> <template #label>
<div class="flex items-center h-[20px]"> <div class="flex items-center gap-[0_5px]">
虚拟网IP <div>服务器</div>
<ElTooltip content="对应命令行参数 --ipv4"> <span>-</span>
<ElIcon><QuestionFilled /></ElIcon> <ElTag
</ElTooltip> effect="dark"
<ElSwitch :type="data.isSuccessGetIp ? 'success' : 'info'"
v-model="config.dhcp" >
class="ml-[5px]" {{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
inline-prompt </ElTag>
inactive-text="固定IP" <ElButton
active-text="动态获取IP" v-if="!data.coreVersion"
size="small" @click="getCoreVersion(true)"
></ElSwitch> >
获取内核版本
</ElButton>
<ElTag
v-else
type="info"
>
{{ data.coreVersion }}
</ElTag>
<ElPopconfirm
width="325"
cancel-button-text="取消"
confirm-button-text="继续"
title="内核从github下载,需要出国工具,可能下载缓慢或失败,是否继续?
也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
@confirm="handleUpdateCore"
>
<template #reference>
<ElButton
:disabled="data.isStart"
:loading="data.update"
type="warning"
size="small"
>
{{ data.coreVersion ? "更新内核" : "下载内核" }}
</ElButton>
</template>
</ElPopconfirm>
</div> </div>
</template> </template>
<ElInput <ElSelect
maxlength="100" allow-create
:disabled="config.dhcp" filterable
:placeholder="data.isStart ? '等待动态分配IP...' : '例如: 10.126.126.1'" default-first-option
v-model="config.ipv4" v-model="config.serverUrl"
></ElInput> @change="handleServerUrlChange"
>
<template #prefix>
<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
<ElSelect
placeholder="协议"
multiple
collapse-tags
@click.stop
v-model="config.protocol"
@change="handleServerUrlChange"
>
<ElOption
v-for="item in protocols"
:key="item"
:label="item"
:value="item"
></ElOption>
</ElSelect>
</div>
</template>
<ElOption
v-for="item in mainStore.basePeers"
:key="item"
:label="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>
</div>
</ElOption>
</ElSelect>
</ElFormItem> </ElFormItem>
</div> <div class="flex flex-wrap gap-[0_10px] items-center">
<div class="flex items-start gap-[0_10px]"> <div class="flex-1">
<div class="w-[122px]"> <ElFormItem label="网络名">
<template #label>
<div class="flex items-center">
网络名
<ElTooltip content="对应命令行参数 --network-name">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
</template>
<ElInput
maxlength="100"
placeholder="请输入网络名"
v-model="config.networkName"
></ElInput>
</ElFormItem>
</div>
<div class="flex-1">
<ElFormItem label="网络密码">
<template #label>
<div class="flex items-center">
网络密码
<ElTooltip content="对应命令行参数 --network-secret">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
</template>
<ElInput
show-password
maxlength="100"
placeholder="请输入网络密码"
v-model="config.networkPassword"
type="password"
></ElInput>
</ElFormItem>
</div>
</div>
<div class="flex gap-[0_10px]">
<ElFormItem label="主机名">
<template #label>
<div class="flex items-center">
主机名
<ElTooltip content="对应命令行参数 --hostname">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
</div>
</template>
<ElInput
maxlength="100"
placeholder="例如: Player1"
v-model="config.hostname"
></ElInput>
</ElFormItem>
<ElFormItem
class="w-[70%]"
label="局域网IP"
>
<template #label>
<div class="flex items-center h-[20px]">
虚拟网IP
<ElTooltip content="对应命令行参数 --ipv4">
<ElIcon><QuestionFilled /></ElIcon>
</ElTooltip>
<ElSwitch
v-model="config.dhcp"
class="ml-[5px]"
inline-prompt
inactive-text="固定IP"
active-text="动态获取IP"
size="small"
></ElSwitch>
</div>
</template>
<ElInput
maxlength="100"
:disabled="config.dhcp"
:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
v-model="config.ipv4"
></ElInput>
</ElFormItem>
</div>
<!-- </div> -->
<div class="flex items-start">
<div>
<div> <div>
<ElDropdown <ElDropdown
@command="handleStartCommand" @command="handleStartCommand"
@@ -182,10 +198,23 @@
<template #dropdown> <template #dropdown>
<ElDropdownMenu> <ElDropdownMenu>
<ElDropdownItem <ElDropdownItem
command="import_config"
:icon="Link"
>
导入配置
</ElDropdownItem>
<ElDropdownItem
command="share_config"
:icon="Share"
>
分享配置
</ElDropdownItem>
<ElDropdownItem
:icon="Tools"
command="toml" command="toml"
:disabled="data.isStart" :disabled="data.isStart"
> >
配置文件启动 使用外部配置文件
</ElDropdownItem> </ElDropdownItem>
</ElDropdownMenu> </ElDropdownMenu>
</template> </template>
@@ -218,7 +247,7 @@
</ElTooltip> </ElTooltip>
</div> </div>
</div> </div>
<div> <div class="ml-auto">
<ElCheckbox <ElCheckbox
v-model="config.disbleP2p" v-model="config.disbleP2p"
size="small" size="small"
@@ -248,34 +277,23 @@
</div> </div>
<div class="flex items-center gap-[0_5px]"> <div class="flex items-center gap-[0_5px]">
<div> <div>
<ElLink <ElButton
class="!text-[11px]" plain
type="info" type="primary"
:underline="false"
@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
>
WinIPBroadcast
<ElTooltip content="找不到游戏房间时,就开启它后再刷新尝试(默认开启)">
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
</ElTooltip>
</ElLink>
<ElSwitch
inline-prompt
:model-value="data.winipBcStart"
@change="handleWinipBcStart"
size="small" size="small"
label="WinIPBroadcast" :icon="MagicStick"
active-text="开启" @click="handleShowToolDialog"
inactive-text="关闭" >
></ElSwitch> 增强工具
</ElButton>
</div> </div>
<ElLink <ElLink
class="!text-[11px] pb-[2px] ml-[15px]" class="!text-[9px] pb-[2px] ml-[8px] truncate"
type="info" type="info"
:underline="false" :underline="false"
@click="open('https://github.com/EasyTier/EasytierGame')" @click="open('https://github.com/EasyTier/EasytierGame')"
> >
主页 EasytierGame主页
</ElLink> </ElLink>
</div> </div>
</div> </div>
@@ -284,6 +302,36 @@
<ElDialog <ElDialog
width="95%" width="95%"
top="10px" 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" v-model="configStart.visible"
:close-on-press-escape="false" :close-on-press-escape="false"
title="配置文件启动" title="配置文件启动"
@@ -323,31 +371,36 @@
></ElOption> ></ElOption>
</ElSelect> </ElSelect>
</div> </div>
<div class="mt-[5px] text-right"> <template #footer>
<ElButton <div class="text-right">
@click="configStart.visible = false" <ElButton
type="danger" size="small"
> @click="configStart.visible = false"
关闭 type="danger"
</ElButton> >
</div> 关闭
</ElButton>
</div>
</template>
</ElDialog> </ElDialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { invoke } from "@tauri-apps/api/core"; import { invoke } from "@tauri-apps/api/core";
import { listen } from "@tauri-apps/api/event"; import { listen } from "@tauri-apps/api/event";
import { open, Command } from "@tauri-apps/plugin-shell"; import { open, Command } from "@tauri-apps/plugin-shell";
import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight } from "@element-plus/icons-vue"; import { QuestionFilled, Delete, List, UserFilled, Setting, Share, RefreshRight, Link, Tools, MagicStick } from "@element-plus/icons-vue";
import { reactive, onBeforeUnmount, onMounted } from "vue"; import { reactive, onBeforeUnmount, onMounted } from "vue";
import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray"; import { useTray, setTrayRunState, setTrayTooltip } from "~/composables/tray";
import { initStartWinIpBroadcast } from "~/composables/netcard";
import useMainStore from "@/stores/index"; import useMainStore from "@/stores/index";
import { ElDropdownMenu, ElMessage } from "element-plus"; import { ElDropdownMenu, ElMessage, ElMessageBox } from "element-plus";
import { getCurrentWindow } from "@tauri-apps/api/window"; import { getCurrentWindow } from "@tauri-apps/api/window";
import { getAllWebviewWindows } from "@tauri-apps/api/webviewWindow"; import { getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
import etWindows from "@/composables/windows"; import etWindows from "@/composables/windows";
import * as tauriAutoStart from "@tauri-apps/plugin-autostart"; import * as tauriAutoStart from "@tauri-apps/plugin-autostart";
import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path"; import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
import { readDir, exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs"; import { readDir, exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs";
import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
let is_close = false; let is_close = false;
@@ -365,6 +418,7 @@
logVisible: false, logVisible: false,
cidrVisible: false, cidrVisible: false,
advanceVisible: false, advanceVisible: false,
toolVisible: false,
winipBcPid: 0, //WinIPBroadcast进程id winipBcPid: 0, //WinIPBroadcast进程id
winipBcStart: false, winipBcStart: false,
memberVisible: false, memberVisible: false,
@@ -374,7 +428,8 @@
coreVersion: "", coreVersion: "",
isSuccessGetIp: false, isSuccessGetIp: false,
startLoading: false, startLoading: false,
isStart: false isStart: false,
connectionSuccess: false
}); });
const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({ const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
@@ -383,6 +438,12 @@
list: [] //配置文件列表 list: [] //配置文件列表
}); });
const importConfigData = reactive<{ data: ""; [key: string]: any }>({
visible: false,
loading: false,
data: ""
});
const closePrevent = async () => { const closePrevent = async () => {
const appWindow = getCurrentWindow(); const appWindow = getCurrentWindow();
if (appWindow.label == "main") { if (appWindow.label == "main") {
@@ -419,21 +480,32 @@
unListenConfigStart: null, unListenConfigStart: null,
thread_id: null, thread_id: null,
async listenOutput() { async listenOutput() {
const appWindow = getCurrentWindow(); // const appWindow = getCurrentWindow();
const unListen = await listen("command-output", async event => { const unListen = await listen("command-output", async event => {
data.isStart = true; data.isStart = true;
if (event.payload) { if (event.payload) {
data.startLoading = false; data.startLoading = false;
let ipv4 = /new: Some\((\d+\.\d+\.\d+\.\d+)\/.*\)/g.exec(event.payload as string)?.[1]; let ipv4 = /dhcp ip changed. old: None, new: Some\((\d+\.\d+\.\d+\.\d+).*\)/g.exec(event.payload as string)?.[1];
if (ipv4) { if (config.dhcp || mainStore.configStartEnable) {
data.isSuccessGetIp = true; if (ipv4) {
await setTrayRunState(tray, true); config.ipv4 = ipv4;
config.ipv4 = ipv4; await setTrayRunState(tray, true);
await setTrayTooltip(tray, `IP: ${ipv4}`); 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); const logArr = data.log.split("\n");
const start = logArr.length > 1000 ? logArr.length - 1000 : 0;
data.log = logArr.slice(start).join("\n");
data.log += (event.payload as string) + "\n"; data.log += (event.payload as string) + "\n";
}); });
this.unListenOutPut = unListen; this.unListenOutPut = unListen;
}, },
@@ -474,11 +546,11 @@
await getReleaseList(); await getReleaseList();
const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string; const latestVersionFileName = data.releaseList?.[0]?.[0]?.[1] as string;
if (latestVersionFileName) { 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 latestVersion = /\-v(\d+\.\d+\.\d+)/g.exec(latestVersionFileName)?.[1];
const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1]; const currentVersion = /(\d+\.\d+\.\d+)/g.exec(data.coreVersion || "")?.[1];
if (latestVersion && currentVersion != latestVersion) { if (latestVersion && currentVersion != latestVersion) {
console.log({ currentVersion, latestVersion }); // console.log({ currentVersion, latestVersion });
ElMessage.success(`更新 -> ${latestVersion}`); ElMessage.success(`更新 -> ${latestVersion}`);
const downloadUrl = data.releaseList?.[0]?.[0]?.[2]; const downloadUrl = data.releaseList?.[0]?.[0]?.[2];
return [true, downloadUrl, latestVersionFileName]; return [true, downloadUrl, latestVersionFileName];
@@ -501,7 +573,7 @@
const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate(); const [isNeedUpdate, downloadUrl, latestVersionFileName] = await checkUpdate();
if (isNeedUpdate) { if (isNeedUpdate) {
await reset(); await reset();
console.log(downloadUrl); // console.log(downloadUrl);
await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName }); await invoke("download_easytier_zip", { download_url: downloadUrl, file_name: latestVersionFileName });
} }
await getCoreVersion(); await getCoreVersion();
@@ -513,44 +585,6 @@
data.releaseList = list as never[]; data.releaseList = list as never[];
}; };
const getWinIpBroadcastPid = async () => {
const pid = await invoke("search_pid_by_pname", { target_process_name: "WinIPBroadcast" });
data.winipBcPid = (pid as number) || 0;
if (data.winipBcPid && data.winipBcPid > 0) {
data.winipBcStart = true;
} else {
data.winipBcStart = false;
}
};
const handleWinipBcStart = async () => {
if (!data.winipBcStart) {
try {
await invoke("stop_command", { child_id: data.winipBcPid || 0 });
const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
data.winipBcPid = child.pid || 0;
if (data.winipBcPid) {
data.winipBcStart = true;
} else {
ElMessage.error(`启动失败`);
}
} catch (err) {
ElMessage.error(`启动失败`);
console.log(err);
}
} else {
await invoke("stop_command", { child_id: data.winipBcPid || 0 });
await getWinIpBroadcastPid();
}
};
const initStartWinIpBroadcast = async () => {
await getWinIpBroadcastPid();
if (!data.winipBcStart) {
await handleWinipBcStart();
}
};
const handleAutoStart = async () => { const handleAutoStart = async () => {
let is_enable = await tauriAutoStart.isEnabled(); let is_enable = await tauriAutoStart.isEnabled();
if (!config.autoStart && !is_enable) { if (!config.autoStart && !is_enable) {
@@ -714,7 +748,7 @@
if (config.saveErrorLog) { if (config.saveErrorLog) {
args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH); args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
} }
if(config.devName && config.devNameValue) { if (config.devName && config.devNameValue) {
args.push("--dev-name", config.devNameValue); args.push("--dev-name", config.devNameValue);
} }
return args; return args;
@@ -747,10 +781,15 @@
await reset(); await reset();
} else { } else {
const args = await getArgs(); const args = await getArgs();
if (!args || args.length <= 0) { if (!args || args.length <= 0) {
return ElMessage.error("无配置"); return ElMessage.error("无配置");
} }
if(args[0] === "-c") {
ElMessage.warning({
message: "使用配置文件中.",
duration: 5000,
});
}
data.log = ""; //清空日志 data.log = ""; //清空日志
data.startLoading = true; data.startLoading = true;
await unListenAll(); await unListenAll();
@@ -784,6 +823,36 @@
} catch (err) {} } 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 initConfigDir = async () => {
@@ -801,7 +870,7 @@
const openConfigDir = async () => { const openConfigDir = async () => {
const resourceDir = await getResourceDir(); const resourceDir = await getResourceDir();
const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_PATH); const configPath = await join(resourceDir, import.meta.env.VITE_CONFIG_PATH);
console.log(configPath); // console.log(configPath);
await Command.create("explorer", [configPath]).execute(); await Command.create("explorer", [configPath]).execute();
}; };
@@ -809,9 +878,9 @@
if (!data.isStart) { if (!data.isStart) {
return ElMessage.warning("请先开始联机"); return ElMessage.warning("请先开始联机");
} }
if (!mainStore.config.ipv4) { // if (!mainStore.config.ipv4) {
return ElMessage.warning("请等待获取IP"); // return ElMessage.warning("请等待获取IP");
} // }
await etWindows( await etWindows(
"member", "member",
@@ -890,4 +959,23 @@
} }
); );
}; };
const handleShowToolDialog = async () => {
await etWindows(
"tool",
{
title: "增强工具",
width: 460,
height: 480,
resizable: true,
url: "#/tool"
},
(_, appWindow) => {
data.toolVisible = true;
},
() => {
data.toolVisible = false;
}
);
};
</script> </script>
+4 -1
View File
@@ -4,10 +4,13 @@
<span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span> <span v-if="!data.member || data.member.length <= 0">{{ "等待成员信息中..." }}</span>
<ElTable <ElTable
stripe stripe
border
:data="data.member" :data="data.member"
v-else> v-else>
<ElTableColumn <ElTableColumn
v-for="prop in showTableHeader" v-for="prop in showTableHeader"
sortable
:prop="prop[0]"
:label="prop[1]" :label="prop[1]"
:key="prop[0]"> :key="prop[0]">
<template #default="{ row }"> <template #default="{ row }">
@@ -56,7 +59,7 @@
value.ipv4 = value.ipv4.split("/")[0]; value.ipv4 = value.ipv4.split("/")[0];
} }
}); });
console.log(peerInfo); // console.log(peerInfo);
data.member = peerInfo; data.member = peerInfo;
}; };
+323
View File
@@ -0,0 +1,323 @@
<template>
<div class="h-full overflow-auto">
<ElTabs
v-model="data.activeTab"
@tab-change="handleTabsChange"
class="h-full"
>
<ElTabPane
label="联机失败解决办法"
name="netcard"
class="flex flex-col h-full"
>
<div>
<div>
<ElTooltip
content="找不到游戏房间时,就开启它后再尝试搜索房间(默认开启)
例如: 一个游戏玩家,有时通过本地局域网联机,有时通过某些联机工具进行联机,但是他只能在其中一个联机方式里看到朋友的游戏房间,而另一个里看不到,这时就可以使用这个工具,让他在两个地方都能看到游戏房间"
>
<ElText>
方案1
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
</ElText>
</ElTooltip>
</div>
<ElLink
class="!text-[15px] mr-[10px]"
type="info"
:underline="false"
@click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"
>
WinIPBroadcast
</ElLink>
<ElSwitch
inline-prompt
:model-value="mainStore.winipBcStart"
@change="handleWinipBcStart"
size="small"
label="WinIPBroadcast"
active-text="已开启"
inactive-text="已关闭"
></ElSwitch>
</div>
<div>
<ElTooltip content="设置网卡的跃点,提升网卡优先级,尝试将您联机使用的网卡跃点设置为最小,请先查询网卡信息">
<ElText>
方案2
<ElIcon class="ml-[3px]"><QuestionFilled /></ElIcon>
</ElText>
</ElTooltip>
</div>
<div class="flex items-center mt-[5px]">
<ElButton
@click="initNetCardInfo"
size="small"
type="primary"
>
查询网卡信息
</ElButton>
<div
v-if="data.row.name"
class="ml-auto flex items-center flex-nowrap gap-[10px]"
>
<ElTooltip content="跃点越小,网卡优先级越高,范围(1-9999)">
<ElInput
class="!w-[80px]"
autofocus
size="small"
v-model="data.row.metric"
placeholder="请输入跃点"
/>
</ElTooltip>
<ElButton
type="success"
size="small"
@click="handleSaveMetric"
>
保存
</ElButton>
</div>
</div>
<div class="flex-1 overflow-auto mt-[5px]">
<ElTable
height="100%"
empty-text="暂无数据"
highlight-current-row
:data="data.netcardList"
@row-click="handleRowClick"
border
>
<ElTableColumn
sortable
label="网卡名"
prop="name"
></ElTableColumn>
<ElTableColumn
sortable
label="跃点"
prop="metric"
></ElTableColumn>
</ElTable>
</div>
</ElTabPane>
<ElTabPane
label="防火墙"
name="firewall"
class="flex flex-col h-full"
>
<div class="flex flex-col items-center">
<div class="mb-[10px]">
<ElButton
type="warning"
size="small"
>
一键关闭防火墙
</ElButton>
</div>
<div class="mb-[10px]">
<ElText class="!mx-[10px]">域防火墙</ElText>
<ElTag :type="data.firewallStatus.domain ? 'danger' : 'success'">
{{ data.firewallStatus.domain ? "已开启" : "已关闭" }}
</ElTag>
</div>
<div class="mb-[10px]">
<ElText class="!mx-[10px]">公用防火墙</ElText>
<ElTag :type="data.firewallStatus.public ? 'danger' : 'success'">
{{ data.firewallStatus.public ? "已开启" : "已关闭" }}
</ElTag>
</div>
<div>
<ElText class="!mx-[10px]">专用防火墙</ElText>
<ElTag :type="data.firewallStatus.dedicated ? 'danger' : 'success'">
{{ data.firewallStatus.dedicated ? "已开启" : "已关闭" }}
</ElTag>
</div>
</div>
<ElDivider>Ping测试</ElDivider>
<div class="flex items-center gap-[10px]">
<ElInput
style="width: 150px"
size="small"
v-model="data.pingIp"
placeholder="请输入IP地址"
/>
<ElInputNumber
controls-position="right"
size="small"
:precision="0"
v-model="data.pingNum"
:min="1"
:max="10"
>
<template #suffix>
<span></span>
</template>
</ElInputNumber>
<ElButton
size="small"
@click="handleTestPing"
>
Ping一下
</ElButton>
</div>
<div class="mt-[5px] flex-1 overflow-auto">
<ElInput
placeholder="日志信息"
type="textarea"
:autosize="{ minRows: 9 }"
resize="none"
v-model="data.pingLog"
/>
</div>
</ElTabPane>
</ElTabs>
</div>
</template>
<script setup lang="ts">
import { open, Command } from "@tauri-apps/plugin-shell";
import { ElMessage, type TabPaneName } from "element-plus";
import { QuestionFilled } from "@element-plus/icons-vue";
import { onMounted, reactive } from "vue";
import useMainStore from "@/stores/index";
import { handleWinipBcStart, initStartWinIpBroadcast } from "@/composables/netcard";
import { getCurrentWindow } from "@tauri-apps/api/window";
const mainStore = useMainStore();
const data = reactive({
activeTab: "netcard",
winipBcPid: 0,
pingNum: 1,
winipBcStart: false,
pingIp: "",
pingLog: "",
firewallStatus: {
domain: false,
public: false,
dedicated: false
},
row: {
name: "",
metric: ""
},
netcardList: []
});
const handleTabsChange = async (tabPaneName: TabPaneName) => {
if (tabPaneName === "netcard") {
// await initNetCardInfo();
} else if (tabPaneName == "firewall") {
await initFirewall();
}
};
const handleRowClick = async (row: any, column: any, event: Event) => {
data.row = { ...row };
};
const handleSaveMetric = async () => {
if (data.row.metric && data.row.name) {
try {
const output = await Command.create("netsh", ["interface", "ipv4", "set", "interface", data.row.name, "metric=", data.row.metric], {
encoding: "gb2312"
}).execute();
ElMessage.success("设置成功");
await initNetCardInfo();
} catch (err) {
console.log(err);
}
}
};
const handleTestPing = async () => {
/^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$/;
if (data.pingIp) {
data.pingLog = "";
try {
for (let i = 0; i < data.pingNum; i++) {
const output = await Command.create("ping", ["-n", "1", data.pingIp], {
encoding: "gb2312"
}).execute();
data.pingLog = data.pingLog.slice(-1000);
if (output.stdout) {
data.pingLog += output.stdout.split("\n")[2];
}
if (output.stderr) {
data.pingLog += output.stderr;
}
}
} catch (err) {
ElMessage.error("Ping发生错误");
console.log(err);
}
}
};
const initNetCardInfo = async () => {
try {
const output = await Command.create("netsh", ["interface", "ipv4", "show", "interface"], {
encoding: "gb2312"
}).execute();
data.netcardList = output.stdout
.split("\n")
.map(el => el.trim().replace(/\s+/g, " "))
.filter(el => el)
.slice(2)
.map(el => {
const [idx, Met, MTU, status, ...rest] = el.split(" ");
return {
index: idx,
metric: Met,
MTU,
status,
name: rest.join(" ")
};
}) as any;
} catch (err) {
ElMessage.error("网卡获取失败");
console.log(err);
}
};
const initFirewall = async () => {
try {
const output = await Command.create("netsh", ["advfirewall", "show", "allprofiles", "state"], {
encoding: "gb2312"
}).execute();
const state = output.stdout
.trim()
.replace(/[\-]+/g, "")
.split("\n")
.map(el => el.trim())
.filter(el => el)
.slice(0, -1);
for (let idx = 0; idx < state.length; idx += 2) {
const status = state[idx + 1].replace(/状态\s+/, "");
const matchName = /域|公用|专用/.exec(state[idx]);
if (matchName) {
const name = matchName[0];
if (name == "域") {
data.firewallStatus.domain = status != "关闭";
} else if (name == "公用") {
data.firewallStatus.public = status != "关闭";
} else if (name == "专用") {
data.firewallStatus.dedicated = status != "关闭";
}
}
}
} catch (err) {
ElMessage.error("获取防火墙状态失败");
console.log(err);
}
};
const appWindow = getCurrentWindow();
mainStore.$subscribe((...a) => {
// console.log("subscribe", a);
appWindow.emitTo("main", "config", { winIpBcAutoStart: mainStore.winIpBcAutoStart, config: { ...mainStore.config } });
});
onMounted(() => {
initStartWinIpBroadcast();
});
</script>
+10
View File
@@ -11,6 +11,9 @@ importers:
'@tauri-apps/plugin-autostart': '@tauri-apps/plugin-autostart':
specifier: ~2 specifier: ~2
version: 2.0.0 version: 2.0.0
'@tauri-apps/plugin-clipboard-manager':
specifier: ^2.0.0
version: 2.0.0
'@tauri-apps/plugin-fs': '@tauri-apps/plugin-fs':
specifier: ~2 specifier: ~2
version: 2.0.1 version: 2.0.1
@@ -1014,6 +1017,9 @@ packages:
'@tauri-apps/plugin-cli@2.0.0': '@tauri-apps/plugin-cli@2.0.0':
resolution: {integrity: sha512-glQmlL1IiCGEa1FHYa/PTPSeYhfu56omLRgHXWlJECDt6DbJyRuJWVgtkQfUxtqnVdYnnU+DGIGeiInoEqtjLw==} 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': '@tauri-apps/plugin-fs@2.0.1':
resolution: {integrity: sha512-PkeZG2WAob9Xpmr66aPvj+McDVgFjV2a7YBzYVZjiCvbGeMs6Yk09tlXhCe3EyZdT/pwWMSi8lXUace+hlsjsw==} resolution: {integrity: sha512-PkeZG2WAob9Xpmr66aPvj+McDVgFjV2a7YBzYVZjiCvbGeMs6Yk09tlXhCe3EyZdT/pwWMSi8lXUace+hlsjsw==}
@@ -5392,6 +5398,10 @@ snapshots:
dependencies: dependencies:
'@tauri-apps/api': 2.0.2 '@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': '@tauri-apps/plugin-fs@2.0.1':
dependencies: dependencies:
'@tauri-apps/api': 2.0.2 '@tauri-apps/api': 2.0.2
+529 -10
View File
@@ -48,6 +48,12 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "aligned-vec"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
[[package]] [[package]]
name = "alloc-no-stdlib" name = "alloc-no-stdlib"
version = "2.0.4" version = "2.0.4"
@@ -110,6 +116,35 @@ dependencies = [
"derive_arbitrary", "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]] [[package]]
name = "arrayvec" name = "arrayvec"
version = "0.7.6" version = "0.7.6"
@@ -305,6 +340,29 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" 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]] [[package]]
name = "backtrace" name = "backtrace"
version = "0.3.74" version = "0.3.74"
@@ -332,6 +390,12 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bit_field"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.3.2" version = "1.3.2"
@@ -347,6 +411,12 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "bitstream-io"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
[[package]] [[package]]
name = "bitvec" name = "bitvec"
version = "1.0.1" version = "1.0.1"
@@ -441,6 +511,12 @@ dependencies = [
"alloc-stdlib", "alloc-stdlib",
] ]
[[package]]
name = "built"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.16.0" version = "3.16.0"
@@ -492,6 +568,12 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "byteorder-lite"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]] [[package]]
name = "bytes" name = "bytes"
version = "1.7.2" version = "1.7.2"
@@ -668,6 +750,15 @@ dependencies = [
"inout", "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]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.26.0" version = "0.26.0"
@@ -678,7 +769,7 @@ dependencies = [
"block", "block",
"cocoa-foundation", "cocoa-foundation",
"core-foundation 0.10.0", "core-foundation 0.10.0",
"core-graphics", "core-graphics 0.24.0",
"foreign-types 0.5.0", "foreign-types 0.5.0",
"libc", "libc",
"objc", "objc",
@@ -693,11 +784,17 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"block", "block",
"core-foundation 0.10.0", "core-foundation 0.10.0",
"core-graphics-types", "core-graphics-types 0.2.0",
"libc", "libc",
"objc", "objc",
] ]
[[package]]
name = "color_quant"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]] [[package]]
name = "combine" name = "combine"
version = "4.6.7" version = "4.6.7"
@@ -755,6 +852,19 @@ version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" 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]] [[package]]
name = "core-graphics" name = "core-graphics"
version = "0.24.0" version = "0.24.0"
@@ -763,11 +873,22 @@ checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"core-foundation 0.10.0", "core-foundation 0.10.0",
"core-graphics-types", "core-graphics-types 0.2.0",
"foreign-types 0.5.0", "foreign-types 0.5.0",
"libc", "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]] [[package]]
name = "core-graphics-types" name = "core-graphics-types"
version = "0.2.0" version = "0.2.0"
@@ -846,6 +967,12 @@ version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "crunchy"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]] [[package]]
name = "crypto-common" name = "crypto-common"
version = "0.1.6" version = "0.1.6"
@@ -1109,7 +1236,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]] [[package]]
name = "easytier-game" name = "easytier-game"
version = "1.1.3" version = "1.1.6"
dependencies = [ dependencies = [
"log", "log",
"planif", "planif",
@@ -1120,6 +1247,7 @@ dependencies = [
"tauri", "tauri",
"tauri-build", "tauri-build",
"tauri-plugin-autostart", "tauri-plugin-autostart",
"tauri-plugin-clipboard-manager",
"tauri-plugin-fs", "tauri-plugin-fs",
"tauri-plugin-log", "tauri-plugin-log",
"tauri-plugin-shell", "tauri-plugin-shell",
@@ -1227,6 +1355,12 @@ dependencies = [
"windows-sys 0.52.0", "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]] [[package]]
name = "event-listener" name = "event-listener"
version = "5.3.1" version = "5.3.1"
@@ -1248,6 +1382,21 @@ dependencies = [
"pin-project-lite", "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]] [[package]]
name = "fastrand" name = "fastrand"
version = "2.1.1" version = "2.1.1"
@@ -1577,6 +1726,16 @@ dependencies = [
"version_check", "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]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.1.16" version = "0.1.16"
@@ -1599,6 +1758,16 @@ dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1", "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]] [[package]]
name = "gimli" name = "gimli"
version = "0.31.1" version = "0.31.1"
@@ -1772,6 +1941,16 @@ dependencies = [
"tracing", "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]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.12.3" version = "0.12.3"
@@ -2003,16 +2182,43 @@ dependencies = [
[[package]] [[package]]
name = "image" name = "image"
version = "0.25.1" version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"byteorder", "byteorder-lite",
"color_quant",
"exr",
"gif",
"image-webp",
"num-traits", "num-traits",
"png", "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]] [[package]]
name = "indexmap" name = "indexmap"
version = "1.9.3" version = "1.9.3"
@@ -2062,6 +2268,17 @@ dependencies = [
"cfg-if", "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]] [[package]]
name = "ipnet" name = "ipnet"
version = "2.10.1" version = "2.10.1"
@@ -2087,6 +2304,15 @@ dependencies = [
"once_cell", "once_cell",
] ]
[[package]]
name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]] [[package]]
name = "itoa" name = "itoa"
version = "0.4.8" version = "0.4.8"
@@ -2153,6 +2379,12 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "jpeg-decoder"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.70" version = "0.3.70"
@@ -2237,6 +2469,12 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "lebe"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]] [[package]]
name = "libappindicator" name = "libappindicator"
version = "0.9.0" version = "0.9.0"
@@ -2267,6 +2505,17 @@ version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" 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]] [[package]]
name = "libloading" name = "libloading"
version = "0.7.4" version = "0.7.4"
@@ -2318,6 +2567,15 @@ dependencies = [
"value-bag", "value-bag",
] ]
[[package]]
name = "loop9"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
dependencies = [
"imgref",
]
[[package]] [[package]]
name = "lzma-rs" name = "lzma-rs"
version = "0.3.0" version = "0.3.0"
@@ -2363,6 +2621,15 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" 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]] [[package]]
name = "memchr" name = "memchr"
version = "2.7.4" version = "2.7.4"
@@ -2384,6 +2651,12 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.8.0" version = "0.8.0"
@@ -2497,6 +2770,22 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" 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]] [[package]]
name = "ntapi" name = "ntapi"
version = "0.4.1" version = "0.4.1"
@@ -2506,12 +2795,53 @@ dependencies = [
"winapi", "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]] [[package]]
name = "num-conv" name = "num-conv"
version = "0.1.0" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" 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]] [[package]]
name = "num-traits" name = "num-traits"
version = "0.2.19" version = "0.2.19"
@@ -2928,6 +3258,12 @@ dependencies = [
"windows-targets 0.52.6", "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]] [[package]]
name = "pathdiff" name = "pathdiff"
version = "0.2.2" version = "0.2.2"
@@ -3242,6 +3578,25 @@ dependencies = [
"unicode-ident", "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]] [[package]]
name = "ptr_meta" name = "ptr_meta"
version = "0.1.4" version = "0.1.4"
@@ -3262,6 +3617,21 @@ dependencies = [
"syn 1.0.109", "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]] [[package]]
name = "quick-xml" name = "quick-xml"
version = "0.32.0" version = "0.32.0"
@@ -3367,6 +3737,55 @@ dependencies = [
"rand_core 0.5.1", "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]] [[package]]
name = "raw-window-handle" name = "raw-window-handle"
version = "0.6.2" version = "0.6.2"
@@ -3496,6 +3915,12 @@ dependencies = [
"windows-registry", "windows-registry",
] ]
[[package]]
name = "rgb"
version = "0.8.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
[[package]] [[package]]
name = "ring" name = "ring"
version = "0.17.8" version = "0.17.8"
@@ -3939,6 +4364,15 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" 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]] [[package]]
name = "simdutf8" name = "simdutf8"
version = "0.1.5" version = "0.1.5"
@@ -3984,7 +4418,7 @@ checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cfg_aliases 0.2.1", "cfg_aliases 0.2.1",
"core-graphics", "core-graphics 0.24.0",
"foreign-types 0.5.0", "foreign-types 0.5.0",
"js-sys", "js-sys",
"log", "log",
@@ -4191,7 +4625,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cocoa", "cocoa",
"core-foundation 0.10.0", "core-foundation 0.10.0",
"core-graphics", "core-graphics 0.24.0",
"crossbeam-channel", "crossbeam-channel",
"dispatch", "dispatch",
"dlopen2", "dlopen2",
@@ -4390,6 +4824,22 @@ dependencies = [
"thiserror", "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]] [[package]]
name = "tauri-plugin-fs" name = "tauri-plugin-fs"
version = "2.0.3" version = "2.0.3"
@@ -4610,6 +5060,17 @@ dependencies = [
"syn 2.0.79", "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]] [[package]]
name = "time" name = "time"
version = "0.3.36" version = "0.3.36"
@@ -4809,7 +5270,7 @@ version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f" checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f"
dependencies = [ dependencies = [
"core-graphics", "core-graphics 0.24.0",
"crossbeam-channel", "crossbeam-channel",
"dirs 5.0.1", "dirs 5.0.1",
"libappindicator", "libappindicator",
@@ -4973,6 +5434,17 @@ dependencies = [
"serde", "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]] [[package]]
name = "value-bag" name = "value-bag"
version = "1.9.0" version = "1.9.0"
@@ -5224,6 +5696,12 @@ dependencies = [
"windows-core 0.58.0", "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]] [[package]]
name = "whoami" name = "whoami"
version = "1.5.2" version = "1.5.2"
@@ -5748,6 +6226,23 @@ dependencies = [
"pkg-config", "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]] [[package]]
name = "xdg-home" name = "xdg-home"
version = "1.3.0" version = "1.3.0"
@@ -5934,6 +6429,30 @@ dependencies = [
"pkg-config", "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]] [[package]]
name = "zvariant" name = "zvariant"
version = "4.0.0" version = "4.0.0"
+3 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "easytier-game" name = "easytier-game"
version = "1.1.3" version = "1.1.6"
homepage = "https://github.com/EasyTier/EasyTier" homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame" repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier" description = "A simple network initiator based on Easytier"
@@ -30,6 +30,7 @@ tauri = { version = "2.0.6", features = [
"image-png", "image-png",
"image-ico", "image-ico",
] } ] }
tauri-plugin-log = "2.0.1" tauri-plugin-log = "2.0.1"
tauri-plugin-shell = "2.0.2" tauri-plugin-shell = "2.0.2"
reqwest = { version = "0.12", features = ["json"] } reqwest = { version = "0.12", features = ["json"] }
@@ -38,6 +39,7 @@ sysinfo = '0.32.0'
planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" } planif = { git = "https://github.com/mattrobineau/planif", tag = "1.0.1" }
whoami = "1.5.2" whoami = "1.5.2"
tauri-plugin-fs = "2" tauri-plugin-fs = "2"
tauri-plugin-clipboard-manager = "2.0.0-rc"
# prost = "0.13" # prost = "0.13"
# prost-types = "0.13" # prost-types = "0.13"
+90 -66
View File
@@ -1,67 +1,91 @@
{ {
"$schema": "../gen/schemas/desktop-schema.json", "$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default", "identifier": "default",
"description": "enables the default permissions", "description": "enables the default permissions",
"windows": ["main", "log", "member", "cidr", "advance"], "windows": [
"permissions": [ "main",
"core:default", "log",
"core:window:allow-minimize", "member",
"core:window:allow-hide", "cidr",
"core:window:allow-close", "advance",
"shell:allow-open", "tool"
"core:window:allow-show", ],
"core:window:allow-create", "permissions": [
"core:window:allow-set-position", "core:default",
"core:window:allow-destroy", "core:window:allow-minimize",
"core:webview:allow-create-webview-window", "core:window:allow-hide",
"core:webview:allow-set-webview-size", "core:window:allow-close",
"core:webview:allow-set-webview-position", "shell:allow-open",
"core:webview:allow-create-webview", "core:window:allow-show",
"core:webview:allow-webview-show", "core:window:allow-create",
"core:webview:allow-webview-hide", "core:window:allow-set-position",
"core:webview:allow-webview-close", "core:window:allow-destroy",
"autostart:default", "core:webview:allow-create-webview-window",
"autostart:allow-enable", "core:webview:allow-set-webview-size",
"autostart:allow-disable", "core:webview:allow-set-webview-position",
"autostart:allow-is-enabled", "core:webview:allow-create-webview",
"core:tray:allow-get-by-id", "core:webview:allow-webview-show",
"core:tray:allow-set-icon", "core:webview:allow-webview-hide",
"core:tray:allow-new", "core:webview:allow-webview-close",
{ "autostart:default",
"identifier": "shell:allow-spawn", "autostart:allow-enable",
"allow": [ "autostart:allow-disable",
{ "autostart:allow-is-enabled",
"args": ["run"], "core:tray:allow-get-by-id",
"cmd": "easytier/tool/WinIPBroadcast", "core:tray:allow-set-icon",
"name": "WinIPBroadcast" "core:tray:allow-new",
} {
] "identifier": "shell:allow-spawn",
}, "allow": [
{ {
"identifier": "shell:allow-execute", "args": [
"allow": [ "run"
{ ],
"args": ["run"], "cmd": "easytier/tool/WinIPBroadcast",
"cmd": "easytier/tool/WinIPBroadcast", "name": "WinIPBroadcast"
"name": "WinIPBroadcast" }
}, ]
{ },
"args": true, {
"cmd": "easytier/tool/nssm", "identifier": "shell:allow-execute",
"name": "nssm" "allow": [
}, {
{ "args": [
"args": true, "run"
"cmd": "explorer", ],
"name": "explorer" "cmd": "easytier/tool/WinIPBroadcast",
} "name": "WinIPBroadcast"
] },
}, {
"fs:default", "args": true,
"fs:allow-read-dir", "cmd": "easytier/tool/nssm",
"fs:allow-exists", "name": "nssm"
"fs:allow-open", },
"fs:allow-resource-read", {
"fs:allow-resource-read-recursive" "args": true,
] "cmd": "explorer",
} "name": "explorer"
},
{
"args": true,
"cmd": "netsh",
"name": "netsh"
},
{
"args": true,
"cmd": "ping",
"name": "ping"
}
]
},
"fs:default",
"fs:allow-read-dir",
"fs:allow-exists",
"fs:allow-open",
"fs:allow-resource-read",
"fs:allow-resource-read-recursive",
"clipboard-manager:allow-clear",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text"
]
}
+13 -22
View File
@@ -394,14 +394,12 @@ fn spawn_autostart(enabled: bool) {
fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> { fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
unsafe { unsafe {
let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?; let task_service: ITaskService = CoCreateInstance(&TaskScheduler, None, CLSCTX_ALL)?;
task_service task_service.Connect(
.Connect( &VARIANT::default(),
&VARIANT::default(), &VARIANT::default(),
&VARIANT::default(), &VARIANT::default(),
&VARIANT::default(), &VARIANT::default(),
&VARIANT::default(), )?;
)
?;
// 指定要删除的任务文件夹路径 // 指定要删除的任务文件夹路径
let folder_path = BSTR::from("\\easytierGame"); let folder_path = BSTR::from("\\easytierGame");
@@ -411,20 +409,12 @@ fn autostart_enabled() -> Result<bool, Box<dyn std::error::Error>> {
let bool_ptr: *mut VARIANT_BOOL = &mut penabled; let bool_ptr: *mut VARIANT_BOOL = &mut penabled;
// 获取任务文件夹F // 获取任务文件夹F
let task_folder: ITaskFolder = task_service let task_folder: ITaskFolder = task_service.GetFolder(&folder_path)?;
.GetFolder(&folder_path) let task = task_folder.GetTask(&task_name)?;
?; task.Definition()?
let task = task_folder .Triggers()?
.GetTask(&task_name) .get_Item(1)?
?; .Enabled(bool_ptr)?;
task.Definition()
?
.Triggers()
?
.get_Item(1)
?
.Enabled(bool_ptr)
?;
// 释放 COM 库 // 释放 COM 库
CoUninitialize(); CoUninitialize();
// return penabled.as_bool(); // return penabled.as_bool();
@@ -517,6 +507,7 @@ pub fn run() {
let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆,用于传递给命令 let stop_signal_clone = Arc::clone(&stop_signal); // 创建一个原子布尔值的克隆,用于传递给命令
let context = tauri::generate_context!(); let context = tauri::generate_context!();
tauri::Builder::default() tauri::Builder::default()
.plugin(tauri_plugin_clipboard_manager::init())
.plugin(tauri_plugin_fs::init()) .plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_autostart::init( .plugin(tauri_plugin_autostart::init(
MacosLauncher::LaunchAgent, MacosLauncher::LaunchAgent,
+8 -4
View File
@@ -1,7 +1,7 @@
{ {
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game", "productName": "easytier-game",
"version": "1.1.3", "version": "1.1.6",
"identifier": "com.tauri.easytier-game", "identifier": "com.tauri.easytier-game",
"build": { "build": {
@@ -13,10 +13,14 @@
"app": { "app": {
"windows": [ "windows": [
{ {
"title": "easytier-game 1.1.3", "title": "easytier-game 1.1.6",
"width": 335, "minWidth": 340,
"width": 340,
"height": 305, "height": 305,
"resizable": false, "minHeight": 305,
"maxHeight": 305,
"maxWidth": 360,
"resizable": true,
"fullscreen": false, "fullscreen": false,
"decorations": true, "decorations": true,
"center": true, "center": true,
+7
View File
@@ -33,6 +33,9 @@ export default defineStore("main", {
configStartEnable: false, //使用配置文件启动 configStartEnable: false, //使用配置文件启动
configPath: "", //配置文件路径 configPath: "", //配置文件路径
cidrEnable: false, cidrEnable: false,
winipBcPid: 0,
winipBcStart: false,
winIpBcAutoStart: true,
basePeers: ["public.easytier.top:11010"], basePeers: ["public.easytier.top:11010"],
}; };
}, },
@@ -41,6 +44,9 @@ export default defineStore("main", {
"basePeers", "basePeers",
"cidrEnable", "cidrEnable",
"theme", "theme",
"configStartEnable",
"configPath",
"winIpBcAutoStart",
"config.proxyNetworks", "config.proxyNetworks",
"config.serverUrl", "config.serverUrl",
"config.networkName", "config.networkName",
@@ -60,6 +66,7 @@ export default defineStore("main", {
"config.disableUdpHolePunching", "config.disableUdpHolePunching",
"config.relayAllPeerrpc", "config.relayAllPeerrpc",
"config.hostname", "config.hostname",
"config.ipv4",
"config.dhcp", "config.dhcp",
"config.saveErrorLog", "config.saveErrorLog",
"config.logLevel", "config.logLevel",
+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);
};