Compare commits
20
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b9f71da08 | ||
|
|
28e0c4664a | ||
|
|
d21649c60e | ||
|
|
4dd60f42a1 | ||
|
|
0a19b4b38a | ||
|
|
7d49a7395f | ||
|
|
d0705b1ffe | ||
|
|
6c7897bf47 | ||
|
|
2f20161010 | ||
|
|
d09599fa95 | ||
|
|
e09b0567d6 | ||
|
|
e66c53e66d | ||
|
|
4f0f9e08b7 | ||
|
|
c7578a2e6b | ||
|
|
126f8896b6 | ||
|
|
5656193b5c | ||
|
|
d85f7b2ad0 | ||
|
|
a745df0880 | ||
|
|
c913379e2b | ||
|
|
f51a7f894e |
@@ -7,6 +7,9 @@ yarn-error.log*
|
|||||||
pnpm-debug.log*
|
pnpm-debug.log*
|
||||||
lerna-debug.log*
|
lerna-debug.log*
|
||||||
|
|
||||||
|
# 发布暂存目录
|
||||||
|
release_stage/
|
||||||
|
|
||||||
node_modules
|
node_modules
|
||||||
dist
|
dist
|
||||||
dist-ssr
|
dist-ssr
|
||||||
|
|||||||
+7
-7
@@ -315,11 +315,11 @@ const status = processStore.getProcessStatus('proxy')
|
|||||||
|
|
||||||
| 命令 | 参数 | 返回值 |
|
| 命令 | 参数 | 返回值 |
|
||||||
|------|------|--------|
|
|------|------|--------|
|
||||||
| `start_process` | `StartProcessParams` | `ProcessInfo` |
|
| `process_start` | `StartProcessParams` | `ProcessInfo` |
|
||||||
| `stop_process` | `id: String` | `()` |
|
| `process_stop` | `id: String` | `()` |
|
||||||
| `get_process_status` | `id: String` | `Option<ProcessInfo>` |
|
| `process_status` | `id: String` | `Option<ProcessInfo>` |
|
||||||
| `get_all_process_status` | - | `Vec<ProcessInfo>` |
|
| `process_all_status` | - | `Vec<ProcessInfo>` |
|
||||||
| `stop_all_processes` | - | `()` |
|
| `process_stop_all` | - | `()` |
|
||||||
|
|
||||||
### 事件
|
### 事件
|
||||||
|
|
||||||
@@ -388,8 +388,8 @@ rusqlite = { version = "0.30", features = ["bundled"] }
|
|||||||
|
|
||||||
### Rust 调试
|
### Rust 调试
|
||||||
|
|
||||||
- 使用 `println!()` 输出到终端
|
- 使用 `crate::logger::log_info / log_warn / log_error`(或 `log_line`)写入统一日志文件,日志页面可过滤级别
|
||||||
- 使用 `dbg!()` 宏调试变量
|
- 使用 `dbg!()` 宏调试变量(仅临时,提交前删除)
|
||||||
- 使用 Visual Studio Code 的 Rust 调试插件
|
- 使用 Visual Studio Code 的 Rust 调试插件
|
||||||
|
|
||||||
### 构建问题排查
|
### 构建问题排查
|
||||||
|
|||||||
+5
-10
@@ -397,7 +397,7 @@ thread::spawn(move || {
|
|||||||
|
|
||||||
### 后端:内核/二进制下载用流式 + 事件推送
|
### 后端:内核/二进制下载用流式 + 事件推送
|
||||||
|
|
||||||
`mihomo_manager.rs` 的 `install_kernel` 确立了"下载二进制资源"的标准模式,未来若有其他模块需要下载外部内核时应复用:
|
`mihomo_manager/` 目录(`kernel.rs`)的 `install_kernel` 确立了"下载二进制资源"的标准模式,未来若有其他模块需要下载外部内核时应复用:
|
||||||
|
|
||||||
- **流式下载**:`reqwest::Response::bytes_stream()` + `futures_util::StreamExt`,避免大文件一次性读入内存
|
- **流式下载**:`reqwest::Response::bytes_stream()` + `futures_util::StreamExt`,避免大文件一次性读入内存
|
||||||
- **进度事件**:通过 `app.emit("xxx-install-progress", progress)` 推送,事件载荷结构参考 `InstallProgress`
|
- **进度事件**:通过 `app.emit("xxx-install-progress", progress)` 推送,事件载荷结构参考 `InstallProgress`
|
||||||
@@ -492,13 +492,13 @@ TitleBar 的关闭按钮实际是 `hide()` 到托盘。webview 快速隐藏时
|
|||||||
|
|
||||||
### 前端:浮动标签切换器(TabsList 滚动遮挡时在 TitleBar 显示)
|
### 前端:浮动标签切换器(TabsList 滚动遮挡时在 TitleBar 显示)
|
||||||
|
|
||||||
模块详情页内容滚动时,顶部 `TabsList` 会被 `TitleBar` 遮挡,导致用户必须滚回顶部才能切换 Tab。已抽取通用 composable `src/lib/useModuleTabs.ts` 自动处理。
|
模块详情页内容滚动时,顶部 `TabsList` 会被 `TitleBar` 遮挡,导致用户必须滚回顶部才能切换 Tab。已抽取通用 composable `src/lib/use-module-tabs.ts` 自动处理。
|
||||||
|
|
||||||
**接入方式**(任何使用 Tabs 的模块都可用,代理/下载器模块已接入):
|
**接入方式**(任何使用 Tabs 的模块都可用,代理/下载器模块已接入):
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
// 模块 <script setup> 顶部
|
// 模块 <script setup> 顶部
|
||||||
import { useModuleTabs } from '@/lib/useModuleTabs'
|
import { useModuleTabs } from '@/lib/use-module-tabs'
|
||||||
|
|
||||||
const activeTab = ref('overview')
|
const activeTab = ref('overview')
|
||||||
const tabsListRef = useModuleTabs(activeTab, [
|
const tabsListRef = useModuleTabs(activeTab, [
|
||||||
@@ -613,11 +613,6 @@ const formatEta = (seconds: number): string => {
|
|||||||
|
|
||||||
下载任务工具栏的速度/活跃/等待/已完成数量,以及代理概览页的内核状态/版本,从纯文本改为 `Badge variant="secondary"` 或带颜色的 `Badge`(绿色已安装/红色未安装),视觉更醒目。新模块的状态展示建议统一用 Badge。
|
下载任务工具栏的速度/活跃/等待/已完成数量,以及代理概览页的内核状态/版本,从纯文本改为 `Badge variant="secondary"` 或带颜色的 `Badge`(绿色已安装/红色未安装),视觉更醒目。新模块的状态展示建议统一用 Badge。
|
||||||
|
|
||||||
### 后端:应用退出清理必须覆盖所有退出路径
|
### 后端:应用退出清理(单一出口)
|
||||||
|
|
||||||
`lib.rs` 中应用退出有两种触发路径,**都要**调用 `cleanup_on_exit` + `stop_all`:
|
退出清理已收敛到 `lib.rs` 的 `RunEvent::ExitRequested` 分支(P0-1/V7):`quit_app` 命令与托盘退出项都只触发 `app.exit(0)`,清理逻辑(`cleanup_on_exit` + `stop_all`)只在该分支执行一次。新增管理子进程的模块时,在 `ExitRequested` 分支注册自己的 `cleanup_on_exit` 即可,不要在命令或托盘路径重复清理。
|
||||||
|
|
||||||
1. `quit_app` Tauri 命令(前端 `appWindow.destroy()` 触发)
|
|
||||||
2. 系统托盘的退出菜单项
|
|
||||||
|
|
||||||
漏掉任何一个都会导致子进程残留(如 mihomo 继续占用端口、系统代理未清除)。新增管理子进程的模块时,检查这两处是否都调用了清理逻辑。
|
|
||||||
|
|||||||
@@ -23,15 +23,15 @@ Thing/
|
|||||||
│ ├── components/ # 通用组件
|
│ ├── components/ # 通用组件
|
||||||
│ │ ├── layout/ # 布局组件(TitleBar、Sidebar、ModuleContainer)
|
│ │ ├── layout/ # 布局组件(TitleBar、Sidebar、ModuleContainer)
|
||||||
│ │ └── ui/ # shadcn-vue UI 组件
|
│ │ └── ui/ # shadcn-vue UI 组件
|
||||||
│ ├── lib/ # 工具库(logger、useModuleTabs、utils)
|
│ ├── lib/ # 工具库(logger、use-module-tabs、calc、constants)
|
||||||
│ ├── modules/ # 功能模块(每个模块含 index.ts 配置 + Vue 组件)
|
│ ├── modules/ # 功能模块(每个模块含 index.ts 配置 + Vue 组件)
|
||||||
│ │ ├── proxy/ # 代理管理模块
|
│ │ ├── proxy/ # 代理管理模块
|
||||||
│ │ ├── clipboard/ # 剪贴板增强模块
|
│ │ ├── clipboard/ # 剪贴板增强模块
|
||||||
│ │ ├── screenshot/ # 截图模块
|
│ │ ├── screenshot/ # 截图模块
|
||||||
│ │ ├── monitor/ # 硬件监控模块
|
│ │ ├── monitor/ # 硬件监控模块
|
||||||
│ │ ├── downloader/ # 下载器模块
|
│ │ ├── downloader/ # 下载器模块
|
||||||
│ │ ├── finder/ # 文件搜索模块
|
│ │ ├── quickpanel/ # 快速面板模块(含 providers/ 搜索提供器目录)
|
||||||
│ │ ├── general/ # 通用设置模块
|
│ │ ├── settings/ # 通用设置模块
|
||||||
│ │ ├── icons.ts # 模块图标映射
|
│ │ ├── icons.ts # 模块图标映射
|
||||||
│ │ ├── index.ts # 模块聚合入口
|
│ │ ├── index.ts # 模块聚合入口
|
||||||
│ │ └── registry.ts # 模块注册表单例
|
│ │ └── registry.ts # 模块注册表单例
|
||||||
@@ -46,12 +46,22 @@ Thing/
|
|||||||
│ ├── icons/ # 应用图标
|
│ ├── icons/ # 应用图标
|
||||||
│ ├── resources/ # 打包资源(浏览器扩展等)
|
│ ├── resources/ # 打包资源(浏览器扩展等)
|
||||||
│ ├── src/
|
│ ├── src/
|
||||||
│ │ ├── download_engine/ # 下载引擎(进程内自建,含 engine/storage/http_dl/server 等)
|
│ │ ├── clipboard/ # 剪贴板模块(reader/monitor/storage/popup)
|
||||||
│ │ ├── logger.rs # 日志系统
|
│ │ ├── download_engine/ # 下载引擎(进程内自建,含 engine/storage/http_dl 等)
|
||||||
│ │ ├── mihomo_manager.rs # mihomo 内核管理(代理模块后端)
|
│ │ ├── mihomo_manager/ # mihomo 内核管理(mod/kernel/profiles/system_proxy/commands 等)
|
||||||
|
│ │ ├── quickpanel/ # 快速面板后端(commands/file_index/icon_extractor)
|
||||||
|
│ │ ├── screenshot/ # 截图后端(capture/commands)
|
||||||
|
│ │ ├── constants.rs # 双端常量(窗口 label / 事件名)
|
||||||
|
│ │ ├── logger.rs # 日志系统(进程级全局日志器)
|
||||||
|
│ │ ├── monitor_kernel.rs # 硬件监控内核(SSE 订阅)
|
||||||
|
│ │ ├── network_monitor.rs # 网速监控
|
||||||
|
│ │ ├── osd_window.rs # OSD 悬浮窗
|
||||||
│ │ ├── process_manager.rs # 子进程统一管理
|
│ │ ├── process_manager.rs # 子进程统一管理
|
||||||
|
│ │ ├── setup.rs # 应用初始化
|
||||||
|
│ │ ├── tray_menu.rs # 系统托盘
|
||||||
|
│ │ ├── win32_util.rs # Win32 屏幕/DPI 工具
|
||||||
│ │ ├── main.rs # Rust 入口
|
│ │ ├── main.rs # Rust 入口
|
||||||
│ │ └── lib.rs # Rust 库入口(命令注册、应用初始化)
|
│ │ └── lib.rs # Rust 库入口(命令注册、事件循环)
|
||||||
│ ├── Cargo.toml # Rust 依赖配置
|
│ ├── Cargo.toml # Rust 依赖配置
|
||||||
│ └── tauri.conf.json # Tauri 配置
|
│ └── tauri.conf.json # Tauri 配置
|
||||||
├── package.json # 前端依赖配置
|
├── package.json # 前端依赖配置
|
||||||
@@ -81,18 +91,16 @@ Thing/
|
|||||||
- [x] 订阅管理
|
- [x] 订阅管理
|
||||||
|
|
||||||
#### 📋 剪贴板增强
|
#### 📋 剪贴板增强
|
||||||
- [ ] 剪贴板历史记录(排序,搜索)
|
- [x] 剪贴板历史记录(排序,搜索)
|
||||||
- [ ] 鼠标位置快携键历史弹窗
|
- [x] 鼠标位置快携键历史弹窗
|
||||||
- [ ] 固定常用条目(快捷输入)
|
- [x] 固定常用条目(快捷输入)
|
||||||
- [ ] 多格式预览(文本、图片、文件)
|
- [x] 多格式预览(文本、图片、文件)
|
||||||
- [ ] SQLite 存储
|
- [x] SQLite 存储
|
||||||
|
|
||||||
#### 📸 截图
|
#### 📸 截图
|
||||||
- [ ] 区域截图
|
- [x] 截图及相关
|
||||||
- [ ] 窗口截图
|
- [ ] 滚动截图(后续支持)
|
||||||
- [ ] 全屏截图
|
- [x] 贴图
|
||||||
- [ ] 滚动截图
|
|
||||||
- [ ] 图片编辑工具
|
|
||||||
|
|
||||||
#### 📊 硬件监控
|
#### 📊 硬件监控
|
||||||
- [x] 悬浮窗显示
|
- [x] 悬浮窗显示
|
||||||
@@ -103,25 +111,24 @@ Thing/
|
|||||||
- [x] 自建进程内下载引擎(多线程 HTTP/HTTPS,无需外部内核)
|
- [x] 自建进程内下载引擎(多线程 HTTP/HTTPS,无需外部内核)
|
||||||
- [x] 接管浏览器下载,浏览器扩展(Thing Extension)
|
- [x] 接管浏览器下载,浏览器扩展(Thing Extension)
|
||||||
- [x] HTTP 下载支持
|
- [x] HTTP 下载支持
|
||||||
- [ ] BT/磁力链接支持(后续支持)
|
- [x] BT/磁力链接支持(后续支持)
|
||||||
- [x] 下载任务管理(历史)
|
- [x] 下载任务管理(历史)
|
||||||
- [x] 速度限制
|
- [x] 速度限制
|
||||||
- [x] 断点续传
|
- [x] 断点续传
|
||||||
|
|
||||||
#### 🔍 文件 / 程序搜索
|
#### 🔍 快速面板
|
||||||
- [ ] 快速搜索弹窗(快捷键触发)
|
- [x] 全局弹窗(快捷键触发)
|
||||||
- [ ] 文件搜索(Everything SDK)
|
- [x] 全局搜索:拼音模糊匹配,正则表达式支持。支持:程序,文件,文件夹,设置项,最近使用,历史命令
|
||||||
- [ ] 应用程序搜索
|
- [x] 快捷命令(例:shutdown, hosts)
|
||||||
- [ ] 拼音模糊匹配
|
- [x] 计算器 / 单位换算(数学表达式、单位/货币换算;时间转换、进制转换后续支持)
|
||||||
- [ ] 正则表达式支持
|
|
||||||
|
|
||||||
### 第三阶段:优化与完善
|
### 第三阶段:优化与完善
|
||||||
|
|
||||||
- [ ] 性能优化
|
- [x] 性能优化(见 MODULE_REVIEW.md)
|
||||||
- [ ] 错误处理与日志完善
|
- [x] 错误处理与日志完善(全局日志器、异常兜底)
|
||||||
- [ ] 用户体验优化
|
- [x] 用户体验优化(混合 DPI 定位、rAF 节流、UI 细节)
|
||||||
- [ ] 自动更新机制
|
- [x] 自动更新机制
|
||||||
- [ ] 打包发布
|
- [x] 打包发布
|
||||||
|
|
||||||
## 模块管理架构
|
## 模块管理架构
|
||||||
|
|
||||||
|
|||||||
@@ -66,6 +66,8 @@ internal sealed class KernelStatus
|
|||||||
{
|
{
|
||||||
public bool Ready { get; set; }
|
public bool Ready { get; set; }
|
||||||
public bool IsAdmin { get; set; }
|
public bool IsAdmin { get; set; }
|
||||||
|
/// <summary>PawnIO 驱动是否已安装(ring0 传感器读取依赖它或 WinRing0,缺失时温度/频率通常无法读取)</summary>
|
||||||
|
public bool PawnIoInstalled { get; set; }
|
||||||
public double UptimeMs { get; set; }
|
public double UptimeMs { get; set; }
|
||||||
public int GroupCount { get; set; }
|
public int GroupCount { get; set; }
|
||||||
public int SensorCount { get; set; }
|
public int SensorCount { get; set; }
|
||||||
|
|||||||
+45
-11
@@ -24,6 +24,9 @@ internal sealed class HardwareManager : IDisposable
|
|||||||
private readonly bool _isAdmin;
|
private readonly bool _isAdmin;
|
||||||
private readonly double _coldStartMs;
|
private readonly double _coldStartMs;
|
||||||
private readonly Stopwatch _startupSw;
|
private readonly Stopwatch _startupSw;
|
||||||
|
// 传感器 ID 缓存:避免每秒为每个传感器重复拼接字符串(减少 GC 压力)
|
||||||
|
private readonly Dictionary<ISensor, string> _sensorIdCache = new();
|
||||||
|
private bool _coldStartSent;
|
||||||
private bool _ready;
|
private bool _ready;
|
||||||
private bool _closed;
|
private bool _closed;
|
||||||
private HardwareConfig _config;
|
private HardwareConfig _config;
|
||||||
@@ -84,7 +87,7 @@ internal sealed class HardwareManager : IDisposable
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 全量 Update 所有硬件。
|
/// 全量 Update 所有硬件。
|
||||||
/// 由 SamplingScheduler 按通道分频调用。
|
/// 仅用于构造函数首轮填充,运行期由调度器分频调用 UpdateFastOnly/UpdateSlowOnly。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void UpdateAll()
|
public void UpdateAll()
|
||||||
{
|
{
|
||||||
@@ -94,9 +97,24 @@ internal sealed class HardwareManager : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 仅 Update 快通道硬件(CPU/GPU/Memory/Network 等)。
|
||||||
|
/// 由调度器快通道 tick 高频调用,避免 SMART 等重查询拖慢采样节奏。
|
||||||
|
/// </summary>
|
||||||
|
public void UpdateFastOnly()
|
||||||
|
{
|
||||||
|
foreach (var hw in _visitor.AllHardware)
|
||||||
|
{
|
||||||
|
if (!IsSlowHardware(hw.HardwareType))
|
||||||
|
{
|
||||||
|
try { hw.Update(); } catch { /* 单个硬件 Update 失败不影响整体 */ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仅 Update 慢通道硬件(Storage/PSU/Battery 等)。
|
/// 仅 Update 慢通道硬件(Storage/PSU/Battery 等)。
|
||||||
/// 快通道硬件(CPU/GPU/Memory/Network)由调度器更高频调用 UpdateAll。
|
/// 快通道硬件(CPU/GPU/Memory/Network)由调度器更高频调用 UpdateFastOnly。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void UpdateSlowOnly()
|
public void UpdateSlowOnly()
|
||||||
{
|
{
|
||||||
@@ -123,10 +141,11 @@ internal sealed class HardwareManager : IDisposable
|
|||||||
Ready = _ready,
|
Ready = _ready,
|
||||||
};
|
};
|
||||||
|
|
||||||
// 首个快照带上冷启动耗时,后续为 0
|
// 首个快照带上冷启动耗时,后续为 0(修复:此前每个快照都携带 ColdStartMs)
|
||||||
if (_coldStartMs > 0 && snap.Timestamp > 0)
|
if (_coldStartMs > 0 && !_coldStartSent)
|
||||||
{
|
{
|
||||||
snap.ColdStartMs = Math.Round(_coldStartMs, 1);
|
snap.ColdStartMs = Math.Round(_coldStartMs, 1);
|
||||||
|
_coldStartSent = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 重新遍历以读取最新传感器值(visitor 缓存的是 hardware 引用,sensor 值实时)
|
// 重新遍历以读取最新传感器值(visitor 缓存的是 hardware 引用,sensor 值实时)
|
||||||
@@ -156,7 +175,7 @@ internal sealed class HardwareManager : IDisposable
|
|||||||
|
|
||||||
g.Sensors.Add(new SensorEntry
|
g.Sensors.Add(new SensorEntry
|
||||||
{
|
{
|
||||||
Id = $"{groupId}/{hw.Name}/{s.SensorType}/{s.Name}".Replace(' ', '_').ToLowerInvariant(),
|
Id = GetSensorId(s, groupId, hw.Name),
|
||||||
Name = s.Name,
|
Name = s.Name,
|
||||||
Type = sensorType,
|
Type = sensorType,
|
||||||
Value = s.Value,
|
Value = s.Value,
|
||||||
@@ -169,6 +188,21 @@ internal sealed class HardwareManager : IDisposable
|
|||||||
return snap;
|
return snap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取传感器稳定 ID(带缓存)。
|
||||||
|
/// ID 格式:{groupId}/{hwName}/{sensorType}/{sensorName},空格转下划线、小写化。
|
||||||
|
/// 缓存命中直接返回,未命中(新传感器)计算后入缓存。
|
||||||
|
/// </summary>
|
||||||
|
private string GetSensorId(ISensor s, string groupId, string hwName)
|
||||||
|
{
|
||||||
|
if (!_sensorIdCache.TryGetValue(s, out var id))
|
||||||
|
{
|
||||||
|
id = $"{groupId}/{hwName}/{s.SensorType}/{s.Name}".Replace(' ', '_').ToLowerInvariant();
|
||||||
|
_sensorIdCache[s] = id;
|
||||||
|
}
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 为已启用但 LHB 未枚举到的硬件类型预创建空分组。
|
/// 为已启用但 LHB 未枚举到的硬件类型预创建空分组。
|
||||||
/// 场景:用户在设置中勾选了主板/电池/电源等,但 LHB 在当前权限或机型下检测不到对应硬件,
|
/// 场景:用户在设置中勾选了主板/电池/电源等,但 LHB 在当前权限或机型下检测不到对应硬件,
|
||||||
@@ -243,7 +277,7 @@ internal sealed class HardwareManager : IDisposable
|
|||||||
_ => "",
|
_ => "",
|
||||||
};
|
};
|
||||||
|
|
||||||
private static bool IsRunningAsAdmin()
|
internal static bool IsRunningAsAdmin()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -290,14 +324,14 @@ internal sealed class SnapshotVisitor : IVisitor
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 采样调度器:按快/慢通道分频驱动 HardwareManager.UpdateAll。
|
/// 采样调度器:按快/慢通道分频驱动 HardwareManager 的分层 Update。
|
||||||
/// 使用 Channel 向 SSE 推送层广播快照(解耦:调度器不关心有几个订阅者)。
|
/// 使用 Channel 向 SSE 推送层广播快照(解耦:调度器不关心有几个订阅者)。
|
||||||
///
|
///
|
||||||
/// 调度策略:
|
/// 调度策略:
|
||||||
/// - 快通道 tick:UpdateAll(含慢通道硬件,因 UpdateAll 成本主要在 SMART,已通过慢通道分频减少调用频率)
|
/// - 快通道 tick:UpdateFastOnly(仅 CPU/GPU/Memory/Network 等轻量硬件),
|
||||||
/// 实际优化:快通道 tick 只 Update 快通道硬件(UpdateFastOnly),慢通道单独按慢节奏 Update
|
/// 避免 SMART 等重查询每秒执行拖慢采样节奏
|
||||||
/// - 慢通道 tick:UpdateSlowOnly(仅 Storage/PSU/Motherboard 等)
|
/// - 慢通道 tick:UpdateSlowOnly(仅 Storage/PSU/Motherboard 等)
|
||||||
/// - 每个 tick 结束后构建快照并广播
|
/// - 快通道每个 tick 结束后构建快照并广播(慢通道更新后的值随下一帧带出)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal sealed class SamplingScheduler : IDisposable
|
internal sealed class SamplingScheduler : IDisposable
|
||||||
{
|
{
|
||||||
@@ -352,7 +386,7 @@ internal sealed class SamplingScheduler : IDisposable
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_hw.UpdateAll();
|
_hw.UpdateFastOnly();
|
||||||
var snap = _hw.BuildSnapshot();
|
var snap = _hw.BuildSnapshot();
|
||||||
_cache.Update(snap);
|
_cache.Update(snap);
|
||||||
_broadcast.Writer.TryWrite(snap);
|
_broadcast.Writer.TryWrite(snap);
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ internal static class HttpEndpoints
|
|||||||
{
|
{
|
||||||
Ready = hw?.Ready ?? false,
|
Ready = hw?.Ready ?? false,
|
||||||
IsAdmin = hw?.IsAdmin ?? false,
|
IsAdmin = hw?.IsAdmin ?? false,
|
||||||
|
PawnIoInstalled = PawnIoSupport.IsServiceInstalled(),
|
||||||
UptimeMs = kernel.Uptime.Elapsed.TotalMilliseconds,
|
UptimeMs = kernel.Uptime.Elapsed.TotalMilliseconds,
|
||||||
GroupCount = snap?.Groups.Count ?? 0,
|
GroupCount = snap?.Groups.Count ?? 0,
|
||||||
SensorCount = kernel.Scheduler.Cache.SensorCount,
|
SensorCount = kernel.Scheduler.Cache.SensorCount,
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using Microsoft.Win32;
|
||||||
|
|
||||||
|
namespace ThingHK;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// PawnIO 驱动支持:检测 + 静默安装。
|
||||||
|
///
|
||||||
|
/// 背景:LHM 读取 CPU 温度/频率等 ring0 数据依赖内核驱动,回退用的 WinRing0 被
|
||||||
|
/// 微软"易受攻击的驱动程序阻止列表"和部分杀软(如火绒)拦截,导致传感器缺失。
|
||||||
|
/// PawnIO 是正规签名的替代驱动(不在阻止列表、兼容 HVCI/安全启动),
|
||||||
|
/// LHM 0.9.5+ 检测到已安装时优先使用,无需任何代码开关。
|
||||||
|
///
|
||||||
|
/// 安装器约定:PawnIO_setup.exe 与 ThingHK.exe 同目录
|
||||||
|
/// (由 Tauri 侧 prepare_kernel 从资源目录随内核一起复制到 {app_data}/monitor/cores/)。
|
||||||
|
///
|
||||||
|
/// 静默参数:-install -silent(官方 CLI 参数,见 namazso/PawnIO.Setup)。
|
||||||
|
/// 退出码:0=成功;3010=成功但需重启(ERROR_SUCCESS_REBOOT_REQUIRED)。
|
||||||
|
///
|
||||||
|
/// 策略:仅在内核已提权时安装。两种提权模式(Thing 提权继承 / 仅提权 ThingHK)
|
||||||
|
/// 都只有一次 UAC,内核拿到权限后自行静默安装,避免二次弹窗。
|
||||||
|
/// serve 模式调用;scan 诊断模式不安装,保持被动。
|
||||||
|
/// </summary>
|
||||||
|
internal static class PawnIoSupport
|
||||||
|
{
|
||||||
|
/// <summary>驱动服务注册表键:存在即认为已安装</summary>
|
||||||
|
private const string ServiceKeyName = @"SYSTEM\CurrentControlSet\Services\PawnIO";
|
||||||
|
|
||||||
|
private const string SetupFileName = "PawnIO_setup.exe";
|
||||||
|
|
||||||
|
/// <summary>3010 = ERROR_SUCCESS_REBOOT_REQUIRED(安装成功但需重启生效)</summary>
|
||||||
|
private const int ExitCodeRebootRequired = 3010;
|
||||||
|
|
||||||
|
/// <summary>驱动安装通常数秒内完成,留足余量防止卡死启动流程</summary>
|
||||||
|
private const int InstallTimeoutMs = 90_000;
|
||||||
|
|
||||||
|
/// <summary>检测 PawnIO 驱动服务是否已注册</summary>
|
||||||
|
public static bool IsServiceInstalled()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var key = Registry.LocalMachine.OpenSubKey(ServiceKeyName);
|
||||||
|
return key != null;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 确保 PawnIO 就绪:已安装直接返回;未安装且当前已提权时静默安装。
|
||||||
|
/// 返回描述性结果(写入 stderr 日志 + /status 诊断)。
|
||||||
|
/// </summary>
|
||||||
|
public static string EnsureInstalled()
|
||||||
|
{
|
||||||
|
if (IsServiceInstalled())
|
||||||
|
return "already-installed";
|
||||||
|
|
||||||
|
if (!HardwareManager.IsRunningAsAdmin())
|
||||||
|
return "skipped: not elevated (温度/频率等传感器需要提权运行)";
|
||||||
|
|
||||||
|
string setupPath = Path.Combine(AppContext.BaseDirectory, SetupFileName);
|
||||||
|
if (!File.Exists(setupPath))
|
||||||
|
return $"skipped: {SetupFileName} 未找到(应随内核一起部署,见 prepare_kernel)";
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var process = Process.Start(new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = setupPath,
|
||||||
|
Arguments = "-install -silent",
|
||||||
|
UseShellExecute = false,
|
||||||
|
CreateNoWindow = true,
|
||||||
|
});
|
||||||
|
if (process == null)
|
||||||
|
return "failed: Process.Start 返回 null";
|
||||||
|
|
||||||
|
if (!process.WaitForExit(InstallTimeoutMs))
|
||||||
|
{
|
||||||
|
try { process.Kill(); } catch { /* 超时后进程可能已自行退出 */ }
|
||||||
|
return "failed: 安装超时";
|
||||||
|
}
|
||||||
|
|
||||||
|
int code = process.ExitCode;
|
||||||
|
if (code == ExitCodeRebootRequired)
|
||||||
|
return "installed: 需重启后生效";
|
||||||
|
|
||||||
|
if (code != 0)
|
||||||
|
return $"failed: 安装器退出码 {code}";
|
||||||
|
|
||||||
|
return IsServiceInstalled()
|
||||||
|
? "installed"
|
||||||
|
: "failed: 安装器返回 0 但服务未注册";
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return $"failed: {ex.Message}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -87,6 +87,11 @@ internal static class Program
|
|||||||
|
|
||||||
Console.Error.WriteLine($"[ThingHK] serve 模式: port={port} config={configPath ?? "(默认)"} fast={fastMs}ms slow={slowMs}ms");
|
Console.Error.WriteLine($"[ThingHK] serve 模式: port={port} config={configPath ?? "(默认)"} fast={fastMs}ms slow={slowMs}ms");
|
||||||
|
|
||||||
|
// PawnIO:ring0 传感器读取的首选驱动(未安装且已提权时静默安装,
|
||||||
|
// 避开 WinRing0 被系统阻止列表/杀软拦截导致的温度/频率缺失)
|
||||||
|
string pawnIoResult = PawnIoSupport.EnsureInstalled();
|
||||||
|
Console.Error.WriteLine($"[ThingHK] PawnIO: {pawnIoResult}");
|
||||||
|
|
||||||
using var kernel = new KernelHost();
|
using var kernel = new KernelHost();
|
||||||
await kernel.StartAsync(configPath, fastMs, slowMs);
|
await kernel.StartAsync(configPath, fastMs, slowMs);
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.7-pre716" />
|
<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.7-pre729" />
|
||||||
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
|
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -5,13 +5,14 @@
|
|||||||
"": {
|
"": {
|
||||||
"name": "thing",
|
"name": "thing",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@lucide/vue": "^1.25.0",
|
"@lucide/vue": "^1.28.0",
|
||||||
"@tailwindcss/vite": "^4.3.2",
|
"@tailwindcss/vite": "^4.3.2",
|
||||||
"@tauri-apps/api": "^2",
|
"@tauri-apps/api": "^2",
|
||||||
"@tauri-apps/plugin-autostart": "~2",
|
"@tauri-apps/plugin-autostart": "~2",
|
||||||
"@tauri-apps/plugin-dialog": "^2",
|
"@tauri-apps/plugin-dialog": "^2",
|
||||||
|
"@tauri-apps/plugin-global-shortcut": "^2",
|
||||||
"@tauri-apps/plugin-opener": "^2",
|
"@tauri-apps/plugin-opener": "^2",
|
||||||
"@vueuse/core": "^14.3.0",
|
"@vueuse/core": "^14.4.0",
|
||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"pinia": "^3.0.4",
|
"pinia": "^3.0.4",
|
||||||
@@ -116,7 +117,7 @@
|
|||||||
|
|
||||||
"@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
|
"@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
|
||||||
|
|
||||||
"@lucide/vue": ["@lucide/vue@1.25.0", "https://registry.npmmirror.com/@lucide/vue/-/vue-1.25.0.tgz", { "peerDependencies": { "vue": ">=3.0.1" } }, "sha512-hkEetV+v48ScIn3uwqwWQ66sI8foeP2q6OMI09GzLFH4SfvBlfe3JHYlMBdBCqFC7WRlhFsndyDn/awRKRc2OQ=="],
|
"@lucide/vue": ["@lucide/vue@1.28.0", "https://registry.npmmirror.com/@lucide/vue/-/vue-1.28.0.tgz", { "peerDependencies": { "vue": ">=3.0.1" } }, "sha512-cO89UyNM/0i2Srdi04nFWeEOQkqzDZlM2ehtWyBhcMpRTJDKpMZPCGAVlmVBgBgr5HaeL5L6FsU8RHsOdwXtKw=="],
|
||||||
|
|
||||||
"@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.62.2", "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz", { "os": "android", "cpu": "arm" }, "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg=="],
|
"@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.62.2", "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz", { "os": "android", "cpu": "arm" }, "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg=="],
|
||||||
|
|
||||||
@@ -234,6 +235,8 @@
|
|||||||
|
|
||||||
"@tauri-apps/plugin-dialog": ["@tauri-apps/plugin-dialog@2.7.2", "https://registry.npmmirror.com/@tauri-apps/plugin-dialog/-/plugin-dialog-2.7.2.tgz", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-pX0IGm1I3I6wc+zeKYcq1GSqogK6okCNX5fOdaNU5ab1AjGS6l1E5wFNjEb7meg7ZFSp0JUs+0jQGQNyOvLrsg=="],
|
"@tauri-apps/plugin-dialog": ["@tauri-apps/plugin-dialog@2.7.2", "https://registry.npmmirror.com/@tauri-apps/plugin-dialog/-/plugin-dialog-2.7.2.tgz", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-pX0IGm1I3I6wc+zeKYcq1GSqogK6okCNX5fOdaNU5ab1AjGS6l1E5wFNjEb7meg7ZFSp0JUs+0jQGQNyOvLrsg=="],
|
||||||
|
|
||||||
|
"@tauri-apps/plugin-global-shortcut": ["@tauri-apps/plugin-global-shortcut@2.3.2", "https://registry.npmmirror.com/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.2.tgz", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-UReHNXrLvpEjylE4jb4oCYiy96uRykPUthoCQCmRXYrd5hs5X9DrW+qOn7GLW57EJN4tdK8bgK5twBTz2NOxzA=="],
|
||||||
|
|
||||||
"@tauri-apps/plugin-opener": ["@tauri-apps/plugin-opener@2.5.4", "https://registry.npmmirror.com/@tauri-apps/plugin-opener/-/plugin-opener-2.5.4.tgz", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-1HnPkb+AmgO29HBazm4uPLKB+r7zzcTBW1d0fyYp1uP+jwtpoiNDGKMMzz58SFp49nOIrxdE3aUJtT57lfO9CQ=="],
|
"@tauri-apps/plugin-opener": ["@tauri-apps/plugin-opener@2.5.4", "https://registry.npmmirror.com/@tauri-apps/plugin-opener/-/plugin-opener-2.5.4.tgz", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-1HnPkb+AmgO29HBazm4uPLKB+r7zzcTBW1d0fyYp1uP+jwtpoiNDGKMMzz58SFp49nOIrxdE3aUJtT57lfO9CQ=="],
|
||||||
|
|
||||||
"@types/estree": ["@types/estree@1.0.9", "https://registry.npmmirror.com/@types/estree/-/estree-1.0.9.tgz", {}, "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg=="],
|
"@types/estree": ["@types/estree@1.0.9", "https://registry.npmmirror.com/@types/estree/-/estree-1.0.9.tgz", {}, "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg=="],
|
||||||
@@ -280,11 +283,11 @@
|
|||||||
|
|
||||||
"@vue/shared": ["@vue/shared@3.5.39", "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.39.tgz", {}, "sha512-l1rrBtBfTnmxvtsvdQDXltUUy8S1Y+ZaqdfUzmAnJkTd8Z8rv5v/ytW+TKiqEOWyHPoqtPlNFSs0lhRmYVSHVA=="],
|
"@vue/shared": ["@vue/shared@3.5.39", "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.39.tgz", {}, "sha512-l1rrBtBfTnmxvtsvdQDXltUUy8S1Y+ZaqdfUzmAnJkTd8Z8rv5v/ytW+TKiqEOWyHPoqtPlNFSs0lhRmYVSHVA=="],
|
||||||
|
|
||||||
"@vueuse/core": ["@vueuse/core@14.3.0", "https://registry.npmmirror.com/@vueuse/core/-/core-14.3.0.tgz", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "14.3.0", "@vueuse/shared": "14.3.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-aHfz47g0ZhMtTVHmIzMVpJy8ePhhOy68GY5bv110+5DVtZ+W7BsOx+m61UNQqfrWyPztIHIanWa3E2tib3NFIw=="],
|
"@vueuse/core": ["@vueuse/core@14.4.0", "https://registry.npmmirror.com/@vueuse/core/-/core-14.4.0.tgz", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "14.4.0", "@vueuse/shared": "14.4.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-X4WHz1HlCzCBoYXesUkifzzWBAcZgXG8Fi5iNPQg/epdzOB3gu8Fawj3hvuwYR1nGcXGnvxwYYcUC/71++svtQ=="],
|
||||||
|
|
||||||
"@vueuse/metadata": ["@vueuse/metadata@14.3.0", "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-14.3.0.tgz", {}, "sha512-BwxmbAzwAVF50+MW57GXOUEV61nFBGnlBvrTqj49PqWJu3uw7hdu72ztXeZ33RdZtDY6kO+bfCAE1PCn88Tktw=="],
|
"@vueuse/metadata": ["@vueuse/metadata@14.4.0", "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-14.4.0.tgz", {}, "sha512-swx/255R6JyHZFJhx845iz5CRWDZdCfvkZOpACWc5+c5WHcG24mv8gUT1WIdFQaHt6dq79rvILd9QnCWiyVm9g=="],
|
||||||
|
|
||||||
"@vueuse/shared": ["@vueuse/shared@14.3.0", "https://registry.npmmirror.com/@vueuse/shared/-/shared-14.3.0.tgz", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-bZpge9eSXwa4ToSiqJ7j6KRwhAsneMFoSz3LMWKQDkqimm3D/tbFlrklrs/IOqC8tEcYmXQZJ6N0UrjhBirVCg=="],
|
"@vueuse/shared": ["@vueuse/shared@14.4.0", "https://registry.npmmirror.com/@vueuse/shared/-/shared-14.4.0.tgz", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-JRgY90Sz8DDtPMsaDflvPMp9xYk69JZAmbuDvAquUVXKr2gEjqtzGNTTthLfckH0BzBqvnu31gb4a8TGLRe79g=="],
|
||||||
|
|
||||||
"alien-signals": ["alien-signals@1.0.13", "https://registry.npmmirror.com/alien-signals/-/alien-signals-1.0.13.tgz", {}, "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg=="],
|
"alien-signals": ["alien-signals@1.0.13", "https://registry.npmmirror.com/alien-signals/-/alien-signals-1.0.13.tgz", {}, "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg=="],
|
||||||
|
|
||||||
@@ -433,5 +436,11 @@
|
|||||||
"@tailwindcss/oxide-wasm32-wasi/@tybys/wasm-util": ["@tybys/wasm-util@0.10.3", "https://registry.npmmirror.com/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg=="],
|
"@tailwindcss/oxide-wasm32-wasi/@tybys/wasm-util": ["@tybys/wasm-util@0.10.3", "https://registry.npmmirror.com/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg=="],
|
||||||
|
|
||||||
"@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
"@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
||||||
|
|
||||||
|
"reka-ui/@vueuse/core": ["@vueuse/core@14.3.0", "https://registry.npmmirror.com/@vueuse/core/-/core-14.3.0.tgz", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "14.3.0", "@vueuse/shared": "14.3.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-aHfz47g0ZhMtTVHmIzMVpJy8ePhhOy68GY5bv110+5DVtZ+W7BsOx+m61UNQqfrWyPztIHIanWa3E2tib3NFIw=="],
|
||||||
|
|
||||||
|
"reka-ui/@vueuse/shared": ["@vueuse/shared@14.3.0", "https://registry.npmmirror.com/@vueuse/shared/-/shared-14.3.0.tgz", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-bZpge9eSXwa4ToSiqJ7j6KRwhAsneMFoSz3LMWKQDkqimm3D/tbFlrklrs/IOqC8tEcYmXQZJ6N0UrjhBirVCg=="],
|
||||||
|
|
||||||
|
"reka-ui/@vueuse/core/@vueuse/metadata": ["@vueuse/metadata@14.3.0", "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-14.3.0.tgz", {}, "sha512-BwxmbAzwAVF50+MW57GXOUEV61nFBGnlBvrTqj49PqWJu3uw7hdu72ztXeZ33RdZtDY6kO+bfCAE1PCn88Tktw=="],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+7
@@ -19,6 +19,7 @@
|
|||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"pinia": "^3.0.4",
|
"pinia": "^3.0.4",
|
||||||
|
"pinyin-pro": "^3.28.2",
|
||||||
"reka-ui": "^2.10.1",
|
"reka-ui": "^2.10.1",
|
||||||
"tailwind-merge": "^3.6.0",
|
"tailwind-merge": "^3.6.0",
|
||||||
"tailwindcss": "^4.3.2",
|
"tailwindcss": "^4.3.2",
|
||||||
@@ -2290,6 +2291,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/pinyin-pro": {
|
||||||
|
"version": "3.28.2",
|
||||||
|
"resolved": "https://registry.npmmirror.com/pinyin-pro/-/pinyin-pro-3.28.2.tgz",
|
||||||
|
"integrity": "sha512-jV38yxXHLfidirMC4hrXasLDozLCSq/4DfX88GnHcSEJ2+GpSedG6I9VOiEXJu6iQ5dbJC/RjmzyMuS5h/wH5A==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/postcss": {
|
"node_modules/postcss": {
|
||||||
"version": "8.5.19",
|
"version": "8.5.19",
|
||||||
"funding": [
|
"funding": [
|
||||||
|
|||||||
+3
-1
@@ -1,12 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "thing",
|
"name": "thing",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.1.0",
|
"version": "26.8.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "vue-tsc --noEmit && vite build",
|
"build": "vue-tsc --noEmit && vite build",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
|
"test": "node --test src/modules/quickpanel/engine.test.ts src/lib/calc.test.ts",
|
||||||
"tauri": "tauri"
|
"tauri": "tauri"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -21,6 +22,7 @@
|
|||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"pinia": "^3.0.4",
|
"pinia": "^3.0.4",
|
||||||
|
"pinyin-pro": "^3.28.2",
|
||||||
"reka-ui": "^2.10.1",
|
"reka-ui": "^2.10.1",
|
||||||
"tailwind-merge": "^3.6.0",
|
"tailwind-merge": "^3.6.0",
|
||||||
"tailwindcss": "^4.3.2",
|
"tailwindcss": "^4.3.2",
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
@echo off
|
||||||
|
chcp 65001 >nul
|
||||||
|
setlocal enabledelayedexpansion
|
||||||
|
|
||||||
|
set "SCRIPT=%~dp0release.ps1"
|
||||||
|
|
||||||
|
echo ================================================
|
||||||
|
echo Thing Build Pubilsh
|
||||||
|
echo 发布目标:https://gitea.atie.fun/LFeng/Thing
|
||||||
|
echo ================================================
|
||||||
|
echo.
|
||||||
|
|
||||||
|
:: ---------- 版本号 ----------
|
||||||
|
set "VERSION="
|
||||||
|
set /p "VERSION=请输入版本号(如 26.8.1,直接回车沿用当前版本): "
|
||||||
|
set "VER_ARG="
|
||||||
|
if not "%VERSION%"=="" set "VER_ARG=-Version %VERSION%"
|
||||||
|
|
||||||
|
:: ---------- 发布模式 ----------
|
||||||
|
echo.
|
||||||
|
echo [1] Build + Pubilsh Gitea
|
||||||
|
echo [2] Build Only
|
||||||
|
echo [3] Pubilsh Gitea
|
||||||
|
set "MODE="
|
||||||
|
set /p "MODE=请输入数字选择(回车默认 1): "
|
||||||
|
if "%MODE%"=="" set "MODE=1"
|
||||||
|
|
||||||
|
set "EXTRA="
|
||||||
|
if "%MODE%"=="2" (
|
||||||
|
set "EXTRA=-SkipPush"
|
||||||
|
) else if "%MODE%"=="3" (
|
||||||
|
set "EXTRA=-SkipBuild"
|
||||||
|
)
|
||||||
|
|
||||||
|
:: ---------- Gitea Token(仅完整发布模式需要) ----------
|
||||||
|
if "%MODE%"=="1" if not defined GITEA_TOKEN (
|
||||||
|
echo.
|
||||||
|
echo 未检测到环境变量 GITEA_TOKEN,上传到 Gitea 需要它。
|
||||||
|
echo 可在此临时输入(仅本次会话生效),留空则自动改为"只构建不上传"。
|
||||||
|
set /p "GITEA_TOKEN=请输入 Gitea Token: "
|
||||||
|
if "!GITEA_TOKEN!"=="" (
|
||||||
|
set "EXTRA=-SkipPush"
|
||||||
|
set "MODE=2"
|
||||||
|
echo [提示] 已切换为"只构建并整理产物,不上传"。
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo Start:release.ps1 %VER_ARG% %EXTRA%
|
||||||
|
echo ------------------------------------------------
|
||||||
|
powershell -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT%" %VER_ARG% %EXTRA%
|
||||||
|
set "RESULT=%ERRORLEVEL%"
|
||||||
|
|
||||||
|
echo.
|
||||||
|
if "%RESULT%"=="0" (
|
||||||
|
echo 执行完成。
|
||||||
|
) else (
|
||||||
|
echo 执行出错,请查看上方日志。
|
||||||
|
)
|
||||||
|
echo.
|
||||||
|
pause
|
||||||
@@ -0,0 +1,166 @@
|
|||||||
|
# ============================================================
|
||||||
|
# Thing 构建发布脚本(目标:自建 Gitea release)
|
||||||
|
#
|
||||||
|
# 用法:
|
||||||
|
# .\scripts\release.ps1 -Version 0.2.0 # 同步版本号 + 构建 + 发布
|
||||||
|
# .\scripts\release.ps1 -Version 0.2.0 -SkipBuild # 复用现有构建产物,直接发布
|
||||||
|
# .\scripts\release.ps1 -Version 0.2.0 -SkipPush # 只构建+整理产物,不上传
|
||||||
|
#
|
||||||
|
# 发布产物(上传到 https://gitea.atie.fun/LFeng/Thing 的 v{Version} release):
|
||||||
|
# thing_{v}_x64.exe 便携免安装版(无内核)
|
||||||
|
# thing_{v}_x64.msi 安装版 MSI(去掉 tauri 默认的 _en-US 后缀)
|
||||||
|
# thing_{v}_x64-setup.exe 安装版 NSIS
|
||||||
|
# thing-hk_{v}.zip ThingHK 硬件监控内核(mihomo 继续走代理模块内置的 GitHub 下载)
|
||||||
|
#
|
||||||
|
# 前提:
|
||||||
|
# - Gitea token 已配置为环境变量 GITEA_TOKEN(-SkipPush 时不需要)
|
||||||
|
# - 可选 -NotesPath 指定 release notes 文件(Markdown 文本),
|
||||||
|
# 缺省时使用 scripts/release-notes.md(若存在),否则用简单占位文本
|
||||||
|
# ============================================================
|
||||||
|
|
||||||
|
param(
|
||||||
|
[string]$Version = '',
|
||||||
|
[switch]$SkipBuild,
|
||||||
|
[switch]$SkipPush,
|
||||||
|
[string]$NotesPath = ''
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
|
||||||
|
$Root = Split-Path -Parent $PSScriptRoot
|
||||||
|
$TargetDir = Join-Path $Root 'src-tauri\target\release'
|
||||||
|
$BundleDir = Join-Path $TargetDir 'bundle'
|
||||||
|
$RepoOwner = 'LFeng'
|
||||||
|
$RepoName = 'Thing'
|
||||||
|
$ApiBase = 'https://gitea.atie.fun/api/v1'
|
||||||
|
$Product = 'thing'
|
||||||
|
|
||||||
|
function Write-Step([string]$msg) { Write-Host "`n==> $msg" -ForegroundColor Cyan }
|
||||||
|
|
||||||
|
# ---------- 0. 版本号 ----------
|
||||||
|
if ([string]::IsNullOrWhiteSpace($Version)) {
|
||||||
|
$conf = Get-Content (Join-Path $Root 'src-tauri\tauri.conf.json') -Raw | ConvertFrom-Json
|
||||||
|
$Version = $conf.version
|
||||||
|
Write-Step "未指定 -Version,沿用现有版本 $Version"
|
||||||
|
}
|
||||||
|
# 校验 X.Y.Z 格式
|
||||||
|
if ($Version -notmatch '^\d+\.\d+\.\d+$') {
|
||||||
|
throw "版本号格式错误(应为 X.Y.Z):$Version"
|
||||||
|
}
|
||||||
|
Write-Step "发布版本:v$Version"
|
||||||
|
|
||||||
|
# ---------- 1. 同步版本号到三处 ----------
|
||||||
|
$tauriConf = Join-Path $Root 'src-tauri\tauri.conf.json'
|
||||||
|
$cargoToml = Join-Path $Root 'src-tauri\Cargo.toml'
|
||||||
|
$pkgJson = Join-Path $Root 'package.json'
|
||||||
|
|
||||||
|
$t = Get-Content $tauriConf -Raw
|
||||||
|
$t = $t -replace '("version"\s*:\s*")[^"]*(")', "`${1}$Version`${2}"
|
||||||
|
[System.IO.File]::WriteAllText($tauriConf, $t, (New-Object System.Text.UTF8Encoding($false)))
|
||||||
|
|
||||||
|
$c = Get-Content $cargoToml -Raw
|
||||||
|
$c = $c -replace '(?m)^(version\s*=\s*")[^"]*(")', "`${1}$Version`${2}"
|
||||||
|
[System.IO.File]::WriteAllText($cargoToml, $c, (New-Object System.Text.UTF8Encoding($false)))
|
||||||
|
|
||||||
|
$p = Get-Content $pkgJson -Raw
|
||||||
|
$p = $p -replace '("version"\s*:\s*")[^"]*(")', "`${1}$Version`${2}"
|
||||||
|
[System.IO.File]::WriteAllText($pkgJson, $p, (New-Object System.Text.UTF8Encoding($false)))
|
||||||
|
Write-Step "版本号已同步:tauri.conf.json / Cargo.toml / package.json"
|
||||||
|
|
||||||
|
# ---------- 2. 构建 ----------
|
||||||
|
if (-not $SkipBuild) {
|
||||||
|
Write-Step '开始构建(bun run tauri build)...'
|
||||||
|
Push-Location $Root
|
||||||
|
try { bun run tauri build }
|
||||||
|
finally { Pop-Location }
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'tauri build 失败' }
|
||||||
|
} else {
|
||||||
|
Write-Step '跳过构建,复用现有产物'
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------- 3. 整理产物 ----------
|
||||||
|
# 版本号此时已解析,再确定暂存目录
|
||||||
|
$StageDir = Join-Path $Root "release_stage\$Version"
|
||||||
|
New-Item -ItemType Directory -Force -Path $StageDir | Out-Null
|
||||||
|
|
||||||
|
$exeSrc = Join-Path $TargetDir "$Product.exe"
|
||||||
|
$msiSrc = Join-Path $BundleDir "msi\${Product}_${Version}_x64_en-US.msi"
|
||||||
|
$nsisSrc = Join-Path $BundleDir "nsis\${Product}_${Version}_x64-setup.exe"
|
||||||
|
$hkSrc = Join-Path $Root 'src-tauri\binaries\ThingHK.exe'
|
||||||
|
|
||||||
|
$exeOut = Join-Path $StageDir "${Product}_${Version}_x64.exe"
|
||||||
|
$msiOut = Join-Path $StageDir "${Product}_${Version}_x64.msi"
|
||||||
|
$nsisOut = Join-Path $StageDir "${Product}_${Version}_x64-setup.exe"
|
||||||
|
$hkZip = Join-Path $StageDir "thing-hk_${Version}.zip"
|
||||||
|
|
||||||
|
if (Test-Path $exeSrc) { Copy-Item $exeSrc $exeOut } else { Write-Warning "缺少便携版:$exeSrc" }
|
||||||
|
if (Test-Path $msiSrc) { Copy-Item $msiSrc $msiOut } else { Write-Warning "缺少 MSI(已跳过重命名):$msiSrc" }
|
||||||
|
if (Test-Path $nsisSrc) { Copy-Item $nsisSrc $nsisOut } else { Write-Warning "缺少 NSIS:$nsisSrc" }
|
||||||
|
|
||||||
|
if (Test-Path $hkSrc) {
|
||||||
|
$tmp = Join-Path $env:TEMP "thinghk_$([guid]::NewGuid().ToString('N'))"
|
||||||
|
New-Item -ItemType Directory -Force -Path $tmp | Out-Null
|
||||||
|
Copy-Item $hkSrc (Join-Path $tmp 'ThingHK.exe')
|
||||||
|
Compress-Archive -Path (Join-Path $tmp 'ThingHK.exe') -DestinationPath $hkZip -Force
|
||||||
|
Remove-Item -Recurse -Force $tmp
|
||||||
|
Write-Step "ThingHK 内核包:$hkZip"
|
||||||
|
} else {
|
||||||
|
Write-Warning "缺少 ThingHK.exe:$hkSrc"
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Step "产物已整理到:$StageDir"
|
||||||
|
Get-ChildItem $StageDir | Select-Object Name, @{n='Size(MB)';e={[math]::Round($_.Length/1MB,1)}} | Format-Table -AutoSize
|
||||||
|
|
||||||
|
# ---------- 4. 上传到 Gitea ----------
|
||||||
|
if ($SkipPush) {
|
||||||
|
Write-Step '已跳过上传(-SkipPush)'
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
$token = $env:GITEA_TOKEN
|
||||||
|
if ([string]::IsNullOrWhiteSpace($token)) {
|
||||||
|
throw '未设置环境变量 GITEA_TOKEN,无法发布到 Gitea(或使用 -SkipPush 跳过上传)'
|
||||||
|
}
|
||||||
|
$auth = @{ Authorization = "token $token" }
|
||||||
|
|
||||||
|
# 4.1 release notes
|
||||||
|
if (-not [string]::IsNullOrWhiteSpace($NotesPath)) {
|
||||||
|
$body = Get-Content $NotesPath -Raw
|
||||||
|
} elseif (Test-Path (Join-Path $PSScriptRoot 'release-notes.md')) {
|
||||||
|
$body = Get-Content (Join-Path $PSScriptRoot 'release-notes.md') -Raw
|
||||||
|
} else {
|
||||||
|
$body = "Thing v$Version"
|
||||||
|
}
|
||||||
|
|
||||||
|
# 4.2 创建 release(已存在同名 tag 则复用)
|
||||||
|
Write-Step "创建 release v$Version ..."
|
||||||
|
$releaseUrl = "$ApiBase/repos/$RepoOwner/$RepoName/releases"
|
||||||
|
$releasePayload = @{
|
||||||
|
tag_name = "v$Version"
|
||||||
|
name = "Thing v$Version"
|
||||||
|
body = $body
|
||||||
|
draft = $false
|
||||||
|
prerelease = $false
|
||||||
|
} | ConvertTo-Json
|
||||||
|
|
||||||
|
try {
|
||||||
|
$release = Invoke-RestMethod -Method Post -Uri $releaseUrl -Headers $auth -ContentType 'application/json' -Body $releasePayload
|
||||||
|
} catch {
|
||||||
|
# tag 已存在:尝试用该 tag 查找现有 release,后续资产上传会追加
|
||||||
|
Write-Warning "创建 release 失败,尝试复用已有 release:$_"
|
||||||
|
$release = Invoke-RestMethod -Method Get -Uri "$releaseUrl/tags/v$Version" -Headers $auth
|
||||||
|
}
|
||||||
|
$releaseId = $release.id
|
||||||
|
Write-Step "release id=$releaseId"
|
||||||
|
|
||||||
|
# 4.3 逐个上传资产
|
||||||
|
$assets = @($exeOut, $msiOut, $nsisOut, $hkZip) | Where-Object { Test-Path $_ }
|
||||||
|
foreach ($file in $assets) {
|
||||||
|
$name = Split-Path $file -Leaf
|
||||||
|
Write-Step "上传 $name ..."
|
||||||
|
$assetUrl = "$releaseUrl/$releaseId/assets?name=$([uri]::EscapeDataString($name))"
|
||||||
|
$resp = Invoke-RestMethod -Method Post -Uri $assetUrl -Headers $auth -ContentType 'application/octet-stream' -InFile $file
|
||||||
|
Write-Host " -> $($resp.browser_download_url)" -ForegroundColor Green
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Step "发布完成:https://gitea.atie.fun/$RepoOwner/$RepoName/releases/tag/v$Version"
|
||||||
Generated
+1554
-25
File diff suppressed because it is too large
Load Diff
+33
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "thing"
|
name = "thing"
|
||||||
version = "0.1.0"
|
version = "26.8.4"
|
||||||
description = "A Tauri App"
|
description = "A Tauri App"
|
||||||
authors = ["you"]
|
authors = ["you"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
@@ -26,7 +26,11 @@ tauri-plugin-global-shortcut = "2"
|
|||||||
tauri-plugin-notification = "2"
|
tauri-plugin-notification = "2"
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
|
regex = "1"
|
||||||
serde_yaml = "0.9"
|
serde_yaml = "0.9"
|
||||||
|
specta = { version = "=2.0.0-rc.25", features = ["derive", "function", "serde_json"] }
|
||||||
|
specta-typescript = "0.0.12"
|
||||||
|
tauri-specta = { version = "=2.0.0-rc.25", features = ["typescript"] }
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
reqwest = { version = "0.12", features = ["json", "stream"] }
|
reqwest = { version = "0.12", features = ["json", "stream"] }
|
||||||
futures-util = "0.3"
|
futures-util = "0.3"
|
||||||
@@ -39,6 +43,10 @@ sysinfo = "0.32"
|
|||||||
rusqlite = { version = "0.32", features = ["bundled"] }
|
rusqlite = { version = "0.32", features = ["bundled"] }
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
image = { version = "0.25", default-features = false, features = ["png"] }
|
image = { version = "0.25", default-features = false, features = ["png"] }
|
||||||
|
walkdir = "2"
|
||||||
|
notify = { version = "6", features = [] }
|
||||||
|
librqbit = "9"
|
||||||
|
bytes = "1"
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
winreg = "0.52"
|
winreg = "0.52"
|
||||||
@@ -51,14 +59,38 @@ windows-sys = { version = "0.52", features = [
|
|||||||
"Win32_System_Ole",
|
"Win32_System_Ole",
|
||||||
"Win32_System_Memory",
|
"Win32_System_Memory",
|
||||||
"Win32_System_DataExchange",
|
"Win32_System_DataExchange",
|
||||||
|
"Win32_System_SystemInformation",
|
||||||
"Win32_UI_WindowsAndMessaging",
|
"Win32_UI_WindowsAndMessaging",
|
||||||
"Win32_UI_Shell",
|
"Win32_UI_Shell",
|
||||||
"Win32_UI_HiDpi",
|
"Win32_UI_HiDpi",
|
||||||
"Win32_UI_Input_KeyboardAndMouse",
|
"Win32_UI_Input_KeyboardAndMouse",
|
||||||
"Win32_Graphics_Gdi",
|
"Win32_Graphics_Gdi",
|
||||||
|
"Win32_Graphics_Dwm",
|
||||||
"Win32_Storage_Xps",
|
"Win32_Storage_Xps",
|
||||||
|
"Win32_Storage_FileSystem",
|
||||||
|
] }
|
||||||
|
# Explorer 鬯ョ・ッ繝サ・キ鬮ォ・ィ繝サ・ャ郢晢スサ繝サ・ヲ鬯ョ・ョ郢晢スサ繝サ・ス繝サ・コ髣費スィ郢晢スサ・つ郢晢スサ繝サ・カ驛「譎「・ス・サ郢晢スサ繝サ・ョ鬯ョ・ッ雋翫・譚溽ケ晢スサ繝サ・「鬯ョ・ョ繝サ・」郢晢スサ繝サ・ス郢晢スサ繝サ・」郢晢スサ邵コ・、・つ鬯ョ・ョ髮懶ス」繝サ・ス繝サ・ャ鬮ッ・キ髣鯉スィ繝サ・ス繝サ・キ驛「譎「・ス・サ郢晢スサ繝サ・シ鬩幢ス「隴趣ス「繝サ・ス繝サ・サShellWindows COM鬩幢ス「隴趣ス「繝サ・ス繝サ・サ鬮」雋サ・ス・ィ髯樊サゑスス・イ郢晢スサ繝サ・ス郢晢スサ繝サ・シ鬮ッ讖ク・ス・「郢晢スサ繝サ・サ驛「譎「・ス・サ郢晢スサ繝サ・サ鬩幢ス「隴趣ス「繝サ・ス繝サ・サ驛「譎「・ス・サ郢晢スサ繝サ・シ鬮ッ・キ髢ァ・エ繝サ・コ陋滂ス・郢晢スサ鬯ッ・ィ繝サ・セ髯具スケ郢晢スサ繝サ・ス繝サ・ス郢晢スサ繝サ・ィ鬯ョ・ッ陷茨スキ繝サ・ス繝サ・サ驛「譎「・ス・サ郢晢スサ繝サ・ー鬯ッ・ィ繝サ・セ郢晢スサ繝サ・ァ鬩幢ス「隴趣ス「繝サ・ス繝サ・サfeature鬩幢ス「隴趣ス「繝サ・ス繝サ・サ鬮ォ・エ繝サ・エ郢晢スサ繝サ・ァ鬯ョ・「繝サ・ー髴托スケ陞「・シ繝サ・エ髴域鱒繝サ郢晢スサ繝サ・カ鬯ッ・ゥ陝カ蟷「・ス・ク陝カ蜷カ繝サ驛「譎「・ス・サ郢晢スサ繝サ・ッ鬮ッ・キ繝サ・ソ郢晢スサ繝サ・ー驛「譎「・ス・サ郢晢スサ繝サ・ス鬯ッ・ェ繝サ・ー髯キ闌ィ・ス・キ郢晢スサ繝サ・ス郢晢スサ繝サ・ァ驛「譎「・ス・サ郢晢スサ繝サ・ッ
|
||||||
|
windows = { version = "0.52", features = [
|
||||||
|
"Win32_Foundation",
|
||||||
|
"Win32_System_Com",
|
||||||
|
"Win32_System_Ole",
|
||||||
|
"Win32_System_Variant",
|
||||||
|
"Win32_UI_Shell",
|
||||||
|
"Win32_UI_WindowsAndMessaging",
|
||||||
] }
|
] }
|
||||||
|
|
||||||
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
||||||
tauri-plugin-autostart = "2"
|
tauri-plugin-autostart = "2"
|
||||||
|
|
||||||
|
# ===== 驛帛・・ッ蜿ー・シ莨懷密 =====
|
||||||
|
# dev 隴ォ繝サ・サ・コ陷キ・ッ騾包スィ陟・ィ」纃シ驛帛・・ッ繝サ+ 髯ヲ謔滓差驛、・ァ髫ケ繝サ・ッ蛹・スシ蝓溽スイ鬨セ貊捺た陜ィ・ー髴托スュ闔会ス」繝サ莨夲スシ蠕。・サ繝サ・ス・ア陷ゥ繝サ`tauri dev`
|
||||||
|
|
||||||
|
[profile.dev]
|
||||||
|
incremental = true
|
||||||
|
debug = "line-tables-only"
|
||||||
|
|
||||||
|
# release 髫エ・ォ郢晢スサ繝サ・サ繝サ・コ鬨セ蜴・スス・ヲ鬮エ繝サ・ス・ォ郢晢スサ陞「・シ隰碑崟蝨キ繝サ・ヲ髯キ・ソ繝サ・キ + LTO郢晢スサ隰疲コ倩ゥ宣劑繝サ・ク讖ク・ス・ョ髣・スス繝サ・」郢晢スサ隴ッ竏ャ謚・ェー蜈キ・ス・ァ繝サ・ッ
|
||||||
|
[profile.release]
|
||||||
|
strip = true
|
||||||
|
lto = true
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
"$schema": "../gen/schemas/desktop-schema.json",
|
||||||
|
"identifier": "clipboard-preview",
|
||||||
|
"description": "Capability for clipboard independent preview window",
|
||||||
|
"windows": ["clipboard-preview"],
|
||||||
|
"permissions": [
|
||||||
|
"core:default",
|
||||||
|
"core:window:allow-hide",
|
||||||
|
"core:window:allow-show",
|
||||||
|
"core:window:allow-set-focus",
|
||||||
|
"core:window:allow-close",
|
||||||
|
"core:window:allow-set-theme",
|
||||||
|
"core:window:allow-set-effects",
|
||||||
|
"core:window:allow-set-background-color",
|
||||||
|
"core:event:allow-listen",
|
||||||
|
"core:event:allow-emit",
|
||||||
|
"snap-layout:default"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"$schema": "../gen/schemas/desktop-schema.json",
|
||||||
|
"identifier": "download-window",
|
||||||
|
"description": "Capability for the per-download one-time window",
|
||||||
|
"windows": ["download-window-*"],
|
||||||
|
"permissions": [
|
||||||
|
"core:default",
|
||||||
|
"core:window:allow-hide",
|
||||||
|
"core:window:allow-show",
|
||||||
|
"core:window:allow-set-focus",
|
||||||
|
"core:window:allow-minimize",
|
||||||
|
"core:window:allow-unminimize",
|
||||||
|
"core:window:allow-set-title",
|
||||||
|
"core:window:allow-set-size",
|
||||||
|
"core:window:allow-start-dragging",
|
||||||
|
"core:window:allow-set-always-on-top",
|
||||||
|
"core:window:allow-set-skip-taskbar",
|
||||||
|
"core:window:allow-set-theme",
|
||||||
|
"core:window:allow-set-effects",
|
||||||
|
"core:window:allow-set-background-color",
|
||||||
|
"core:window:allow-close",
|
||||||
|
"core:event:allow-emit",
|
||||||
|
"core:event:allow-listen",
|
||||||
|
"snap-layout:default"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"$schema": "../gen/schemas/desktop-schema.json",
|
||||||
|
"identifier": "quick-panel",
|
||||||
|
"description": "Capability for quick panel popup window",
|
||||||
|
"windows": ["quick-panel"],
|
||||||
|
"permissions": [
|
||||||
|
"core:default",
|
||||||
|
"core:window:allow-hide",
|
||||||
|
"core:window:allow-show",
|
||||||
|
"core:window:allow-set-focus",
|
||||||
|
"core:window:allow-close",
|
||||||
|
"core:window:allow-set-theme",
|
||||||
|
"core:window:allow-set-effects",
|
||||||
|
"core:window:allow-set-background-color",
|
||||||
|
"core:event:allow-emit",
|
||||||
|
"core:event:allow-listen",
|
||||||
|
"opener:allow-open-url",
|
||||||
|
"snap-layout:default"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"$schema": "../gen/schemas/desktop-schema.json",
|
"$schema": "../gen/schemas/desktop-schema.json",
|
||||||
"identifier": "screenshot",
|
"identifier": "screenshot",
|
||||||
"description": "Capability for screenshot overlay and editor windows",
|
"description": "Capability for screenshot overlay, editor and pin windows",
|
||||||
"windows": ["screenshot-overlay", "screenshot-editor"],
|
"windows": ["screenshot-overlay*", "screenshot-editor-*", "screenshot-pin"],
|
||||||
"permissions": [
|
"permissions": [
|
||||||
"core:default",
|
"core:default",
|
||||||
"core:window:allow-hide",
|
"core:window:allow-hide",
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
"core:window:allow-start-dragging",
|
"core:window:allow-start-dragging",
|
||||||
"core:window:allow-set-position",
|
"core:window:allow-set-position",
|
||||||
"core:window:allow-set-size",
|
"core:window:allow-set-size",
|
||||||
|
"core:window:allow-set-resizable",
|
||||||
"core:window:allow-set-always-on-top",
|
"core:window:allow-set-always-on-top",
|
||||||
"core:window:allow-set-skip-taskbar",
|
"core:window:allow-set-skip-taskbar",
|
||||||
"core:window:allow-set-decorations",
|
"core:window:allow-set-decorations",
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ const DEFAULT_CONFIG = {
|
|||||||
interceptDownload: true,
|
interceptDownload: true,
|
||||||
minSize: 0,
|
minSize: 0,
|
||||||
excludeDomains: [],
|
excludeDomains: [],
|
||||||
showNotifications: true,
|
|
||||||
// 嗅探开关
|
// 嗅探开关
|
||||||
sniffEnabled: true,
|
sniffEnabled: true,
|
||||||
// 嗅探的资源类型:只保留视频/音频/图片/压缩包/种子/安装包
|
// 嗅探的资源类型:只保留视频/音频/图片/压缩包/种子/安装包
|
||||||
@@ -359,6 +358,11 @@ async function addDownload(url, filename, referer, cookies, headers) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ===== 下载拦截 =====
|
// ===== 下载拦截 =====
|
||||||
|
// 处理中的 URL(防止同一 URL 并发/重入,也避免与引擎去重检查竞态)
|
||||||
|
const processingUrls = new Set()
|
||||||
|
// 我们自己用 chrome.downloads.download 回退创建的下载 URL(短时间内跳过,防止再次被拦截形成死循环)
|
||||||
|
const fallbackUrls = new Map() // url -> 过期时间戳
|
||||||
|
|
||||||
async function shouldIntercept(downloadItem) {
|
async function shouldIntercept(downloadItem) {
|
||||||
const config = await getConfig()
|
const config = await getConfig()
|
||||||
if (!config.interceptDownload) return false
|
if (!config.interceptDownload) return false
|
||||||
@@ -374,42 +378,94 @@ async function shouldIntercept(downloadItem) {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断是否为"历史下载"(安装插件之前就已存在、随后被浏览器恢复的旧下载)
|
||||||
|
* 这类下载一律不接管,交给浏览器原生处理,实现"只接管以后的下载,历史都不管"
|
||||||
|
*/
|
||||||
|
async function isHistoricalDownload(item) {
|
||||||
|
// 1) canResume=true 表示已存在有效的部分文件,说明浏览器在恢复旧下载
|
||||||
|
if (item.canResume) return true
|
||||||
|
// 2) 开始时间早于插件首次安装时间(浏览器重启后恢复的旧下载会保留原来的开始时间)
|
||||||
|
try {
|
||||||
|
const start = item.startTime ? new Date(item.startTime).getTime() : 0
|
||||||
|
if (start > 0) {
|
||||||
|
const stored = await chrome.storage.local.get('installTime')
|
||||||
|
const installTime = stored.installTime || 0
|
||||||
|
if (installTime > 0 && start < installTime) return true
|
||||||
|
}
|
||||||
|
} catch { /* ignore */ }
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询引擎是否已有同 URL 的非终态任务(活跃/排队/暂停)
|
||||||
|
* 用于防止同一下载被重复转发、重复下载
|
||||||
|
*/
|
||||||
|
async function hasExistingTask(url) {
|
||||||
|
try {
|
||||||
|
const tasks = await apiRequest('/api/downloads')
|
||||||
|
return tasks.some(t => {
|
||||||
|
const s = t.status
|
||||||
|
if (s === 'complete' || s === 'error') return false
|
||||||
|
return t.url === url
|
||||||
|
})
|
||||||
|
} catch {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function handleDownloadCreated(downloadItem) {
|
async function handleDownloadCreated(downloadItem) {
|
||||||
|
const url = downloadItem.finalUrl || downloadItem.url
|
||||||
|
|
||||||
|
// 回退下载:我们自己用 chrome.downloads.download 创建的,直接跳过,避免无限循环
|
||||||
|
const fbExp = fallbackUrls.get(url)
|
||||||
|
if (fbExp && Date.now() < fbExp) {
|
||||||
|
fallbackUrls.delete(url)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 历史下载(安装前的旧下载被浏览器恢复)一律不接管
|
||||||
|
if (await isHistoricalDownload(downloadItem)) return
|
||||||
|
|
||||||
if (!await shouldIntercept(downloadItem)) return
|
if (!await shouldIntercept(downloadItem)) return
|
||||||
|
|
||||||
|
// 同一 URL 已在处理中,跳过(防并发/防重复转发)
|
||||||
|
if (processingUrls.has(url)) return
|
||||||
|
|
||||||
|
// 引擎不可达时不接管(保留浏览器原生下载),避免取消后下载无处可去
|
||||||
|
let connected = false
|
||||||
|
try { connected = await testConnection() } catch { connected = false }
|
||||||
|
if (!connected) return
|
||||||
|
|
||||||
|
// 引擎已有同 URL 的非终态任务,不重复转发
|
||||||
|
if (await hasExistingTask(url)) return
|
||||||
|
|
||||||
|
processingUrls.add(url)
|
||||||
|
try {
|
||||||
try {
|
try {
|
||||||
await chrome.downloads.cancel(downloadItem.id)
|
await chrome.downloads.cancel(downloadItem.id)
|
||||||
await chrome.downloads.erase({ id: downloadItem.id })
|
await chrome.downloads.erase({ id: downloadItem.id })
|
||||||
} catch { /* ignore */ }
|
} catch { /* ignore */ }
|
||||||
|
|
||||||
const url = downloadItem.finalUrl || downloadItem.url
|
|
||||||
const filename = downloadItem.filename || ''
|
const filename = downloadItem.filename || ''
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const id = await addDownload(url, filename, downloadItem.referrer, '')
|
await addDownload(url, filename, downloadItem.referrer, '')
|
||||||
await notify('已添加到 Thing', `${filename || url}`)
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
await notify('Thing 添加失败', `${filename || url}\n${e.message}`)
|
// 添加失败:回退为浏览器自带下载,并标记该 URL 短时间内跳过,防止再次被拦截形成死循环
|
||||||
|
fallbackUrls.set(url, Date.now() + 3000)
|
||||||
try { await chrome.downloads.download({ url }) } catch { /* ignore */ }
|
try { await chrome.downloads.download({ url }) } catch { /* ignore */ }
|
||||||
}
|
}
|
||||||
|
} finally {
|
||||||
|
processingUrls.delete(url)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===== 通知 =====
|
// ===== 右键菜单 & 安装标记 =====
|
||||||
async function notify(title, message) {
|
chrome.runtime.onInstalled.addListener(async (details) => {
|
||||||
const config = await getConfig()
|
// 记录首次安装时间:用于区分"安装前的历史下载"(被浏览器恢复的旧下载)与"安装后的新下载"
|
||||||
if (!config.showNotifications) return
|
if (details.reason === 'install') {
|
||||||
try {
|
await chrome.storage.local.set({ installTime: Date.now() })
|
||||||
await chrome.notifications.create({
|
}
|
||||||
type: 'basic',
|
|
||||||
iconUrl: 'icons/icon-128.png',
|
|
||||||
title,
|
|
||||||
message
|
|
||||||
})
|
|
||||||
} catch { /* ignore */ }
|
|
||||||
}
|
|
||||||
|
|
||||||
// ===== 右键菜单 =====
|
|
||||||
chrome.runtime.onInstalled.addListener(() => {
|
|
||||||
chrome.contextMenus.create({
|
chrome.contextMenus.create({
|
||||||
id: 'thing-download-link',
|
id: 'thing-download-link',
|
||||||
title: '使用 Thing 下载此链接',
|
title: '使用 Thing 下载此链接',
|
||||||
@@ -428,10 +484,7 @@ chrome.contextMenus.onClicked.addListener(async (info, tab) => {
|
|||||||
const filename = url.split('/').pop()?.split('?')[0] || ''
|
const filename = url.split('/').pop()?.split('?')[0] || ''
|
||||||
try {
|
try {
|
||||||
await addDownload(url, filename, info.pageUrl, '')
|
await addDownload(url, filename, info.pageUrl, '')
|
||||||
await notify('已添加到 Thing', `${filename || url}`)
|
} catch (e) { /* 忽略:添加失败时不打扰用户 */ }
|
||||||
} catch (e) {
|
|
||||||
await notify('Thing 添加失败', `${e.message}`)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"manifest_version": 3,
|
"manifest_version": 3,
|
||||||
"name": "Thing Extension",
|
"name": "Thing Extension",
|
||||||
"version": "0.2.0",
|
"version": "0.30",
|
||||||
"description": "发送浏览器下载到 Thing 下载引擎,嗅探网页资源。",
|
"description": "发送浏览器下载到 Thing 下载引擎,嗅探网页资源。",
|
||||||
"icons": {
|
"icons": {
|
||||||
"16": "icons/icon-16.png",
|
"16": "icons/icon-16.png",
|
||||||
@@ -11,9 +11,7 @@
|
|||||||
"permissions": [
|
"permissions": [
|
||||||
"downloads",
|
"downloads",
|
||||||
"storage",
|
"storage",
|
||||||
"notifications",
|
|
||||||
"webRequest",
|
"webRequest",
|
||||||
"webNavigation",
|
|
||||||
"contextMenus",
|
"contextMenus",
|
||||||
"tabs",
|
"tabs",
|
||||||
"scripting"
|
"scripting"
|
||||||
|
|||||||
@@ -87,11 +87,6 @@
|
|||||||
<span>启用资源嗅探</span>
|
<span>启用资源嗅探</span>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label class="checkbox">
|
|
||||||
<input type="checkbox" id="showNotifications" />
|
|
||||||
<span>显示桌面通知</span>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label class="field">
|
<label class="field">
|
||||||
<span>下载最小文件大小(字节,0=全部)</span>
|
<span>下载最小文件大小(字节,0=全部)</span>
|
||||||
<input type="number" id="minSize" min="0" placeholder="0" />
|
<input type="number" id="minSize" min="0" placeholder="0" />
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ const DEFAULT_CONFIG = {
|
|||||||
interceptDownload: true,
|
interceptDownload: true,
|
||||||
minSize: 0,
|
minSize: 0,
|
||||||
excludeDomains: [],
|
excludeDomains: [],
|
||||||
showNotifications: true,
|
|
||||||
sniffEnabled: true,
|
sniffEnabled: true,
|
||||||
sniffTypes: ['video', 'audio', 'image', 'archive', 'torrent', 'installer'],
|
sniffTypes: ['video', 'audio', 'image', 'archive', 'torrent', 'installer'],
|
||||||
sniffMaxItems: 200,
|
sniffMaxItems: 200,
|
||||||
@@ -57,7 +56,6 @@ function fillForm(config) {
|
|||||||
$('secret').value = config.secret || ''
|
$('secret').value = config.secret || ''
|
||||||
$('interceptDownload').checked = config.interceptDownload !== false
|
$('interceptDownload').checked = config.interceptDownload !== false
|
||||||
$('sniffEnabled').checked = config.sniffEnabled !== false
|
$('sniffEnabled').checked = config.sniffEnabled !== false
|
||||||
$('showNotifications').checked = config.showNotifications !== false
|
|
||||||
$('minSize').value = config.minSize || 0
|
$('minSize').value = config.minSize || 0
|
||||||
$('sniffMinSize').value = config.sniffMinSize ?? DEFAULT_CONFIG.sniffMinSize
|
$('sniffMinSize').value = config.sniffMinSize ?? DEFAULT_CONFIG.sniffMinSize
|
||||||
$('excludeDomains').value = (config.excludeDomains || []).join(',')
|
$('excludeDomains').value = (config.excludeDomains || []).join(',')
|
||||||
@@ -69,7 +67,6 @@ function readForm() {
|
|||||||
secret: $('secret').value.trim(),
|
secret: $('secret').value.trim(),
|
||||||
interceptDownload: $('interceptDownload').checked,
|
interceptDownload: $('interceptDownload').checked,
|
||||||
sniffEnabled: $('sniffEnabled').checked,
|
sniffEnabled: $('sniffEnabled').checked,
|
||||||
showNotifications: $('showNotifications').checked,
|
|
||||||
minSize: parseInt($('minSize').value, 10) || 0,
|
minSize: parseInt($('minSize').value, 10) || 0,
|
||||||
sniffMinSize: parseInt($('sniffMinSize').value, 10) || 0,
|
sniffMinSize: parseInt($('sniffMinSize').value, 10) || 0,
|
||||||
excludeDomains: $('excludeDomains').value
|
excludeDomains: $('excludeDomains').value
|
||||||
|
|||||||
Binary file not shown.
@@ -3,13 +3,14 @@
|
|||||||
use base64::engine::general_purpose::STANDARD;
|
use base64::engine::general_purpose::STANDARD;
|
||||||
use base64::Engine as _;
|
use base64::Engine as _;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
use specta::Type;
|
||||||
use tauri::{AppHandle, State};
|
use tauri::{AppHandle, State};
|
||||||
|
|
||||||
use super::manager::{ClipboardManager, ClipboardSettings};
|
use super::manager::{ClipboardManager, ClipboardSettings};
|
||||||
use super::reader::dib_to_png;
|
use super::reader::{dib_to_png, dib_to_thumbnail};
|
||||||
use super::storage::{ClipboardItem, ClipboardItemDetail};
|
use super::storage::{ClipboardItem, ClipboardItemDetail};
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct ClipboardStatus {
|
pub struct ClipboardStatus {
|
||||||
pub running: bool,
|
pub running: bool,
|
||||||
@@ -21,7 +22,7 @@ fn img_to_base64(b: &[u8]) -> Option<String> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 历史查询结果(含总数,用于分页)
|
/// 历史查询结果(含总数,用于分页)
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct HistoryPage {
|
pub struct HistoryPage {
|
||||||
pub items: Vec<ClipboardItem>,
|
pub items: Vec<ClipboardItem>,
|
||||||
@@ -29,74 +30,122 @@ pub struct HistoryPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_get_history(
|
pub async fn clipboard_get_history(
|
||||||
limit: Option<i64>,
|
limit: Option<i64>,
|
||||||
offset: Option<i64>,
|
offset: Option<i64>,
|
||||||
kind: Option<String>,
|
kind: Option<String>,
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
) -> Result<HistoryPage, String> {
|
) -> Result<HistoryPage, String> {
|
||||||
let storage = manager.storage();
|
let storage = manager.storage().clone();
|
||||||
let kind = kind.unwrap_or_else(|| "all".into());
|
let kind = kind.unwrap_or_else(|| "all".into());
|
||||||
let limit = limit.unwrap_or(50);
|
let limit = limit.unwrap_or(50);
|
||||||
let offset = offset.unwrap_or(0);
|
let offset = offset.unwrap_or(0);
|
||||||
|
// SQLite 查询移出 async runtime 线程
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
let items = storage.get_history(limit, offset, &kind);
|
let items = storage.get_history(limit, offset, &kind);
|
||||||
let total = storage.count_kind(&kind);
|
let total = storage.count_kind(&kind);
|
||||||
Ok(HistoryPage { items, total })
|
HistoryPage { items, total }
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("查询任务失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_get_pinned(
|
pub async fn clipboard_get_pinned(
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
) -> Result<Vec<ClipboardItem>, String> {
|
) -> Result<Vec<ClipboardItem>, String> {
|
||||||
Ok(manager.storage().get_pinned())
|
let storage = manager.storage().clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || storage.get_pinned())
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("查询任务失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_search(
|
pub async fn clipboard_search(
|
||||||
query: String,
|
query: String,
|
||||||
limit: Option<i64>,
|
limit: Option<i64>,
|
||||||
offset: Option<i64>,
|
offset: Option<i64>,
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
) -> Result<HistoryPage, String> {
|
) -> Result<HistoryPage, String> {
|
||||||
let storage = manager.storage();
|
let storage = manager.storage().clone();
|
||||||
let limit = limit.unwrap_or(50);
|
let limit = limit.unwrap_or(50);
|
||||||
let offset = offset.unwrap_or(0);
|
let offset = offset.unwrap_or(0);
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
let items = storage.search(&query, limit, offset);
|
let items = storage.search(&query, limit, offset);
|
||||||
let total = storage.count_search(&query);
|
let total = storage.count_search(&query);
|
||||||
Ok(HistoryPage { items, total })
|
HistoryPage { items, total }
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("查询任务失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_get_item(
|
pub async fn clipboard_get_item(
|
||||||
id: i64,
|
id: i64,
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
) -> Result<Option<ClipboardItemDetail>, String> {
|
) -> Result<Option<ClipboardItemDetail>, String> {
|
||||||
Ok(manager.storage().get_detail(id, img_to_base64))
|
let storage = manager.storage().clone();
|
||||||
|
// get_detail 内部:锁内取数 + 锁外 base64 编码,整体移出主线程
|
||||||
|
tauri::async_runtime::spawn_blocking(move || storage.get_detail(id, img_to_base64))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("查询任务失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取图片缩略图 PNG base64(弹窗悬停预览用,避免加载全尺寸图片)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn clipboard_get_thumb(
|
||||||
|
id: i64,
|
||||||
|
manager: State<'_, ClipboardManager>,
|
||||||
|
) -> Result<Option<String>, String> {
|
||||||
|
let storage = manager.storage().clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
storage.get_thumb(id, |dib| dib_to_thumbnail(dib, 256))
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("查询任务失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_set_pinned(
|
pub async fn clipboard_set_pinned(
|
||||||
id: i64,
|
id: i64,
|
||||||
pinned: bool,
|
pinned: bool,
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
) -> Result<bool, String> {
|
) -> Result<bool, String> {
|
||||||
Ok(manager.storage().set_pinned(id, pinned))
|
let storage = manager.storage().clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || storage.set_pinned(id, pinned))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("操作任务失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_delete(
|
pub async fn clipboard_delete(
|
||||||
id: i64,
|
id: i64,
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
) -> Result<bool, String> {
|
) -> Result<bool, String> {
|
||||||
Ok(manager.storage().delete(id))
|
let storage = manager.storage().clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || storage.delete(id))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("删除任务失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_clear(manager: State<'_, ClipboardManager>) -> Result<bool, String> {
|
pub async fn clipboard_clear(manager: State<'_, ClipboardManager>) -> Result<bool, String> {
|
||||||
Ok(manager.storage().clear_non_pinned())
|
let storage = manager.storage().clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || storage.clear_non_pinned())
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("清空任务失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_copy_back(
|
pub async fn clipboard_copy_back(
|
||||||
id: i64,
|
id: i64,
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
@@ -105,11 +154,16 @@ pub async fn clipboard_copy_back(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_count(manager: State<'_, ClipboardManager>) -> Result<i64, String> {
|
pub async fn clipboard_count(manager: State<'_, ClipboardManager>) -> Result<i64, String> {
|
||||||
Ok(manager.storage().count())
|
let storage = manager.storage().clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || storage.count())
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("查询任务失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_get_settings(
|
pub async fn clipboard_get_settings(
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
) -> Result<ClipboardSettings, String> {
|
) -> Result<ClipboardSettings, String> {
|
||||||
@@ -117,44 +171,75 @@ pub async fn clipboard_get_settings(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_save_settings(
|
pub async fn clipboard_save_settings(
|
||||||
settings: ClipboardSettings,
|
settings: ClipboardSettings,
|
||||||
app: AppHandle,
|
app: AppHandle,
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let prev_enabled = manager.get_settings().enabled;
|
let prev = manager.get_settings();
|
||||||
let prev_shortcut = manager.get_settings().shortcut.clone();
|
let prev_enabled = prev.enabled;
|
||||||
|
let prev_shortcut = prev.shortcut.clone();
|
||||||
|
|
||||||
|
// 快捷键变化且新值非空:先注册(原子化 + 冲突检测),成功后才保存设置。
|
||||||
|
// 注册失败时恢复旧快捷键并中止保存,避免设置被写入无法生效的组合键、旧键丢失。
|
||||||
|
if settings.shortcut != prev_shortcut && !settings.shortcut.trim().is_empty() {
|
||||||
|
if let Err(e) = crate::shortcut::register_shortcut(&app, "剪贴板", &settings.shortcut, |a| {
|
||||||
|
super::popup::show_popup(a)
|
||||||
|
}) {
|
||||||
|
// register_shortcut 内部已注销旧快捷键,失败时需重新注册旧键以恢复
|
||||||
|
if !prev_shortcut.trim().is_empty() {
|
||||||
|
let _ = crate::shortcut::register_shortcut(&app, "剪贴板", &prev_shortcut, |a| {
|
||||||
|
super::popup::show_popup(a)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return Err(e);
|
||||||
|
}
|
||||||
|
// 新快捷键非空时确保弹窗/预览窗口已预创建
|
||||||
|
super::popup::ensure_popup_window(&app);
|
||||||
|
super::popup::ensure_preview_window(&app);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 保存设置
|
||||||
manager.save_settings(settings.clone());
|
manager.save_settings(settings.clone());
|
||||||
|
|
||||||
// 监听开关变化时联动启停
|
// 监听开关变化时联动启停
|
||||||
if settings.enabled && !prev_enabled {
|
if settings.enabled && !prev_enabled {
|
||||||
manager.start(&app);
|
manager.start(&app);
|
||||||
} else if !settings.enabled && prev_enabled {
|
} else if !settings.enabled && prev_enabled {
|
||||||
manager.stop();
|
manager.stop();
|
||||||
}
|
}
|
||||||
// 快捷键变化时重新注册
|
|
||||||
if settings.shortcut != prev_shortcut {
|
// 快捷键改为空字符串(禁用):注销旧快捷键
|
||||||
super::popup::register_shortcut(&app, &settings.shortcut)?;
|
if settings.shortcut.trim().is_empty() && settings.shortcut != prev_shortcut {
|
||||||
|
crate::shortcut::unregister_shortcut(&app, "剪贴板");
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_status(
|
pub async fn clipboard_status(
|
||||||
manager: State<'_, ClipboardManager>,
|
manager: State<'_, ClipboardManager>,
|
||||||
) -> Result<ClipboardStatus, String> {
|
) -> Result<ClipboardStatus, String> {
|
||||||
Ok(ClipboardStatus {
|
let storage = manager.storage().clone();
|
||||||
running: manager.is_running(),
|
let running = manager.is_running();
|
||||||
count: manager.storage().count(),
|
let count = tauri::async_runtime::spawn_blocking(move || storage.count())
|
||||||
})
|
.await
|
||||||
|
.map_err(|e| format!("查询任务失败: {}", e))?;
|
||||||
|
Ok(ClipboardStatus { running, count })
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_start(app: AppHandle, manager: State<'_, ClipboardManager>) -> Result<(), String> {
|
pub async fn clipboard_start(app: AppHandle, manager: State<'_, ClipboardManager>) -> Result<(), String> {
|
||||||
manager.start(&app);
|
manager.start(&app);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_stop(manager: State<'_, ClipboardManager>) -> Result<(), String> {
|
pub async fn clipboard_stop(manager: State<'_, ClipboardManager>) -> Result<(), String> {
|
||||||
manager.stop();
|
manager.stop();
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -162,22 +247,27 @@ pub async fn clipboard_stop(manager: State<'_, ClipboardManager>) -> Result<(),
|
|||||||
|
|
||||||
/// 注册(或切换)快捷弹窗全局快捷键
|
/// 注册(或切换)快捷弹窗全局快捷键
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_register_shortcut(
|
pub async fn clipboard_register_shortcut(
|
||||||
shortcut: String,
|
shortcut: String,
|
||||||
app: AppHandle,
|
app: AppHandle,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
super::popup::register_shortcut(&app, &shortcut)
|
crate::shortcut::register_shortcut(&app, "剪贴板", &shortcut, |a| {
|
||||||
|
super::popup::show_popup(a)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 注销快捷弹窗全局快捷键
|
/// 注销快捷弹窗全局快捷键
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_unregister_shortcut(app: AppHandle) -> Result<(), String> {
|
pub async fn clipboard_unregister_shortcut(app: AppHandle) -> Result<(), String> {
|
||||||
super::popup::unregister_shortcut(&app);
|
crate::shortcut::unregister_shortcut(&app, "剪贴板");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 手动触发显示快捷弹窗(供 UI 按钮调用)
|
/// 手动触发显示快捷弹窗(供 UI 按钮调用)
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_show_popup(app: AppHandle) -> Result<(), String> {
|
pub async fn clipboard_show_popup(app: AppHandle) -> Result<(), String> {
|
||||||
super::popup::show_popup(&app);
|
super::popup::show_popup(&app);
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -185,6 +275,7 @@ pub async fn clipboard_show_popup(app: AppHandle) -> Result<(), String> {
|
|||||||
|
|
||||||
/// 隐藏快捷弹窗
|
/// 隐藏快捷弹窗
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_hide_popup(app: AppHandle) -> Result<(), String> {
|
pub async fn clipboard_hide_popup(app: AppHandle) -> Result<(), String> {
|
||||||
super::popup::hide_popup(&app);
|
super::popup::hide_popup(&app);
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -192,6 +283,7 @@ pub async fn clipboard_hide_popup(app: AppHandle) -> Result<(), String> {
|
|||||||
|
|
||||||
/// 显示已创建的弹窗窗口(前端 onMounted 后调用)
|
/// 显示已创建的弹窗窗口(前端 onMounted 后调用)
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_show_window(app: AppHandle) -> Result<(), String> {
|
pub async fn clipboard_show_window(app: AppHandle) -> Result<(), String> {
|
||||||
super::popup::show_window(&app);
|
super::popup::show_window(&app);
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -199,7 +291,57 @@ pub async fn clipboard_show_window(app: AppHandle) -> Result<(), String> {
|
|||||||
|
|
||||||
/// 隐藏弹窗并模拟 Ctrl+V 粘贴到原窗口
|
/// 隐藏弹窗并模拟 Ctrl+V 粘贴到原窗口
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn clipboard_paste_to_target(app: AppHandle) -> Result<(), String> {
|
pub async fn clipboard_paste_to_target(app: AppHandle) -> Result<(), String> {
|
||||||
super::popup::paste_to_target(&app);
|
super::popup::paste_to_target(&app);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 在弹窗旁显示独立预览窗口(悬停/键盘选中时调用)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn clipboard_show_preview(app: AppHandle, id: i64) -> Result<(), String> {
|
||||||
|
super::popup::show_preview(&app, id);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 隐藏独立预览窗口
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn clipboard_hide_preview(app: AppHandle) -> Result<(), String> {
|
||||||
|
super::popup::hide_preview(&app);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按内容自适应调整预览窗大小(逻辑像素)。前端加载内容(文本测高、图片按宽高比)后调用,
|
||||||
|
/// 窗口贴合内容消除留白;后端按弹窗所在屏工作区钳制并重新对齐弹窗。
|
||||||
|
/// allow_flip:初始落位为 true(优先侧放不下可换侧);放大/还原为 false(保持原侧)。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn clipboard_resize_preview(
|
||||||
|
app: AppHandle,
|
||||||
|
width: f64,
|
||||||
|
height: f64,
|
||||||
|
allow_flip: bool,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
super::popup::resize_preview(&app, width, height, allow_flip);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 显示已就绪的预览窗口。前端完成内容加载与 resize 后调用,窗口以最终尺寸出现,
|
||||||
|
/// 消除"先以上次尺寸(可能是放大态大窗)显示再缩回"的闪烁。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn clipboard_reveal_preview(app: AppHandle) -> Result<(), String> {
|
||||||
|
super::popup::reveal_preview(&app);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 预览窗交互锁定:前端预览窗收到 mousedown(放大/缩小、复制、选择文本)时调用。
|
||||||
|
/// 此后弹窗+预览不因失焦/鼠标离开而关闭,仅当点击外部或弹窗重新聚焦时退出锁定。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn clipboard_preview_interacted(app: AppHandle) -> Result<(), String> {
|
||||||
|
super::popup::preview_interacted(&app);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -7,13 +7,15 @@ use std::sync::{Arc, Mutex};
|
|||||||
use std::thread::JoinHandle;
|
use std::thread::JoinHandle;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
use super::monitor::start_monitor;
|
use super::monitor::start_monitor;
|
||||||
use super::reader::{write_dib, write_files, write_text};
|
use super::reader::{write_dib, write_files, write_text};
|
||||||
use super::storage::Storage;
|
use super::storage::Storage;
|
||||||
|
use windows_sys::Win32::System::DataExchange::GetClipboardSequenceNumber;
|
||||||
|
|
||||||
/// 剪贴板设置(持久化到 clipboard/settings.json)
|
/// 剪贴板设置(持久化到 clipboard/settings.json)
|
||||||
#[derive(Clone, Serialize, Deserialize)]
|
#[derive(Clone, Serialize, Deserialize, Type)]
|
||||||
#[serde(rename_all = "camelCase", default)]
|
#[serde(rename_all = "camelCase", default)]
|
||||||
pub struct ClipboardSettings {
|
pub struct ClipboardSettings {
|
||||||
/// 监听是否启用
|
/// 监听是否启用
|
||||||
@@ -54,7 +56,8 @@ impl Default for ClipboardSettings {
|
|||||||
pub struct ClipboardManager {
|
pub struct ClipboardManager {
|
||||||
storage: Arc<Storage>,
|
storage: Arc<Storage>,
|
||||||
settings: Arc<Mutex<ClipboardSettings>>,
|
settings: Arc<Mutex<ClipboardSettings>>,
|
||||||
suppress: Arc<AtomicBool>,
|
/// 本应用 copy_back 写入后的剪贴板序列号,用于跳过自身写入产生的记录
|
||||||
|
suppress: Arc<Mutex<Option<u32>>>,
|
||||||
monitor_stop: Arc<AtomicBool>,
|
monitor_stop: Arc<AtomicBool>,
|
||||||
monitor_handle: Mutex<Option<JoinHandle<()>>>,
|
monitor_handle: Mutex<Option<JoinHandle<()>>>,
|
||||||
settings_path: PathBuf,
|
settings_path: PathBuf,
|
||||||
@@ -66,13 +69,13 @@ impl ClipboardManager {
|
|||||||
let storage = match Storage::new(&clip_dir) {
|
let storage = match Storage::new(&clip_dir) {
|
||||||
Ok(s) => Arc::new(s),
|
Ok(s) => Arc::new(s),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("[clipboard] 磁盘存储初始化失败,回退内存: {}", e);
|
crate::logger::log_warn("clipboard", &format!("磁盘存储初始化失败,回退内存: {}", e));
|
||||||
Arc::new(Storage::new_in_memory())
|
Arc::new(Storage::new_in_memory())
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let settings_path = clip_dir.join("settings.json");
|
let settings_path = clip_dir.join("settings.json");
|
||||||
let settings = Arc::new(Mutex::new(load_settings(&settings_path)));
|
let settings = Arc::new(Mutex::new(load_settings(&settings_path)));
|
||||||
let suppress = Arc::new(AtomicBool::new(false));
|
let suppress = Arc::new(Mutex::new(None));
|
||||||
let monitor_stop = Arc::new(AtomicBool::new(true));
|
let monitor_stop = Arc::new(AtomicBool::new(true));
|
||||||
Self {
|
Self {
|
||||||
storage,
|
storage,
|
||||||
@@ -86,7 +89,7 @@ impl ClipboardManager {
|
|||||||
|
|
||||||
/// 启动监听(若已运行则跳过)
|
/// 启动监听(若已运行则跳过)
|
||||||
pub fn start(&self, app: &tauri::AppHandle) {
|
pub fn start(&self, app: &tauri::AppHandle) {
|
||||||
let mut handle = self.monitor_handle.lock().unwrap();
|
let mut handle = self.monitor_handle.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
if handle.is_some() {
|
if handle.is_some() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -99,41 +102,51 @@ impl ClipboardManager {
|
|||||||
self.monitor_stop.clone(),
|
self.monitor_stop.clone(),
|
||||||
);
|
);
|
||||||
*handle = Some(h);
|
*handle = Some(h);
|
||||||
eprintln!("[clipboard] 监听已启动");
|
crate::logger::log_info("clipboard", "监听已启动");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 停止监听
|
/// 停止监听
|
||||||
pub fn stop(&self) {
|
pub fn stop(&self) {
|
||||||
self.monitor_stop.store(true, Ordering::SeqCst);
|
self.monitor_stop.store(true, Ordering::SeqCst);
|
||||||
if let Some(h) = self.monitor_handle.lock().unwrap().take() {
|
if let Some(h) = self
|
||||||
// 不阻塞等待;轮询线程最迟 800ms 后退出
|
.monitor_handle
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.take()
|
||||||
|
{
|
||||||
|
// 后台等待监听线程退出(最迟 800ms),不阻塞调用者。
|
||||||
|
// 剪贴板 stop 命令跑在 async runtime 线程上,直接 join 会卡住 tokio worker。
|
||||||
|
std::thread::spawn(move || {
|
||||||
let _ = h.join();
|
let _ = h.join();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
eprintln!("[clipboard] 监听已停止");
|
crate::logger::log_info("clipboard", "监听已停止");
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn is_running(&self) -> bool {
|
pub fn is_running(&self) -> bool {
|
||||||
self.monitor_handle.lock().unwrap().is_some()
|
self.monitor_handle
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.is_some()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_settings(&self) -> ClipboardSettings {
|
pub fn get_settings(&self) -> ClipboardSettings {
|
||||||
self.settings.lock().unwrap().clone()
|
self.settings.lock().unwrap_or_else(|e| e.into_inner()).clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn save_settings(&self, s: ClipboardSettings) {
|
pub fn save_settings(&self, s: ClipboardSettings) {
|
||||||
{
|
{
|
||||||
*self.settings.lock().unwrap() = s.clone();
|
*self.settings.lock().unwrap_or_else(|e| e.into_inner()) = s.clone();
|
||||||
}
|
}
|
||||||
save_settings(&self.settings_path, &s);
|
save_settings(&self.settings_path, &s);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 将某条历史写回剪贴板。写回前置 suppress 标志以避免再次记录。
|
/// 将某条历史写回剪贴板。写回成功后记录剪贴板序列号,供监听跳过自身写入。
|
||||||
pub fn copy_back(&self, id: i64) -> Result<(), String> {
|
pub fn copy_back(&self, id: i64) -> Result<(), String> {
|
||||||
let (kind, content, blob) = self
|
let (kind, content, blob) = self
|
||||||
.storage
|
.storage
|
||||||
.get_raw_for_copy(id)
|
.get_raw_for_copy(id)
|
||||||
.ok_or_else(|| "条目不存在".to_string())?;
|
.ok_or_else(|| "条目不存在".to_string())?;
|
||||||
self.suppress.store(true, Ordering::SeqCst);
|
|
||||||
let ok = match kind.as_str() {
|
let ok = match kind.as_str() {
|
||||||
"text" => content.as_deref().map(write_text).unwrap_or(false),
|
"text" => content.as_deref().map(write_text).unwrap_or(false),
|
||||||
"image" => blob.as_deref().map(write_dib).unwrap_or(false),
|
"image" => blob.as_deref().map(write_dib).unwrap_or(false),
|
||||||
@@ -151,10 +164,12 @@ impl ClipboardManager {
|
|||||||
_ => false,
|
_ => false,
|
||||||
};
|
};
|
||||||
if ok {
|
if ok {
|
||||||
|
// 绑定到写入完成后的剪贴板序列号:仅跳过本次写入产生的记录,
|
||||||
|
// 用户后续复制(序列号不同)不会被误吞。
|
||||||
|
let seq = unsafe { GetClipboardSequenceNumber() };
|
||||||
|
*self.suppress.lock().unwrap_or_else(|e| e.into_inner()) = Some(seq);
|
||||||
Ok(())
|
Ok(())
|
||||||
} else {
|
} else {
|
||||||
// 写入失败也清除 suppress,避免误吞下次复制
|
|
||||||
self.suppress.store(false, Ordering::SeqCst);
|
|
||||||
Err("写回剪贴板失败".into())
|
Err("写回剪贴板失败".into())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,9 +9,12 @@ pub mod storage;
|
|||||||
|
|
||||||
pub use commands::{
|
pub use commands::{
|
||||||
clipboard_clear, clipboard_copy_back, clipboard_count, clipboard_delete, clipboard_get_history,
|
clipboard_clear, clipboard_copy_back, clipboard_count, clipboard_delete, clipboard_get_history,
|
||||||
clipboard_get_item, clipboard_get_pinned, clipboard_get_settings, clipboard_hide_popup,
|
clipboard_get_item, clipboard_get_pinned, clipboard_get_settings, clipboard_get_thumb,
|
||||||
clipboard_paste_to_target, clipboard_register_shortcut, clipboard_save_settings, clipboard_search,
|
clipboard_hide_popup, clipboard_hide_preview, clipboard_paste_to_target,
|
||||||
clipboard_set_pinned, clipboard_show_popup, clipboard_show_window, clipboard_start,
|
clipboard_preview_interacted, clipboard_register_shortcut,
|
||||||
|
clipboard_reveal_preview,
|
||||||
|
clipboard_save_settings, clipboard_search, clipboard_set_pinned, clipboard_resize_preview,
|
||||||
|
clipboard_show_popup, clipboard_show_preview, clipboard_show_window, clipboard_start,
|
||||||
clipboard_status, clipboard_stop, clipboard_unregister_shortcut,
|
clipboard_status, clipboard_stop, clipboard_unregister_shortcut,
|
||||||
};
|
};
|
||||||
pub use manager::ClipboardManager;
|
pub use manager::ClipboardManager;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
//! 剪贴板监听线程:基于 GetClipboardSequenceNumber 轮询
|
//! 剪贴板监听线程:基于 GetClipboardSequenceNumber 轮询
|
||||||
//!
|
//!
|
||||||
//! 选用轮询而非 AddClipboardFormatListener 消息窗口:实现更简单、无需消息循环,
|
//! 选用轮询而非 AddClipboardFormatListener 消息窗口:实现更简单、无需消息循环,
|
||||||
//! 800ms 间隔对剪贴板场景延迟可接受,且 GetClipboardSequenceNumber 不需要 OpenClipboard,开销极小。
|
//! 250ms 间隔兼顾响应速度与开销,且 GetClipboardSequenceNumber 不需要 OpenClipboard,开销极小。
|
||||||
|
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
@@ -15,18 +15,19 @@ use super::storage::{NewItem, Storage};
|
|||||||
use windows_sys::Win32::System::DataExchange::GetClipboardSequenceNumber;
|
use windows_sys::Win32::System::DataExchange::GetClipboardSequenceNumber;
|
||||||
|
|
||||||
/// 启动监听线程,返回 JoinHandle。
|
/// 启动监听线程,返回 JoinHandle。
|
||||||
|
/// `suppress` 记录本应用 copy_back 写入后的剪贴板序列号,用于跳过自身写入产生的记录。
|
||||||
pub fn start_monitor(
|
pub fn start_monitor(
|
||||||
storage: Arc<Storage>,
|
storage: Arc<Storage>,
|
||||||
app: AppHandle,
|
app: AppHandle,
|
||||||
settings: Arc<Mutex<super::manager::ClipboardSettings>>,
|
settings: Arc<Mutex<super::manager::ClipboardSettings>>,
|
||||||
suppress: Arc<AtomicBool>,
|
suppress: Arc<Mutex<Option<u32>>>,
|
||||||
stop: Arc<AtomicBool>,
|
stop: Arc<AtomicBool>,
|
||||||
) -> thread::JoinHandle<()> {
|
) -> thread::JoinHandle<()> {
|
||||||
thread::spawn(move || loop {
|
thread::spawn(move || loop {
|
||||||
if stop.load(Ordering::SeqCst) {
|
if stop.load(Ordering::SeqCst) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
thread::sleep(Duration::from_millis(800));
|
thread::sleep(Duration::from_millis(250));
|
||||||
if stop.load(Ordering::SeqCst) {
|
if stop.load(Ordering::SeqCst) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -40,13 +41,16 @@ pub fn start_monitor(
|
|||||||
if seq == last {
|
if seq == last {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// 序列号变化,处理一次
|
// 序列号变化:仅当变化来自本应用 copy_back(序列号精确匹配)时跳过,
|
||||||
if suppress.swap(false, Ordering::SeqCst) {
|
// 避免旧布尔标志在用户后续复制时被误吞。
|
||||||
// 由本应用 copy_back 触发,跳过记录
|
if let Ok(mut s) = suppress.lock() {
|
||||||
|
if *s == Some(seq) {
|
||||||
|
*s = None;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
let (rec_text, rec_image, rec_files, max_items, max_image_kb, dedup) = {
|
let (rec_text, rec_image, rec_files, max_items, max_image_kb, dedup) = {
|
||||||
let s = settings.lock().unwrap();
|
let s = settings.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
(
|
(
|
||||||
s.record_text,
|
s.record_text,
|
||||||
s.record_image,
|
s.record_image,
|
||||||
@@ -85,7 +89,7 @@ pub fn start_monitor(
|
|||||||
};
|
};
|
||||||
if let Some(_id) = storage.insert_or_touch(item, dedup) {
|
if let Some(_id) = storage.insert_or_touch(item, dedup) {
|
||||||
storage.prune_to_max(max_items);
|
storage.prune_to_max(max_items);
|
||||||
let _ = app.emit("clipboard-changed", ());
|
let _ = app.emit(crate::constants::events::CLIPBOARD_CHANGED, ());
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -99,6 +103,7 @@ fn build_text_item(t: &str) -> NewItem {
|
|||||||
kind: "text".into(),
|
kind: "text".into(),
|
||||||
content: Some(t.to_string()),
|
content: Some(t.to_string()),
|
||||||
blob: None,
|
blob: None,
|
||||||
|
thumb: None,
|
||||||
preview: make_preview(t, 200),
|
preview: make_preview(t, 200),
|
||||||
size: t.len() as i64,
|
size: t.len() as i64,
|
||||||
hash: hash_str(t),
|
hash: hash_str(t),
|
||||||
@@ -110,6 +115,7 @@ fn build_image_item(dib: &[u8], w: u32, h: u32) -> NewItem {
|
|||||||
kind: "image".into(),
|
kind: "image".into(),
|
||||||
content: None,
|
content: None,
|
||||||
blob: Some(dib.to_vec()),
|
blob: Some(dib.to_vec()),
|
||||||
|
thumb: super::reader::dib_to_thumbnail(dib, 256),
|
||||||
preview: format!("图片 {}×{}", w, h),
|
preview: format!("图片 {}×{}", w, h),
|
||||||
size: dib.len() as i64,
|
size: dib.len() as i64,
|
||||||
hash: hash_bytes(dib),
|
hash: hash_bytes(dib),
|
||||||
@@ -132,6 +138,7 @@ fn build_files_item(files: &[String]) -> NewItem {
|
|||||||
kind: "files".into(),
|
kind: "files".into(),
|
||||||
content: Some(content),
|
content: Some(content),
|
||||||
blob: None,
|
blob: None,
|
||||||
|
thumb: None,
|
||||||
preview,
|
preview,
|
||||||
size: files.iter().map(|f| f.len()).sum::<usize>() as i64,
|
size: files.iter().map(|f| f.len()).sum::<usize>() as i64,
|
||||||
hash,
|
hash,
|
||||||
|
|||||||
+594
-162
@@ -9,64 +9,158 @@
|
|||||||
//! 6. 窗口失焦自动隐藏
|
//! 6. 窗口失焦自动隐藏
|
||||||
|
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
use tauri::{AppHandle, Manager, WebviewUrl, WebviewWindowBuilder, Emitter};
|
use tauri::{AppHandle, Manager, WebviewUrl, WebviewWindowBuilder, Emitter};
|
||||||
use tauri::window::{Effect, EffectsBuilder};
|
use tauri::window::{Effect, EffectsBuilder};
|
||||||
use tauri_plugin_global_shortcut::{GlobalShortcutExt, Shortcut, ShortcutState};
|
|
||||||
|
|
||||||
/// 弹窗窗口标签
|
/// 弹窗窗口标签
|
||||||
pub const POPUP_LABEL: &str = "clipboard-popup";
|
pub const POPUP_LABEL: &str = "clipboard-popup";
|
||||||
|
|
||||||
/// 当前注册的快捷键(用于注销旧快捷键)
|
/// 预览窗口标签(悬停/键盘选中条目时在弹窗旁显示内容)
|
||||||
static CURRENT_SHORTCUT: Mutex<Option<String>> = Mutex::new(None);
|
pub const PREVIEW_LABEL: &str = "clipboard-preview";
|
||||||
|
|
||||||
/// 解析快捷键字符串为 Shortcut(格式如 "Alt+V"、"Ctrl+Shift+V")
|
/// 预览窗口初始逻辑尺寸(后续由前端按内容自适应调整,见 resize_preview)
|
||||||
/// 失败返回 None。
|
const PREVIEW_W: f64 = 340.0;
|
||||||
pub fn parse_shortcut(s: &str) -> Option<Shortcut> {
|
const PREVIEW_H: f64 = 300.0;
|
||||||
s.trim().parse::<Shortcut>().ok()
|
|
||||||
|
/// 预览窗口最小逻辑尺寸(防止内容过小时窗口退化)
|
||||||
|
const PREVIEW_MIN_W: f64 = 240.0;
|
||||||
|
const PREVIEW_MIN_H: f64 = 160.0;
|
||||||
|
|
||||||
|
/// 弹窗与预览窗之间的可视间距(逻辑像素,左右对称)
|
||||||
|
const PREVIEW_GAP: f64 = 12.0;
|
||||||
|
|
||||||
|
/// 标志:show_popup 兜底创建路径设为 true,前端 onMounted 回调 show_window 时据此判断是否显示。
|
||||||
|
/// 预创建路径不设置,避免应用启动时弹窗自动弹出。
|
||||||
|
static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
/// 兜底创建路径下 show_popup 计算出的待显示位置(物理坐标),供 show_window 应用,
|
||||||
|
/// 避免窗口重建后仍停留在屏幕外 (-10000, -10000)。
|
||||||
|
static PENDING_POS: Mutex<Option<(f64, f64)>> = Mutex::new(None);
|
||||||
|
|
||||||
|
/// 弹窗当前是否可见(同步单一事实来源)。
|
||||||
|
/// show_preview 用它代替 popup.is_visible():后者在 hide 异步在途时可能返回过期 true,
|
||||||
|
/// 导致"弹窗已隐藏但残留的悬停/键盘请求重新弹出孤立预览窗"。该标志在隐藏路径
|
||||||
|
/// 同步置 false,任何在途请求都会直接拒绝。
|
||||||
|
static POPUP_VISIBLE: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
/// 预览窗当前是否可见(同步标志,与 POPUP_VISIBLE 同理:预览窗以原生
|
||||||
|
/// SW_SHOWNOACTIVATE 显示,Tauri 的 is_visible() 可能与其真实状态不同步,
|
||||||
|
/// 故用该标志代替 is_visible 判断预览交互状态)。
|
||||||
|
static PREVIEW_VISIBLE: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
/// 弹窗因预览交互(光标位于预览窗内)而推迟隐藏的标记:
|
||||||
|
/// 点击预览窗(选择/复制文本、放大图片)时,弹窗会收到 Focused(false),但用户正在
|
||||||
|
/// 预览窗内交互,此时不应隐藏弹窗。置该标记后保持弹窗显示,待用户离开预览窗
|
||||||
|
/// (hide_preview)时再连同弹窗一起隐藏,避免"点击预览即关闭弹窗"导致无法交互。
|
||||||
|
static POPUP_DEFER_HIDE: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
/// 失焦隐藏的宽限期:WebView2 透明窗口在 show 后激活期间焦点可能短暂弹跳
|
||||||
|
/// (与快速面板同因),导致 Focused(false) 紧跟在 show 之后触发并立即隐藏刚显示的弹窗。
|
||||||
|
const SHOW_GRACE: Duration = Duration::from_millis(500);
|
||||||
|
|
||||||
|
/// 最近一次 show 的时间,用于失焦宽限期判断。
|
||||||
|
static LAST_SHOWN: Mutex<Option<Instant>> = Mutex::new(None);
|
||||||
|
|
||||||
|
/// 标记"已发起显示",并记录时间供失焦宽限期使用。
|
||||||
|
fn mark_shown() {
|
||||||
|
if let Ok(mut t) = LAST_SHOWN.lock() {
|
||||||
|
*t = Some(Instant::now());
|
||||||
|
}
|
||||||
|
POPUP_VISIBLE.store(true, Ordering::SeqCst);
|
||||||
|
// 重新显示弹窗时复位推迟隐藏标记(上一轮预览交互的遗留状态不应影响本轮)
|
||||||
|
POPUP_DEFER_HIDE.store(false, Ordering::SeqCst);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 注册全局快捷键。重复调用会先注销旧快捷键。
|
/// 判断距上次 show 是否仍在宽限期内(是则忽略失焦自动隐藏)。
|
||||||
/// 传入空字符串则仅注销不注册。
|
fn within_show_grace() -> bool {
|
||||||
pub fn register_shortcut(app: &AppHandle, shortcut_str: &str) -> Result<(), String> {
|
LAST_SHOWN
|
||||||
// 先注销旧快捷键
|
.lock()
|
||||||
unregister_shortcut(app);
|
.ok()
|
||||||
|
.and_then(|t| *t)
|
||||||
|
.map(|t| t.elapsed() < SHOW_GRACE)
|
||||||
|
.unwrap_or(false)
|
||||||
|
}
|
||||||
|
|
||||||
if shortcut_str.trim().is_empty() {
|
/// 创建弹窗窗口(隐藏状态)并注册失焦监听。
|
||||||
return Ok(());
|
/// 位置默认在屏幕外,show_popup 时会重新定位。
|
||||||
|
/// 预创建后首次按快捷键走"窗口已存在"分支直接 show,避免首次创建的时序问题。
|
||||||
|
fn create_popup_window(app: &AppHandle) {
|
||||||
|
let win = match WebviewWindowBuilder::new(
|
||||||
|
app,
|
||||||
|
POPUP_LABEL,
|
||||||
|
WebviewUrl::App("index.html#clipboard-popup".into()),
|
||||||
|
)
|
||||||
|
.title("剪贴板")
|
||||||
|
.inner_size(380.0, 460.0)
|
||||||
|
.position(-10000.0, -10000.0) // 屏幕外,避免隐藏时一闪
|
||||||
|
.decorations(false)
|
||||||
|
.transparent(true)
|
||||||
|
.shadow(true)
|
||||||
|
.always_on_top(true)
|
||||||
|
.skip_taskbar(true)
|
||||||
|
.resizable(false)
|
||||||
|
.visible(false)
|
||||||
|
.focused(false) // 不抢占焦点,避免创建即触发 Focused(false)
|
||||||
|
.effects(EffectsBuilder::new().effects(vec![Effect::Mica]).build())
|
||||||
|
.build()
|
||||||
|
{
|
||||||
|
Ok(w) => w,
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_error("clipboard", &format!("创建弹窗失败: {}", e));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let shortcut = parse_shortcut(shortcut_str)
|
// 监听窗口失焦:自动隐藏(同时隐藏预览窗)
|
||||||
.ok_or_else(|| format!("无效的快捷键: {}", shortcut_str))?;
|
|
||||||
|
|
||||||
let app_handle = app.clone();
|
let app_handle = app.clone();
|
||||||
app.global_shortcut()
|
let win_handle = win.clone();
|
||||||
.on_shortcut(shortcut, move |_app, _shortcut, event| {
|
win.on_window_event(move |event| {
|
||||||
// 仅在按下时触发(松开不触发)
|
match event {
|
||||||
if event.state == ShortcutState::Pressed {
|
tauri::WindowEvent::Focused(false) => {
|
||||||
show_popup(&app_handle);
|
// 失焦宽限期:show 后激活期间的焦点弹跳不隐藏弹窗,避免弹窗刚显示就被隐藏
|
||||||
|
if within_show_grace() {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
})
|
// 交互锁定模式(点击过预览窗):弹窗与预览保持显示,仅由看护线程在
|
||||||
.map_err(|e| format!("注册快捷键失败: {}", e))?;
|
// "点击外部"时关闭;此处的失焦是点击预览窗(NoActivate)所致,不隐藏。
|
||||||
|
if POPUP_INTERACTED.load(Ordering::SeqCst) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// 鼠标当前位于预览窗或弹窗内(用户正在交互:选择/复制文本、放大图片、或
|
||||||
|
// 已移回弹窗准备继续浏览):弹窗失焦是点击预览窗或焦点反弹所致,不应隐藏弹窗。
|
||||||
|
// 置推迟标记保持弹窗显示,待用户离开整个区域(hide_preview / 再次失焦)再隐藏。
|
||||||
|
if is_cursor_in_preview(&app_handle) || is_cursor_in_popup(&app_handle) {
|
||||||
|
POPUP_DEFER_HIDE.store(true, Ordering::SeqCst);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// 先同步标记弹窗不可见,再隐藏窗口/预览:异步 hide 在途时,残留的
|
||||||
|
// show_preview 请求会因该标志为 false 而拒绝,预览窗不会孤立残留。
|
||||||
|
POPUP_VISIBLE.store(false, Ordering::SeqCst);
|
||||||
|
POPUP_DEFER_HIDE.store(false, Ordering::SeqCst);
|
||||||
|
let _ = win_handle.hide();
|
||||||
|
hide_preview(&app_handle);
|
||||||
|
let _ = app_handle.emit(crate::constants::events::CLIPBOARD_POPUP_HIDE, ());
|
||||||
|
}
|
||||||
|
tauri::WindowEvent::Focused(true) => {
|
||||||
|
// 弹窗重新获得焦点(用户点击/移回弹窗):取消推迟隐藏状态
|
||||||
|
POPUP_DEFER_HIDE.store(false, Ordering::SeqCst);
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
if let Ok(mut cur) = CURRENT_SHORTCUT.lock() {
|
crate::logger::log_info("clipboard", "弹窗窗口已预创建(隐藏状态)");
|
||||||
*cur = Some(shortcut_str.to_string());
|
|
||||||
}
|
|
||||||
eprintln!("[clipboard] 已注册快捷键: {}", shortcut_str);
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 注销当前快捷键
|
/// 应用启动时预创建弹窗窗口(隐藏)。
|
||||||
pub fn unregister_shortcut(app: &AppHandle) {
|
/// 这样首次按快捷键时窗口已存在,直接 show + 定位,避免首次创建时序问题。
|
||||||
if let Ok(cur) = CURRENT_SHORTCUT.lock() {
|
pub fn ensure_popup_window(app: &AppHandle) {
|
||||||
if let Some(ref s) = *cur {
|
if app.get_webview_window(POPUP_LABEL).is_some() {
|
||||||
if let Some(shortcut) = parse_shortcut(s) {
|
return;
|
||||||
let _ = app.global_shortcut().unregister(shortcut);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if let Ok(mut cur) = CURRENT_SHORTCUT.lock() {
|
|
||||||
*cur = None;
|
|
||||||
}
|
}
|
||||||
|
create_popup_window(app);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 在鼠标当前位置显示弹窗。
|
/// 在鼠标当前位置显示弹窗。
|
||||||
@@ -79,7 +173,7 @@ pub fn show_popup(app: &AppHandle) {
|
|||||||
None => return,
|
None => return,
|
||||||
};
|
};
|
||||||
|
|
||||||
// 窗口尺寸(逻辑像素)
|
// 窗口尺寸(物理像素,由光标所在屏 DPI 换算)
|
||||||
let w = 380.0_f64;
|
let w = 380.0_f64;
|
||||||
let h = 460.0_f64;
|
let h = 460.0_f64;
|
||||||
|
|
||||||
@@ -87,90 +181,77 @@ pub fn show_popup(app: &AppHandle) {
|
|||||||
let (wa_left, wa_top, wa_right, wa_bottom) = get_work_area_at_point(mx, my)
|
let (wa_left, wa_top, wa_right, wa_bottom) = get_work_area_at_point(mx, my)
|
||||||
.unwrap_or((0, 0, 1920, 1040));
|
.unwrap_or((0, 0, 1920, 1040));
|
||||||
|
|
||||||
// 获取光标所在显示器的 DPI,将物理坐标转为逻辑坐标(DIP)
|
// 光标所在显示器的 DPI:窗口尺寸需按物理像素放大
|
||||||
let dpi = get_dpi_for_point(mx, my).unwrap_or(96);
|
let dpi = get_dpi_for_point(mx, my).unwrap_or(96);
|
||||||
let scale = dpi as f64 / 96.0;
|
let scale = dpi as f64 / 96.0;
|
||||||
|
let w_px = w * scale;
|
||||||
|
let h_px = h * scale;
|
||||||
|
|
||||||
let mx_l = mx as f64 / scale;
|
// 直接以物理坐标 clamping(光标位置 + 工作区均为物理像素,避免混合 DPI 下
|
||||||
let my_l = my as f64 / scale;
|
// 手动"物理→逻辑"换算后 Tauri 再按窗口所在屏解释导致的定位偏移)
|
||||||
let wa_left_l = wa_left as f64 / scale;
|
let x = (mx as f64).max(wa_left as f64).min(wa_right as f64 - w_px);
|
||||||
let wa_top_l = wa_top as f64 / scale;
|
let y = (my as f64).max(wa_top as f64).min(wa_bottom as f64 - h_px);
|
||||||
let wa_right_l = wa_right as f64 / scale;
|
|
||||||
let wa_bottom_l = wa_bottom as f64 / scale;
|
|
||||||
|
|
||||||
// 逻辑坐标 clamping(窗口尺寸 w/h 也是逻辑像素)
|
|
||||||
let x = mx_l.max(wa_left_l).min(wa_right_l - w);
|
|
||||||
let y = my_l.max(wa_top_l).min(wa_bottom_l - h);
|
|
||||||
|
|
||||||
// 窗口已存在:移动 + 显示 + 请求焦点
|
// 窗口已存在:移动 + 显示 + 请求焦点
|
||||||
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
||||||
let _ = win.set_position(tauri::Position::Logical(tauri::LogicalPosition {
|
let _ = win.set_position(tauri::Position::Physical(tauri::PhysicalPosition {
|
||||||
x,
|
x: x as i32,
|
||||||
y,
|
y: y as i32,
|
||||||
}));
|
}));
|
||||||
let _ = win.show();
|
let _ = win.show();
|
||||||
|
mark_shown();
|
||||||
let _ = win.set_focus();
|
let _ = win.set_focus();
|
||||||
// 通知前端刷新数据
|
// 通知前端刷新数据
|
||||||
let _ = app.emit("clipboard-popup-show", ());
|
let _ = app.emit(crate::constants::events::CLIPBOARD_POPUP_SHOW, ());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 首次创建窗口:先隐藏,等前端挂载完成后再显示
|
// 兜底:窗口被销毁时重新创建(隐藏),等前端 onMounted 回调 show_window
|
||||||
// 这样确保主题效果(dark class、mica)在窗口可见前已应用
|
POPUP_PENDING_SHOW.store(true, Ordering::SeqCst);
|
||||||
let win = match WebviewWindowBuilder::new(
|
if let Ok(mut pos) = PENDING_POS.lock() {
|
||||||
app,
|
*pos = Some((x, y));
|
||||||
POPUP_LABEL,
|
|
||||||
WebviewUrl::App("index.html#clipboard-popup".into()),
|
|
||||||
)
|
|
||||||
.title("剪贴板")
|
|
||||||
.inner_size(w, h)
|
|
||||||
.position(x, y)
|
|
||||||
.decorations(false)
|
|
||||||
.transparent(true)
|
|
||||||
.shadow(true)
|
|
||||||
.always_on_top(true)
|
|
||||||
.skip_taskbar(true)
|
|
||||||
.resizable(false)
|
|
||||||
.visible(false) // 关键:先隐藏,前端 onMounted 后调用 show_window
|
|
||||||
.focused(true)
|
|
||||||
.effects(EffectsBuilder::new().effects(vec![Effect::Mica]).build())
|
|
||||||
.build()
|
|
||||||
{
|
|
||||||
Ok(w) => w,
|
|
||||||
Err(e) => {
|
|
||||||
eprintln!("[clipboard] 创建弹窗失败: {}", e);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
};
|
create_popup_window(app);
|
||||||
|
|
||||||
// 监听窗口失焦:自动隐藏
|
|
||||||
let app_handle = app.clone();
|
|
||||||
let win_handle = win.clone();
|
|
||||||
win.on_window_event(move |event| {
|
|
||||||
if let tauri::WindowEvent::Focused(false) = event {
|
|
||||||
let _ = win_handle.hide();
|
|
||||||
let _ = app_handle.emit("clipboard-popup-hide", ());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
eprintln!("[clipboard] 弹窗窗口已创建(隐藏状态)");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 显示已创建的弹窗窗口(由前端 onMounted 后调用)。
|
/// 显示已创建的弹窗窗口(由前端 onMounted 后调用)。
|
||||||
|
/// 预创建路径下前端 onMounted 也会调用此函数,但 POPUP_PENDING_SHOW 为 false 时直接跳过,
|
||||||
|
/// 避免应用启动时弹窗自动弹出。仅 show_popup 兜底创建路径才真正显示。
|
||||||
pub fn show_window(app: &AppHandle) {
|
pub fn show_window(app: &AppHandle) {
|
||||||
|
if !POPUP_PENDING_SHOW.swap(false, Ordering::SeqCst) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
||||||
|
// 应用 show_popup 计算的兜底位置(物理坐标),避免停留在屏幕外
|
||||||
|
let pos = PENDING_POS.lock().ok().and_then(|p| *p);
|
||||||
|
if let Some((x, y)) = pos {
|
||||||
|
let _ = win.set_position(tauri::Position::Physical(tauri::PhysicalPosition {
|
||||||
|
x: x as i32,
|
||||||
|
y: y as i32,
|
||||||
|
}));
|
||||||
|
}
|
||||||
let _ = win.show();
|
let _ = win.show();
|
||||||
|
mark_shown();
|
||||||
let _ = win.set_focus();
|
let _ = win.set_focus();
|
||||||
// 通知前端刷新数据
|
// 通知前端刷新数据
|
||||||
let _ = app.emit("clipboard-popup-show", ());
|
let _ = app.emit(crate::constants::events::CLIPBOARD_POPUP_SHOW, ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 隐藏弹窗(不销毁,保留复用)
|
/// 隐藏弹窗(不销毁,保留复用),并通知前端清理悬停定时器/预览。
|
||||||
pub fn hide_popup(app: &AppHandle) {
|
pub fn hide_popup(app: &AppHandle) {
|
||||||
|
// 复位推迟隐藏标记(先于 hide_preview,避免 hide_preview 重入 hide_popup 形成递归)
|
||||||
|
POPUP_DEFER_HIDE.store(false, Ordering::SeqCst);
|
||||||
|
// 复位交互锁定:弹窗关闭后下次呼出恢复"失焦即隐藏"的常规模式
|
||||||
|
POPUP_INTERACTED.store(false, Ordering::SeqCst);
|
||||||
|
// 同步标记弹窗不可见,拒绝此后在途的 show_preview 请求
|
||||||
|
POPUP_VISIBLE.store(false, Ordering::SeqCst);
|
||||||
|
hide_preview(app);
|
||||||
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
||||||
let _ = win.hide();
|
let _ = win.hide();
|
||||||
}
|
}
|
||||||
|
// 通知前端:取消悬停定时器并隐藏预览,避免弹窗隐藏后残留定时器重新弹出预览窗
|
||||||
|
let _ = app.emit(crate::constants::events::CLIPBOARD_POPUP_HIDE, ());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 隐藏弹窗后延迟模拟 Ctrl+V 粘贴到之前聚焦的窗口。
|
/// 隐藏弹窗后延迟模拟 Ctrl+V 粘贴到之前聚焦的窗口。
|
||||||
@@ -224,83 +305,434 @@ fn simulate_paste() {
|
|||||||
// 非 Windows 平台暂不支持自动粘贴
|
// 非 Windows 平台暂不支持自动粘贴
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===== Win32 API:获取鼠标位置和工作区 =====
|
// ===== 独立预览窗口 =====
|
||||||
|
|
||||||
#[cfg(windows)]
|
/// 创建预览窗口(隐藏状态),应用 NoActivate 样式避免抢焦点。
|
||||||
mod win_api {
|
fn create_preview_window(app: &AppHandle) {
|
||||||
use windows_sys::Win32::Foundation::POINT;
|
let win = match WebviewWindowBuilder::new(
|
||||||
use windows_sys::Win32::UI::WindowsAndMessaging::{GetCursorPos, SystemParametersInfoW, SPI_GETWORKAREA};
|
app,
|
||||||
|
PREVIEW_LABEL,
|
||||||
/// 获取鼠标位置(屏幕坐标,物理像素)
|
WebviewUrl::App("index.html#clipboard-preview".into()),
|
||||||
pub fn get_cursor_pos() -> Option<(i32, i32)> {
|
)
|
||||||
let mut pt = POINT { x: 0, y: 0 };
|
.title("预览")
|
||||||
unsafe {
|
.inner_size(PREVIEW_W, PREVIEW_H)
|
||||||
if GetCursorPos(&mut pt) != 0 {
|
.position(-10000.0, -10000.0) // 屏幕外,避免隐藏时一闪
|
||||||
Some((pt.x, pt.y))
|
.decorations(false)
|
||||||
} else {
|
.transparent(true)
|
||||||
None
|
.shadow(true)
|
||||||
|
.always_on_top(true)
|
||||||
|
.skip_taskbar(true)
|
||||||
|
.resizable(false)
|
||||||
|
.visible(false)
|
||||||
|
.focused(false) // 不抢占焦点
|
||||||
|
.effects(EffectsBuilder::new().effects(vec![Effect::Mica]).build())
|
||||||
|
.build()
|
||||||
|
{
|
||||||
|
Ok(w) => w,
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_error("clipboard", &format!("创建预览窗失败: {}", e));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 获取主屏工作区尺寸(排除任务栏,物理像素)
|
|
||||||
pub fn get_work_area() -> Option<(f64, f64)> {
|
|
||||||
use windows_sys::Win32::Foundation::RECT;
|
|
||||||
let mut rect = RECT { left: 0, top: 0, right: 0, bottom: 0 };
|
|
||||||
unsafe {
|
|
||||||
if SystemParametersInfoW(SPI_GETWORKAREA, 0, &mut rect as *mut _ as *mut _, 0) != 0 {
|
|
||||||
Some(((rect.right - rect.left) as f64, (rect.bottom - rect.top) as f64))
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 获取指定点所在显示器的工作区(排除任务栏),返回 (left, top, right, bottom) 物理像素。
|
|
||||||
/// 使用 MonitorFromPoint 支持多显示器环境。
|
|
||||||
pub fn get_work_area_at_point(x: i32, y: i32) -> Option<(i32, i32, i32, i32)> {
|
|
||||||
use windows_sys::Win32::Graphics::Gdi::{
|
|
||||||
GetMonitorInfoW, MonitorFromPoint, MONITORINFO, MONITOR_DEFAULTTONEAREST,
|
|
||||||
};
|
};
|
||||||
let pt = POINT { x, y };
|
|
||||||
let hmon = unsafe { MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST) };
|
// NoActivate:预览窗可交互但不激活,弹窗保持前台(键盘导航/粘贴不受影响)
|
||||||
let mut mi: MONITORINFO = unsafe { std::mem::zeroed() };
|
// 圆角:NoActivate 悬浮窗系统不自动圆角,显式指定 DWMWCP_ROUND 与弹窗外观统一
|
||||||
mi.cbSize = std::mem::size_of::<MONITORINFO>() as u32;
|
#[cfg(windows)]
|
||||||
unsafe {
|
if let Ok(hwnd) = win.hwnd() {
|
||||||
if GetMonitorInfoW(hmon, &mut mi) != 0 {
|
crate::win32_util::apply_no_activate(hwnd.0 as isize);
|
||||||
let rc = mi.rcWork;
|
crate::win32_util::apply_rounded_corners(hwnd.0 as isize);
|
||||||
Some((rc.left, rc.top, rc.right, rc.bottom))
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
crate::logger::log_info("clipboard", "预览窗口已预创建(隐藏状态)");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用启动时预创建预览窗口(隐藏),随弹窗一起就绪。
|
||||||
|
pub fn ensure_preview_window(app: &AppHandle) {
|
||||||
|
if app.get_webview_window(PREVIEW_LABEL).is_some() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
create_preview_window(app);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 预览当前所在侧(default=右,left=左),供放大/还原重定位沿用同侧。
|
||||||
|
#[derive(Clone, Copy, PartialEq)]
|
||||||
|
enum PreviewSide {
|
||||||
|
Right,
|
||||||
|
Left,
|
||||||
|
}
|
||||||
|
|
||||||
|
static PREVIEW_SIDE: Mutex<Option<PreviewSide>> = Mutex::new(None);
|
||||||
|
|
||||||
|
/// 最近一次显示预览时的鼠标 Y 锚点(物理像素)。预览窗垂直中线对齐该位置
|
||||||
|
/// (贴近鼠标所悬停的条目),resize(切换条目/放大还原)时沿用,保持中线稳定不跳变。
|
||||||
|
static PREVIEW_ANCHOR_Y: Mutex<Option<i32>> = Mutex::new(None);
|
||||||
|
|
||||||
|
/// 弹窗离开看护线程是否已在运行(防重入,见 spawn_popup_leave_watch)。
|
||||||
|
static POPUP_LEAVE_WATCH: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
/// 交互锁定模式:用户点击过预览窗(放大/缩小、复制文本等)后置位。
|
||||||
|
/// 该模式下弹窗与预览不因失焦/鼠标离开而关闭,仅当点击弹窗+预览之外的
|
||||||
|
/// 区域(看护线程检测鼠标按下沿)或弹窗重新聚焦(恢复正常模式)时才复位。
|
||||||
|
static POPUP_INTERACTED: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
/// 重新定位预览窗口(物理像素)。preferred 指定优先放置侧,返回实际落位侧。
|
||||||
|
/// anchor_y 为鼠标 Y 锚点:预览窗垂直中线对齐该位置(贴近悬停条目),
|
||||||
|
/// 上下 clamp 到工作区;None 时退回弹窗顶部对齐。
|
||||||
|
///
|
||||||
|
/// 无边框+阴影窗口(tao 实现)的外框矩形在客户区四周各留一条不可见边框
|
||||||
|
/// (SM_CXSIZEFRAME+SM_CXPADDEDBORDER,典型 8px):outer_position/outer_size 均含该边框,
|
||||||
|
/// 而可视内容仅占客户区。若直接用外框尺寸计算右侧落位,右侧可视间距会比左侧多出
|
||||||
|
/// 两侧边框之和(约 16px)。这里以"可视边缘"对齐:frame = (外框宽 - 客户区宽) / 2,
|
||||||
|
/// 左右两侧使用同一 GAP,保证两侧可视间距一致。
|
||||||
|
fn reposition_preview(
|
||||||
|
popup: &tauri::WebviewWindow,
|
||||||
|
win: &tauri::WebviewWindow,
|
||||||
|
vw: i32,
|
||||||
|
vh: i32,
|
||||||
|
preferred: PreviewSide,
|
||||||
|
anchor_y: Option<i32>,
|
||||||
|
allow_flip: bool,
|
||||||
|
) -> PreviewSide {
|
||||||
|
// 弹窗当前物理位置与尺寸(外框,含不可见边框)
|
||||||
|
let Ok(pos) = popup.outer_position() else { return preferred };
|
||||||
|
let Ok(osz) = popup.outer_size() else { return preferred };
|
||||||
|
let Ok(isz) = popup.inner_size() else { return preferred };
|
||||||
|
let (px, py) = (pos.x, pos.y);
|
||||||
|
let pw = osz.width as i32;
|
||||||
|
// 不可见边框宽度(外框与客户区之差的一半;无阴影窗口为 0)
|
||||||
|
let frame = ((osz.width.saturating_sub(isz.width)) / 2) as i32;
|
||||||
|
|
||||||
|
// 弹窗所在显示器工作区
|
||||||
|
let (wa_left, wa_top, wa_right, wa_bottom) = get_work_area_at_point(px, py)
|
||||||
|
.unwrap_or((0, 0, 1920, 1040));
|
||||||
|
|
||||||
|
let gap = (PREVIEW_GAP * popup.scale_factor().unwrap_or(1.0)).round() as i32;
|
||||||
|
|
||||||
|
// 可视边缘对齐:
|
||||||
|
// 右侧落位 = 弹窗可视右缘(px+pw-frame) + GAP - 预览窗自身左边框(frame)
|
||||||
|
// 左侧落位 = 弹窗可视左缘(px+frame) - GAP - 预览可视宽(vw) - 预览窗左边框(frame)
|
||||||
|
// (frame 两两抵消,与旧公式一致)
|
||||||
|
let right_x = px + pw - 2 * frame + gap;
|
||||||
|
let left_x = px - gap - vw;
|
||||||
|
// 可视区域(含预览窗自身边框偏移)不越工作区
|
||||||
|
let fits_right = right_x + frame + vw <= wa_right;
|
||||||
|
let fits_left = left_x + frame >= wa_left;
|
||||||
|
let mut x = match preferred {
|
||||||
|
PreviewSide::Right => right_x,
|
||||||
|
PreviewSide::Left => left_x,
|
||||||
|
};
|
||||||
|
// 仅初始落位(allow_flip=true)允许换侧:优先侧放不下时切到另一侧。
|
||||||
|
// 内容尺寸变化(放大/还原,allow_flip=false)不允许换侧:窗口跳到另一侧会使
|
||||||
|
// 鼠标瞬间落在窗外,误触发 mouseleave 而关闭预览/弹窗;此时保持原侧并靠
|
||||||
|
// 工作区 clamp(大图可能覆盖弹窗边缘,属合理取舍,鼠标仍在预览窗内可交互)。
|
||||||
|
if allow_flip {
|
||||||
|
match preferred {
|
||||||
|
PreviewSide::Right => {
|
||||||
|
if !fits_right {
|
||||||
|
x = left_x;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PreviewSide::Left => {
|
||||||
|
if !fits_left {
|
||||||
|
x = right_x;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
x = (x + frame).max(wa_left).min(wa_right - vw) - frame;
|
||||||
|
// 仅初始落位(allow_flip)按最终位置更新所在侧(换侧时位置在弹窗另一侧,判定正确);
|
||||||
|
// 放大/还原(不允许换侧)时即使被工作区 clamp 覆盖到弹窗上方,语义上仍属原侧,
|
||||||
|
// 必须沿用 preferred——否则 clamp 后按位置误判为另一侧并存档,缩小后会跳侧。
|
||||||
|
let side = if allow_flip {
|
||||||
|
if x + vw <= px { PreviewSide::Left } else { PreviewSide::Right }
|
||||||
|
} else {
|
||||||
|
preferred
|
||||||
|
};
|
||||||
|
// 垂直定位:预览窗中线对齐鼠标 Y 锚点(贴近悬停条目),上下 clamp 到工作区;
|
||||||
|
// 无锚点时退回弹窗顶部对齐
|
||||||
|
let y = match anchor_y {
|
||||||
|
Some(ay) => (ay - vh / 2).max(wa_top).min(wa_bottom - vh),
|
||||||
|
None => py.max(wa_top).min(wa_bottom - vh),
|
||||||
|
};
|
||||||
|
|
||||||
|
let _ = win.set_position(tauri::Position::Physical(tauri::PhysicalPosition { x, y }));
|
||||||
|
if let Ok(mut s) = PREVIEW_SIDE.lock() {
|
||||||
|
*s = Some(side);
|
||||||
|
}
|
||||||
|
side
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 通知预览前端加载指定条目。窗口此时保持隐藏:前端测得内容尺寸后先调用
|
||||||
|
/// resize_preview(隐藏状态下完成尺寸/位置调整)再 reveal_preview 显示,
|
||||||
|
/// 避免"先以上次尺寸(可能是放大态大窗)显示再缩回"的闪烁。
|
||||||
|
pub fn show_preview(app: &AppHandle, id: i64) {
|
||||||
|
// 弹窗已隐藏(或隐藏中)时拒绝显示预览:同步标志消除 is_visible() 的异步时序竞态,
|
||||||
|
// 保证"弹窗失焦消失后预览窗不会孤立残留"。
|
||||||
|
if !POPUP_VISIBLE.load(Ordering::SeqCst) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if app.get_webview_window(PREVIEW_LABEL).is_none() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let Some(popup) = app.get_webview_window(POPUP_LABEL) else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
// 弹窗不可见时不显示预览:避免弹窗隐藏后仍在途的悬停请求重新弹出孤立的预览窗
|
||||||
|
if !popup.is_visible().unwrap_or(false) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 记录鼠标 Y 锚点:预览窗中线对齐鼠标所悬停的条目位置;resize 时沿用
|
||||||
|
if let Some((_, y)) = get_cursor_pos() {
|
||||||
|
if let Ok(mut a) = PREVIEW_ANCHOR_Y.lock() {
|
||||||
|
*a = Some(y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 获取指定点所在显示器的有效 DPI。
|
// 通知前端加载条目内容(前端完成后自行 resize + reveal)
|
||||||
/// scale factor = dpi / 96。
|
let _ = app.emit(crate::constants::events::CLIPBOARD_PREVIEW_SHOW, id);
|
||||||
pub fn get_dpi_for_point(x: i32, y: i32) -> Option<u32> {
|
}
|
||||||
use windows_sys::Win32::Graphics::Gdi::{MonitorFromPoint, MONITOR_DEFAULTTONEAREST};
|
|
||||||
use windows_sys::Win32::UI::HiDpi::{GetDpiForMonitor, MDT_EFFECTIVE_DPI};
|
/// 显示已就绪的预览窗口(前端完成内容加载与 resize 后调用)。
|
||||||
let pt = POINT { x, y };
|
/// 显示前重查弹窗可见性,消除内容加载期间弹窗已隐藏的竞态。
|
||||||
let hmon = unsafe { MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST) };
|
pub fn reveal_preview(app: &AppHandle) {
|
||||||
let mut dpi_x: u32 = 0;
|
// 弹窗已隐藏:在途请求作废
|
||||||
let mut dpi_y: u32 = 0;
|
if !POPUP_VISIBLE.load(Ordering::SeqCst) {
|
||||||
unsafe {
|
return;
|
||||||
if GetDpiForMonitor(hmon, MDT_EFFECTIVE_DPI, &mut dpi_x, &mut dpi_y) == 0 {
|
|
||||||
Some(dpi_x)
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
}
|
||||||
|
// 已可见则跳过(放大/还原触发的重复 reveal)
|
||||||
|
if PREVIEW_VISIBLE.load(Ordering::SeqCst) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
let Some(win) = app.get_webview_window(PREVIEW_LABEL) else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 同步标记预览窗可见(以原生方式显示,Tauri 的 is_visible 可能不同步)
|
||||||
|
PREVIEW_VISIBLE.store(true, Ordering::SeqCst);
|
||||||
|
// 不激活显示(SW_SHOWNOACTIVATE),弹窗保持前台
|
||||||
|
#[cfg(windows)]
|
||||||
|
if let Ok(hwnd) = win.hwnd() {
|
||||||
|
crate::win32_util::show_no_activate(hwnd.0 as isize);
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
let _ = win.show();
|
||||||
|
|
||||||
|
// 显示期间弹窗可能已被隐藏(失焦/关闭):立即收回预览。
|
||||||
|
// 关闭初次检查与真正 show 之间的竞态——失焦处理器先置 POPUP_VISIBLE=false
|
||||||
|
// 再隐藏,这里 show 之后重查一次,若已被隐藏则收回预览,避免孤立残留。
|
||||||
|
if !POPUP_VISIBLE.load(Ordering::SeqCst) {
|
||||||
|
PREVIEW_VISIBLE.store(false, Ordering::SeqCst);
|
||||||
|
let _ = win.hide();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(windows))]
|
/// 按内容自适应调整预览窗大小(逻辑像素),位置沿用当前所在侧并重新对齐弹窗。
|
||||||
mod win_api {
|
/// 前端加载/切换内容(文本测高、图片按宽高比)后调用,窗口贴合内容消除留白。
|
||||||
pub fn get_cursor_pos() -> Option<(i32, i32)> { None }
|
/// allow_flip:初始落位为 true(优先侧放不下可换侧);放大/还原为 false
|
||||||
pub fn get_work_area() -> Option<(f64, f64)> { None }
|
/// (保持原侧靠工作区 clamp,避免窗口跳侧使鼠标落在窗外误触发隐藏)。
|
||||||
pub fn get_work_area_at_point(_x: i32, _y: i32) -> Option<(i32, i32, i32, i32)> { None }
|
pub fn resize_preview(app: &AppHandle, width: f64, height: f64, allow_flip: bool) {
|
||||||
pub fn get_dpi_for_point(_x: i32, _y: i32) -> Option<u32> { None }
|
// 弹窗不可见时忽略(无对齐基准)
|
||||||
|
if !POPUP_VISIBLE.load(Ordering::SeqCst) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let Some(win) = app.get_webview_window(PREVIEW_LABEL) else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
let Some(popup) = app.get_webview_window(POPUP_LABEL) else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
let scale = popup.scale_factor().unwrap_or(1.0);
|
||||||
|
// 以弹窗所在屏工作区为上限钳制(逻辑像素),并保证不小于最小可视尺寸
|
||||||
|
let (wa_left, wa_top, wa_right, wa_bottom) = popup
|
||||||
|
.outer_position()
|
||||||
|
.ok()
|
||||||
|
.and_then(|p| get_work_area_at_point(p.x, p.y))
|
||||||
|
.unwrap_or((0, 0, 1920, 1040));
|
||||||
|
let max_w = ((wa_right - wa_left).max(0) as f64 / scale).floor().max(PREVIEW_MIN_W);
|
||||||
|
let max_h = ((wa_bottom - wa_top).max(0) as f64 / scale).floor().max(PREVIEW_MIN_H);
|
||||||
|
let w = width.clamp(PREVIEW_MIN_W, max_w);
|
||||||
|
let h = height.clamp(PREVIEW_MIN_H, max_h);
|
||||||
|
let vw = (w * scale).round() as i32;
|
||||||
|
let vh = (h * scale).round() as i32;
|
||||||
|
|
||||||
|
let side = PREVIEW_SIDE.lock().ok().and_then(|s| *s).unwrap_or(PreviewSide::Right);
|
||||||
|
// 沿用最近一次的鼠标 Y 锚点:高度变化时中线保持对齐悬停条目,不产生跳变
|
||||||
|
let anchor_y = PREVIEW_ANCHOR_Y.lock().ok().and_then(|a| *a);
|
||||||
|
reposition_preview(&popup, &win, vw, vh, side, anchor_y, allow_flip);
|
||||||
|
let _ = win.set_size(tauri::Size::Physical(tauri::PhysicalSize { width: vw as u32, height: vh as u32 }));
|
||||||
}
|
}
|
||||||
|
|
||||||
pub use win_api::{get_cursor_pos, get_work_area, get_work_area_at_point, get_dpi_for_point};
|
/// 交互锁定模式入口:前端预览窗收到 mousedown(放大/缩小、复制、选择文本)时调用。
|
||||||
|
/// 置位锁定标志并启动看护线程:此后弹窗+预览不因失焦/鼠标离开而关闭,
|
||||||
|
/// 仅当点击弹窗+预览之外的区域或弹窗重新聚焦时退出锁定。
|
||||||
|
pub fn preview_interacted(app: &AppHandle) {
|
||||||
|
POPUP_INTERACTED.store(true, Ordering::SeqCst);
|
||||||
|
// 交互锁定取代推迟隐藏模式:清除可能残留的 DEFER 标记,
|
||||||
|
// 避免后续取消钉住时 hide_preview 走 DEFER 分支误关弹窗
|
||||||
|
POPUP_DEFER_HIDE.store(false, Ordering::SeqCst);
|
||||||
|
spawn_popup_leave_watch(app.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 隐藏预览窗口(保留复用),并通知前端清空内容。
|
||||||
|
pub fn hide_preview(app: &AppHandle) {
|
||||||
|
// 交互锁定模式:弹窗仍显示时预览保持(生命周期由看护线程管理,点击外部才
|
||||||
|
// 随弹窗一起关闭),忽略常规隐藏请求(条目离开、键盘切换等)。
|
||||||
|
if POPUP_INTERACTED.load(Ordering::SeqCst) && POPUP_VISIBLE.load(Ordering::SeqCst) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
POPUP_INTERACTED.store(false, Ordering::SeqCst);
|
||||||
|
// 若此前因预览交互推迟了弹窗隐藏(弹窗已失焦但保持显示),现在用户离开预览窗,
|
||||||
|
// 需判断去向:光标已回到弹窗内(继续浏览弹窗)→ 仅隐藏预览、保持弹窗显示;
|
||||||
|
// 光标在弹窗之外(离开整个区域)→ 连同弹窗一起隐藏。
|
||||||
|
// (hide_popup 会先复位该标记,故此处 swap(false) 后调用不会递归重入)
|
||||||
|
if POPUP_DEFER_HIDE.swap(false, Ordering::SeqCst) {
|
||||||
|
if !is_cursor_in_popup(app) {
|
||||||
|
hide_popup(app);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// 光标已回到弹窗内。若弹窗仍持有焦点(曾点击弹窗重新激活),仅隐藏预览即可,
|
||||||
|
// 后续失焦仍走 Focused(false) 正常关闭;若弹窗已失焦(点击预览窗所致),
|
||||||
|
// 它不会再收到 Focused(false) 事件——光标一旦离开弹窗区域,弹窗将永远
|
||||||
|
// 无法关闭(无焦点残留窗口)。启动看护线程兜底关闭。
|
||||||
|
let focused = app
|
||||||
|
.get_webview_window(POPUP_LABEL)
|
||||||
|
.map(|w| w.is_focused().unwrap_or(false))
|
||||||
|
.unwrap_or(false);
|
||||||
|
if !focused {
|
||||||
|
spawn_popup_leave_watch(app.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PREVIEW_VISIBLE.store(false, Ordering::SeqCst);
|
||||||
|
if let Some(win) = app.get_webview_window(PREVIEW_LABEL) {
|
||||||
|
let _ = win.hide();
|
||||||
|
// 预览窗以原生 SW_SHOWNOACTIVATE 方式显示,Tauri 内部可见性状态可能与其
|
||||||
|
// 不同步;补一次原生 SW_HIDE,确保任何路径下都被可靠隐藏。
|
||||||
|
#[cfg(windows)]
|
||||||
|
if let Ok(hwnd) = win.hwnd() {
|
||||||
|
crate::win32_util::hide_window(hwnd.0 as isize);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _ = app.emit(crate::constants::events::CLIPBOARD_PREVIEW_HIDE, ());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 弹窗失焦但保持显示时的看护线程(防重入单例)。
|
||||||
|
///
|
||||||
|
/// 两种工作模式(每轮动态读取 POPUP_INTERACTED,可中途切换):
|
||||||
|
/// - 常规模式(未点击过预览窗):光标连续 ~300ms 既不在弹窗也不在预览窗内
|
||||||
|
/// (连续计数防"穿越弹窗-预览间隙"时的瞬时离开误判)→ 关闭弹窗;
|
||||||
|
/// - 交互锁定模式(点击过预览窗的放大/缩小/复制等):弹窗已失焦不会再收到
|
||||||
|
/// Focused(false),检测"鼠标按下沿且按下位置在弹窗+预览之外"→ 点击外部,关闭弹窗。
|
||||||
|
///
|
||||||
|
/// 公共退出条件:弹窗已隐藏/销毁(其他路径关闭);弹窗重新获得焦点(用户点击
|
||||||
|
/// 弹窗,恢复正常失焦关闭路径,并复位交互锁定);超时兜底防线程泄漏
|
||||||
|
/// (常规 30s;交互锁定为事件驱动,放宽至 10min)。
|
||||||
|
fn spawn_popup_leave_watch(app: AppHandle) {
|
||||||
|
// 防重入:已有看护在运行则跳过
|
||||||
|
if POPUP_LEAVE_WATCH.swap(true, Ordering::SeqCst) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
let start = Instant::now();
|
||||||
|
let mut outside = 0u32;
|
||||||
|
let mut was_down = false;
|
||||||
|
loop {
|
||||||
|
std::thread::sleep(Duration::from_millis(30));
|
||||||
|
// 弹窗已隐藏或被销毁:看护结束
|
||||||
|
if !POPUP_VISIBLE.load(Ordering::SeqCst)
|
||||||
|
|| app.get_webview_window(POPUP_LABEL).is_none()
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// 弹窗重新获得焦点(用户点击弹窗):恢复正常失焦关闭路径,复位交互锁定
|
||||||
|
if app
|
||||||
|
.get_webview_window(POPUP_LABEL)
|
||||||
|
.map(|w| w.is_focused().unwrap_or(false))
|
||||||
|
.unwrap_or(false)
|
||||||
|
{
|
||||||
|
POPUP_INTERACTED.store(false, Ordering::SeqCst);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let interacted = POPUP_INTERACTED.load(Ordering::SeqCst);
|
||||||
|
// 超长兜底:避免异常路径下看护线程无限轮询
|
||||||
|
let timeout = if interacted {
|
||||||
|
Duration::from_secs(600)
|
||||||
|
} else {
|
||||||
|
Duration::from_secs(30)
|
||||||
|
};
|
||||||
|
if start.elapsed() > timeout {
|
||||||
|
hide_popup(&app);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let cursor_in = is_cursor_in_popup(&app) || is_cursor_in_preview(&app);
|
||||||
|
if interacted {
|
||||||
|
// 交互锁定:左键按下沿发生在弹窗+预览之外 → 点击外部,关闭弹窗+预览。
|
||||||
|
// 按下沿判定(上一轮未按下、本轮按下)配合 30ms 轮询,可捕获常规点击;
|
||||||
|
// 在弹窗/预览内按下后拖出再松开不算外部点击(以按下位置为准)。
|
||||||
|
let down = crate::win32_util::is_left_button_down();
|
||||||
|
if down && !was_down && !cursor_in {
|
||||||
|
hide_popup(&app);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
was_down = down;
|
||||||
|
} else if cursor_in {
|
||||||
|
outside = 0;
|
||||||
|
} else {
|
||||||
|
outside += 1;
|
||||||
|
// 连续 ~300ms 不在弹窗/预览区域(排除穿越间隙的瞬时状态)才关闭
|
||||||
|
if outside >= 10 {
|
||||||
|
hide_popup(&app);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
POPUP_LEAVE_WATCH.store(false, Ordering::SeqCst);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 鼠标当前是否位于弹窗矩形内(弹窗可见且光标在其窗口范围内)。
|
||||||
|
/// 用于 hide_preview 判断"用户是回到弹窗继续浏览,还是离开整个区域"。
|
||||||
|
fn is_cursor_in_popup(app: &AppHandle) -> bool {
|
||||||
|
if !POPUP_VISIBLE.load(Ordering::SeqCst) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let Some(win) = app.get_webview_window(POPUP_LABEL) else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
let Ok(pos) = win.outer_position() else { return false };
|
||||||
|
let Ok(size) = win.outer_size() else { return false };
|
||||||
|
let Some((cx, cy)) = crate::win32_util::get_cursor_pos() else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
let x = pos.x;
|
||||||
|
let y = pos.y;
|
||||||
|
let w = size.width as i32;
|
||||||
|
let h = size.height as i32;
|
||||||
|
cx >= x && cx <= x + w && cy >= y && cy <= y + h
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 鼠标当前是否位于预览窗矩形内(预览窗可见且光标在其窗口范围内)。
|
||||||
|
/// 用于弹窗失焦时判断是否因预览交互所致,决定是否推迟隐藏弹窗。
|
||||||
|
fn is_cursor_in_preview(app: &AppHandle) -> bool {
|
||||||
|
if !PREVIEW_VISIBLE.load(Ordering::SeqCst) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let Some(win) = app.get_webview_window(PREVIEW_LABEL) else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
let Ok(pos) = win.outer_position() else { return false };
|
||||||
|
let Ok(size) = win.outer_size() else { return false };
|
||||||
|
let Some((cx, cy)) = crate::win32_util::get_cursor_pos() else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
let x = pos.x;
|
||||||
|
let y = pos.y;
|
||||||
|
let w = size.width as i32;
|
||||||
|
let h = size.height as i32;
|
||||||
|
cx >= x && cx <= x + w && cy >= y && cy <= y + h
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 屏幕/光标/DPI 工具已迁移至 crate::win32_util(跨模块共享) =====
|
||||||
|
|
||||||
|
use crate::win32_util::{get_cursor_pos, get_work_area_at_point, get_dpi_for_point};
|
||||||
|
|||||||
@@ -295,3 +295,29 @@ pub fn dib_to_png(dib: &[u8]) -> Option<Vec<u8>> {
|
|||||||
.ok()?;
|
.ok()?;
|
||||||
Some(buf)
|
Some(buf)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 生成缩略图 PNG(最长边不超过 max_dim 像素)。
|
||||||
|
/// 小图直接复用 `dib_to_png` 结果;大图降采样后重新编码,供弹窗悬停预览使用。
|
||||||
|
pub fn dib_to_thumbnail(dib: &[u8], max_dim: u32) -> Option<Vec<u8>> {
|
||||||
|
use image::codecs::png::PngEncoder;
|
||||||
|
use image::GenericImageView;
|
||||||
|
use image::ImageEncoder;
|
||||||
|
|
||||||
|
let png = dib_to_png(dib)?;
|
||||||
|
let img = image::load_from_memory(&png).ok()?;
|
||||||
|
let (w, h) = img.dimensions();
|
||||||
|
if w.max(h) <= max_dim {
|
||||||
|
return Some(png); // 小图直接使用,避免重复编码
|
||||||
|
}
|
||||||
|
// 让 image 库在 max_dim×max_dim 边界内自动等比缩放,避免手算 nw/nh 与库内部
|
||||||
|
// resize_dimensions 的取整不一致(如手算 256x10 而库实际输出 250x10),
|
||||||
|
// 否则 write_image 的缓冲区长度断言会失败。
|
||||||
|
let resized = img.resize(max_dim, max_dim, image::imageops::FilterType::Triangle);
|
||||||
|
let (rw, rh) = resized.dimensions();
|
||||||
|
let rgba = resized.to_rgba8();
|
||||||
|
let mut buf = Vec::new();
|
||||||
|
let enc = PngEncoder::new(&mut buf);
|
||||||
|
enc.write_image(rgba.as_raw(), rw, rh, image::ExtendedColorType::Rgba8)
|
||||||
|
.ok()?;
|
||||||
|
Some(buf)
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,13 +2,15 @@
|
|||||||
//!
|
//!
|
||||||
//! 表结构见 `init_db`。所有方法线程安全(内部 Mutex 包裹 Connection)。
|
//! 表结构见 `init_db`。所有方法线程安全(内部 Mutex 包裹 Connection)。
|
||||||
|
|
||||||
|
use base64::Engine as _;
|
||||||
use rusqlite::{params, Connection, OptionalExtension};
|
use rusqlite::{params, Connection, OptionalExtension};
|
||||||
|
use specta::Type;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
|
|
||||||
/// 列表项(不含大字段,用于历史/搜索结果)
|
/// 列表项(不含大字段,用于历史/搜索结果)
|
||||||
#[derive(Debug, Clone, serde::Serialize)]
|
#[derive(Debug, Clone, serde::Serialize, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct ClipboardItem {
|
pub struct ClipboardItem {
|
||||||
pub id: i64,
|
pub id: i64,
|
||||||
@@ -21,7 +23,7 @@ pub struct ClipboardItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 详情(含文本内容或图片 base64)
|
/// 详情(含文本内容或图片 base64)
|
||||||
#[derive(Debug, Clone, serde::Serialize)]
|
#[derive(Debug, Clone, serde::Serialize, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct ClipboardItemDetail {
|
pub struct ClipboardItemDetail {
|
||||||
#[serde(flatten)]
|
#[serde(flatten)]
|
||||||
@@ -37,6 +39,8 @@ pub struct NewItem {
|
|||||||
pub kind: String,
|
pub kind: String,
|
||||||
pub content: Option<String>,
|
pub content: Option<String>,
|
||||||
pub blob: Option<Vec<u8>>,
|
pub blob: Option<Vec<u8>>,
|
||||||
|
/// 图片缩略图 PNG(仅 image 类型,供弹窗悬停预览)
|
||||||
|
pub thumb: Option<Vec<u8>>,
|
||||||
pub preview: String,
|
pub preview: String,
|
||||||
pub size: i64,
|
pub size: i64,
|
||||||
pub hash: String,
|
pub hash: String,
|
||||||
@@ -87,6 +91,19 @@ impl Storage {
|
|||||||
CREATE INDEX IF NOT EXISTS idx_hash ON clipboard_history(hash);
|
CREATE INDEX IF NOT EXISTS idx_hash ON clipboard_history(hash);
|
||||||
CREATE INDEX IF NOT EXISTS idx_kind ON clipboard_history(kind);",
|
CREATE INDEX IF NOT EXISTS idx_kind ON clipboard_history(kind);",
|
||||||
);
|
);
|
||||||
|
// 迁移:老库无 thumb 列(图片缩略图,供弹窗悬停预览),补列
|
||||||
|
let has_thumb = conn
|
||||||
|
.prepare("PRAGMA table_info(clipboard_history)")
|
||||||
|
.ok()
|
||||||
|
.map(|mut stmt| {
|
||||||
|
stmt.query_map([], |r| r.get::<_, String>(1))
|
||||||
|
.map(|rows| rows.filter_map(|c| c.ok()).any(|c| c == "thumb"))
|
||||||
|
.unwrap_or(false)
|
||||||
|
})
|
||||||
|
.unwrap_or(false);
|
||||||
|
if !has_thumb {
|
||||||
|
let _ = conn.execute("ALTER TABLE clipboard_history ADD COLUMN thumb BLOB", []);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 插入新条目;若 dedup 为 true 且 hash 已存在则仅更新 created_at,返回条目 id。
|
/// 插入新条目;若 dedup 为 true 且 hash 已存在则仅更新 created_at,返回条目 id。
|
||||||
@@ -119,12 +136,13 @@ impl Storage {
|
|||||||
let now = now_ms();
|
let now = now_ms();
|
||||||
let res = conn.execute(
|
let res = conn.execute(
|
||||||
"INSERT INTO clipboard_history
|
"INSERT INTO clipboard_history
|
||||||
(kind, content, blob, preview, size, hash, pinned, pinned_order, created_at)
|
(kind, content, blob, thumb, preview, size, hash, pinned, pinned_order, created_at)
|
||||||
VALUES (?1, ?2, ?3, ?4, ?5, ?6, 0, NULL, ?7)",
|
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, 0, NULL, ?8)",
|
||||||
params![
|
params![
|
||||||
item.kind,
|
item.kind,
|
||||||
item.content,
|
item.content,
|
||||||
item.blob.as_deref(),
|
item.blob.as_deref(),
|
||||||
|
item.thumb.as_deref(),
|
||||||
item.preview,
|
item.preview,
|
||||||
item.size,
|
item.size,
|
||||||
item.hash,
|
item.hash,
|
||||||
@@ -206,10 +224,11 @@ impl Storage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 获取详情(含文本/图片预览 base64)
|
/// 获取详情(含文本/图片预览 base64)
|
||||||
|
/// 先锁内查询数据,释放锁后再执行耗时编码(DIB→PNG + base64),避免长时间占用连接锁
|
||||||
pub fn get_detail(&self, id: i64, image_to_base64: impl Fn(&[u8]) -> Option<String>) -> Option<ClipboardItemDetail> {
|
pub fn get_detail(&self, id: i64, image_to_base64: impl Fn(&[u8]) -> Option<String>) -> Option<ClipboardItemDetail> {
|
||||||
|
let (item, content, blob) = {
|
||||||
let conn = self.conn.lock().ok()?;
|
let conn = self.conn.lock().ok()?;
|
||||||
let row = conn
|
conn.query_row(
|
||||||
.query_row(
|
|
||||||
"SELECT id, kind, preview, size, pinned, pinned_order, created_at, content, blob
|
"SELECT id, kind, preview, size, pinned, pinned_order, created_at, content, blob
|
||||||
FROM clipboard_history WHERE id = ?1",
|
FROM clipboard_history WHERE id = ?1",
|
||||||
params![id],
|
params![id],
|
||||||
@@ -232,8 +251,9 @@ impl Storage {
|
|||||||
))
|
))
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.ok()?;
|
.ok()?
|
||||||
let (item, content, blob) = row;
|
};
|
||||||
|
// conn 已在此处释放,以下编码不占用连接锁
|
||||||
let image_base64 = if item.kind == "image" {
|
let image_base64 = if item.kind == "image" {
|
||||||
blob.as_deref().and_then(|b| image_to_base64(b))
|
blob.as_deref().and_then(|b| image_to_base64(b))
|
||||||
} else {
|
} else {
|
||||||
@@ -246,6 +266,26 @@ impl Storage {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 获取图片缩略图 PNG base64(弹窗悬停预览用)。
|
||||||
|
/// 老数据无缩略图时回退为 `thumb_from_dib` 现场生成。
|
||||||
|
pub fn get_thumb(&self, id: i64, thumb_from_dib: impl Fn(&[u8]) -> Option<Vec<u8>>) -> Option<String> {
|
||||||
|
let (thumb, blob) = {
|
||||||
|
let conn = self.conn.lock().ok()?;
|
||||||
|
conn.query_row(
|
||||||
|
"SELECT thumb, blob FROM clipboard_history WHERE id = ?1 AND kind = 'image'",
|
||||||
|
params![id],
|
||||||
|
|r| Ok((r.get::<_, Option<Vec<u8>>>(0)?, r.get::<_, Option<Vec<u8>>>(1)?)),
|
||||||
|
)
|
||||||
|
.ok()?
|
||||||
|
};
|
||||||
|
// conn 已在此处释放
|
||||||
|
let png = match thumb {
|
||||||
|
Some(t) if !t.is_empty() => Some(t),
|
||||||
|
_ => blob.as_deref().and_then(|b| thumb_from_dib(b)),
|
||||||
|
};
|
||||||
|
png.map(|p| base64::engine::general_purpose::STANDARD.encode(&p))
|
||||||
|
}
|
||||||
|
|
||||||
/// 获取原始字段供 copy_back 写回(避免 base64 转换开销)
|
/// 获取原始字段供 copy_back 写回(避免 base64 转换开销)
|
||||||
pub fn get_raw_for_copy(&self, id: i64) -> Option<(String, Option<String>, Option<Vec<u8>>)> {
|
pub fn get_raw_for_copy(&self, id: i64) -> Option<(String, Option<String>, Option<Vec<u8>>)> {
|
||||||
let conn = self.conn.lock().ok()?;
|
let conn = self.conn.lock().ok()?;
|
||||||
@@ -342,6 +382,7 @@ impl Storage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 按搜索关键词统计匹配的非固定条目总数
|
/// 按搜索关键词统计匹配的非固定条目总数
|
||||||
|
/// 与 `search` 保持一致的匹配字段(preview + content),避免分页总数错误
|
||||||
pub fn count_search(&self, query: &str) -> i64 {
|
pub fn count_search(&self, query: &str) -> i64 {
|
||||||
let conn = match self.conn.lock() {
|
let conn = match self.conn.lock() {
|
||||||
Ok(c) => c,
|
Ok(c) => c,
|
||||||
@@ -349,7 +390,8 @@ impl Storage {
|
|||||||
};
|
};
|
||||||
let pattern = format!("%{}%", query);
|
let pattern = format!("%{}%", query);
|
||||||
conn.query_row(
|
conn.query_row(
|
||||||
"SELECT COUNT(*) FROM clipboard_history WHERE pinned = 0 AND preview LIKE ?1",
|
"SELECT COUNT(*) FROM clipboard_history
|
||||||
|
WHERE pinned = 0 AND (preview LIKE ?1 OR content LIKE ?1)",
|
||||||
params![pattern],
|
params![pattern],
|
||||||
|r| r.get(0),
|
|r| r.get(0),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
//! 全局常量集中定义。
|
||||||
|
//! 窗口 label / Tauri 事件名,避免魔法字符串散布各处。
|
||||||
|
//! 与前端 `src/lib/constants.ts` 保持对应。
|
||||||
|
|
||||||
|
/// 窗口 label(对应 capabilities/*.json 与前端 constants::WINDOWS)
|
||||||
|
pub mod windows {
|
||||||
|
pub const MAIN: &str = "main";
|
||||||
|
// 以下窗口由前端创建,Rust 侧仅作双端对应声明(无直接引用)
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub const OSD_OVERLAY: &str = "osd-overlay";
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub const SCREENSHOT_OVERLAY: &str = "screenshot-overlay";
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub const SCREENSHOT_PIN: &str = "screenshot-pin";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Tauri 事件名(与前端 constants::EVENTS 对应)
|
||||||
|
pub mod events {
|
||||||
|
// 托盘菜单
|
||||||
|
pub const TRAY_MENU_SHOW: &str = "tray-menu-show";
|
||||||
|
pub const TRAY_MENU_STATE_UPDATED: &str = "tray-menu-state-updated";
|
||||||
|
pub const TRAY_TOGGLE_OSD: &str = "tray:toggle-osd";
|
||||||
|
pub const TRAY_NEW_DOWNLOAD: &str = "tray:new-download";
|
||||||
|
pub const TRAY_OPEN_SETTINGS: &str = "tray:open-settings";
|
||||||
|
// 剪贴板
|
||||||
|
pub const CLIPBOARD_CHANGED: &str = "clipboard-changed";
|
||||||
|
pub const CLIPBOARD_POPUP_SHOW: &str = "clipboard-popup-show";
|
||||||
|
pub const CLIPBOARD_POPUP_HIDE: &str = "clipboard-popup-hide";
|
||||||
|
pub const CLIPBOARD_PREVIEW_SHOW: &str = "clipboard-preview-show";
|
||||||
|
pub const CLIPBOARD_PREVIEW_HIDE: &str = "clipboard-preview-hide";
|
||||||
|
// 快速面板
|
||||||
|
pub const QUICKPANEL_SHOW: &str = "quickpanel-show";
|
||||||
|
pub const QUICKPANEL_HIDE: &str = "quickpanel-hide";
|
||||||
|
pub const QUICKPANEL_EXTRACT_PROGRESS: &str = "quickpanel-extract-progress";
|
||||||
|
/// 文件索引构建完成(闲时自动建立/重建、手动构建),负载为条目数
|
||||||
|
pub const QUICKPANEL_INDEX_UPDATED: &str = "quickpanel-index-updated";
|
||||||
|
// 监控
|
||||||
|
pub const MONITOR_DATA: &str = "monitor-data";
|
||||||
|
pub const MONITOR_NETWORK: &str = "monitor-network";
|
||||||
|
pub const MONITOR_ERROR: &str = "monitor-error";
|
||||||
|
pub const MONITOR_LOADING: &str = "monitor-loading";
|
||||||
|
pub const MONITOR_READY: &str = "monitor-ready";
|
||||||
|
pub const MONITOR_DISCONNECTED: &str = "monitor-disconnected";
|
||||||
|
// OSD 窗口
|
||||||
|
pub const OSD_SYSTEM_UI_ACTIVE: &str = "osd-system-ui-active";
|
||||||
|
pub const OSD_SYSTEM_UI_INACTIVE: &str = "osd-system-ui-inactive";
|
||||||
|
pub const OSD_GAME_ACTIVE: &str = "osd-game-active";
|
||||||
|
pub const OSD_GAME_INACTIVE: &str = "osd-game-inactive";
|
||||||
|
pub const OSD_START_DRAG: &str = "osd-start-drag";
|
||||||
|
pub const OSD_END_DRAG: &str = "osd-end-drag";
|
||||||
|
// 截图
|
||||||
|
pub const SCREENSHOT_SHORTCUT: &str = "screenshot-shortcut";
|
||||||
|
pub const SCREENSHOT_PIN_SHORTCUT: &str = "screenshot-pin-shortcut";
|
||||||
|
// 内核安装进度
|
||||||
|
pub const KERNEL_INSTALL_PROGRESS: &str = "kernel-install-progress";
|
||||||
|
// 后端自动切换节点完成(前端据以刷新节点列表并提示)
|
||||||
|
pub const PROXY_AUTO_SWITCH: &str = "proxy-auto-switch";
|
||||||
|
// 应用更新进度
|
||||||
|
pub const UPDATE_PROGRESS: &str = "update-progress";
|
||||||
|
// 进程与下载
|
||||||
|
pub const PROCESS_STATUS_CHANGED: &str = "process-status-changed";
|
||||||
|
pub const DOWNLOAD_ADDED: &str = "download-added";
|
||||||
|
/// 任务被删除(浏览器扩展通过 HTTP API 删除任务时发出,前端据此刷新任务列表)
|
||||||
|
pub const DOWNLOAD_REMOVED: &str = "download-removed";
|
||||||
|
/// 浏览器扩展通过 HTTP API 新增下载(负载 { id },前端据以为该任务创建专属下载窗口)
|
||||||
|
pub const DOWNLOAD_EXTENSION_ADDED: &str = "download-extension-added";
|
||||||
|
}
|
||||||
@@ -1,19 +1,36 @@
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use tauri::{AppHandle, State};
|
use tauri::{AppHandle, Manager, State};
|
||||||
use tauri_plugin_opener::OpenerExt;
|
use tauri_plugin_opener::OpenerExt;
|
||||||
|
|
||||||
use super::engine::{CheckUrlResult, DownloadEngine};
|
use super::engine::{CheckUrlResult, DownloadEngine};
|
||||||
use super::task::{DownloadTask, DownloaderSettings};
|
use super::task::{DownloadTask, DownloaderSettings};
|
||||||
|
use super::torrent::TorrentInfo;
|
||||||
|
|
||||||
/// 获取所有任务
|
/// 获取所有任务
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub fn downloader_get_tasks(engine: State<'_, DownloadEngine>) -> Vec<DownloadTask> {
|
pub fn downloader_get_tasks(engine: State<'_, DownloadEngine>) -> Vec<DownloadTask> {
|
||||||
engine.get_tasks()
|
engine.get_tasks()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 解析磁力链 / .torrent 文件,返回种子信息(名称 / infohash / 文件列表),供前端做文件勾选
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn downloader_inspect(engine: State<'_, DownloadEngine>, input: String) -> Result<TorrentInfo, String> {
|
||||||
|
engine.inspect(&input).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 磁力任务:元数据解析成功后,用户勾选文件并确认开始下载
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn downloader_select_bt_files(engine: State<'_, DownloadEngine>, id: String, only_files: Vec<u32>) -> Result<(), String> {
|
||||||
|
engine.select_bt_files(&id, only_files).await
|
||||||
|
}
|
||||||
|
|
||||||
/// 检查 URL 重复性并探测文件信息(添加下载前调用)
|
/// 检查 URL 重复性并探测文件信息(添加下载前调用)
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn downloader_check_url(
|
pub async fn downloader_check_url(
|
||||||
engine: State<'_, DownloadEngine>,
|
engine: State<'_, DownloadEngine>,
|
||||||
url: String,
|
url: String,
|
||||||
@@ -47,6 +64,7 @@ pub async fn downloader_check_url(
|
|||||||
|
|
||||||
/// 添加下载任务
|
/// 添加下载任务
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn downloader_add_task(
|
pub async fn downloader_add_task(
|
||||||
engine: State<'_, DownloadEngine>,
|
engine: State<'_, DownloadEngine>,
|
||||||
url: String,
|
url: String,
|
||||||
@@ -54,24 +72,42 @@ pub async fn downloader_add_task(
|
|||||||
dir: Option<String>,
|
dir: Option<String>,
|
||||||
headers: Option<HashMap<String, String>>,
|
headers: Option<HashMap<String, String>>,
|
||||||
auto_rename: Option<bool>,
|
auto_rename: Option<bool>,
|
||||||
|
only_files: Option<Vec<u32>>,
|
||||||
) -> Result<String, String> {
|
) -> Result<String, String> {
|
||||||
engine.add_task(url, filename, dir, headers.unwrap_or_default(), auto_rename.unwrap_or(false)).await
|
engine.add_task(url, filename, dir, headers.unwrap_or_default(), auto_rename.unwrap_or(false), only_files).await
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 暂停任务
|
/// 暂停任务
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub fn downloader_pause_task(engine: State<'_, DownloadEngine>, id: String) -> Result<(), String> {
|
pub fn downloader_pause_task(engine: State<'_, DownloadEngine>, id: String) -> Result<(), String> {
|
||||||
engine.pause_task(&id)
|
engine.pause_task(&id)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 恢复任务
|
/// 恢复任务
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub fn downloader_resume_task(engine: State<'_, DownloadEngine>, id: String) -> Result<(), String> {
|
pub fn downloader_resume_task(engine: State<'_, DownloadEngine>, id: String) -> Result<(), String> {
|
||||||
engine.resume_task(&id)
|
engine.resume_task(&id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 取消任务(置为已取消,清空进度并删除下载文件,但保留记录)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn downloader_cancel_task(engine: State<'_, DownloadEngine>, id: String) -> Result<(), String> {
|
||||||
|
engine.cancel_task(&id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 重新下载已取消/出错的任务
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn downloader_redownload(engine: State<'_, DownloadEngine>, id: String) -> Result<(), String> {
|
||||||
|
engine.redownload(&id).await
|
||||||
|
}
|
||||||
|
|
||||||
/// 移除任务
|
/// 移除任务
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub fn downloader_remove_task(
|
pub fn downloader_remove_task(
|
||||||
engine: State<'_, DownloadEngine>,
|
engine: State<'_, DownloadEngine>,
|
||||||
id: String,
|
id: String,
|
||||||
@@ -82,12 +118,14 @@ pub fn downloader_remove_task(
|
|||||||
|
|
||||||
/// 获取设置
|
/// 获取设置
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub fn downloader_get_settings(engine: State<'_, DownloadEngine>) -> DownloaderSettings {
|
pub fn downloader_get_settings(engine: State<'_, DownloadEngine>) -> DownloaderSettings {
|
||||||
engine.get_settings()
|
engine.get_settings()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 保存设置
|
/// 保存设置
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub fn downloader_save_settings(
|
pub fn downloader_save_settings(
|
||||||
engine: State<'_, DownloadEngine>,
|
engine: State<'_, DownloadEngine>,
|
||||||
settings: DownloaderSettings,
|
settings: DownloaderSettings,
|
||||||
@@ -118,6 +156,7 @@ pub fn downloader_get_extension_info(engine: State<'_, DownloadEngine>) -> serde
|
|||||||
|
|
||||||
/// 用系统资源管理器打开目录
|
/// 用系统资源管理器打开目录
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub fn downloader_open_dir(app: AppHandle, path: String) -> Result<(), String> {
|
pub fn downloader_open_dir(app: AppHandle, path: String) -> Result<(), String> {
|
||||||
app.opener()
|
app.opener()
|
||||||
.open_path(path, None::<&str>)
|
.open_path(path, None::<&str>)
|
||||||
@@ -126,8 +165,30 @@ pub fn downloader_open_dir(app: AppHandle, path: String) -> Result<(), String> {
|
|||||||
|
|
||||||
/// 用系统默认浏览器打开 URL
|
/// 用系统默认浏览器打开 URL
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub fn downloader_open_url(app: AppHandle, url: String) -> Result<(), String> {
|
pub fn downloader_open_url(app: AppHandle, url: String) -> Result<(), String> {
|
||||||
app.opener()
|
app.opener()
|
||||||
.open_url(url, None::<&str>)
|
.open_url(url, None::<&str>)
|
||||||
.map_err(|e| format!("打开链接失败: {}", e))
|
.map_err(|e| format!("打开链接失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 将指定 label 的下载窗口显示并强制置为前台。
|
||||||
|
/// Tauri 的 set_focus 在 Windows 上受前台锁定限制(尤其下载窗口由后台进程创建、
|
||||||
|
/// 或创建到非主显示器时更明显),改用原生 SetForegroundWindow + BringWindowToTop
|
||||||
|
/// (模拟 Alt 键重置前台锁定),保证开始/完成下载时窗口能正确定位到前台。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn downloader_focus_window(app: AppHandle, label: String) -> Result<(), String> {
|
||||||
|
let Some(window) = app.get_webview_window(&label) else {
|
||||||
|
return Ok(()); // 窗口已关闭则忽略
|
||||||
|
};
|
||||||
|
window.show().map_err(|e| e.to_string())?;
|
||||||
|
window.unminimize().map_err(|e| e.to_string())?;
|
||||||
|
match window.hwnd() {
|
||||||
|
Ok(hwnd) => crate::win32_util::force_foreground(hwnd.0 as isize),
|
||||||
|
Err(_) => {
|
||||||
|
window.set_focus().ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -12,30 +12,77 @@ use tokio::task::JoinSet;
|
|||||||
use super::rate_limit::RateLimiter;
|
use super::rate_limit::RateLimiter;
|
||||||
use super::task::{ProbeResult, Segment};
|
use super::task::{ProbeResult, Segment};
|
||||||
|
|
||||||
|
/// 请求超时:连接 + 响应头必须在 30s 内就绪(分段请求若无超时,
|
||||||
|
/// 服务器挂死时任务将永久卡在 Active,pause→resume 会出现新旧任务并发写同一临时文件)
|
||||||
|
const REQUEST_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30);
|
||||||
|
/// 分块读取停滞超时:30s 内无任何数据视为连接挂死,主动中断(配合取消标志及时退出)
|
||||||
|
const READ_STALL_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30);
|
||||||
|
|
||||||
/// HTTP/HTTPS 下载器
|
/// HTTP/HTTPS 下载器
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct HttpDownloader {
|
pub struct HttpDownloader {
|
||||||
client: Client,
|
/// 默认客户端:尊重系统代理(reqwest 默认行为,mihomo 开启系统代理时经其转发)
|
||||||
|
system_client: Client,
|
||||||
|
/// 直连客户端:强制禁用系统代理(no_proxy)
|
||||||
|
direct_client: Client,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl HttpDownloader {
|
impl HttpDownloader {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
let client = Client::builder()
|
let system_client = Client::builder()
|
||||||
.build()
|
.build()
|
||||||
.unwrap_or_else(|_| Client::new());
|
.unwrap_or_else(|_| Client::new());
|
||||||
Self { client }
|
let direct_client = Client::builder()
|
||||||
|
// 强制直连:即使系统代理已开启,下载也不经过代理
|
||||||
|
.no_proxy()
|
||||||
|
.build()
|
||||||
|
.unwrap_or_else(|_| Client::new());
|
||||||
|
Self {
|
||||||
|
system_client,
|
||||||
|
direct_client,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 根据 use_proxy 选择客户端
|
||||||
|
fn client(&self, use_proxy: bool) -> &Client {
|
||||||
|
if use_proxy {
|
||||||
|
&self.system_client
|
||||||
|
} else {
|
||||||
|
&self.direct_client
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 探测下载资源信息(大小、是否支持 Range、文件名)
|
/// 探测下载资源信息(大小、是否支持 Range、文件名)
|
||||||
/// 优先用 GET + Range: bytes=0-0(返回 206 + Content-Range),回退到 HEAD
|
/// 优先用 GET + Range: bytes=0-0(返回 206 + Content-Range),回退到 HEAD。
|
||||||
|
/// 代理降级:use_proxy=true 时先走系统代理,失败则回退 no_proxy 直连重试一次
|
||||||
pub async fn probe(
|
pub async fn probe(
|
||||||
&self,
|
&self,
|
||||||
url: &str,
|
url: &str,
|
||||||
headers: &HashMap<String, String>,
|
headers: &HashMap<String, String>,
|
||||||
|
use_proxy: bool,
|
||||||
|
) -> Result<ProbeResult, String> {
|
||||||
|
let first = self.client(use_proxy);
|
||||||
|
match self.probe_with_client(first, url, headers).await {
|
||||||
|
Ok(r) => return Ok(r),
|
||||||
|
Err(e) if use_proxy => {
|
||||||
|
let direct = self.client(false);
|
||||||
|
self.probe_with_client(direct, url, headers)
|
||||||
|
.await
|
||||||
|
.map_err(|e2| format!("代理探测失败({}),直连重试也失败({})", e, e2))
|
||||||
|
}
|
||||||
|
Err(e) => Err(e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 用指定 client 执行探测(GET Range → 回退 HEAD),供代理降级复用
|
||||||
|
async fn probe_with_client(
|
||||||
|
&self,
|
||||||
|
client: &Client,
|
||||||
|
url: &str,
|
||||||
|
headers: &HashMap<String, String>,
|
||||||
) -> Result<ProbeResult, String> {
|
) -> Result<ProbeResult, String> {
|
||||||
// 先尝试 Range 请求(能同时判断 Accept-Ranges 和获取大小)
|
// 先尝试 Range 请求(能同时判断 Accept-Ranges 和获取大小)
|
||||||
let mut req = self
|
let mut req = client
|
||||||
.client
|
|
||||||
.get(url)
|
.get(url)
|
||||||
.header("Range", "bytes=0-0")
|
.header("Range", "bytes=0-0")
|
||||||
.header("User-Agent", "Thing-Download-Engine/1.0");
|
.header("User-Agent", "Thing-Download-Engine/1.0");
|
||||||
@@ -43,7 +90,10 @@ impl HttpDownloader {
|
|||||||
req = req.header(k, v);
|
req = req.header(k, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
match req.send().await {
|
match tokio::time::timeout(REQUEST_TIMEOUT, req.send())
|
||||||
|
.await
|
||||||
|
.map_err(|_| "探测超时(30s 内未收到响应头)".to_string())?
|
||||||
|
{
|
||||||
Ok(resp) => {
|
Ok(resp) => {
|
||||||
let status = resp.status();
|
let status = resp.status();
|
||||||
let headers_map = resp.headers().clone();
|
let headers_map = resp.headers().clone();
|
||||||
@@ -88,13 +138,13 @@ impl HttpDownloader {
|
|||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
// GET 失败,尝试 HEAD 作为回退
|
// GET 失败,尝试 HEAD 作为回退
|
||||||
let mut head_req = self.client.head(url);
|
let mut head_req = client.head(url);
|
||||||
for (k, v) in headers {
|
for (k, v) in headers {
|
||||||
head_req = head_req.header(k, v);
|
head_req = head_req.header(k, v);
|
||||||
}
|
}
|
||||||
let resp = head_req
|
let resp = tokio::time::timeout(REQUEST_TIMEOUT, head_req.send())
|
||||||
.send()
|
|
||||||
.await
|
.await
|
||||||
|
.map_err(|_| "探测超时(HEAD 30s 内未收到响应头)".to_string())?
|
||||||
.map_err(|e| format!("探测失败(GET 和 HEAD 均失败): {}", e))?;
|
.map_err(|e| format!("探测失败(GET 和 HEAD 均失败): {}", e))?;
|
||||||
let headers_map = resp.headers().clone();
|
let headers_map = resp.headers().clone();
|
||||||
let total_size = headers_map
|
let total_size = headers_map
|
||||||
@@ -123,6 +173,7 @@ impl HttpDownloader {
|
|||||||
/// - `cancel`: 取消标志
|
/// - `cancel`: 取消标志
|
||||||
/// - `progress`: 每个分段的已下载字节(AtomicU64,与 segments 一一对应)
|
/// - `progress`: 每个分段的已下载字节(AtomicU64,与 segments 一一对应)
|
||||||
/// - `limiter`: 全局限速器
|
/// - `limiter`: 全局限速器
|
||||||
|
/// - `use_proxy`: 是否使用系统代理(false=强制直连)
|
||||||
pub async fn download(
|
pub async fn download(
|
||||||
&self,
|
&self,
|
||||||
url: &str,
|
url: &str,
|
||||||
@@ -132,6 +183,37 @@ impl HttpDownloader {
|
|||||||
cancel: Arc<AtomicBool>,
|
cancel: Arc<AtomicBool>,
|
||||||
progress: &[Arc<AtomicU64>],
|
progress: &[Arc<AtomicU64>],
|
||||||
limiter: Arc<RateLimiter>,
|
limiter: Arc<RateLimiter>,
|
||||||
|
use_proxy: bool,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
// 代理降级:仅当 use_proxy=true 才有"走代理→失败回退直连"的意义。
|
||||||
|
// use_proxy=false 直接用直连客户端,无需回退。
|
||||||
|
// 注意:用户主动暂停/取消(返回"已取消")必须原样透传,不能触发代理回退,
|
||||||
|
// 否则会把"已取消"包装成"代理失败",导致引擎将其误判为错误而非暂停。
|
||||||
|
let first = self.client(use_proxy);
|
||||||
|
match self.download_with_client(first, url, headers, segments, file_path, cancel.clone(), progress, &limiter).await {
|
||||||
|
Ok(()) => return Ok(()),
|
||||||
|
Err(e) if use_proxy && e != "已取消" => {
|
||||||
|
// 回退直连重试(不继承 use_proxy,保证用 no_proxy 客户端)
|
||||||
|
let direct = self.client(false);
|
||||||
|
self.download_with_client(direct, url, headers, segments, file_path, cancel, progress, &limiter)
|
||||||
|
.await
|
||||||
|
.map_err(|e2| format!("代理下载失败({}),直连重试也失败({})", e, e2))
|
||||||
|
}
|
||||||
|
Err(e) => Err(e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 用指定 client 执行下载(支持单线程与多线程分段),供代理降级复用
|
||||||
|
async fn download_with_client(
|
||||||
|
&self,
|
||||||
|
client: &Client,
|
||||||
|
url: &str,
|
||||||
|
headers: &HashMap<String, String>,
|
||||||
|
segments: &[Segment],
|
||||||
|
file_path: &Path,
|
||||||
|
cancel: Arc<AtomicBool>,
|
||||||
|
progress: &[Arc<AtomicU64>],
|
||||||
|
limiter: &Arc<RateLimiter>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let total_size = segments.iter().map(|s| s.len()).sum();
|
let total_size = segments.iter().map(|s| s.len()).sum();
|
||||||
|
|
||||||
@@ -158,7 +240,7 @@ impl HttpDownloader {
|
|||||||
// 单线程下载(不支持 Range 或文件太小)
|
// 单线程下载(不支持 Range 或文件太小)
|
||||||
let seg = &segments[0];
|
let seg = &segments[0];
|
||||||
let prog = &progress[0];
|
let prog = &progress[0];
|
||||||
self.download_segment(url, headers, seg, file_path, cancel.clone(), prog.clone(), limiter)
|
self.download_segment(url, headers, seg, file_path, cancel.clone(), prog.clone(), limiter.clone(), client)
|
||||||
.await?;
|
.await?;
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
@@ -178,7 +260,7 @@ impl HttpDownloader {
|
|||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
let limiter = limiter.clone();
|
let limiter = limiter.clone();
|
||||||
let file_path = file_path.to_path_buf();
|
let file_path = file_path.to_path_buf();
|
||||||
let client = self.client.clone();
|
let client = client.clone();
|
||||||
|
|
||||||
join_set.spawn(async move {
|
join_set.spawn(async move {
|
||||||
download_segment_with_client(
|
download_segment_with_client(
|
||||||
@@ -232,9 +314,10 @@ impl HttpDownloader {
|
|||||||
cancel: Arc<AtomicBool>,
|
cancel: Arc<AtomicBool>,
|
||||||
progress: Arc<AtomicU64>,
|
progress: Arc<AtomicU64>,
|
||||||
limiter: Arc<RateLimiter>,
|
limiter: Arc<RateLimiter>,
|
||||||
|
client: &Client,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
download_segment_with_client(
|
download_segment_with_client(
|
||||||
&self.client,
|
client,
|
||||||
url,
|
url,
|
||||||
headers,
|
headers,
|
||||||
seg,
|
seg,
|
||||||
@@ -295,15 +378,27 @@ async fn download_segment_with_client(
|
|||||||
req = req.header(k, v);
|
req = req.header(k, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
let resp = req
|
let resp = tokio::time::timeout(REQUEST_TIMEOUT, req.send())
|
||||||
.send()
|
|
||||||
.await
|
.await
|
||||||
|
.map_err(|_| "请求超时(30s 内未收到响应头)".to_string())?
|
||||||
.map_err(|e| format!("请求失败: {}", e))?;
|
.map_err(|e| format!("请求失败: {}", e))?;
|
||||||
|
|
||||||
let status = resp.status();
|
let status = resp.status();
|
||||||
if !status.is_success() && status.as_u16() != 206 {
|
if unknown_size {
|
||||||
|
// 未知大小:未发送 Range 头,接受任意 2xx
|
||||||
|
if !status.is_success() {
|
||||||
return Err(format!("服务器返回 HTTP {}", status));
|
return Err(format!("服务器返回 HTTP {}", status));
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// 已发送 Range 头:必须返回 206。若服务器忽略 Range 返回 200 全文,
|
||||||
|
// 按 range_start 偏移写入会错位 → 静默损坏文件;此处直接中断。
|
||||||
|
if status.as_u16() != 206 {
|
||||||
|
return Err(format!(
|
||||||
|
"服务器未按分段请求响应(期望 206,实际 {}),已中断以避免文件损坏",
|
||||||
|
status
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 流式读取并写入文件
|
// 流式读取并写入文件
|
||||||
let mut stream = resp.bytes_stream();
|
let mut stream = resp.bytes_stream();
|
||||||
@@ -315,8 +410,9 @@ async fn download_segment_with_client(
|
|||||||
return Err("已取消".to_string());
|
return Err("已取消".to_string());
|
||||||
}
|
}
|
||||||
|
|
||||||
match stream.next().await {
|
// 停滞超时:30s 无数据即中断,确保 cancel 标志能及时被感知(配合代际句柄防并发写)
|
||||||
Some(Ok(chunk)) => {
|
match tokio::time::timeout(READ_STALL_TIMEOUT, stream.next()).await {
|
||||||
|
Ok(Some(Ok(chunk))) => {
|
||||||
buf.extend_from_slice(&chunk);
|
buf.extend_from_slice(&chunk);
|
||||||
// 接收到数据立即更新进度(避免监控周期内进度无变化导致速度显示为 0)
|
// 接收到数据立即更新进度(避免监控周期内进度无变化导致速度显示为 0)
|
||||||
local_completed += chunk.len() as u64;
|
local_completed += chunk.len() as u64;
|
||||||
@@ -331,10 +427,10 @@ async fn download_segment_with_client(
|
|||||||
buf.clear();
|
buf.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(Err(e)) => {
|
Ok(Some(Err(e))) => {
|
||||||
return Err(format!("读取数据失败: {}", e));
|
return Err(format!("读取数据失败: {}", e));
|
||||||
}
|
}
|
||||||
None => {
|
Ok(None) => {
|
||||||
// 流结束,写入剩余数据
|
// 流结束,写入剩余数据
|
||||||
if !buf.is_empty() {
|
if !buf.is_empty() {
|
||||||
file.write_all(&buf)
|
file.write_all(&buf)
|
||||||
@@ -344,8 +440,20 @@ async fn download_segment_with_client(
|
|||||||
limiter.consume(buf.len() as u64).await;
|
limiter.consume(buf.len() as u64).await;
|
||||||
buf.clear();
|
buf.clear();
|
||||||
}
|
}
|
||||||
|
// 校验:已知大小的分段若流提前结束(收到的字节数不足分段长度),
|
||||||
|
// 说明服务器提前断开或返回不完整内容,不能标记为完成,否则文件会被截断
|
||||||
|
if !unknown_size && local_completed < seg.len() {
|
||||||
|
return Err(format!(
|
||||||
|
"文件不完整:已接收 {} / {} 字节,服务器提前结束连接",
|
||||||
|
local_completed,
|
||||||
|
seg.len()
|
||||||
|
));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Err(_) => {
|
||||||
|
return Err("读取超时(30s 无数据,已中断下载)".to_string());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -436,10 +544,11 @@ fn percent_decode(s: &str) -> String {
|
|||||||
/// 将文件大小划分为 N 个分段
|
/// 将文件大小划分为 N 个分段
|
||||||
pub fn split_segments(total_size: u64, num_connections: u32) -> Vec<Segment> {
|
pub fn split_segments(total_size: u64, num_connections: u32) -> Vec<Segment> {
|
||||||
if total_size == 0 || num_connections == 0 {
|
if total_size == 0 || num_connections == 0 {
|
||||||
|
// 空文件或未指定连接数:单段覆盖整个文件(end 按 total_size 推导,不能硬编码 0)
|
||||||
return vec![Segment {
|
return vec![Segment {
|
||||||
index: 0,
|
index: 0,
|
||||||
start: 0,
|
start: 0,
|
||||||
end: 0,
|
end: total_size.saturating_sub(1),
|
||||||
completed: 0,
|
completed: 0,
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
@@ -473,3 +582,86 @@ pub fn split_segments(total_size: u64, num_connections: u32) -> Vec<Segment> {
|
|||||||
|
|
||||||
segments
|
segments
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod split_segments_tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// 分段必须完整覆盖 [0, total_size),且相互连续无重叠
|
||||||
|
fn assert_contiguous(segments: &[Segment], total_size: u64) {
|
||||||
|
assert!(!segments.is_empty());
|
||||||
|
let mut prev_end: i64 = -1;
|
||||||
|
for seg in segments {
|
||||||
|
assert_eq!(seg.start as i64, prev_end + 1, "分段不连续");
|
||||||
|
assert!(seg.end >= seg.start, "分段 start > end");
|
||||||
|
prev_end = seg.end as i64;
|
||||||
|
}
|
||||||
|
assert_eq!(
|
||||||
|
segments.last().unwrap().end,
|
||||||
|
total_size - 1,
|
||||||
|
"末段未覆盖文件末尾"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn zero_size_returns_single_segment() {
|
||||||
|
let segs = split_segments(0, 4);
|
||||||
|
assert_eq!(segs.len(), 1);
|
||||||
|
assert_eq!(segs[0].start, 0);
|
||||||
|
assert_eq!(segs[0].end, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn zero_connections_covers_whole_file() {
|
||||||
|
let segs = split_segments(1024, 0);
|
||||||
|
assert_eq!(segs.len(), 1);
|
||||||
|
assert_eq!(segs[0].start, 0);
|
||||||
|
assert_eq!(segs[0].end, 1023);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn divides_evenly_with_contiguous_coverage() {
|
||||||
|
// 10MB / 4 连接 → 4 段完整覆盖
|
||||||
|
let total = 10 * 1024 * 1024;
|
||||||
|
let segs = split_segments(total, 4);
|
||||||
|
assert_eq!(segs.len(), 4);
|
||||||
|
assert_contiguous(&segs, total);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn clamps_connections_by_min_segment_size() {
|
||||||
|
// 2MB 文件请求 8 连接 → 受 1MB 最小分段限制,实际 ≤ 2 段
|
||||||
|
let total = 2 * 1024 * 1024;
|
||||||
|
let segs = split_segments(total, 8);
|
||||||
|
assert!(segs.len() <= 2, "连接数未按最小分段收敛: {}", segs.len());
|
||||||
|
assert_contiguous(&segs, total);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn respects_requested_connection_count() {
|
||||||
|
// 大文件按请求连接数切分
|
||||||
|
let total = 100 * 1024 * 1024;
|
||||||
|
let segs = split_segments(total, 3);
|
||||||
|
assert_eq!(segs.len(), 3);
|
||||||
|
assert_contiguous(&segs, total);
|
||||||
|
// 每段大小均匀
|
||||||
|
for seg in &segs {
|
||||||
|
let seg_len = seg.end - seg.start + 1;
|
||||||
|
assert!(
|
||||||
|
seg_len >= total / 3,
|
||||||
|
"分段大小不均: {} 段只有 {} 字节",
|
||||||
|
seg.index,
|
||||||
|
seg_len
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn tiny_file_single_segment() {
|
||||||
|
// 小于 1MB 的文件始终单段
|
||||||
|
let total = 100;
|
||||||
|
let segs = split_segments(total, 4);
|
||||||
|
assert_eq!(segs.len(), 1);
|
||||||
|
assert_contiguous(&segs, total);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,10 +5,11 @@ pub mod rate_limit;
|
|||||||
pub mod server;
|
pub mod server;
|
||||||
pub mod storage;
|
pub mod storage;
|
||||||
pub mod task;
|
pub mod task;
|
||||||
|
pub mod torrent;
|
||||||
|
|
||||||
pub use commands::{
|
pub use commands::{
|
||||||
downloader_add_task, downloader_check_url, downloader_get_extension_info, downloader_get_settings, downloader_get_tasks,
|
downloader_add_task, downloader_cancel_task, downloader_check_url, downloader_focus_window, downloader_get_extension_info, downloader_get_settings, downloader_get_tasks, downloader_inspect, downloader_select_bt_files,
|
||||||
downloader_open_dir, downloader_open_url, downloader_pause_task, downloader_remove_task,
|
downloader_open_dir, downloader_open_url, downloader_pause_task, downloader_redownload, downloader_remove_task,
|
||||||
downloader_resume_task, downloader_save_settings, downloader_status,
|
downloader_resume_task, downloader_save_settings, downloader_status,
|
||||||
};
|
};
|
||||||
pub use engine::DownloadEngine;
|
pub use engine::DownloadEngine;
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ impl RateLimiter {
|
|||||||
// 尝试在当前窗口消费(用作用域确保 MutexGuard 在 await 前释放)
|
// 尝试在当前窗口消费(用作用域确保 MutexGuard 在 await 前释放)
|
||||||
let over_limit = {
|
let over_limit = {
|
||||||
let now = std::time::Instant::now();
|
let now = std::time::Instant::now();
|
||||||
let mut start = self.window_start.lock().unwrap();
|
let mut start = self.window_start.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
let elapsed = now.duration_since(*start);
|
let elapsed = now.duration_since(*start);
|
||||||
|
|
||||||
// 窗口过期,重置
|
// 窗口过期,重置
|
||||||
@@ -72,3 +72,64 @@ impl Clone for RateLimiter {
|
|||||||
Self::new(self.limit.load(Ordering::Relaxed))
|
Self::new(self.limit.load(Ordering::Relaxed))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod rate_limiter_tests {
|
||||||
|
use super::*;
|
||||||
|
use std::time::Instant;
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn zero_limit_never_blocks() {
|
||||||
|
let limiter = RateLimiter::new(0);
|
||||||
|
let start = Instant::now();
|
||||||
|
limiter.consume(1024 * 1024).await;
|
||||||
|
limiter.consume(u64::MAX).await;
|
||||||
|
assert!(start.elapsed() < Duration::from_millis(50));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn under_limit_returns_immediately() {
|
||||||
|
let limiter = RateLimiter::new(100_000); // 100KB/s
|
||||||
|
let start = Instant::now();
|
||||||
|
limiter.consume(1024).await;
|
||||||
|
assert!(start.elapsed() < Duration::from_millis(50));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn exceeding_limit_waits_proportionally() {
|
||||||
|
// 限速 200 B/s:先消耗 100 未超限,再消耗 150 → 超限 50 → 等待约 250ms
|
||||||
|
let limiter = RateLimiter::new(200);
|
||||||
|
limiter.consume(100).await;
|
||||||
|
let start = Instant::now();
|
||||||
|
limiter.consume(150).await;
|
||||||
|
let elapsed = start.elapsed();
|
||||||
|
assert!(
|
||||||
|
elapsed >= Duration::from_millis(200),
|
||||||
|
"等待时间不足: {:?}",
|
||||||
|
elapsed
|
||||||
|
);
|
||||||
|
assert!(elapsed < Duration::from_millis(1100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn window_resets_after_one_second() {
|
||||||
|
// 限速 100 B/s:第一窗口耗尽后,1.1s 窗口重置,再消耗 100 不应阻塞
|
||||||
|
let limiter = RateLimiter::new(100);
|
||||||
|
limiter.consume(100).await;
|
||||||
|
tokio::time::sleep(Duration::from_millis(1100)).await;
|
||||||
|
let start = Instant::now();
|
||||||
|
limiter.consume(100).await;
|
||||||
|
assert!(start.elapsed() < Duration::from_millis(100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn set_limit_takes_effect_dynamically() {
|
||||||
|
let limiter = RateLimiter::new(0);
|
||||||
|
limiter.consume(1024).await; // 不限速
|
||||||
|
limiter.set_limit(100);
|
||||||
|
limiter.consume(100).await;
|
||||||
|
let start = Instant::now();
|
||||||
|
limiter.consume(100).await; // 累计 200 > 100 → 等待 1000ms
|
||||||
|
assert!(start.elapsed() >= Duration::from_millis(900));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -9,9 +9,10 @@ use axum::{
|
|||||||
Router,
|
Router,
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use tauri::{AppHandle, Emitter};
|
||||||
|
|
||||||
use super::engine::DownloadEngine;
|
use super::engine::DownloadEngine;
|
||||||
use super::task::DownloadTask;
|
use super::task::{DownloadTask, TaskStatus};
|
||||||
|
|
||||||
/// 扩展 HTTP API 服务器
|
/// 扩展 HTTP API 服务器
|
||||||
pub struct ExtensionServer;
|
pub struct ExtensionServer;
|
||||||
@@ -45,27 +46,31 @@ struct ErrorResponse {
|
|||||||
|
|
||||||
impl ExtensionServer {
|
impl ExtensionServer {
|
||||||
/// 启动 HTTP API 服务器(绑定到 127.0.0.1:port)
|
/// 启动 HTTP API 服务器(绑定到 127.0.0.1:port)
|
||||||
pub async fn start(engine: DownloadEngine, port: u16, secret: String) {
|
pub async fn start(engine: DownloadEngine, port: u16, secret: String, app_handle: AppHandle) {
|
||||||
let addr: SocketAddr = format!("127.0.0.1:{}", port).parse().expect("无效端口");
|
let addr: SocketAddr = format!("127.0.0.1:{}", port).parse().expect("无效端口");
|
||||||
|
|
||||||
let app = Router::new()
|
let app = Router::new()
|
||||||
.route("/health", get(health))
|
.route("/health", get(health))
|
||||||
.route("/api/downloads", post(create_download).get(list_downloads))
|
.route("/api/downloads", post(create_download).get(list_downloads))
|
||||||
.route("/api/downloads/:id", axum::routing::delete(remove_download))
|
.route("/api/downloads/:id", axum::routing::delete(remove_download))
|
||||||
.with_state(AppState { engine, secret });
|
.with_state(AppState {
|
||||||
|
engine,
|
||||||
|
secret,
|
||||||
|
app_handle,
|
||||||
|
});
|
||||||
|
|
||||||
let listener = match tokio::net::TcpListener::bind(&addr).await {
|
let listener = match tokio::net::TcpListener::bind(&addr).await {
|
||||||
Ok(l) => l,
|
Ok(l) => l,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("[download_engine] 扩展 HTTP 服务启动失败 ({}): {}", addr, e);
|
crate::logger::log_error("download", &format!("扩展 HTTP 服务启动失败 ({}): {}", addr, e));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
eprintln!("[download_engine] 扩展 HTTP 服务已启动: http://{}", addr);
|
crate::logger::log_info("download", &format!("扩展 HTTP 服务已启动: http://{}", addr));
|
||||||
|
|
||||||
if let Err(e) = axum::serve(listener, app).await {
|
if let Err(e) = axum::serve(listener, app).await {
|
||||||
eprintln!("[download_engine] 扩展 HTTP 服务异常: {}", e);
|
crate::logger::log_error("download", &format!("扩展 HTTP 服务异常: {}", e));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,6 +79,7 @@ impl ExtensionServer {
|
|||||||
struct AppState {
|
struct AppState {
|
||||||
engine: DownloadEngine,
|
engine: DownloadEngine,
|
||||||
secret: String,
|
secret: String,
|
||||||
|
app_handle: AppHandle,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 鉴权检查:如果配置了 secret,校验 Bearer token
|
/// 鉴权检查:如果配置了 secret,校验 Bearer token
|
||||||
@@ -108,8 +114,24 @@ async fn create_download(
|
|||||||
return Err((StatusCode::UNAUTHORIZED, Json(ErrorResponse { error: "未授权".into() })));
|
return Err((StatusCode::UNAUTHORIZED, Json(ErrorResponse { error: "未授权".into() })));
|
||||||
}
|
}
|
||||||
|
|
||||||
match state.engine.add_task(req.url, req.filename, req.dir, req.headers, true).await {
|
// 去重:同 URL 已有非终态任务(活跃/排队/暂停)时直接返回既有任务,
|
||||||
Ok(id) => Ok(Json(CreateDownloadResponse { id })),
|
// 避免浏览器重复转发同一下载造成重复下载
|
||||||
|
if let Some(existing) = state.engine.get_tasks().into_iter().find(|t| {
|
||||||
|
matches!(t.status, TaskStatus::Active | TaskStatus::Queued | TaskStatus::Paused) && t.url == req.url
|
||||||
|
}) {
|
||||||
|
return Ok(Json(CreateDownloadResponse { id: existing.id }));
|
||||||
|
}
|
||||||
|
|
||||||
|
match state.engine.add_task(req.url, req.filename, req.dir, req.headers, true, None).await {
|
||||||
|
Ok(id) => {
|
||||||
|
// 浏览器扩展发起下载:不再置前主窗口,改为带 task id 通知前端,
|
||||||
|
// 由前端为该任务创建一个专属的一次性下载窗口(不打断主界面)
|
||||||
|
let _ = state.app_handle.emit(
|
||||||
|
crate::constants::events::DOWNLOAD_EXTENSION_ADDED,
|
||||||
|
serde_json::json!({ "id": id }),
|
||||||
|
);
|
||||||
|
Ok(Json(CreateDownloadResponse { id }))
|
||||||
|
}
|
||||||
Err(e) => Err((StatusCode::BAD_REQUEST, Json(ErrorResponse { error: e }))),
|
Err(e) => Err((StatusCode::BAD_REQUEST, Json(ErrorResponse { error: e }))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -133,7 +155,11 @@ async fn remove_download(
|
|||||||
return Err((StatusCode::UNAUTHORIZED, Json(ErrorResponse { error: "未授权".into() })));
|
return Err((StatusCode::UNAUTHORIZED, Json(ErrorResponse { error: "未授权".into() })));
|
||||||
}
|
}
|
||||||
match state.engine.remove_task(&id, false) {
|
match state.engine.remove_task(&id, false) {
|
||||||
Ok(()) => Ok(StatusCode::NO_CONTENT),
|
Ok(()) => {
|
||||||
|
// 通知前端刷新任务列表(扩展删除时前端无从感知,否则列表残留已删除任务)
|
||||||
|
let _ = state.app_handle.emit(crate::constants::events::DOWNLOAD_REMOVED, serde_json::json!({ "id": id }));
|
||||||
|
Ok(StatusCode::NO_CONTENT)
|
||||||
|
}
|
||||||
Err(e) => Err((StatusCode::NOT_FOUND, Json(ErrorResponse { error: e }))),
|
Err(e) => Err((StatusCode::NOT_FOUND, Json(ErrorResponse { error: e }))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ impl Storage {
|
|||||||
pub fn new(data_dir: PathBuf) -> Self {
|
pub fn new(data_dir: PathBuf) -> Self {
|
||||||
// 确保数据目录存在(首次启动或目录被删除时自动创建)
|
// 确保数据目录存在(首次启动或目录被删除时自动创建)
|
||||||
if let Err(e) = fs::create_dir_all(&data_dir) {
|
if let Err(e) = fs::create_dir_all(&data_dir) {
|
||||||
eprintln!("[download_engine] 创建数据目录失败: {} ({})", data_dir.display(), e);
|
crate::logger::log_error("download", &format!("创建数据目录失败: {} ({})", data_dir.display(), e));
|
||||||
}
|
}
|
||||||
let state_path = data_dir.join("engine_state.json");
|
let state_path = data_dir.join("engine_state.json");
|
||||||
let existing = Self::load_raw(&state_path);
|
let existing = Self::load_raw(&state_path);
|
||||||
@@ -68,23 +68,24 @@ impl Storage {
|
|||||||
Self::load_raw(&self.state_path).unwrap_or_default()
|
Self::load_raw(&self.state_path).unwrap_or_default()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 保存状态到磁盘
|
/// 保存状态到磁盘(原子写:先写 .tmp 再 rename 覆盖,
|
||||||
pub fn save(&self, mut state: EngineState) {
|
/// 避免进程崩溃时产生半写/截断的状态文件导致任务列表丢失)
|
||||||
|
/// 失败返回 Err,由调用方决定是否将任务置为 Error(防止"看似已保存"的假象)。
|
||||||
|
pub fn save(&self, mut state: EngineState) -> Result<(), String> {
|
||||||
// 同步 ID 计数器
|
// 同步 ID 计数器
|
||||||
state.next_id = self.id_counter.load(Ordering::SeqCst);
|
state.next_id = self.id_counter.load(Ordering::SeqCst);
|
||||||
match serde_json::to_string_pretty(&state) {
|
let json = serde_json::to_string_pretty(&state)
|
||||||
Ok(json) => {
|
.map_err(|e| format!("序列化状态失败: {}", e))?;
|
||||||
// 兜底:若父目录被外部删除则在写入前重建
|
// 兜底:若父目录被外部删除则在写入前重建
|
||||||
if let Some(parent) = self.state_path.parent() {
|
if let Some(parent) = self.state_path.parent() {
|
||||||
let _ = fs::create_dir_all(parent);
|
let _ = fs::create_dir_all(parent);
|
||||||
}
|
}
|
||||||
if let Err(e) = fs::write(&self.state_path, json) {
|
let tmp_path = PathBuf::from(format!("{}.tmp", self.state_path.display()));
|
||||||
eprintln!("[download_engine] 保存状态失败: {}", e);
|
fs::write(&tmp_path, json).map_err(|e| format!("保存状态失败: {}", e))?;
|
||||||
}
|
fs::rename(&tmp_path, &self.state_path).map_err(|e| {
|
||||||
}
|
let _ = fs::remove_file(&tmp_path);
|
||||||
Err(e) => {
|
format!("替换状态文件失败: {}", e)
|
||||||
eprintln!("[download_engine] 序列化状态失败: {}", e);
|
})?;
|
||||||
}
|
Ok(())
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,20 @@
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use specta::Type;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
/// 任务下载协议类型
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Type, Default)]
|
||||||
|
#[serde(rename_all = "lowercase")]
|
||||||
|
pub enum TaskProtocol {
|
||||||
|
/// HTTP/HTTPS 直链
|
||||||
|
#[default]
|
||||||
|
Http,
|
||||||
|
/// BitTorrent(磁力链 / .torrent 文件)
|
||||||
|
BitTorrent,
|
||||||
|
}
|
||||||
|
|
||||||
/// 任务状态
|
/// 任务状态
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Type)]
|
||||||
#[serde(rename_all = "lowercase")]
|
#[serde(rename_all = "lowercase")]
|
||||||
pub enum TaskStatus {
|
pub enum TaskStatus {
|
||||||
/// 排队等待(并发数已满)
|
/// 排队等待(并发数已满)
|
||||||
@@ -15,10 +27,12 @@ pub enum TaskStatus {
|
|||||||
Complete,
|
Complete,
|
||||||
/// 错误
|
/// 错误
|
||||||
Error,
|
Error,
|
||||||
|
/// 已取消(用户取消:进度与文件已清除,仅保留记录,只能再次下载)
|
||||||
|
Cancelled,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 下载分段(多线程 Range 下载 / 断点续传用)
|
/// 下载分段(多线程 Range 下载 / 断点续传用)
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct Segment {
|
pub struct Segment {
|
||||||
/// 分段索引
|
/// 分段索引
|
||||||
@@ -36,24 +50,57 @@ impl Segment {
|
|||||||
pub fn len(&self) -> u64 {
|
pub fn len(&self) -> u64 {
|
||||||
self.end.saturating_sub(self.start) + 1
|
self.end.saturating_sub(self.start) + 1
|
||||||
}
|
}
|
||||||
|
/// 是否为未知大小哨兵段(start=0, end=0,表示不支持 Range 或未探测到大小)
|
||||||
|
pub fn is_unknown_size(&self) -> bool {
|
||||||
|
self.start == 0 && self.end == 0
|
||||||
|
}
|
||||||
/// 是否已完成
|
/// 是否已完成
|
||||||
pub fn is_done(&self) -> bool {
|
pub fn is_done(&self) -> bool {
|
||||||
|
// 未知大小段无法用长度判断是否完成,由流结束(Ok(None))判定;
|
||||||
|
// 若按 len()=1 判断,暂停/恢复后 completed>=1 会误判为已完成,导致文件被截断
|
||||||
|
if self.is_unknown_size() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
self.completed >= self.len()
|
self.completed >= self.len()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// BT 种子内文件条目(多文件任务用;阶段1下载全部文件,但保留列表供 UI 展示)
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct BtFileInfo {
|
||||||
|
/// 文件在种子内的索引
|
||||||
|
pub index: u32,
|
||||||
|
/// 相对种子根目录的路径(如 "sub/file.mkv")
|
||||||
|
pub path: String,
|
||||||
|
/// 文件大小(字节)
|
||||||
|
pub size: u64,
|
||||||
|
}
|
||||||
|
|
||||||
/// 下载任务
|
/// 下载任务
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct DownloadTask {
|
pub struct DownloadTask {
|
||||||
/// 任务 ID(自增 hex 字符串)
|
/// 任务 ID(自增 hex 字符串)
|
||||||
pub id: String,
|
pub id: String,
|
||||||
/// 下载地址
|
/// 下载地址(HTTP URL 或磁力链接)
|
||||||
pub url: String,
|
pub url: String,
|
||||||
/// 文件名
|
/// 文件名(HTTP:目标文件名;BT:种子名称)
|
||||||
pub filename: String,
|
pub filename: String,
|
||||||
/// 保存目录(绝对路径)
|
/// 保存目录(绝对路径)
|
||||||
pub dir: String,
|
pub dir: String,
|
||||||
|
/// 协议类型
|
||||||
|
#[serde(default)]
|
||||||
|
pub protocol: TaskProtocol,
|
||||||
|
/// BT 种子 infohash(协议=BitTorrent 时存在)
|
||||||
|
#[serde(default)]
|
||||||
|
pub info_hash: Option<String>,
|
||||||
|
/// BT 种子内文件列表(协议=BitTorrent 时存在)
|
||||||
|
#[serde(default)]
|
||||||
|
pub bt_files: Vec<BtFileInfo>,
|
||||||
|
/// BT 元数据是否已解析就绪(异步添加时:后台解析完成前为 false,调度器跳过)
|
||||||
|
#[serde(default)]
|
||||||
|
pub bt_metadata_ready: bool,
|
||||||
/// 状态
|
/// 状态
|
||||||
pub status: TaskStatus,
|
pub status: TaskStatus,
|
||||||
/// 文件总大小(字节),0=未知
|
/// 文件总大小(字节),0=未知
|
||||||
@@ -98,7 +145,7 @@ impl DownloadTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 下载设置
|
/// 下载设置
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct DownloaderSettings {
|
pub struct DownloaderSettings {
|
||||||
/// 下载目录
|
/// 下载目录
|
||||||
@@ -128,6 +175,21 @@ pub struct DownloaderSettings {
|
|||||||
/// 添加下载前检查重复(URL 或文件名重复时询问)
|
/// 添加下载前检查重复(URL 或文件名重复时询问)
|
||||||
#[serde(default = "default_true")]
|
#[serde(default = "default_true")]
|
||||||
pub check_duplicate: bool,
|
pub check_duplicate: bool,
|
||||||
|
/// 下载是否使用代理:true=尊重系统代理(mihomo 开启系统代理时经其转发),false=强制直连
|
||||||
|
#[serde(default = "default_true")]
|
||||||
|
pub use_proxy: bool,
|
||||||
|
/// BitTorrent 上传限速 KB/s(0=不限)
|
||||||
|
#[serde(default)]
|
||||||
|
pub bt_upload_limit_kb: u64,
|
||||||
|
/// BitTorrent 下载完成后是否继续做种上传(false=下载完即停止上传)
|
||||||
|
#[serde(default)]
|
||||||
|
pub bt_seed_after_download: bool,
|
||||||
|
/// BitTorrent 监听端口(0=自动选择)
|
||||||
|
#[serde(default)]
|
||||||
|
pub bt_listen_port: u16,
|
||||||
|
/// BitTorrent 使用代理下载:开启后自动使用代理模块(mihomo)的 SOCKS5 端口;代理不可用时降级直连
|
||||||
|
#[serde(default)]
|
||||||
|
pub bt_use_proxy: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn default_max_concurrent() -> u32 {
|
fn default_max_concurrent() -> u32 {
|
||||||
@@ -166,6 +228,11 @@ impl Default for DownloaderSettings {
|
|||||||
extension_secret: String::new(),
|
extension_secret: String::new(),
|
||||||
delete_files_on_remove: false,
|
delete_files_on_remove: false,
|
||||||
check_duplicate: true,
|
check_duplicate: true,
|
||||||
|
use_proxy: true,
|
||||||
|
bt_upload_limit_kb: 0,
|
||||||
|
bt_seed_after_download: false,
|
||||||
|
bt_listen_port: 0,
|
||||||
|
bt_use_proxy: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,477 @@
|
|||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::sync::{Arc, Mutex, RwLock};
|
||||||
|
|
||||||
|
// 会话字段专用 tokio 异步互斥(与 std 互斥区分开):
|
||||||
|
// 创建 Session 是 async 操作,必须持锁跨 await,否则"双重检查"在 await 期间失效,
|
||||||
|
// 并发首次添加 BT 任务可能各建一个全局会话,产生孤儿会话与跨会话无效句柄。
|
||||||
|
use tokio::sync::Mutex as AsyncMutex;
|
||||||
|
|
||||||
|
use librqbit::api::TorrentIdOrHash;
|
||||||
|
use librqbit::{AddTorrent, AddTorrentOptions, AddTorrentResponse, ManagedTorrent, Session};
|
||||||
|
|
||||||
|
use super::task::BtFileInfo;
|
||||||
|
|
||||||
|
/// 磁力元数据解析超时(秒):依赖 DHT/tracker 拉取,过短易误报,过长体验差
|
||||||
|
pub(crate) const INSPECT_TIMEOUT_SECS: u64 = 60;
|
||||||
|
|
||||||
|
/// 每日 tracker 同步源(XIU2/TrackersListCollection,官方新域名 cf.trackerslist.com)。
|
||||||
|
/// 注意:GitHub 仓库 raw 路径(raw.githubusercontent.com/...trackers_best.txt)已随项目
|
||||||
|
/// 迁移失效(404),不要再用 GitHub 代理镜像。以下为官方 Cloudflare 分发地址,
|
||||||
|
/// 国内直连通常可达,按顺序尝试、首个成功即用。
|
||||||
|
const TRACKER_SYNC_SOURCES: &[&str] = &[
|
||||||
|
"https://cf.trackerslist.com/best.txt",
|
||||||
|
"https://trackerslist.com/best.txt",
|
||||||
|
"https://cf.trackerslist.com/all.txt",
|
||||||
|
];
|
||||||
|
/// 动态 tracker 持久化文件与同步元数据
|
||||||
|
const TRACKERS_FILE: &str = "bt_trackers.txt";
|
||||||
|
const TRACKERS_META_FILE: &str = "bt_trackers_meta.json";
|
||||||
|
|
||||||
|
/// 常用公共 tracker:磁力链接本身可能只带很少 tracker,追加这些可提升解析成功率。
|
||||||
|
/// 混合 UDP/HTTP(S)/WebSocket,覆盖 UDP 被屏蔽但 HTTP 可用的网络环境。
|
||||||
|
pub const PUBLIC_TRACKERS: &[&str] = &[
|
||||||
|
// UDP
|
||||||
|
"udp://tracker.opentrackr.org:1337/announce",
|
||||||
|
"udp://open.tracker.cl:1337/announce",
|
||||||
|
"udp://tracker.openbittorrent.com:6969/announce",
|
||||||
|
"udp://tracker.torrent.eu.org:451/announce",
|
||||||
|
"udp://open.stealth.si:80/announce",
|
||||||
|
"udp://exodus.desync.com:6969/announce",
|
||||||
|
"udp://tracker.tiny-vps.com:6969/announce",
|
||||||
|
"udp://open.demonii.com:1337/announce",
|
||||||
|
"udp://tracker.moeking.me:6969/announce",
|
||||||
|
"udp://ipv4.tracker.harry.lu:80/announce",
|
||||||
|
"udp://explodie.org:6969/announce",
|
||||||
|
"udp://tracker.birkenfeld.ru:7496/announce",
|
||||||
|
"udp://tracker.pomf.se:80/announce",
|
||||||
|
"udp://tracker.tamersunion.org:6969/announce",
|
||||||
|
"udp://retracker.lanta-net.ru:2710/announce",
|
||||||
|
// HTTP(S)
|
||||||
|
"http://tracker.opentrackr.org:1337/announce",
|
||||||
|
"http://tracker.openbittorrent.com:80/announce",
|
||||||
|
"http://tracker1.itzmx.com:8080/announce",
|
||||||
|
"http://tracker4.itzmx.com:2710/announce",
|
||||||
|
"https://tracker.gbitt.info:443/announce",
|
||||||
|
"https://tracker.nanoha.org:443/announce",
|
||||||
|
"http://tracker.bt4g.com:2095/announce",
|
||||||
|
"http://tracker.gbitt.info:80/announce",
|
||||||
|
];
|
||||||
|
|
||||||
|
/// 种子信息(inspect 解析结果,供命令返回给前端做文件勾选)
|
||||||
|
#[derive(Debug, Clone, serde::Serialize, specta::Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct TorrentInfo {
|
||||||
|
/// 种子名称
|
||||||
|
pub name: String,
|
||||||
|
/// infohash(hex 小写字符串)
|
||||||
|
pub info_hash: String,
|
||||||
|
/// 种子内全部文件总大小(字节)
|
||||||
|
pub total_size: u64,
|
||||||
|
/// 种子内文件列表
|
||||||
|
pub files: Vec<BtFileInfo>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// BitTorrent 下载器:封装 librqbit 全局会话(多任务共享 DHT / 监听端口 / tracker 缓存)。
|
||||||
|
/// 会话懒创建:只有真正添加 BT 任务时才初始化,避免引擎启动即拉起 BT 内核。
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct TorrentDownloader {
|
||||||
|
/// 全局会话(懒创建;tokio 异步互斥保证并发首次添加只创建一个会话)
|
||||||
|
session: Arc<AsyncMutex<Option<Arc<Session>>>>,
|
||||||
|
/// 会话默认输出目录(每个任务用 AddTorrentOptions.output_folder 覆盖)
|
||||||
|
base_dir: PathBuf,
|
||||||
|
/// 上传限速 bytes/s(0=不限),per-torrent 应用
|
||||||
|
upload_limit_bps: Arc<std::sync::atomic::AtomicU64>,
|
||||||
|
/// 监听端口(0=自动)
|
||||||
|
listen_port: Arc<std::sync::atomic::AtomicU16>,
|
||||||
|
/// SOCKS5 代理地址(None=直连;来自代理模块,不可用时降级直连)
|
||||||
|
proxy_addr: Arc<Mutex<Option<String>>>,
|
||||||
|
/// 动态公共 tracker(每日从外部列表同步,叠加到内置列表)
|
||||||
|
dynamic_trackers: Arc<RwLock<Vec<String>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TorrentDownloader {
|
||||||
|
pub fn new(base_dir: PathBuf) -> Self {
|
||||||
|
Self {
|
||||||
|
session: Arc::new(AsyncMutex::new(None)),
|
||||||
|
base_dir,
|
||||||
|
upload_limit_bps: Arc::new(std::sync::atomic::AtomicU64::new(0)),
|
||||||
|
listen_port: Arc::new(std::sync::atomic::AtomicU16::new(0)),
|
||||||
|
proxy_addr: Arc::new(Mutex::new(None)),
|
||||||
|
dynamic_trackers: Arc::new(RwLock::new(Vec::new())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 更新 BT 专属设置(上传限速 KB/s、监听端口、SOCKS5 代理地址)— 会话创建时生效
|
||||||
|
pub fn set_settings(&self, upload_limit_kb: u64, listen_port: u16, proxy_addr: Option<String>) {
|
||||||
|
self.upload_limit_bps
|
||||||
|
.store(upload_limit_kb.saturating_mul(1024), std::sync::atomic::Ordering::SeqCst);
|
||||||
|
self.listen_port
|
||||||
|
.store(listen_port, std::sync::atomic::Ordering::SeqCst);
|
||||||
|
*self.proxy_addr.lock().unwrap_or_else(|e| e.into_inner()) = proxy_addr;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置动态 tracker(合并去重)
|
||||||
|
pub fn add_dynamic_trackers(&self, list: Vec<String>) {
|
||||||
|
if list.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let mut g = self.dynamic_trackers.write().unwrap_or_else(|e| e.into_inner());
|
||||||
|
for t in list {
|
||||||
|
let t = t.trim().to_string();
|
||||||
|
if !t.is_empty() && !g.contains(&t) {
|
||||||
|
g.push(t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 当前动态 tracker 数量
|
||||||
|
pub fn dynamic_count(&self) -> usize {
|
||||||
|
self.dynamic_trackers.read().unwrap_or_else(|e| e.into_inner()).len()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 合并内置 + 动态 tracker(去重),供 inspect / add_async 共用
|
||||||
|
fn build_trackers(&self) -> Vec<String> {
|
||||||
|
let dyn_trackers = self.dynamic_trackers.read().unwrap_or_else(|e| e.into_inner()).clone();
|
||||||
|
let mut trackers: Vec<String> = PUBLIC_TRACKERS.iter().map(|s| s.to_string()).collect();
|
||||||
|
for t in dyn_trackers {
|
||||||
|
if !trackers.contains(&t) {
|
||||||
|
trackers.push(t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
trackers
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 每日同步动态 tracker:读取本地缓存 → 判断今天是否已同步 → 未同步则拉取更新。
|
||||||
|
/// 失败静默降级:保留上次成功的列表。
|
||||||
|
pub async fn sync_dynamic_trackers(&self, data_dir: &Path) {
|
||||||
|
fn parse_list(text: &str) -> Vec<String> {
|
||||||
|
text.lines()
|
||||||
|
.map(|l| l.trim())
|
||||||
|
.filter(|l| l.starts_with("http://") || l.starts_with("https://") || l.starts_with("udp://") || l.starts_with("ws://") || l.starts_with("wss://"))
|
||||||
|
.map(|l| l.to_string())
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
let trackers_path = data_dir.join(TRACKERS_FILE);
|
||||||
|
let meta_path = data_dir.join(TRACKERS_META_FILE);
|
||||||
|
let today = chrono::Local::now().format("%Y-%m-%d").to_string();
|
||||||
|
|
||||||
|
// 1. 先加载上次成功保存的列表到内存(覆盖"重启后内存被清空")
|
||||||
|
if let Ok(s) = std::fs::read_to_string(&trackers_path) {
|
||||||
|
self.add_dynamic_trackers(parse_list(&s));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. 今天已同步过则不再下载
|
||||||
|
if let Ok(meta) = std::fs::read_to_string(&meta_path) {
|
||||||
|
if let Ok(v) = serde_json::from_str::<serde_json::Value>(&meta) {
|
||||||
|
if v.get("date").and_then(|d| d.as_str()) == Some(&today) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. 依次尝试各镜像源(记录每个源的失败原因,便于判断是 DNS 还是连接超时)
|
||||||
|
let client = reqwest::Client::builder()
|
||||||
|
.timeout(std::time::Duration::from_secs(10))
|
||||||
|
.build()
|
||||||
|
.ok();
|
||||||
|
for url in TRACKER_SYNC_SOURCES {
|
||||||
|
let Some(c) = &client else { break };
|
||||||
|
match c.get(*url).send().await {
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_line("download", crate::logger::LogLevel::Debug, &format!("动态 tracker 源不可达 {}: {}", url, e));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Ok(resp) => {
|
||||||
|
let text = match resp.text().await {
|
||||||
|
Ok(t) => t,
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_line("download", crate::logger::LogLevel::Debug, &format!("动态 tracker 源读取失败 {}: {}", url, e));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let list = parse_list(&text);
|
||||||
|
if list.is_empty() {
|
||||||
|
crate::logger::log_line("download", crate::logger::LogLevel::Debug, &format!("动态 tracker 源返回空列表 {}", url));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// 保存列表与同步元数据
|
||||||
|
let _ = std::fs::write(&trackers_path, format!("{}\n", list.join("\n")));
|
||||||
|
let _ = std::fs::write(&meta_path, serde_json::json!({ "date": today }).to_string());
|
||||||
|
self.add_dynamic_trackers(list);
|
||||||
|
crate::logger::log_info("download", &format!("已同步动态 tracker(共 {} 条)", self.dynamic_count()));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
crate::logger::log_warn("download", "动态 tracker 全部同步源不可达,使用上次成功列表或内置列表(不影响磁力解析,公共 tracker 仍会生效)");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话级公共 tracker(HashSet<Url>,供 SessionOptions.trackers 使用)。
|
||||||
|
/// 注意:librqbit 对磁力链接只采用 magnet URL 自带的 tr= 参数,完全忽略
|
||||||
|
/// AddTorrentOptions.trackers(见 librqbit session.rs 的 magnet 分支),导致
|
||||||
|
/// 纯磁力(无自带 tr)解析元数据时 "trackers list is empty"。而会话级
|
||||||
|
/// SessionOptions.trackers 会在 make_peer_rx 中合并进每个种子(含磁力),
|
||||||
|
/// 因此必须放到这里才能让磁力链接真正带上公共 tracker。
|
||||||
|
fn session_trackers(&self) -> std::collections::HashSet<url::Url> {
|
||||||
|
self.build_trackers()
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|t| url::Url::parse(&t).ok())
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取或创建全局会话。
|
||||||
|
/// 持 tokio 互斥锁覆盖整个构造过程:并发调用在此串行化,
|
||||||
|
/// 先进入者创建并写入,后续者锁内二次检查直接复用(避免多会话竞态)。
|
||||||
|
/// 开启代理时先尝试用代理初始化;失败则降级为直连(记录下来供 add 重试判断)。
|
||||||
|
async fn get_session(&self) -> Result<Arc<Session>, String> {
|
||||||
|
let mut guard = self.session.lock().await;
|
||||||
|
if let Some(s) = guard.as_ref() {
|
||||||
|
return Ok(s.clone());
|
||||||
|
}
|
||||||
|
let _ = std::fs::create_dir_all(&self.base_dir);
|
||||||
|
let port = self.listen_port.load(std::sync::atomic::Ordering::SeqCst);
|
||||||
|
let proxy = self.proxy_addr.lock().unwrap_or_else(|e| e.into_inner()).clone();
|
||||||
|
let connect_opt = proxy.as_ref().map(|p| librqbit::ConnectionOptions { proxy_url: Some(p.clone()), ..Default::default() });
|
||||||
|
let had_proxy = connect_opt.is_some();
|
||||||
|
|
||||||
|
// 构造带代理(若启用)+ 监听端口 + 会话级公共 tracker 的会话选项
|
||||||
|
let mut opts = lib_session_options();
|
||||||
|
opts.trackers = self.session_trackers();
|
||||||
|
if connect_opt.is_some() {
|
||||||
|
opts.connect = connect_opt;
|
||||||
|
}
|
||||||
|
if port > 0 {
|
||||||
|
if let Ok(addr) = format!("0.0.0.0:{}", port).parse::<std::net::SocketAddr>() {
|
||||||
|
opts.listen = Some(librqbit::ListenerOptions {
|
||||||
|
listen_addr: addr,
|
||||||
|
..Default::default()
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
crate::logger::log_error("download", &format!("BT 监听端口 {} 无效,使用自动端口", port));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 尝试创建会话:先按配置(可能带代理),失败且有代理则降级直连重试
|
||||||
|
let s = match Session::new_with_opts(self.base_dir.clone(), opts).await {
|
||||||
|
Ok(s) => s,
|
||||||
|
Err(e) => {
|
||||||
|
if had_proxy {
|
||||||
|
crate::logger::log_error("download", &format!("BT 代理会话初始化失败({}),降级为直连", e));
|
||||||
|
let mut m = lib_session_options();
|
||||||
|
m.trackers = self.session_trackers();
|
||||||
|
if port > 0 {
|
||||||
|
if let Ok(addr) = format!("0.0.0.0:{}", port).parse::<std::net::SocketAddr>() {
|
||||||
|
m.listen = Some(librqbit::ListenerOptions { listen_addr: addr, ..Default::default() });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Session::new_with_opts(self.base_dir.clone(), m).await.map_err(|e2| format!("初始化 BitTorrent 会话失败: {}", e2))?
|
||||||
|
} else {
|
||||||
|
return Err(format!("初始化 BitTorrent 会话失败: {}", e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
*guard = Some(s.clone());
|
||||||
|
Ok(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 解析磁力链 / 本地 .torrent 文件,返回种子信息(不开始下载)。
|
||||||
|
/// list_only 模式:仅获取元数据,不加入会话,因此不影响后续真正添加。
|
||||||
|
/// 磁力元数据依赖 DHT/tracker 拉取,无超时会永久等待,故加超时。
|
||||||
|
pub async fn inspect(&self, input: &str) -> Result<TorrentInfo, String> {
|
||||||
|
let session = self.get_session().await?;
|
||||||
|
let trackers = self.build_trackers();
|
||||||
|
// 磁力:需从网络拉取元数据,可能较慢(取决于种子热度与网络连通性);
|
||||||
|
// 本地 .torrent / http(s) .torrent URL:元数据在文件内,from_cli_argument 会读取/下载并解析
|
||||||
|
let add = AddTorrent::from_cli_argument(input).map_err(|e| format!("无效的种子输入: {}", e))?;
|
||||||
|
let add_fut = session.add_torrent(
|
||||||
|
add,
|
||||||
|
Some(AddTorrentOptions {
|
||||||
|
list_only: true,
|
||||||
|
trackers: Some(trackers),
|
||||||
|
..Default::default()
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
let resp = tokio::time::timeout(std::time::Duration::from_secs(INSPECT_TIMEOUT_SECS), add_fut)
|
||||||
|
.await
|
||||||
|
.map_err(|_| "解析磁力元数据超时:未能从 DHT/Tracker 获取种子信息,请确认种子有做种源或网络可直连 BT".to_string())?
|
||||||
|
.map_err(|e| format!("解析种子失败: {}", e))?;
|
||||||
|
|
||||||
|
let AddTorrentResponse::ListOnly(lo) = resp else {
|
||||||
|
return Err("该链接未返回有效的种子元数据".to_string());
|
||||||
|
};
|
||||||
|
|
||||||
|
let info = lo.info.info();
|
||||||
|
let name = info
|
||||||
|
.name
|
||||||
|
.as_ref()
|
||||||
|
.map(|b| String::from_utf8_lossy(b.as_ref()).into_owned())
|
||||||
|
.or_else(|| lo.info.name().map(|c| c.to_string()))
|
||||||
|
.unwrap_or_else(|| "未命名种子".to_string());
|
||||||
|
|
||||||
|
let mut files = Vec::new();
|
||||||
|
let mut total_size = 0u64;
|
||||||
|
if let Some(fs) = &info.files {
|
||||||
|
for (i, f) in fs.iter().enumerate() {
|
||||||
|
let path = f
|
||||||
|
.path
|
||||||
|
.iter()
|
||||||
|
.map(|p| String::from_utf8_lossy(p.as_ref()).into_owned())
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("/");
|
||||||
|
files.push(BtFileInfo {
|
||||||
|
index: i as u32,
|
||||||
|
path,
|
||||||
|
size: f.length,
|
||||||
|
});
|
||||||
|
total_size += f.length;
|
||||||
|
}
|
||||||
|
} else if let Some(len) = info.length {
|
||||||
|
// 单文件种子
|
||||||
|
files.push(BtFileInfo {
|
||||||
|
index: 0,
|
||||||
|
path: name.clone(),
|
||||||
|
size: len,
|
||||||
|
});
|
||||||
|
total_size = len;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(TorrentInfo {
|
||||||
|
name,
|
||||||
|
info_hash: hex_encode(&lo.info_hash.0),
|
||||||
|
total_size,
|
||||||
|
files,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 异步添加种子:立即返回句柄(不等待元数据),由调用方后台解析。
|
||||||
|
/// 附加公共 tracker 提升磁力元数据解析成功率;上传限速 per-torrent 应用。
|
||||||
|
pub async fn add_async(
|
||||||
|
&self,
|
||||||
|
input: &str,
|
||||||
|
output_dir: &str,
|
||||||
|
) -> Result<(usize, Arc<ManagedTorrent>), String> {
|
||||||
|
let session = self.get_session().await?;
|
||||||
|
std::fs::create_dir_all(output_dir).map_err(|e| format!("创建下载目录失败: {}", e))?;
|
||||||
|
let up = self.upload_limit_bps.load(std::sync::atomic::Ordering::SeqCst);
|
||||||
|
let upload_bps = std::num::NonZeroU32::new(up.min(u32::MAX as u64) as u32);
|
||||||
|
let trackers = self.build_trackers();
|
||||||
|
let opts = AddTorrentOptions {
|
||||||
|
paused: true,
|
||||||
|
output_folder: Some(output_dir.to_string()),
|
||||||
|
overwrite: true,
|
||||||
|
trackers: Some(trackers),
|
||||||
|
ratelimits: librqbit::limits::LimitsConfig {
|
||||||
|
upload_bps,
|
||||||
|
download_bps: None,
|
||||||
|
},
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
let add = AddTorrent::from_cli_argument(input).map_err(|e| format!("无效的种子输入: {}", e))?;
|
||||||
|
let resp = session
|
||||||
|
.add_torrent(add, Some(opts))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("添加种子失败: {}", e))?;
|
||||||
|
match resp {
|
||||||
|
AddTorrentResponse::Added(id, handle) => Ok((id, handle)),
|
||||||
|
AddTorrentResponse::AlreadyManaged(id, handle) => Ok((id, handle)),
|
||||||
|
_ => Err("种子已存在或元数据无效".to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 等待种子元数据初始化就绪(磁力需要从网络拉取,带超时)
|
||||||
|
pub async fn wait_initialized(&self, handle: &Arc<ManagedTorrent>) -> Result<(), String> {
|
||||||
|
tokio::time::timeout(
|
||||||
|
std::time::Duration::from_secs(INSPECT_TIMEOUT_SECS),
|
||||||
|
handle.wait_until_initialized(),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.map_err(|_| "解析磁力元数据超时:未能从 DHT/Tracker 获取种子信息,请确认种子有做种源或网络可直连 BT".to_string())?
|
||||||
|
.map_err(|e| format!("获取种子元数据失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置要下载的种子文件子集(用户文件勾选;传全部索引则全选)
|
||||||
|
pub async fn set_only_files(&self, handle: &Arc<ManagedTorrent>, files: &[u32]) -> Result<(), String> {
|
||||||
|
let session = self.get_session().await?;
|
||||||
|
let set: std::collections::HashSet<usize> = files.iter().map(|&i| i as usize).collect();
|
||||||
|
session
|
||||||
|
.update_only_files(handle, &set)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("设置下载文件失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 读取句柄当前进度:返回 (已下载字节, 总字节, 每文件已下载字节)
|
||||||
|
/// `file_progress` 与种子文件一一对应,供前端详情页展示单文件进度。
|
||||||
|
pub fn progress_full(handle: &Arc<ManagedTorrent>) -> (u64, u64, Vec<u64>) {
|
||||||
|
let s = handle.stats();
|
||||||
|
(s.progress_bytes, s.total_bytes, s.file_progress.clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 暂停种子(下载中的连接会停止,已下载片段保留,可继续)
|
||||||
|
pub async fn pause(&self, handle: &Arc<ManagedTorrent>) -> Result<(), String> {
|
||||||
|
let session = self.get_session().await?;
|
||||||
|
session
|
||||||
|
.pause(handle)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("暂停种子失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 继续种子(幂等):恢复已暂停的种子。
|
||||||
|
/// 若种子本已处于 Live(例如 select_bt_files 的 set_only_files 内部已恢复过、
|
||||||
|
/// 或暂停期间被其他逻辑恢复),直接视为成功,避免 librqbit 报 "torrent is already live"
|
||||||
|
/// 而导致 pause→resume 链路被误判为失败。
|
||||||
|
pub async fn unpause(&self, handle: &Arc<ManagedTorrent>) -> Result<(), String> {
|
||||||
|
let session = self.get_session().await?;
|
||||||
|
match handle.stats().state {
|
||||||
|
librqbit::TorrentStatsState::Live => Ok(()),
|
||||||
|
librqbit::TorrentStatsState::Error => Err("种子处于错误状态,无法继续".to_string()),
|
||||||
|
librqbit::TorrentStatsState::Paused
|
||||||
|
| librqbit::TorrentStatsState::Initializing { .. } => session
|
||||||
|
.unpause(handle)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("继续种子失败: {}", e)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除种子(info_hash 为 hex 字符串;delete_files 是否同时删除已下载文件)
|
||||||
|
pub async fn delete(&self, info_hash: &str, delete_files: bool) -> Result<(), String> {
|
||||||
|
let session = self.get_session().await?;
|
||||||
|
let id = TorrentIdOrHash::parse(info_hash)
|
||||||
|
.map_err(|_| format!("无效的 infohash: {}", info_hash))?;
|
||||||
|
session
|
||||||
|
.delete(id, delete_files)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("删除种子失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 读取句柄当前下载进度 (已下载字节, 总字节)
|
||||||
|
pub fn progress(handle: &Arc<ManagedTorrent>) -> (u64, u64) {
|
||||||
|
let s = handle.stats();
|
||||||
|
(s.progress_bytes, s.total_bytes)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 停止全局会话(应用退出时调用)
|
||||||
|
pub async fn stop(&self) {
|
||||||
|
let session = {
|
||||||
|
let mut guard = self.session.lock().await;
|
||||||
|
guard.take()
|
||||||
|
};
|
||||||
|
if let Some(s) = session {
|
||||||
|
let _ = s.stop().await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 字节数组转小写十六进制字符串(librqbit 的 Id 未实现 Display)
|
||||||
|
pub(crate) fn hex_encode(bytes: &[u8]) -> String {
|
||||||
|
const HEX: &[u8; 16] = b"0123456789abcdef";
|
||||||
|
let mut out = String::with_capacity(bytes.len() * 2);
|
||||||
|
for &b in bytes {
|
||||||
|
out.push(HEX[(b >> 4) as usize] as char);
|
||||||
|
out.push(HEX[(b & 0x0f) as usize] as char);
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 默认会话选项(后续如需新增 DHT/缓存等可在此统一配置)
|
||||||
|
fn lib_session_options() -> librqbit::SessionOptions {
|
||||||
|
librqbit::SessionOptions::default()
|
||||||
|
}
|
||||||
+227
-158
@@ -1,7 +1,7 @@
|
|||||||
use std::sync::Arc;
|
|
||||||
use tauri::Manager;
|
use tauri::Manager;
|
||||||
|
|
||||||
mod clipboard;
|
mod clipboard;
|
||||||
|
mod constants;
|
||||||
mod download_engine;
|
mod download_engine;
|
||||||
mod logger;
|
mod logger;
|
||||||
mod mihomo_manager;
|
mod mihomo_manager;
|
||||||
@@ -9,91 +9,169 @@ mod monitor_kernel;
|
|||||||
mod network_monitor;
|
mod network_monitor;
|
||||||
mod osd_window;
|
mod osd_window;
|
||||||
mod process_manager;
|
mod process_manager;
|
||||||
|
mod quickpanel;
|
||||||
mod screenshot;
|
mod screenshot;
|
||||||
|
mod setup;
|
||||||
|
mod shortcut;
|
||||||
mod snap_fix;
|
mod snap_fix;
|
||||||
mod tray_menu;
|
mod tray_menu;
|
||||||
|
mod updater;
|
||||||
|
mod win32_util;
|
||||||
|
|
||||||
use download_engine::{
|
use download_engine::{
|
||||||
DownloadEngine, ExtensionServer,
|
DownloadEngine,
|
||||||
downloader_add_task, downloader_check_url, downloader_get_extension_info, downloader_get_settings, downloader_get_tasks,
|
downloader_add_task, downloader_cancel_task, downloader_check_url, downloader_focus_window, downloader_get_extension_info, downloader_get_settings, downloader_get_tasks, downloader_inspect, downloader_select_bt_files,
|
||||||
downloader_open_dir, downloader_open_url, downloader_pause_task, downloader_remove_task,
|
downloader_open_dir, downloader_open_url, downloader_pause_task, downloader_redownload, downloader_remove_task,
|
||||||
downloader_resume_task, downloader_save_settings, downloader_status,
|
downloader_resume_task, downloader_save_settings, downloader_status,
|
||||||
};
|
};
|
||||||
use logger::{
|
use logger::{
|
||||||
clear_logs, get_log_info, get_logs, log_message, LogManager,
|
log_clear, log_info_state, log_list, log_message,
|
||||||
};
|
};
|
||||||
use mihomo_manager::{
|
use mihomo_manager::{
|
||||||
proxy_activate_profile, proxy_check_kernel_update, proxy_clear_system_proxy, proxy_close_connection, proxy_delete_profile,
|
proxy_activate_profile, proxy_apply_kernel_update, proxy_cancel_kernel_install, proxy_check_kernel_update, proxy_clear_system_proxy,
|
||||||
proxy_get_connections, proxy_get_proxies, proxy_get_settings, proxy_get_system_proxy,
|
proxy_close_connection, proxy_confirm_install, proxy_delete_profile, proxy_get_connections, proxy_get_proxies, proxy_get_settings, proxy_get_system_proxy,
|
||||||
proxy_import_profile, proxy_install_kernel, proxy_kernel_info, proxy_patch_configs, proxy_restart, proxy_save_settings,
|
proxy_import_profile, proxy_kernel_info, proxy_patch_configs, proxy_restart, proxy_save_settings,
|
||||||
proxy_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop,
|
proxy_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop, proxy_traffic,
|
||||||
proxy_test_delay, proxy_update_kernel, proxy_update_profile, proxy_version, MihomoManager,
|
proxy_test_delay, proxy_update_profile, proxy_version, MihomoManager,
|
||||||
};
|
};
|
||||||
use monitor_kernel::{
|
use monitor_kernel::{
|
||||||
monitor_elevate_self, monitor_get_elevate_on_launch, monitor_get_hardware_config,
|
monitor_elevate_self, monitor_get_auto_start, monitor_get_elevate_on_launch,
|
||||||
monitor_get_snapshot, monitor_get_status, monitor_kernel_info, monitor_set_elevate_on_launch,
|
monitor_get_hardware_config, monitor_get_snapshot, monitor_get_status, monitor_kernel_info,
|
||||||
monitor_set_hardware_config, monitor_start, monitor_start_elevated, monitor_status,
|
monitor_set_auto_start, monitor_set_elevate_on_launch, monitor_set_hardware_config,
|
||||||
monitor_stop, MonitorKernel,
|
monitor_start, monitor_start_elevated, monitor_status, monitor_stop, MonitorKernel,
|
||||||
};
|
};
|
||||||
use network_monitor::{network_monitor_status, NetworkMonitor};
|
use network_monitor::network_status;
|
||||||
use osd_window::{
|
use osd_window::{
|
||||||
osd_apply_overlay_style, osd_begin_drag, osd_set_click_through, osd_set_topmost,
|
osd_apply_overlay_style, osd_begin_drag, osd_set_bounds, osd_set_click_through,
|
||||||
osd_start_drag_watch, osd_start_topmost_watch, osd_stop_watch,
|
osd_set_topmost, osd_start_drag_watch, osd_start_game_watch, osd_start_topmost_watch,
|
||||||
|
osd_stop_watch,
|
||||||
};
|
};
|
||||||
use process_manager::{
|
use process_manager::{
|
||||||
get_all_process_status, get_process_status, start_monitoring_thread, start_process,
|
process_all_status, process_start, process_status,
|
||||||
stop_all_processes, stop_process, ProcessManager,
|
process_stop, process_stop_all, ProcessManager,
|
||||||
};
|
};
|
||||||
use screenshot::commands::{
|
use screenshot::commands::{
|
||||||
screenshot_capture_fullscreen, screenshot_capture_window, screenshot_copy_image,
|
screenshot_capture_fullscreen, screenshot_capture_window, screenshot_clear_fullscreen,
|
||||||
screenshot_crop_stored, screenshot_enum_windows, screenshot_get_editor_image,
|
screenshot_compose_copy, screenshot_copy_image, screenshot_crop_copy_stored,
|
||||||
screenshot_save_png, screenshot_set_editor_image, screenshot_take_fullscreen,
|
screenshot_crop_stored, screenshot_cursor_pos, screenshot_delete_cache,
|
||||||
screenshot_window_from_point,
|
screenshot_disable_transitions, screenshot_enum_windows, screenshot_fullscreen_png,
|
||||||
|
screenshot_get_editor_image, screenshot_get_fullscreen_bmp, screenshot_load_cache,
|
||||||
|
screenshot_load_cache_raw, screenshot_pick_list, screenshot_register_pin_shortcut,
|
||||||
|
screenshot_register_shortcut,
|
||||||
|
screenshot_save_cache, screenshot_save_png, screenshot_set_editor_image,
|
||||||
|
screenshot_show_overlay, screenshot_unregister_pin_shortcut,
|
||||||
|
screenshot_unregister_shortcut,
|
||||||
};
|
};
|
||||||
use clipboard::{
|
use clipboard::{
|
||||||
ClipboardManager,
|
ClipboardManager,
|
||||||
clipboard_clear, clipboard_copy_back, clipboard_count, clipboard_delete, clipboard_get_history,
|
clipboard_clear, clipboard_copy_back, clipboard_count, clipboard_delete, clipboard_get_history,
|
||||||
clipboard_get_item, clipboard_get_pinned, clipboard_get_settings, clipboard_hide_popup,
|
clipboard_get_item, clipboard_get_pinned, clipboard_get_settings, clipboard_get_thumb,
|
||||||
clipboard_paste_to_target, clipboard_register_shortcut, clipboard_save_settings, clipboard_search,
|
clipboard_hide_popup, clipboard_hide_preview, clipboard_paste_to_target,
|
||||||
clipboard_set_pinned, clipboard_show_popup, clipboard_show_window, clipboard_start,
|
clipboard_preview_interacted, clipboard_register_shortcut,
|
||||||
|
clipboard_reveal_preview,
|
||||||
|
clipboard_save_settings, clipboard_search, clipboard_set_pinned, clipboard_resize_preview,
|
||||||
|
clipboard_show_popup, clipboard_show_preview, clipboard_show_window, clipboard_start,
|
||||||
clipboard_status, clipboard_stop, clipboard_unregister_shortcut,
|
clipboard_status, clipboard_stop, clipboard_unregister_shortcut,
|
||||||
};
|
};
|
||||||
|
use quickpanel::{
|
||||||
|
quickpanel_apply_rename, quickpanel_batch_extract, quickpanel_build_file_index,
|
||||||
|
quickpanel_clear_app_icon_cache, quickpanel_delete_file, quickpanel_delete_files,
|
||||||
|
quickpanel_file_index_stats, quickpanel_get_app_icon, quickpanel_get_settings,
|
||||||
|
quickpanel_get_special_locations, quickpanel_hide_popup, quickpanel_init_file_index,
|
||||||
|
quickpanel_list_archives, quickpanel_list_dir, quickpanel_lock_screen, quickpanel_open_file,
|
||||||
|
quickpanel_open_special, quickpanel_preview_rename, quickpanel_register_shortcut,
|
||||||
|
quickpanel_reveal_in_explorer, quickpanel_run_custom_command, quickpanel_run_system_command,
|
||||||
|
quickpanel_save_settings, quickpanel_scan_apps, quickpanel_search_files, quickpanel_show_popup,
|
||||||
|
quickpanel_show_window, quickpanel_unregister_shortcut, quickpanel_focus_main_window,
|
||||||
|
};
|
||||||
use tray_menu::{tray_menu_action, tray_menu_hide, tray_menu_ready};
|
use tray_menu::{tray_menu_action, tray_menu_hide, tray_menu_ready};
|
||||||
|
use updater::{
|
||||||
|
app_version, update_check, update_install, update_thinghk_apply, update_thinghk_cancel,
|
||||||
|
update_thinghk_confirm, ThinghkUpdateState,
|
||||||
|
};
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn greet(name: &str) -> String {
|
fn quit_app(app: tauri::AppHandle) {
|
||||||
format!("Hello, {}! You've been greeted from Rust!", name)
|
// 资源清理统一收敛到 RunEvent::ExitRequested(覆盖所有退出路径),此处仅请求退出
|
||||||
|
app.exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
/// 导出 tauri-specta 生成的 TypeScript 类型与命令绑定(仅 debug 构建,开发时自动刷新)。
|
||||||
fn quit_app(
|
/// 覆盖 proxy / quickpanel / clipboard / download_engine / screenshot 五个模块;
|
||||||
state: tauri::State<'_, ProcessManager>,
|
/// 豁免清单(返回 serde_json::Value 或 tauri::ipc::Response/Request,specta 无法生成):
|
||||||
mihomo: tauri::State<'_, MihomoManager>,
|
/// proxy_version / proxy_get_proxies / proxy_get_connections / proxy_patch_configs、
|
||||||
engine: tauri::State<'_, DownloadEngine>,
|
/// downloader_status / downloader_get_extension_info、
|
||||||
monitor: tauri::State<'_, MonitorKernel>,
|
/// screenshot_get_fullscreen_bmp(返回 ipc::Response)/ screenshot_compose_copy(接收 ipc::Request)。
|
||||||
clipboard: tauri::State<'_, ClipboardManager>,
|
#[cfg(debug_assertions)]
|
||||||
app: tauri::AppHandle,
|
fn export_bindings() {
|
||||||
) {
|
use specta_typescript::Typescript;
|
||||||
// 退出前清理系统代理,避免遗留导致网络问题
|
use tauri_specta::{Builder, ErrorHandlingMode, collect_commands};
|
||||||
mihomo.cleanup_on_exit();
|
|
||||||
// 退出前保存下载引擎状态
|
Builder::<tauri::Wry>::new()
|
||||||
engine.cleanup_on_exit();
|
// 全局把 u64/i64 映射为 number(项目取值均在 JS 安全整数范围:大小/时间戳/limit)
|
||||||
// 停止提权 Kernel(普通权限由 stop_all 统一清理,提权 Kernel 需通过 /shutdown)
|
.dangerously_cast_bigints_to_number()
|
||||||
tauri::async_runtime::block_on(monitor.cleanup_on_exit(&app));
|
// 生成命令失败时直接 throw,与原生 invoke 一致,前端无需解包 helper
|
||||||
// 停止剪贴板监听线程
|
.error_handling(ErrorHandlingMode::Throw)
|
||||||
clipboard.stop();
|
.commands(collect_commands![
|
||||||
// 停止所有子进程(同步 kill + 带超时的 wait,确保进程真正终止)
|
// 应用更新(6)
|
||||||
state.stop_all();
|
app_version, update_check, update_install, update_thinghk_apply,
|
||||||
// 通过 app.exit 触发 RunEvent::ExitRequested,统一退出路径
|
update_thinghk_confirm, update_thinghk_cancel,
|
||||||
app.exit(0);
|
// proxy(20)
|
||||||
|
proxy_activate_profile, proxy_apply_kernel_update, proxy_cancel_kernel_install, proxy_check_kernel_update, proxy_clear_system_proxy,
|
||||||
|
proxy_close_connection, proxy_confirm_install, proxy_delete_profile, proxy_get_settings,
|
||||||
|
proxy_get_system_proxy, proxy_import_profile, proxy_kernel_info,
|
||||||
|
proxy_restart, proxy_save_settings,
|
||||||
|
proxy_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop, proxy_traffic,
|
||||||
|
proxy_test_delay, proxy_update_profile,
|
||||||
|
// quickpanel(22)
|
||||||
|
quickpanel_get_settings, quickpanel_save_settings, quickpanel_register_shortcut,
|
||||||
|
quickpanel_unregister_shortcut, quickpanel_show_popup, quickpanel_hide_popup,
|
||||||
|
quickpanel_show_window, quickpanel_lock_screen, quickpanel_init_file_index,
|
||||||
|
quickpanel_build_file_index, quickpanel_search_files, quickpanel_file_index_stats,
|
||||||
|
quickpanel_scan_apps, quickpanel_get_app_icon, quickpanel_clear_app_icon_cache,
|
||||||
|
quickpanel_reveal_in_explorer, quickpanel_open_file, quickpanel_get_special_locations,
|
||||||
|
quickpanel_open_special, quickpanel_delete_file, quickpanel_run_custom_command,
|
||||||
|
quickpanel_run_system_command, quickpanel_list_archives, quickpanel_list_dir,
|
||||||
|
quickpanel_batch_extract, quickpanel_preview_rename, quickpanel_apply_rename,
|
||||||
|
quickpanel_delete_files, quickpanel_focus_main_window,
|
||||||
|
// clipboard(23)
|
||||||
|
clipboard_get_history, clipboard_get_pinned, clipboard_search, clipboard_get_item,
|
||||||
|
clipboard_get_thumb, clipboard_set_pinned, clipboard_delete, clipboard_clear,
|
||||||
|
clipboard_copy_back, clipboard_count, clipboard_get_settings, clipboard_save_settings,
|
||||||
|
clipboard_status, clipboard_start, clipboard_stop, clipboard_register_shortcut,
|
||||||
|
clipboard_unregister_shortcut, clipboard_show_popup, clipboard_hide_popup,
|
||||||
|
clipboard_show_window, clipboard_paste_to_target, clipboard_show_preview,
|
||||||
|
clipboard_hide_preview, clipboard_resize_preview, clipboard_reveal_preview,
|
||||||
|
clipboard_preview_interacted,
|
||||||
|
// download_engine(10,豁免 2)
|
||||||
|
downloader_get_tasks, downloader_check_url, downloader_add_task, downloader_pause_task,
|
||||||
|
downloader_resume_task, downloader_cancel_task, downloader_redownload, downloader_remove_task, downloader_get_settings,
|
||||||
|
downloader_save_settings, downloader_open_dir, downloader_open_url, downloader_focus_window, downloader_inspect, downloader_select_bt_files,
|
||||||
|
// screenshot(22,豁免 3:get_fullscreen_bmp / load_cache_raw 返回 ipc::Response、compose_copy 接收 ipc::Request)
|
||||||
|
screenshot_disable_transitions, screenshot_show_overlay, screenshot_register_shortcut,
|
||||||
|
screenshot_unregister_shortcut, screenshot_register_pin_shortcut,
|
||||||
|
screenshot_unregister_pin_shortcut, screenshot_capture_fullscreen,
|
||||||
|
screenshot_fullscreen_png, screenshot_clear_fullscreen, screenshot_crop_stored,
|
||||||
|
screenshot_crop_copy_stored, screenshot_pick_list, screenshot_cursor_pos,
|
||||||
|
screenshot_enum_windows, screenshot_capture_window, screenshot_set_editor_image,
|
||||||
|
screenshot_get_editor_image, screenshot_copy_image, screenshot_save_png,
|
||||||
|
screenshot_save_cache, screenshot_load_cache, screenshot_delete_cache,
|
||||||
|
])
|
||||||
|
.export(Typescript::default(), "../src/lib/bindings.ts")
|
||||||
|
.expect("failed to export bindings");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||||
pub fn run() {
|
pub fn run() {
|
||||||
|
#[cfg(debug_assertions)]
|
||||||
|
export_bindings();
|
||||||
|
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
.plugin(tauri_plugin_autostart::Builder::new().build())
|
.plugin(tauri_plugin_autostart::Builder::new().build())
|
||||||
.plugin(tauri_plugin_opener::init())
|
.plugin(tauri_plugin_opener::init())
|
||||||
.plugin(tauri_plugin_dialog::init())
|
.plugin(tauri_plugin_dialog::init())
|
||||||
|
// 截图快捷键改由 screenshot::shortcut::register_shortcut(on_shortcut)按需注册,
|
||||||
|
// 支持自定义;默认 Ctrl+Alt+A 由前端 store 启动时注册
|
||||||
.plugin(tauri_plugin_global_shortcut::Builder::new().build())
|
.plugin(tauri_plugin_global_shortcut::Builder::new().build())
|
||||||
.plugin(tauri_plugin_notification::init())
|
.plugin(tauri_plugin_notification::init())
|
||||||
.plugin(
|
.plugin(
|
||||||
@@ -102,27 +180,35 @@ pub fn run() {
|
|||||||
.build()
|
.build()
|
||||||
)
|
)
|
||||||
.manage(ProcessManager::new())
|
.manage(ProcessManager::new())
|
||||||
|
.manage(ThinghkUpdateState::new())
|
||||||
.invoke_handler(tauri::generate_handler![
|
.invoke_handler(tauri::generate_handler![
|
||||||
greet,
|
|
||||||
quit_app,
|
quit_app,
|
||||||
start_process,
|
app_version,
|
||||||
stop_process,
|
update_check,
|
||||||
get_process_status,
|
update_install,
|
||||||
get_all_process_status,
|
update_thinghk_apply,
|
||||||
stop_all_processes,
|
update_thinghk_confirm,
|
||||||
|
update_thinghk_cancel,
|
||||||
|
process_start,
|
||||||
|
process_stop,
|
||||||
|
process_status,
|
||||||
|
process_all_status,
|
||||||
|
process_stop_all,
|
||||||
log_message,
|
log_message,
|
||||||
get_logs,
|
log_list,
|
||||||
clear_logs,
|
log_clear,
|
||||||
get_log_info,
|
log_info_state,
|
||||||
proxy_get_settings,
|
proxy_get_settings,
|
||||||
proxy_save_settings,
|
proxy_save_settings,
|
||||||
proxy_kernel_info,
|
proxy_kernel_info,
|
||||||
proxy_check_kernel_update,
|
proxy_check_kernel_update,
|
||||||
proxy_update_kernel,
|
proxy_apply_kernel_update,
|
||||||
proxy_install_kernel,
|
proxy_cancel_kernel_install,
|
||||||
|
proxy_confirm_install,
|
||||||
proxy_status,
|
proxy_status,
|
||||||
proxy_start,
|
proxy_start,
|
||||||
proxy_stop,
|
proxy_stop,
|
||||||
|
proxy_traffic,
|
||||||
proxy_restart,
|
proxy_restart,
|
||||||
proxy_version,
|
proxy_version,
|
||||||
proxy_get_proxies,
|
proxy_get_proxies,
|
||||||
@@ -148,21 +234,27 @@ pub fn run() {
|
|||||||
monitor_get_snapshot,
|
monitor_get_snapshot,
|
||||||
monitor_get_elevate_on_launch,
|
monitor_get_elevate_on_launch,
|
||||||
monitor_set_elevate_on_launch,
|
monitor_set_elevate_on_launch,
|
||||||
|
monitor_get_auto_start,
|
||||||
|
monitor_set_auto_start,
|
||||||
monitor_get_hardware_config,
|
monitor_get_hardware_config,
|
||||||
monitor_set_hardware_config,
|
monitor_set_hardware_config,
|
||||||
network_monitor_status,
|
network_status,
|
||||||
osd_apply_overlay_style,
|
osd_apply_overlay_style,
|
||||||
osd_begin_drag,
|
osd_begin_drag,
|
||||||
|
osd_set_bounds,
|
||||||
osd_set_click_through,
|
osd_set_click_through,
|
||||||
osd_set_topmost,
|
osd_set_topmost,
|
||||||
osd_start_drag_watch,
|
osd_start_drag_watch,
|
||||||
osd_start_topmost_watch,
|
osd_start_topmost_watch,
|
||||||
|
osd_start_game_watch,
|
||||||
osd_stop_watch,
|
osd_stop_watch,
|
||||||
downloader_get_tasks,
|
downloader_get_tasks,
|
||||||
downloader_add_task,
|
downloader_add_task,
|
||||||
downloader_check_url,
|
downloader_check_url,
|
||||||
downloader_pause_task,
|
downloader_pause_task,
|
||||||
downloader_resume_task,
|
downloader_resume_task,
|
||||||
|
downloader_cancel_task,
|
||||||
|
downloader_redownload,
|
||||||
downloader_remove_task,
|
downloader_remove_task,
|
||||||
downloader_get_settings,
|
downloader_get_settings,
|
||||||
downloader_save_settings,
|
downloader_save_settings,
|
||||||
@@ -170,10 +262,14 @@ pub fn run() {
|
|||||||
downloader_get_extension_info,
|
downloader_get_extension_info,
|
||||||
downloader_open_dir,
|
downloader_open_dir,
|
||||||
downloader_open_url,
|
downloader_open_url,
|
||||||
|
downloader_focus_window,
|
||||||
|
downloader_inspect,
|
||||||
|
downloader_select_bt_files,
|
||||||
clipboard_get_history,
|
clipboard_get_history,
|
||||||
clipboard_get_pinned,
|
clipboard_get_pinned,
|
||||||
clipboard_search,
|
clipboard_search,
|
||||||
clipboard_get_item,
|
clipboard_get_item,
|
||||||
|
clipboard_get_thumb,
|
||||||
clipboard_set_pinned,
|
clipboard_set_pinned,
|
||||||
clipboard_delete,
|
clipboard_delete,
|
||||||
clipboard_clear,
|
clipboard_clear,
|
||||||
@@ -190,119 +286,80 @@ pub fn run() {
|
|||||||
clipboard_show_window,
|
clipboard_show_window,
|
||||||
clipboard_hide_popup,
|
clipboard_hide_popup,
|
||||||
clipboard_paste_to_target,
|
clipboard_paste_to_target,
|
||||||
|
clipboard_show_preview,
|
||||||
|
clipboard_hide_preview,
|
||||||
|
clipboard_resize_preview,
|
||||||
|
clipboard_reveal_preview,
|
||||||
|
clipboard_preview_interacted,
|
||||||
|
quickpanel_get_settings,
|
||||||
|
quickpanel_save_settings,
|
||||||
|
quickpanel_register_shortcut,
|
||||||
|
quickpanel_unregister_shortcut,
|
||||||
|
quickpanel_show_popup,
|
||||||
|
quickpanel_show_window,
|
||||||
|
quickpanel_hide_popup,
|
||||||
|
quickpanel_lock_screen,
|
||||||
|
quickpanel_init_file_index,
|
||||||
|
quickpanel_build_file_index,
|
||||||
|
quickpanel_search_files,
|
||||||
|
quickpanel_file_index_stats,
|
||||||
|
quickpanel_scan_apps,
|
||||||
|
quickpanel_get_app_icon,
|
||||||
|
quickpanel_clear_app_icon_cache,
|
||||||
|
quickpanel_reveal_in_explorer,
|
||||||
|
quickpanel_open_file,
|
||||||
|
quickpanel_delete_file,
|
||||||
|
quickpanel_delete_files,
|
||||||
|
quickpanel_run_custom_command,
|
||||||
|
quickpanel_run_system_command,
|
||||||
|
quickpanel_get_special_locations,
|
||||||
|
quickpanel_open_special,
|
||||||
|
quickpanel_list_archives,
|
||||||
|
quickpanel_list_dir,
|
||||||
|
quickpanel_batch_extract,
|
||||||
|
quickpanel_preview_rename,
|
||||||
|
quickpanel_apply_rename,
|
||||||
|
quickpanel_focus_main_window,
|
||||||
tray_menu_action,
|
tray_menu_action,
|
||||||
tray_menu_hide,
|
tray_menu_hide,
|
||||||
tray_menu_ready,
|
tray_menu_ready,
|
||||||
snap_fix::fix_snap_background,
|
snap_fix::fix_snap_background,
|
||||||
screenshot_capture_fullscreen,
|
screenshot_capture_fullscreen,
|
||||||
screenshot_take_fullscreen,
|
screenshot_get_fullscreen_bmp,
|
||||||
|
screenshot_fullscreen_png,
|
||||||
|
screenshot_clear_fullscreen,
|
||||||
screenshot_crop_stored,
|
screenshot_crop_stored,
|
||||||
screenshot_window_from_point,
|
screenshot_crop_copy_stored,
|
||||||
|
screenshot_pick_list,
|
||||||
|
screenshot_show_overlay,
|
||||||
|
screenshot_cursor_pos,
|
||||||
screenshot_enum_windows,
|
screenshot_enum_windows,
|
||||||
screenshot_capture_window,
|
screenshot_capture_window,
|
||||||
screenshot_set_editor_image,
|
screenshot_set_editor_image,
|
||||||
screenshot_get_editor_image,
|
screenshot_get_editor_image,
|
||||||
screenshot_copy_image,
|
screenshot_copy_image,
|
||||||
screenshot_save_png
|
screenshot_save_png,
|
||||||
|
screenshot_save_cache,
|
||||||
|
screenshot_load_cache,
|
||||||
|
screenshot_load_cache_raw,
|
||||||
|
screenshot_delete_cache,
|
||||||
|
screenshot_register_shortcut,
|
||||||
|
screenshot_unregister_shortcut,
|
||||||
|
screenshot_register_pin_shortcut,
|
||||||
|
screenshot_unregister_pin_shortcut,
|
||||||
|
screenshot_disable_transitions,
|
||||||
|
screenshot_compose_copy
|
||||||
])
|
])
|
||||||
.setup(|app| {
|
.setup(setup::init)
|
||||||
// 初始化日志系统,日志目录: {app_data_dir}/logs/
|
|
||||||
let log_dir = app
|
|
||||||
.path()
|
|
||||||
.app_data_dir()
|
|
||||||
.unwrap_or_else(|_| std::path::PathBuf::from("."))
|
|
||||||
.join("logs");
|
|
||||||
app.manage(LogManager::new(log_dir));
|
|
||||||
|
|
||||||
// 初始化 MihomoManager,数据目录: {app_data_dir}/proxy/
|
|
||||||
let app_data_dir = app
|
|
||||||
.path()
|
|
||||||
.app_data_dir()
|
|
||||||
.unwrap_or_else(|_| std::path::PathBuf::from("."));
|
|
||||||
|
|
||||||
// 永久提权检查:如果标志已设置且当前非管理员,以管理员权限重启自身并退出
|
|
||||||
// 必须在所有模块初始化之前执行(此时无资源需要清理)
|
|
||||||
if monitor_kernel::check_and_relaunch_if_needed(&app_data_dir) {
|
|
||||||
std::process::exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
let mihomo = MihomoManager::new(app_data_dir.clone());
|
|
||||||
app.manage(mihomo);
|
|
||||||
|
|
||||||
// 初始化 MonitorKernel,数据目录: {app_data_dir}/monitor/
|
|
||||||
let monitor = MonitorKernel::new(app_data_dir.clone());
|
|
||||||
app.manage(monitor);
|
|
||||||
|
|
||||||
// 初始化 NetworkMonitor(网速监控,独立于 ThingHK Kernel)
|
|
||||||
// 网速采样不依赖提权,应用启动即开始
|
|
||||||
let network_monitor = Arc::new(NetworkMonitor::new());
|
|
||||||
app.manage(network_monitor.clone());
|
|
||||||
network_monitor.start(app.handle().clone());
|
|
||||||
|
|
||||||
// 初始化 DownloadEngine,数据目录: {app_data_dir}/downloader/
|
|
||||||
let engine = DownloadEngine::new(
|
|
||||||
app_data_dir.join("downloader"),
|
|
||||||
app.handle().clone(),
|
|
||||||
);
|
|
||||||
let settings = engine.get_settings();
|
|
||||||
app.manage(engine.clone());
|
|
||||||
|
|
||||||
// 启动扩展 HTTP API 服务器
|
|
||||||
let server_engine = engine.clone();
|
|
||||||
let server_port = settings.extension_port;
|
|
||||||
let server_secret = settings.extension_secret.clone();
|
|
||||||
tauri::async_runtime::spawn(async move {
|
|
||||||
ExtensionServer::start(server_engine, server_port, server_secret).await;
|
|
||||||
});
|
|
||||||
|
|
||||||
// 初始化 ClipboardManager,数据目录: {app_data_dir}/clipboard/
|
|
||||||
let clipboard = ClipboardManager::new(app_data_dir.clone());
|
|
||||||
// 应用启动时若已启用则自动开始监听
|
|
||||||
if clipboard.get_settings().enabled {
|
|
||||||
clipboard.start(&app.handle());
|
|
||||||
}
|
|
||||||
// 应用启动时注册快捷弹窗全局快捷键
|
|
||||||
let shortcut = clipboard.get_settings().shortcut.clone();
|
|
||||||
if !shortcut.trim().is_empty() {
|
|
||||||
let app_handle = app.handle().clone();
|
|
||||||
if let Err(e) = clipboard::popup::register_shortcut(&app_handle, &shortcut) {
|
|
||||||
eprintln!("[clipboard] 快捷键注册失败: {}", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
app.manage(clipboard);
|
|
||||||
|
|
||||||
// 自定义托盘菜单(代理/OSD/Kernel/下载/设置/退出)
|
|
||||||
tray_menu::create_tray_menu(app.handle())?;
|
|
||||||
|
|
||||||
// 启动进程监控线程
|
|
||||||
start_monitoring_thread(app.handle().clone());
|
|
||||||
|
|
||||||
// 应用启动时自动启动 mihomo(如果用户在设置中开启了自动启动)
|
|
||||||
if let Some(mihomo) = app.try_state::<MihomoManager>() {
|
|
||||||
if let Some(pm) = app.try_state::<ProcessManager>() {
|
|
||||||
mihomo.auto_start_on_launch(app.handle(), &pm);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 应用启动时自动启动 monitor Kernel(硬件监控默认启用,被动读取无副作用)
|
|
||||||
if let Some(monitor) = app.try_state::<MonitorKernel>() {
|
|
||||||
let monitor = monitor.inner().clone();
|
|
||||||
let app_handle = app.handle().clone();
|
|
||||||
tauri::async_runtime::spawn(async move {
|
|
||||||
match monitor.start_with_subscription(&app_handle).await {
|
|
||||||
Ok(info) => eprintln!("[monitor] 自动启动成功, pid={:?}", info.pid),
|
|
||||||
Err(e) => eprintln!("[monitor] 自动启动跳过: {}", e),
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
})
|
|
||||||
.on_window_event(|window, event| {
|
.on_window_event(|window, event| {
|
||||||
|
// 仅主窗口拦截关闭(隐藏到托盘)。其他窗口(截图编辑器/OSD 等)
|
||||||
|
// 调用 close() 是真实销毁语义,全局拦截会导致隐藏窗口累积泄漏。
|
||||||
|
if window.label() == constants::windows::MAIN {
|
||||||
if let tauri::WindowEvent::CloseRequested { api, .. } = event {
|
if let tauri::WindowEvent::CloseRequested { api, .. } = event {
|
||||||
window.hide().ok();
|
window.hide().ok();
|
||||||
api.prevent_close();
|
api.prevent_close();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.build(tauri::generate_context!())
|
.build(tauri::generate_context!())
|
||||||
.expect("error while building tauri application")
|
.expect("error while building tauri application")
|
||||||
@@ -315,7 +372,19 @@ pub fn run() {
|
|||||||
engine.cleanup_on_exit();
|
engine.cleanup_on_exit();
|
||||||
}
|
}
|
||||||
if let Some(monitor) = app.try_state::<MonitorKernel>() {
|
if let Some(monitor) = app.try_state::<MonitorKernel>() {
|
||||||
tauri::async_runtime::block_on(monitor.cleanup_on_exit(app));
|
// cleanup_on_exit 是 async;在事件循环回调中直接 block_on 有 panic 风险且阻塞退出,
|
||||||
|
// 放到独立 OS 线程执行并通过 channel 限时等待 3s,超时放弃等待直接退出
|
||||||
|
// (进程终止时 OS 回收残留资源),避免清理挂起导致退出卡死。
|
||||||
|
let app_clone = app.clone();
|
||||||
|
let monitor_clone = monitor.inner().clone();
|
||||||
|
let (tx, rx) = std::sync::mpsc::channel::<()>();
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
tauri::async_runtime::block_on(async move {
|
||||||
|
monitor_clone.cleanup_on_exit(&app_clone).await;
|
||||||
|
});
|
||||||
|
let _ = tx.send(());
|
||||||
|
});
|
||||||
|
let _ = rx.recv_timeout(std::time::Duration::from_secs(3));
|
||||||
}
|
}
|
||||||
if let Some(clip) = app.try_state::<ClipboardManager>() {
|
if let Some(clip) = app.try_state::<ClipboardManager>() {
|
||||||
clip.stop();
|
clip.stop();
|
||||||
|
|||||||
+276
-23
@@ -1,8 +1,9 @@
|
|||||||
use chrono::Local;
|
use chrono::Local;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::fs::{self, File, OpenOptions};
|
use std::fs::{self, File, OpenOptions};
|
||||||
use std::io::{BufRead, BufReader, Write};
|
use std::io::{Read, Seek, SeekFrom, Write};
|
||||||
use std::path::PathBuf;
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::sync::{Arc, Mutex, OnceLock};
|
||||||
|
|
||||||
/// 日志级别
|
/// 日志级别
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||||
@@ -34,11 +35,14 @@ pub struct LogInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 日志管理器 —— 负责文件轮转、写入、查询
|
/// 日志管理器 —— 负责文件轮转、写入、查询
|
||||||
|
/// 所有写/轮转/读操作通过 write_lock 串行化,防止并发写交错与轮转竞争
|
||||||
|
#[derive(Clone)]
|
||||||
pub struct LogManager {
|
pub struct LogManager {
|
||||||
log_dir: PathBuf,
|
log_dir: PathBuf,
|
||||||
max_file_size: u64,
|
max_file_size: u64,
|
||||||
max_files: u32,
|
max_files: u32,
|
||||||
base_name: String,
|
base_name: String,
|
||||||
|
write_lock: Arc<Mutex<()>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LogManager {
|
impl LogManager {
|
||||||
@@ -48,12 +52,14 @@ impl LogManager {
|
|||||||
log_dir,
|
log_dir,
|
||||||
max_file_size: 5 * 1024 * 1024,
|
max_file_size: 5 * 1024 * 1024,
|
||||||
max_files: 5,
|
max_files: 5,
|
||||||
base_name: "thing".to_string(),
|
base_name: "Thing".to_string(),
|
||||||
|
write_lock: Arc::new(Mutex::new(())),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 写入一条日志
|
/// 写入一条日志(写 + 轮转在锁内串行执行)
|
||||||
pub fn log(&self, level: LogLevel, module: &str, message: &str) {
|
pub fn log(&self, level: LogLevel, module: &str, message: &str) {
|
||||||
|
let _guard = self.write_lock.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
let timestamp = Local::now().format("%Y-%m-%d %H:%M:%S").to_string();
|
let timestamp = Local::now().format("%Y-%m-%d %H:%M:%S").to_string();
|
||||||
let level_str = match level {
|
let level_str = match level {
|
||||||
LogLevel::Debug => "DEBUG",
|
LogLevel::Debug => "DEBUG",
|
||||||
@@ -114,32 +120,38 @@ impl LogManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 读取日志(支持按模块/级别过滤、条数限制)
|
/// 读取日志(支持按模块/级别过滤、条数限制)
|
||||||
|
/// 从最新文件向旧文件倒序遍历,每个文件从末尾向前读取,达到 limit 即停止,
|
||||||
|
/// 避免将全部日志读入内存后再排序截断
|
||||||
pub fn get_logs(
|
pub fn get_logs(
|
||||||
&self,
|
&self,
|
||||||
module: Option<&str>,
|
module: Option<&str>,
|
||||||
level: Option<LogLevel>,
|
level: Option<LogLevel>,
|
||||||
limit: Option<usize>,
|
limit: Option<usize>,
|
||||||
) -> Vec<LogEntry> {
|
) -> Vec<LogEntry> {
|
||||||
|
let limit = limit.unwrap_or(100);
|
||||||
|
// 与写入共用同一把锁,避免读到轮转半途/写入半行的状态
|
||||||
|
let _guard = self.write_lock.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
|
||||||
let mut entries: Vec<LogEntry> = Vec::new();
|
let mut entries: Vec<LogEntry> = Vec::new();
|
||||||
|
|
||||||
// 收集所有日志文件(包括轮转文件)
|
// 收集日志文件(最新在前:thing.log → thing.1.log → …)
|
||||||
let mut log_files: Vec<PathBuf> = Vec::new();
|
let mut paths: Vec<PathBuf> = Vec::new();
|
||||||
let current = self.log_dir.join(format!("{}.log", self.base_name));
|
let current = self.log_dir.join(format!("{}.log", self.base_name));
|
||||||
if current.exists() {
|
if current.exists() {
|
||||||
log_files.push(current);
|
paths.push(current);
|
||||||
}
|
}
|
||||||
for i in 1..=self.max_files {
|
for i in 1..=self.max_files {
|
||||||
let rotated = self
|
let rotated = self
|
||||||
.log_dir
|
.log_dir
|
||||||
.join(format!("{}.{}.log", self.base_name, i));
|
.join(format!("{}.{}.log", self.base_name, i));
|
||||||
if rotated.exists() {
|
if rotated.exists() {
|
||||||
log_files.push(rotated);
|
paths.push(rotated);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for path in &log_files {
|
'outer: for path in &paths {
|
||||||
if let Ok(file) = File::open(path) {
|
// 每文件返回最近 limit 行(从新到旧),收集满即整体停止
|
||||||
for line in BufReader::new(file).lines().flatten() {
|
for line in read_tail_lines(path, limit) {
|
||||||
if let Some(entry) = Self::parse_line(&line) {
|
if let Some(entry) = Self::parse_line(&line) {
|
||||||
if let Some(ref m) = module {
|
if let Some(ref m) = module {
|
||||||
if entry.module != *m {
|
if entry.module != *m {
|
||||||
@@ -152,18 +164,13 @@ impl LogManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
entries.push(entry);
|
entries.push(entry);
|
||||||
|
if entries.len() >= limit {
|
||||||
|
break 'outer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 按时间戳降序(最新在前)
|
|
||||||
entries.sort_by(|a, b| b.timestamp.cmp(&a.timestamp));
|
|
||||||
|
|
||||||
if let Some(n) = limit {
|
|
||||||
entries.truncate(n);
|
|
||||||
}
|
|
||||||
|
|
||||||
entries
|
entries
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,6 +219,7 @@ impl LogManager {
|
|||||||
|
|
||||||
/// 清空所有日志文件
|
/// 清空所有日志文件
|
||||||
pub fn clear_logs(&self) -> Result<(), String> {
|
pub fn clear_logs(&self) -> Result<(), String> {
|
||||||
|
let _guard = self.write_lock.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
let current = self.log_dir.join(format!("{}.log", self.base_name));
|
let current = self.log_dir.join(format!("{}.log", self.base_name));
|
||||||
fs::remove_file(¤t).map_err(|e| e.to_string())?;
|
fs::remove_file(¤t).map_err(|e| e.to_string())?;
|
||||||
for i in 1..=self.max_files {
|
for i in 1..=self.max_files {
|
||||||
@@ -259,6 +267,63 @@ impl LogManager {
|
|||||||
|
|
||||||
// ===== Tauri 命令 =====
|
// ===== Tauri 命令 =====
|
||||||
|
|
||||||
|
/// 从文件末尾向前读取日志行(返回时间从新到旧的最近 max_lines 行)。
|
||||||
|
/// 按 8KB 块向前 seek 读取并拼接跨块半行,只读取文件尾部,避免全量读入
|
||||||
|
fn read_tail_lines(path: &Path, max_lines: usize) -> Vec<String> {
|
||||||
|
let mut file = match File::open(path) {
|
||||||
|
Ok(f) => f,
|
||||||
|
Err(_) => return Vec::new(),
|
||||||
|
};
|
||||||
|
let file_len = match file.metadata() {
|
||||||
|
Ok(m) => m.len(),
|
||||||
|
Err(_) => return Vec::new(),
|
||||||
|
};
|
||||||
|
const CHUNK: u64 = 8192;
|
||||||
|
|
||||||
|
// tail 保存"当前块更靠后的半行",下一轮(更早的块)拼在其前
|
||||||
|
let mut tail = String::new();
|
||||||
|
let mut lines: Vec<String> = Vec::new();
|
||||||
|
let mut pos = file_len;
|
||||||
|
|
||||||
|
while pos > 0 && lines.len() < max_lines {
|
||||||
|
let start = pos.saturating_sub(CHUNK);
|
||||||
|
let len = (pos - start) as usize;
|
||||||
|
let mut bytes = vec![0u8; len];
|
||||||
|
if file.seek(SeekFrom::Start(start)).is_err() || file.read_exact(&mut bytes).is_err() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
pos = start;
|
||||||
|
|
||||||
|
let mut text = String::from_utf8_lossy(&bytes).into_owned();
|
||||||
|
text.push_str(&tail);
|
||||||
|
|
||||||
|
// 最后一段未以 \n 结尾 → 半行,作为下一轮 tail(与本块之前的内容拼接)
|
||||||
|
let mut parts: Vec<&str> = text.split('\n').collect();
|
||||||
|
tail = parts.pop().unwrap_or("").to_string();
|
||||||
|
|
||||||
|
// 从后往前(新到旧)取完整行
|
||||||
|
for part in parts.iter().rev() {
|
||||||
|
let trimmed = part.trim();
|
||||||
|
if !trimmed.is_empty() {
|
||||||
|
lines.push(trimmed.to_string());
|
||||||
|
if lines.len() >= max_lines {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 文件头残余(pos == 0 时 tail 里可能是文件第一行)
|
||||||
|
if pos == 0 {
|
||||||
|
let trimmed = tail.trim();
|
||||||
|
if !trimmed.is_empty() && lines.len() < max_lines {
|
||||||
|
lines.push(trimmed.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lines
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn log_message(
|
pub fn log_message(
|
||||||
state: tauri::State<'_, LogManager>,
|
state: tauri::State<'_, LogManager>,
|
||||||
@@ -278,12 +343,12 @@ pub fn log_message(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn get_logs(
|
pub async fn log_list(
|
||||||
state: tauri::State<'_, LogManager>,
|
state: tauri::State<'_, LogManager>,
|
||||||
module: Option<String>,
|
module: Option<String>,
|
||||||
level: Option<String>,
|
level: Option<String>,
|
||||||
limit: Option<usize>,
|
limit: Option<usize>,
|
||||||
) -> Vec<LogEntry> {
|
) -> Result<Vec<LogEntry>, String> {
|
||||||
let level = level.and_then(|l| match l.as_str() {
|
let level = level.and_then(|l| match l.as_str() {
|
||||||
"debug" => Some(LogLevel::Debug),
|
"debug" => Some(LogLevel::Debug),
|
||||||
"info" => Some(LogLevel::Info),
|
"info" => Some(LogLevel::Info),
|
||||||
@@ -291,15 +356,203 @@ pub fn get_logs(
|
|||||||
"error" => Some(LogLevel::Error),
|
"error" => Some(LogLevel::Error),
|
||||||
_ => None,
|
_ => None,
|
||||||
});
|
});
|
||||||
state.get_logs(module.as_deref(), level, limit)
|
// 文件读取(含 seek 尾部扫描)移出 async runtime 线程
|
||||||
|
let manager = state.inner().clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || manager.get_logs(module.as_deref(), level, limit))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取日志任务失败: {}", e))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn clear_logs(state: tauri::State<'_, LogManager>) -> Result<(), String> {
|
pub fn log_clear(state: tauri::State<'_, LogManager>) -> Result<(), String> {
|
||||||
state.clear_logs()
|
state.clear_logs()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn get_log_info(state: tauri::State<'_, LogManager>) -> LogInfo {
|
pub fn log_info_state(state: tauri::State<'_, LogManager>) -> LogInfo {
|
||||||
state.get_info()
|
state.get_info()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ===== 进程级全局日志器 =====
|
||||||
|
// 后端模块(无 AppHandle 上下文)通过 log_line 写入统一的日志文件,
|
||||||
|
// 与 Tauri 命令 log_message 共用同一 LogManager(write_lock 串行化),
|
||||||
|
// 消除 eprintln!/println! 双轨并行问题。
|
||||||
|
|
||||||
|
static GLOBAL_LOGGER: OnceLock<LogManager> = OnceLock::new();
|
||||||
|
|
||||||
|
/// 在 setup 中注册全局日志器(与 app.manage 注册的实例共享同一把 write_lock)
|
||||||
|
pub fn install_global(manager: LogManager) {
|
||||||
|
let _ = GLOBAL_LOGGER.set(manager);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 写一条后端模块日志。未注册全局日志器时回退到 stderr(如测试环境)。
|
||||||
|
pub fn log_line(module: &str, level: LogLevel, message: &str) {
|
||||||
|
match GLOBAL_LOGGER.get() {
|
||||||
|
Some(m) => m.log(level, module, message),
|
||||||
|
None => eprintln!("[{}] {}", module, message),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 便捷:INFO 级别
|
||||||
|
pub fn log_info(module: &str, message: &str) {
|
||||||
|
log_line(module, LogLevel::Info, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 便捷:WARN 级别
|
||||||
|
pub fn log_warn(module: &str, message: &str) {
|
||||||
|
log_line(module, LogLevel::Warn, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 便捷:ERROR 级别
|
||||||
|
pub fn log_error(module: &str, message: &str) {
|
||||||
|
log_line(module, LogLevel::Error, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod logger_tests {
|
||||||
|
use super::*;
|
||||||
|
use std::sync::atomic::{AtomicU32, Ordering};
|
||||||
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
|
static TEST_COUNTER: AtomicU32 = AtomicU32::new(0);
|
||||||
|
|
||||||
|
/// 创建唯一临时目录(进程内多次调用不冲突),测试结束自动清理
|
||||||
|
fn temp_dir(tag: &str) -> PathBuf {
|
||||||
|
let nanos = SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)
|
||||||
|
.unwrap()
|
||||||
|
.as_nanos();
|
||||||
|
let pid = std::process::id();
|
||||||
|
let seq = TEST_COUNTER.fetch_add(1, Ordering::SeqCst);
|
||||||
|
let dir = std::env::temp_dir().join(format!(
|
||||||
|
"thing_log_test_{}_{}_{}_{}",
|
||||||
|
tag, pid, nanos, seq
|
||||||
|
));
|
||||||
|
fs::create_dir_all(&dir).unwrap();
|
||||||
|
dir
|
||||||
|
}
|
||||||
|
|
||||||
|
struct TempGuard(PathBuf);
|
||||||
|
impl Drop for TempGuard {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let _ = fs::remove_dir_all(&self.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parse_line_roundtrip() {
|
||||||
|
let line = "[2026-08-05 10:00:00] [INFO] [downloader] 下载完成";
|
||||||
|
let entry = LogManager::parse_line(line).expect("标准行应能解析");
|
||||||
|
assert_eq!(entry.timestamp, "2026-08-05 10:00:00");
|
||||||
|
assert_eq!(entry.level, LogLevel::Info);
|
||||||
|
assert_eq!(entry.module, "downloader");
|
||||||
|
assert_eq!(entry.message, "下载完成");
|
||||||
|
|
||||||
|
// 非法行返回 None
|
||||||
|
assert!(LogManager::parse_line("not a log line").is_none());
|
||||||
|
assert!(LogManager::parse_line("").is_none());
|
||||||
|
assert!(LogManager::parse_line("[bad] [INFO] [m] msg").is_none());
|
||||||
|
assert!(LogManager::parse_line("[2026-08-05 10:00:00] [NOPE] [m] msg").is_none());
|
||||||
|
// 时间戳不做格式校验:仅按方括号切分,日期形式同样可解析
|
||||||
|
assert!(LogManager::parse_line("[2026-08-05] [INFO] [m] msg").is_some());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rotate_shifts_files_and_caps_count() {
|
||||||
|
let dir = temp_dir("rotate");
|
||||||
|
let _guard = TempGuard(dir.clone());
|
||||||
|
let mgr = LogManager::new(dir.clone());
|
||||||
|
|
||||||
|
let current = dir.join("thing.log");
|
||||||
|
fs::write(¤t, "content-0").unwrap();
|
||||||
|
mgr.rotate();
|
||||||
|
// thing.log → thing.1.log
|
||||||
|
assert!(!current.exists());
|
||||||
|
assert_eq!(
|
||||||
|
fs::read_to_string(dir.join("thing.1.log")).unwrap(),
|
||||||
|
"content-0"
|
||||||
|
);
|
||||||
|
|
||||||
|
// 第二次轮转:thing.1.log → thing.2.log,新 thing.log → thing.1.log
|
||||||
|
fs::write(¤t, "content-1").unwrap();
|
||||||
|
mgr.rotate();
|
||||||
|
assert_eq!(
|
||||||
|
fs::read_to_string(dir.join("thing.2.log")).unwrap(),
|
||||||
|
"content-0"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
fs::read_to_string(dir.join("thing.1.log")).unwrap(),
|
||||||
|
"content-1"
|
||||||
|
);
|
||||||
|
|
||||||
|
// 轮转超过 max_files(5) 后最旧文件被删除,文件数量不超上限
|
||||||
|
for i in 0..6 {
|
||||||
|
fs::write(¤t, format!("content-{}", i)).unwrap();
|
||||||
|
mgr.rotate();
|
||||||
|
}
|
||||||
|
let files: Vec<String> = fs::read_dir(&dir)
|
||||||
|
.unwrap()
|
||||||
|
.filter_map(|e| e.ok().map(|e| e.file_name().to_string_lossy().into_owned()))
|
||||||
|
.filter(|n| n.ends_with(".log"))
|
||||||
|
.collect();
|
||||||
|
assert!(files.len() <= 5, "轮转文件数量超上限: {:?}", files);
|
||||||
|
assert!(dir.join("thing.1.log").exists(), "最新的旋转文件应存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn log_writes_and_get_logs_filters() {
|
||||||
|
let dir = temp_dir("query");
|
||||||
|
let _guard = TempGuard(dir.clone());
|
||||||
|
let mgr = LogManager::new(dir.clone());
|
||||||
|
|
||||||
|
mgr.log(LogLevel::Info, "downloader", "任务开始");
|
||||||
|
mgr.log(LogLevel::Error, "downloader", "任务失败");
|
||||||
|
mgr.log(LogLevel::Info, "proxy", "节点切换");
|
||||||
|
|
||||||
|
// 全部(新到旧)
|
||||||
|
let all = mgr.get_logs(None, None, None);
|
||||||
|
assert_eq!(all.len(), 3);
|
||||||
|
assert_eq!(all[0].message, "节点切换");
|
||||||
|
assert_eq!(all[2].message, "任务开始");
|
||||||
|
|
||||||
|
// 按模块过滤
|
||||||
|
let dl = mgr.get_logs(Some("downloader"), None, None);
|
||||||
|
assert_eq!(dl.len(), 2);
|
||||||
|
assert!(dl.iter().all(|e| e.module == "downloader"));
|
||||||
|
|
||||||
|
// 按级别过滤
|
||||||
|
let errs = mgr.get_logs(None, Some(LogLevel::Error), None);
|
||||||
|
assert_eq!(errs.len(), 1);
|
||||||
|
assert_eq!(errs[0].message, "任务失败");
|
||||||
|
|
||||||
|
// 条数限制
|
||||||
|
let limited = mgr.get_logs(None, None, Some(2));
|
||||||
|
assert_eq!(limited.len(), 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn auto_rotate_triggers_on_size() {
|
||||||
|
let dir = temp_dir("auto");
|
||||||
|
let _guard = TempGuard(dir.clone());
|
||||||
|
let mgr = LogManager::new(dir.clone());
|
||||||
|
|
||||||
|
// 写满 5MB 触发自动轮转(meta.len() >= max_file_size)
|
||||||
|
let current = dir.join("thing.log");
|
||||||
|
let mut f = OpenOptions::new()
|
||||||
|
.create(true)
|
||||||
|
.append(true)
|
||||||
|
.open(¤t)
|
||||||
|
.unwrap();
|
||||||
|
let big = "x".repeat(5 * 1024 * 1024);
|
||||||
|
f.write_all(big.as_bytes()).unwrap();
|
||||||
|
drop(f);
|
||||||
|
|
||||||
|
mgr.log(LogLevel::Info, "test", "触发轮转");
|
||||||
|
assert!(dir.join("thing.1.log").exists(), "应自动轮转出 thing.1.log");
|
||||||
|
// 轮转后旧文件(5MB)被重命名为 thing.1.log,当前文件只含新追加的一行
|
||||||
|
let rotated_len = fs::metadata(dir.join("thing.1.log")).unwrap().len();
|
||||||
|
assert_eq!(rotated_len, 5 * 1024 * 1024, "轮转出的文件应保留完整旧内容");
|
||||||
|
let cur_len = fs::metadata(¤t).unwrap().len();
|
||||||
|
assert!(cur_len < 100, "轮转后的当前文件应只含新行: {}", cur_len);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,192 @@
|
|||||||
|
//! 自动切换节点:后端调度,独立于前端模块是否处于激活状态。
|
||||||
|
//! 应用启动后由 `setup.rs` 启动后台任务,按用户设置的间隔周期性测速并切换到当前最优节点,
|
||||||
|
//! 切换完成后通过 `proxy-auto-switch` 事件通知前端刷新界面。
|
||||||
|
//! 节点候选(目标组 + 地区筛选 + 伪节点过滤)与择优逻辑对前端、后台调度、托盘三处保持一致。
|
||||||
|
|
||||||
|
use futures_util::future::join_all;
|
||||||
|
use serde_json::{Map, Value};
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
use tauri::{AppHandle, Emitter, Manager, State};
|
||||||
|
|
||||||
|
use super::{MihomoManager, ProxySettings};
|
||||||
|
use crate::constants::events::PROXY_AUTO_SWITCH;
|
||||||
|
use crate::process_manager::{ProcessManager, ProcessStatus};
|
||||||
|
|
||||||
|
/// 测速目标(同前端/托盘),用于判断节点可用性
|
||||||
|
const TEST_URL: &str = "http://www.gstatic.com/generate_204";
|
||||||
|
/// 单节点测速超时(毫秒)
|
||||||
|
const TEST_TIMEOUT: u32 = 5000;
|
||||||
|
/// 调度轮询粒度(秒)
|
||||||
|
const CHECK_INTERVAL: u64 = 30;
|
||||||
|
|
||||||
|
/// 后端启动自动切换调度任务(幂等,可安全多次调用)。
|
||||||
|
/// 仅在用户开启「自动切换节点」且 mihomo 运行时才会真正执行测速与切换。
|
||||||
|
pub fn start_auto_switch_loop(app: AppHandle) {
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
let mut last_run: Option<Instant> = None;
|
||||||
|
loop {
|
||||||
|
tokio::time::sleep(Duration::from_secs(CHECK_INTERVAL)).await;
|
||||||
|
|
||||||
|
let enabled = app
|
||||||
|
.try_state::<MihomoManager>()
|
||||||
|
.map(|m: State<'_, MihomoManager>| m.load_settings().auto_switch_enabled)
|
||||||
|
.unwrap_or(false);
|
||||||
|
if !enabled {
|
||||||
|
last_run = None;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
let interval_secs = app
|
||||||
|
.try_state::<MihomoManager>()
|
||||||
|
.map(|m: State<'_, MihomoManager>| m.load_settings().auto_switch_interval.max(1) as u64)
|
||||||
|
.unwrap_or(5)
|
||||||
|
* 60;
|
||||||
|
|
||||||
|
let due = match last_run {
|
||||||
|
Some(t) => t.elapsed().as_secs() >= interval_secs,
|
||||||
|
None => true,
|
||||||
|
};
|
||||||
|
if !due {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some((group, name, delay)) = perform_auto_switch(&app).await {
|
||||||
|
let _ = app.emit(
|
||||||
|
PROXY_AUTO_SWITCH,
|
||||||
|
serde_json::json!({
|
||||||
|
"switched": true,
|
||||||
|
"group": group,
|
||||||
|
"name": name,
|
||||||
|
"delay": delay,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
last_run = Some(Instant::now());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 执行一次自动切换:若当前不是最优节点则切换并返回 `(组名, 节点名, 延迟)`,否则返回 `None`。
|
||||||
|
/// 供后台调度任务使用(模块内私有)。
|
||||||
|
async fn perform_auto_switch(app: &AppHandle) -> Option<(String, String, u32)> {
|
||||||
|
let mihomo = app.state::<MihomoManager>();
|
||||||
|
let pm = app.state::<ProcessManager>();
|
||||||
|
|
||||||
|
// 仅在 mihomo 运行时执行
|
||||||
|
let running = matches!(
|
||||||
|
pm.get_status("proxy").map(|p| p.status),
|
||||||
|
Some(ProcessStatus::Running)
|
||||||
|
);
|
||||||
|
if !running {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let settings = mihomo.load_settings();
|
||||||
|
if !settings.auto_switch_enabled {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let (group, name, delay, now) = pick_best(&mihomo, &settings).await.ok()??;
|
||||||
|
|
||||||
|
if name != now && mihomo.select_proxy(&group, &name).await.is_ok() {
|
||||||
|
return Some((group, name, delay));
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按自动切换设置确定候选组与地区,并发测速并返回当前最优节点(不执行切换)。
|
||||||
|
/// `Some((组名, 最优节点, 延迟, 当前节点))`;无候选或全部超时返回 `Ok(None)`。
|
||||||
|
/// 当自动切换关闭时自动切换目标组为空、地区为空,故退化为「主组 + 全部节点」全量择优,
|
||||||
|
/// 托盘「开启代理」与调度任务复用此函数保证行为一致。
|
||||||
|
pub async fn pick_best(
|
||||||
|
mihomo: &MihomoManager,
|
||||||
|
settings: &ProxySettings,
|
||||||
|
) -> Result<Option<(String, String, u32, String)>, String> {
|
||||||
|
let proxies = mihomo.get_proxies().await?;
|
||||||
|
let map = proxies
|
||||||
|
.get("proxies")
|
||||||
|
.and_then(|v| v.as_object())
|
||||||
|
.cloned()
|
||||||
|
.ok_or_else(|| "无法解析代理数据".to_string())?;
|
||||||
|
|
||||||
|
let group_name = if !settings.auto_switch_group.is_empty() {
|
||||||
|
settings.auto_switch_group.clone()
|
||||||
|
} else {
|
||||||
|
match main_selector_group(&map) {
|
||||||
|
Some(g) => g,
|
||||||
|
None => return Ok(None),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let group = match map.get(&group_name) {
|
||||||
|
Some(g) => g,
|
||||||
|
None => return Ok(None),
|
||||||
|
};
|
||||||
|
let now = group
|
||||||
|
.get("now")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("")
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
let mut nodes: Vec<String> = group
|
||||||
|
.get("all")
|
||||||
|
.and_then(|v| v.as_array())
|
||||||
|
.map(|arr| arr.iter().filter_map(|n| n.as_str().map(|s| s.to_string())).collect())
|
||||||
|
.unwrap_or_default();
|
||||||
|
if nodes.is_empty() {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 过滤伪节点(DIRECT、REJECT、流量、套餐等)
|
||||||
|
nodes.retain(|n| !super::is_pseudo_node(n));
|
||||||
|
// 地区筛选
|
||||||
|
if !settings.auto_switch_region.is_empty() {
|
||||||
|
let region = settings.auto_switch_region.clone();
|
||||||
|
nodes.retain(|n| extract_region(n) == region);
|
||||||
|
}
|
||||||
|
if nodes.is_empty() {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 并发测速
|
||||||
|
let futures = nodes.iter().map(|name| async move {
|
||||||
|
let d = mihomo.test_delay(name, TEST_URL, TEST_TIMEOUT).await.ok();
|
||||||
|
(name.clone(), d)
|
||||||
|
}).collect::<Vec<_>>();
|
||||||
|
let results = join_all(futures).await;
|
||||||
|
let best = results
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|(n, d)| d.filter(|x| *x > 0).map(|x| (n, x)))
|
||||||
|
.min_by_key(|(_, d)| *d);
|
||||||
|
|
||||||
|
Ok(best.map(|(name, delay)| (group_name, name, delay, now)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 主选择分组:选取名为 PROXY/Proxy/节点选择/代理 的 Selector 组;找不到时回退到第一个 Selector 组
|
||||||
|
fn main_selector_group(map: &Map<String, Value>) -> Option<String> {
|
||||||
|
let mut preferred: Option<String> = None;
|
||||||
|
let mut first_selector: Option<String> = None;
|
||||||
|
for (name, val) in map {
|
||||||
|
let kind = val.get("type").and_then(|v| v.as_str()).unwrap_or("");
|
||||||
|
if kind != "Selector" {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if first_selector.is_none() {
|
||||||
|
first_selector = Some(name.clone());
|
||||||
|
}
|
||||||
|
if preferred.is_none() && ["PROXY", "Proxy", "节点选择", "代理"].contains(&name.as_str()) {
|
||||||
|
preferred = Some(name.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
preferred.or(first_selector)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 提取节点地区(与前端 extractRegion 保持一致):取名称中第一个数字/符号分隔符之前的文本
|
||||||
|
fn extract_region(name: &str) -> String {
|
||||||
|
for (idx, ch) in name.char_indices() {
|
||||||
|
if ch.is_ascii_digit() || matches!(ch, '|' | '-' | '-' | '—' | '(' | '(' | '【') {
|
||||||
|
return name[..idx].trim().to_string();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
name.trim().to_string()
|
||||||
|
}
|
||||||
@@ -0,0 +1,340 @@
|
|||||||
|
//! 代理模块 Tauri 命令层。
|
||||||
|
|
||||||
|
use tauri::{AppHandle, State};
|
||||||
|
|
||||||
|
use super::system_proxy::{clear_system_proxy_windows, get_system_proxy_windows, set_system_proxy_windows};
|
||||||
|
use super::{
|
||||||
|
KernelInfo, KernelUpdateInfo, MihomoManager, ProfileMeta, ProxySettings, ProxyStatus, TrafficSnapshot,
|
||||||
|
};
|
||||||
|
|
||||||
|
use crate::process_manager::{ProcessInfo, ProcessManager, ProcessStatus};
|
||||||
|
|
||||||
|
/// 判断 mihomo 进程是否处于运行状态
|
||||||
|
fn mihomo_running(pm: &ProcessManager) -> bool {
|
||||||
|
matches!(
|
||||||
|
pm.get_status("proxy").map(|p| p.status),
|
||||||
|
Some(ProcessStatus::Running)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_get_settings(state: State<'_, MihomoManager>) -> ProxySettings {
|
||||||
|
state.load_settings()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_save_settings(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
settings: ProxySettings,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
state.save_settings(&settings)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_kernel_info(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
app: AppHandle,
|
||||||
|
) -> Result<KernelInfo, String> {
|
||||||
|
state.prepare_kernel(&app)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn proxy_check_kernel_update(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
) -> Result<KernelUpdateInfo, String> {
|
||||||
|
state.check_kernel_update().await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 取消内核下载/安装(设置取消标志,下载循环轮询后中止)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_cancel_kernel_install(state: State<'_, MihomoManager>) -> Result<(), String> {
|
||||||
|
state.cancel_kernel_install();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 前端确认 mihomo 已停止,唤醒等待中的安装流程继续解压替换。
|
||||||
|
/// (下载阶段允许 mihomo 运行以便走系统代理,解压替换前必须停止 mihomo,否则 exe 被占用)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_confirm_install(state: State<'_, MihomoManager>) -> Result<(), String> {
|
||||||
|
state.confirm_install();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用内核更新:下载阶段已由下载模块完成,本方法仅做 need_stop → 解压 → 替换。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn proxy_apply_kernel_update(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
app: AppHandle,
|
||||||
|
zip_path: String,
|
||||||
|
) -> Result<KernelInfo, String> {
|
||||||
|
let path = std::path::PathBuf::from(zip_path);
|
||||||
|
state.apply_kernel_update(&app, path).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_status(pm: State<'_, ProcessManager>) -> ProxyStatus {
|
||||||
|
match pm.get_status("proxy") {
|
||||||
|
Some(p) => ProxyStatus {
|
||||||
|
running: matches!(p.status, crate::process_manager::ProcessStatus::Running),
|
||||||
|
pid: p.pid,
|
||||||
|
restart_count: p.restart_count,
|
||||||
|
},
|
||||||
|
None => ProxyStatus {
|
||||||
|
running: false,
|
||||||
|
pid: None,
|
||||||
|
restart_count: 0,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_start(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
pm: State<'_, ProcessManager>,
|
||||||
|
app: AppHandle,
|
||||||
|
) -> Result<ProcessInfo, String> {
|
||||||
|
let params = state.prepare_for_start(&app)?;
|
||||||
|
let info = pm.start(params)?;
|
||||||
|
// 手动启动也遵循「启动时自动开启系统代理」设置
|
||||||
|
state.apply_auto_system_proxy();
|
||||||
|
Ok(info)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_stop(state: State<'_, MihomoManager>, pm: State<'_, ProcessManager>) -> Result<(), String> {
|
||||||
|
// 关闭 mihomo 时同步关闭系统代理(若开启),避免系统代理指向已停止的端口导致断网
|
||||||
|
if get_system_proxy_windows() {
|
||||||
|
let _ = state.disable_system_proxy();
|
||||||
|
}
|
||||||
|
pm.stop("proxy")
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn proxy_restart(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
pm: State<'_, ProcessManager>,
|
||||||
|
app: AppHandle,
|
||||||
|
) -> Result<ProcessInfo, String> {
|
||||||
|
let _ = pm.stop("proxy");
|
||||||
|
// 等待 TCP 端口释放(Windows 上 kill 后端口释放有延迟),在阻塞线程池中 sleep 避免阻塞主线程
|
||||||
|
tauri::async_runtime::spawn_blocking(|| {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(800));
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("sleep 失败: {}", e))?;
|
||||||
|
|
||||||
|
// 启动并等待 API 就绪,带有限重试(共 3 次):
|
||||||
|
// - 冷加载大订阅(首次解析 + geo 下载)可能远超过前端 waitForApi 的 10s 预算,
|
||||||
|
// 这里在命令内等满就绪,避免重启成功后仍被前端误判为「重启失败」导致节点不刷新。
|
||||||
|
// - 偶发的端口未及时释放 / 启动瞬间退出,通过重试自愈。
|
||||||
|
let mut last_err = "mihomo 启动失败".to_string();
|
||||||
|
for _ in 0..3 {
|
||||||
|
match start_and_wait(state.inner(), pm.inner(), &app).await {
|
||||||
|
Ok(info) => return Ok(info),
|
||||||
|
Err(e) => {
|
||||||
|
last_err = e;
|
||||||
|
// 上个实例刚退出,多等一会儿释放端口再重试
|
||||||
|
tauri::async_runtime::spawn_blocking(|| {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(1200));
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|x| format!("sleep 失败: {}", x))?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 所有启动尝试均失败:mihomo 已停止,同步关闭系统代理(若开启),避免代理指向已停止端口导致断网
|
||||||
|
if get_system_proxy_windows() {
|
||||||
|
let _ = state.disable_system_proxy();
|
||||||
|
}
|
||||||
|
Err(last_err)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 启动 mihomo 并等待其 HTTP API 就绪(最多 20s)。
|
||||||
|
/// - 若启动后进程立即退出,快速返回(不白等满预算),便于外层尽早重试。
|
||||||
|
/// - 若 pm.start 返回「已在运行中」,说明崩溃监控已抢先拉起进程,同样等待其 API 就绪即可。
|
||||||
|
async fn start_and_wait(
|
||||||
|
state: &MihomoManager,
|
||||||
|
pm: &ProcessManager,
|
||||||
|
app: &AppHandle,
|
||||||
|
) -> Result<ProcessInfo, String> {
|
||||||
|
let params = state.prepare_for_start(app)?;
|
||||||
|
if let Err(e) = pm.start(params) {
|
||||||
|
// "已在运行中" = 崩溃监控已拉起,不算失败;其余为上抛
|
||||||
|
if !e.contains("运行中") {
|
||||||
|
return Err(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let deadline = tokio::time::Instant::now() + std::time::Duration::from_secs(20);
|
||||||
|
loop {
|
||||||
|
// 进程已退出且 API 未就绪 → 启动失败(快速失败,交外层重试)
|
||||||
|
if let Some(st) = pm.get_status("proxy") {
|
||||||
|
if !matches!(st.status, ProcessStatus::Running) {
|
||||||
|
return Err("mihomo 启动后立即退出".to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if state.get_version().await.is_ok() {
|
||||||
|
return pm.get_status("proxy").ok_or_else(|| "mihomo 进程不存在".to_string());
|
||||||
|
}
|
||||||
|
if tokio::time::Instant::now() >= deadline {
|
||||||
|
return Err("mihomo 启动超时,API 无响应".to_string());
|
||||||
|
}
|
||||||
|
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn proxy_version(state: State<'_, MihomoManager>) -> Result<serde_json::Value, String> {
|
||||||
|
state.get_version().await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn proxy_get_proxies(state: State<'_, MihomoManager>) -> Result<serde_json::Value, String> {
|
||||||
|
state.get_proxies().await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn proxy_select_proxy(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
group: String,
|
||||||
|
name: String,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
state.select_proxy(&group, &name).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn proxy_test_delay(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
name: String,
|
||||||
|
url: Option<String>,
|
||||||
|
timeout: Option<u32>,
|
||||||
|
) -> Result<u32, String> {
|
||||||
|
state
|
||||||
|
.test_delay(
|
||||||
|
&name,
|
||||||
|
url.as_deref().unwrap_or("https://www.gstatic.com/generate_204"),
|
||||||
|
timeout.unwrap_or(5000),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn proxy_get_connections(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
) -> Result<serde_json::Value, String> {
|
||||||
|
state.get_connections().await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn proxy_traffic(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
) -> Result<TrafficSnapshot, String> {
|
||||||
|
state.traffic_snapshot().await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn proxy_close_connection(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
id: String,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
state.close_connection(&id).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn proxy_patch_configs(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
body: serde_json::Value,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
state.patch_configs(body).await
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- 订阅 ----------
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn proxy_import_profile(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
url: String,
|
||||||
|
name: String,
|
||||||
|
) -> Result<ProfileMeta, String> {
|
||||||
|
state.import_profile(&url, &name).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn proxy_update_profile(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
id: String,
|
||||||
|
) -> Result<ProfileMeta, String> {
|
||||||
|
state.update_profile(&id).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_delete_profile(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
id: String,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
state.delete_profile(&id)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_activate_profile(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
id: String,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
state.activate_profile(&id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- 系统代理 ----------
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_set_system_proxy(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
pm: State<'_, ProcessManager>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
// 停机时禁止开启系统代理:否则系统代理指向已停止的端口,会导致所有网络请求失败
|
||||||
|
if !mihomo_running(&pm) {
|
||||||
|
return Err("mihomo 未运行,无法开启系统代理".into());
|
||||||
|
}
|
||||||
|
let settings = state.load_settings();
|
||||||
|
let addr = format!("127.0.0.1:{}", settings.mixed_port);
|
||||||
|
set_system_proxy_windows(&addr)?;
|
||||||
|
let mut settings = settings;
|
||||||
|
settings.system_proxy = true;
|
||||||
|
state.save_settings(&settings)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_clear_system_proxy(
|
||||||
|
state: State<'_, MihomoManager>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
clear_system_proxy_windows()?;
|
||||||
|
let mut settings = state.load_settings();
|
||||||
|
settings.system_proxy = false;
|
||||||
|
state.save_settings(&settings)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn proxy_get_system_proxy() -> bool {
|
||||||
|
get_system_proxy_windows()
|
||||||
|
}
|
||||||
@@ -0,0 +1,406 @@
|
|||||||
|
//! 内核(mihomo.exe)安装 / 更新 / 版本查询。
|
||||||
|
//! 子模块通过 `impl super::MihomoManager` 为管理器追加方法,可访问父模块私有字段。
|
||||||
|
|
||||||
|
use std::fs;
|
||||||
|
use std::io::{Read, Write};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::atomic::Ordering;
|
||||||
|
use tauri::{AppHandle, Emitter, Manager};
|
||||||
|
|
||||||
|
use crate::constants::events::KERNEL_INSTALL_PROGRESS;
|
||||||
|
use super::{InstallProgress, KernelInfo, KernelUpdateInfo, MihomoManager};
|
||||||
|
|
||||||
|
/// 用户主动取消下载的标记错误信息(前端据此静默处理,不弹错误 toast)
|
||||||
|
const KERNEL_CANCELLED: &str = "下载已取消";
|
||||||
|
|
||||||
|
impl MihomoManager {
|
||||||
|
// ---------- 内核 ----------
|
||||||
|
pub fn kernel_info(&self) -> KernelInfo {
|
||||||
|
let path = self.kernel_path();
|
||||||
|
let exists = path.exists();
|
||||||
|
let version = if exists {
|
||||||
|
let mut cmd = std::process::Command::new(&path);
|
||||||
|
cmd.arg("-v");
|
||||||
|
// 隐藏控制台窗口(mihomo.exe -v 也会弹窗)
|
||||||
|
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||||
|
// 重定向 stdio,避免继承主进程控制台
|
||||||
|
cmd.stdout(std::process::Stdio::piped())
|
||||||
|
.stderr(std::process::Stdio::null())
|
||||||
|
.stdin(std::process::Stdio::null());
|
||||||
|
cmd.output()
|
||||||
|
.ok()
|
||||||
|
.and_then(|o| String::from_utf8(o.stdout).ok())
|
||||||
|
.and_then(|s| {
|
||||||
|
s.lines()
|
||||||
|
.find(|l| l.contains("Mihomo Meta") || l.contains("mihomo"))
|
||||||
|
.map(|l| l.trim().to_string())
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
KernelInfo {
|
||||||
|
path: path.to_string_lossy().to_string(),
|
||||||
|
exists,
|
||||||
|
version,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 确保内核就位:若 cores/ 无内核,尝试从 resource 目录复制
|
||||||
|
pub fn prepare_kernel(&self, app: &AppHandle) -> Result<KernelInfo, String> {
|
||||||
|
let kernel = self.kernel_path();
|
||||||
|
if !kernel.exists() {
|
||||||
|
if let Ok(res) = app.path().resolve("binaries/mihomo.exe", tauri::path::BaseDirectory::Resource) {
|
||||||
|
if res.exists() {
|
||||||
|
fs::copy(&res, &kernel).map_err(|e| format!("复制内核失败: {}", e))?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(self.kernel_info())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 检查 GitHub 上的最新 mihomo 版本
|
||||||
|
/// 策略:优先用 API(能拿到完整资产列表,命名变化时更健壮),
|
||||||
|
/// 失败时回退到重定向解析(不受 API rate limit 限制)
|
||||||
|
pub async fn check_kernel_update(&self) -> Result<KernelUpdateInfo, String> {
|
||||||
|
match self.fetch_latest_via_api().await {
|
||||||
|
Ok(info) => Ok(info),
|
||||||
|
Err(api_err) => {
|
||||||
|
crate::logger::log_warn("mihomo", &format!("API 查询失败,回退到重定向解析: {}", api_err));
|
||||||
|
self.fetch_latest_via_redirect().await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 通过 GitHub API 查询最新版本(受 rate limit 限制:未认证 60次/小时/IP)
|
||||||
|
async fn fetch_latest_via_api(&self) -> Result<KernelUpdateInfo, String> {
|
||||||
|
let resp = self
|
||||||
|
.client
|
||||||
|
.get("https://api.github.com/repos/MetaCubeX/mihomo/releases/latest")
|
||||||
|
.header("User-Agent", "thing-app")
|
||||||
|
.timeout(std::time::Duration::from_secs(15))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("请求 GitHub API 失败: {}", e))?;
|
||||||
|
let status = resp.status();
|
||||||
|
if !status.is_success() {
|
||||||
|
let body = resp.text().await.unwrap_or_default();
|
||||||
|
// 按字符边界截断,避免切在多字节字符中间导致 panic
|
||||||
|
let preview: String = body.chars().take(300).collect();
|
||||||
|
return Err(format!(
|
||||||
|
"GitHub API 返回 HTTP {}:{}{}",
|
||||||
|
status.as_u16(),
|
||||||
|
preview,
|
||||||
|
if body.chars().count() > 300 { "..." } else { "" }
|
||||||
|
));
|
||||||
|
}
|
||||||
|
let resp: serde_json::Value = resp
|
||||||
|
.json()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("解析 GitHub 响应失败: {}", e))?;
|
||||||
|
|
||||||
|
let latest_version = resp
|
||||||
|
.get("tag_name")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("unknown")
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
let assets_arr = resp.get("assets").and_then(|a| a.as_array());
|
||||||
|
|
||||||
|
// 收集所有 windows amd64 zip 候选资产(排除 compatible/arm64/386)
|
||||||
|
let candidates: Vec<(String, String)> = assets_arr
|
||||||
|
.map(|assets| {
|
||||||
|
assets.iter().filter_map(|asset| {
|
||||||
|
let name = asset.get("name")?.as_str()?;
|
||||||
|
let url = asset.get("browser_download_url")?.as_str()?;
|
||||||
|
if name.starts_with("mihomo-windows-amd64-")
|
||||||
|
&& name.ends_with(".zip")
|
||||||
|
&& !name.contains("compatible")
|
||||||
|
&& !name.contains("arm64")
|
||||||
|
&& !name.contains("386")
|
||||||
|
{
|
||||||
|
Some((name.to_string(), url.to_string()))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}).collect()
|
||||||
|
})
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
// 按优先级匹配:v3 标准 > v3-go124 > v3-go123 > v3 其他 > v2 > v1 > 旧命名
|
||||||
|
let download_url = candidates
|
||||||
|
.iter().find(|(n, _)| n.contains("-v3-v") && !n.contains("-go"))
|
||||||
|
.or_else(|| candidates.iter().find(|(n, _)| n.contains("-v3-go124-")))
|
||||||
|
.or_else(|| candidates.iter().find(|(n, _)| n.contains("-v3-go123-")))
|
||||||
|
.or_else(|| candidates.iter().find(|(n, _)| n.contains("-v3-go")))
|
||||||
|
.or_else(|| candidates.iter().find(|(n, _)| n.contains("-v2-v")))
|
||||||
|
.or_else(|| candidates.iter().find(|(n, _)| n.contains("-v1-v")))
|
||||||
|
.or_else(|| candidates.iter().find(|(n, _)| {
|
||||||
|
!n.contains("-v1-") && !n.contains("-v2-") && !n.contains("-v3-")
|
||||||
|
}))
|
||||||
|
.map(|(_, u)| u.clone())
|
||||||
|
.ok_or_else(|| {
|
||||||
|
let candidates_str = candidates.iter()
|
||||||
|
.map(|(n, _)| n.as_str())
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(", ");
|
||||||
|
format!("API 未找到适用的 Windows amd64 内核资产。候选:[{}]", candidates_str)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(self.build_update_info(latest_version, download_url))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 通过 releases/latest 重定向解析版本号(不受 API rate limit 限制)
|
||||||
|
/// 访问 https://github.com/MetaCubeX/mihomo/releases/latest 会 302 到
|
||||||
|
/// https://github.com/MetaCubeX/mihomo/releases/tag/v1.19.13
|
||||||
|
/// 从最终 URL 提取版本号后,按 v1.19+ 稳定命名规则构造下载 URL
|
||||||
|
async fn fetch_latest_via_redirect(&self) -> Result<KernelUpdateInfo, String> {
|
||||||
|
let resp = self
|
||||||
|
.client
|
||||||
|
.get("https://github.com/MetaCubeX/mihomo/releases/latest")
|
||||||
|
.header("User-Agent", "thing-app")
|
||||||
|
.timeout(std::time::Duration::from_secs(15))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("请求 GitHub releases 页面失败: {}", e))?;
|
||||||
|
|
||||||
|
// 从重定向后的最终 URL 提取版本号
|
||||||
|
let final_url = resp.url().to_string();
|
||||||
|
let latest_version = final_url
|
||||||
|
.rsplit('/')
|
||||||
|
.next()
|
||||||
|
.filter(|s| s.starts_with('v') && s.chars().any(|c| c == '.'))
|
||||||
|
.ok_or_else(|| format!("无法从重定向 URL 提取版本号: {}", final_url))?
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
// 构造下载 URL:mihomo v1.19+ 稳定使用 -v3-vX.X.X.zip 命名(CPU level v3)
|
||||||
|
let download_url = format!(
|
||||||
|
"https://github.com/MetaCubeX/mihomo/releases/download/{}/mihomo-windows-amd64-v3-{}.zip",
|
||||||
|
latest_version, latest_version
|
||||||
|
);
|
||||||
|
|
||||||
|
crate::logger::log_info(
|
||||||
|
"mihomo",
|
||||||
|
&format!("重定向解析成功: version={}, url={}", latest_version, download_url),
|
||||||
|
);
|
||||||
|
Ok(self.build_update_info(latest_version, download_url))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 根据最新版本和下载 URL 构造更新信息(含当前版本比较)
|
||||||
|
fn build_update_info(&self, latest_version: String, download_url: String) -> KernelUpdateInfo {
|
||||||
|
let current = self.kernel_info().version;
|
||||||
|
let has_update = match ¤t {
|
||||||
|
Some(c) => {
|
||||||
|
let cur_ver = c
|
||||||
|
.split_whitespace()
|
||||||
|
.find(|s| s.starts_with('v') && s.chars().filter(|c| *c == '.').count() >= 2)
|
||||||
|
.unwrap_or("");
|
||||||
|
cur_ver != latest_version && !latest_version.is_empty()
|
||||||
|
}
|
||||||
|
None => true,
|
||||||
|
};
|
||||||
|
KernelUpdateInfo {
|
||||||
|
current_version: current,
|
||||||
|
latest_version,
|
||||||
|
download_url,
|
||||||
|
has_update,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用内核更新:下载阶段已由下载模块完成,本方法仅做 need_stop → 解压 → 替换。
|
||||||
|
/// zip_path: 下载模块下载完成的 zip 文件路径。
|
||||||
|
/// 任何阶段失败都会 emit error 事件,避免前端进度卡住。
|
||||||
|
pub async fn apply_kernel_update(&self, app: &AppHandle, zip_path: PathBuf) -> Result<KernelInfo, String> {
|
||||||
|
self.kernel_cancel.store(false, Ordering::SeqCst);
|
||||||
|
let _ = self.kernel_cancel_tx.send(false);
|
||||||
|
let result = self.apply_kernel_inner(app, zip_path).await;
|
||||||
|
if let Err(ref e) = result {
|
||||||
|
if e != KERNEL_CANCELLED {
|
||||||
|
let _ = app.emit(
|
||||||
|
KERNEL_INSTALL_PROGRESS,
|
||||||
|
InstallProgress {
|
||||||
|
stage: "error".into(),
|
||||||
|
percent: 0,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: e.clone(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.kernel_cancel.store(false, Ordering::SeqCst);
|
||||||
|
let _ = self.kernel_cancel_tx.send(false);
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn apply_kernel_inner(&self, app: &AppHandle, zip_path: PathBuf) -> Result<KernelInfo, String> {
|
||||||
|
let extract_dir = self.cores_dir().join("mihomo-update-tmp");
|
||||||
|
|
||||||
|
// 检查 zip 文件是否存在
|
||||||
|
if !zip_path.exists() {
|
||||||
|
return Err(format!("下载文件不存在: {}", zip_path.display()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解压替换前需要等待前端确认 mihomo 已停止(否则 exe 文件被占用)
|
||||||
|
if self.kernel_cancel.load(Ordering::SeqCst) {
|
||||||
|
return Err(KERNEL_CANCELLED.to_string());
|
||||||
|
}
|
||||||
|
let _ = app.emit(
|
||||||
|
KERNEL_INSTALL_PROGRESS,
|
||||||
|
InstallProgress {
|
||||||
|
stage: "need_stop".into(),
|
||||||
|
percent: 90,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: "需要停止 mihomo 才能继续安装".into(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
// 创建 oneshot 通道等待前端确认
|
||||||
|
let (tx, mut rx) = tokio::sync::oneshot::channel::<()>();
|
||||||
|
*self.install_confirm.lock().unwrap() = Some(tx);
|
||||||
|
let mut cancel_rx = self.kernel_cancel_tx.subscribe();
|
||||||
|
loop {
|
||||||
|
if self.kernel_cancel.load(Ordering::SeqCst) {
|
||||||
|
*self.install_confirm.lock().unwrap() = None;
|
||||||
|
return Err(KERNEL_CANCELLED.to_string());
|
||||||
|
}
|
||||||
|
tokio::select! {
|
||||||
|
_ = &mut rx => break,
|
||||||
|
_ = cancel_rx.changed() => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解压阶段
|
||||||
|
let _ = app.emit(
|
||||||
|
KERNEL_INSTALL_PROGRESS,
|
||||||
|
InstallProgress {
|
||||||
|
stage: "extracting".into(),
|
||||||
|
percent: 92,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: "正在解压...".into(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
if extract_dir.exists() {
|
||||||
|
fs::remove_dir_all(&extract_dir).ok();
|
||||||
|
}
|
||||||
|
fs::create_dir_all(&extract_dir).map_err(|e| e.to_string())?;
|
||||||
|
if let Err(e) = self.extract_zip(&zip_path, &extract_dir) {
|
||||||
|
let _ = app.emit(
|
||||||
|
KERNEL_INSTALL_PROGRESS,
|
||||||
|
InstallProgress {
|
||||||
|
stage: "error".into(),
|
||||||
|
percent: 0,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: format!("解压失败:{}", e),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return Err(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 在解压目录中递归查找 exe 文件
|
||||||
|
let new_exe = self
|
||||||
|
.find_exe_in_dir(&extract_dir)
|
||||||
|
.ok_or_else(|| "解压后未找到任何 .exe 文件".to_string())?;
|
||||||
|
|
||||||
|
// 替换阶段
|
||||||
|
let _ = app.emit(
|
||||||
|
KERNEL_INSTALL_PROGRESS,
|
||||||
|
InstallProgress {
|
||||||
|
stage: "replacing".into(),
|
||||||
|
percent: 96,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: "正在替换内核...".into(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let kernel = self.kernel_path();
|
||||||
|
if kernel.exists() {
|
||||||
|
let bak = self.cores_dir().join("mihomo.exe.bak");
|
||||||
|
fs::remove_file(&bak).ok();
|
||||||
|
fs::rename(&kernel, &bak).map_err(|e| format!("备份旧内核失败: {}", e))?;
|
||||||
|
}
|
||||||
|
fs::rename(&new_exe, &kernel).map_err(|e| format!("替换内核失败: {}", e))?;
|
||||||
|
|
||||||
|
// 清理临时文件
|
||||||
|
fs::remove_file(&zip_path).ok();
|
||||||
|
fs::remove_dir_all(&extract_dir).ok();
|
||||||
|
|
||||||
|
let final_info = self.kernel_info();
|
||||||
|
let _ = app.emit(
|
||||||
|
KERNEL_INSTALL_PROGRESS,
|
||||||
|
InstallProgress {
|
||||||
|
stage: "done".into(),
|
||||||
|
percent: 100,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: format!(
|
||||||
|
"安装完成 ({})",
|
||||||
|
final_info.version.as_deref().unwrap_or("unknown")
|
||||||
|
),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
Ok(final_info)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 用 zip crate 解压(纯 Rust,避免 PowerShell 执行策略问题)
|
||||||
|
fn extract_zip(&self, zip_path: &PathBuf, dest: &PathBuf) -> Result<(), String> {
|
||||||
|
let file = fs::File::open(zip_path).map_err(|e| format!("打开 zip 失败: {}", e))?;
|
||||||
|
let mut archive = zip::ZipArchive::new(file).map_err(|e| format!("读取 zip 失败: {}", e))?;
|
||||||
|
for i in 0..archive.len() {
|
||||||
|
let mut entry = archive
|
||||||
|
.by_index(i)
|
||||||
|
.map_err(|e| format!("读取条目失败: {}", e))?;
|
||||||
|
let outpath = match entry.enclosed_name() {
|
||||||
|
Some(p) => dest.join(p),
|
||||||
|
None => continue,
|
||||||
|
};
|
||||||
|
if entry.is_dir() {
|
||||||
|
fs::create_dir_all(&outpath).map_err(|e| e.to_string())?;
|
||||||
|
} else {
|
||||||
|
if let Some(parent) = outpath.parent() {
|
||||||
|
fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
let mut outfile = fs::File::create(&outpath).map_err(|e| e.to_string())?;
|
||||||
|
let mut buf = [0u8; 8192];
|
||||||
|
loop {
|
||||||
|
let n = entry.read(&mut buf).map_err(|e| e.to_string())?;
|
||||||
|
if n == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
outfile.write_all(&buf[..n]).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 递归查找目录中的 .exe 文件
|
||||||
|
/// mihomo zip 内的 exe 名字不固定(可能含版本号、CPU level 等),
|
||||||
|
/// 策略:收集所有 .exe,优先返回名字含 "mihomo" 的,否则返回第一个
|
||||||
|
fn find_exe_in_dir(&self, dir: &PathBuf) -> Option<PathBuf> {
|
||||||
|
let mut exes: Vec<PathBuf> = Vec::new();
|
||||||
|
self.collect_exes(dir, &mut exes);
|
||||||
|
if exes.is_empty() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
// 优先选名字含 mihomo 的
|
||||||
|
exes.iter()
|
||||||
|
.find(|p| p.file_name().and_then(|n| n.to_str()).map(|s| s.to_lowercase().contains("mihomo")).unwrap_or(false))
|
||||||
|
.or_else(|| exes.first())
|
||||||
|
.cloned()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn collect_exes(&self, dir: &PathBuf, out: &mut Vec<PathBuf>) {
|
||||||
|
if let Ok(entries) = fs::read_dir(dir) {
|
||||||
|
for entry in entries.flatten() {
|
||||||
|
let path = entry.path();
|
||||||
|
if path.is_dir() {
|
||||||
|
self.collect_exes(&path, out);
|
||||||
|
} else if path.extension().and_then(|e| e.to_str()).map(|s| s.eq_ignore_ascii_case("exe")).unwrap_or(false) {
|
||||||
|
out.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,538 @@
|
|||||||
|
//! 代理模块(mihomo 管理器):按功能域拆分子模块。
|
||||||
|
//!
|
||||||
|
//! - [`MihomoManager`]:核心状态与目录/设置/配置/API 方法
|
||||||
|
//! - [`kernel`]:内核安装与更新
|
||||||
|
//! - [`profiles`]:订阅管理
|
||||||
|
//! - [`system_proxy`]:Windows 系统代理开关
|
||||||
|
//! - [`commands`]:Tauri 命令层
|
||||||
|
|
||||||
|
mod autoswitch;
|
||||||
|
mod commands;
|
||||||
|
mod kernel;
|
||||||
|
mod profiles;
|
||||||
|
mod pseudo;
|
||||||
|
mod system_proxy;
|
||||||
|
mod types;
|
||||||
|
|
||||||
|
pub use autoswitch::{pick_best, start_auto_switch_loop};
|
||||||
|
pub use pseudo::is_pseudo_node;
|
||||||
|
pub use system_proxy::get_system_proxy_windows;
|
||||||
|
pub use types::{InstallProgress, KernelInfo, KernelUpdateInfo, ProfileMeta, ProxySettings, ProxyStatus, TrafficSnapshot};
|
||||||
|
pub use commands::{
|
||||||
|
proxy_activate_profile, proxy_apply_kernel_update, proxy_cancel_kernel_install, proxy_check_kernel_update, proxy_clear_system_proxy,
|
||||||
|
proxy_close_connection, proxy_confirm_install, proxy_delete_profile, proxy_get_connections, proxy_get_proxies,
|
||||||
|
proxy_get_settings, proxy_get_system_proxy, proxy_import_profile, proxy_kernel_info, proxy_traffic,
|
||||||
|
proxy_patch_configs, proxy_restart, proxy_save_settings, proxy_select_proxy, proxy_set_system_proxy,
|
||||||
|
proxy_start, proxy_status, proxy_stop, proxy_test_delay, proxy_update_profile, proxy_version,
|
||||||
|
};
|
||||||
|
|
||||||
|
use reqwest::Client;
|
||||||
|
use serde_yaml::Value as YamlValue;
|
||||||
|
use std::fs;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
use tauri::AppHandle;
|
||||||
|
|
||||||
|
use crate::process_manager::{ProcessManager, StartProcessParams};
|
||||||
|
|
||||||
|
// ===================== MihomoManager =====================
|
||||||
|
|
||||||
|
/// settings 内存缓存条目(短时复用,避免高频状态轮询反复读盘)
|
||||||
|
struct SettingsCacheEntry {
|
||||||
|
read_at: Instant,
|
||||||
|
settings: ProxySettings,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 流量速率差分基线:记录上次采样的会话总量与时刻,用于计算实时速率
|
||||||
|
struct TrafficBaseline {
|
||||||
|
download_total: u64,
|
||||||
|
upload_total: u64,
|
||||||
|
at: Instant,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct MihomoManager {
|
||||||
|
root: PathBuf,
|
||||||
|
client: Client,
|
||||||
|
settings_cache: Mutex<Option<SettingsCacheEntry>>,
|
||||||
|
/// 流量速率差分基线:记录上次采样总量与时刻,由两次 /connections 总量差异计算实时速率
|
||||||
|
traffic_baseline: Mutex<Option<TrafficBaseline>>,
|
||||||
|
/// 内核安装/更新的取消标志(前端「停止下载」置位,下载循环轮询后中止)
|
||||||
|
kernel_cancel: Arc<AtomicBool>,
|
||||||
|
/// 取消唤醒通道:让停滞在流式读取(stream.next 最多等 30s)中的下载立即感知取消,
|
||||||
|
/// 否则旧任务会残留最长 30s,期间可能与新任务并发写临时文件/互相重置取消标志
|
||||||
|
kernel_cancel_tx: tokio::sync::watch::Sender<bool>,
|
||||||
|
/// 下载完成后解压替换前的确认通道:mihomo 运行时下载不受影响,但解压替换前
|
||||||
|
/// 必须等前端确认已停止 mihomo(否则 exe 文件被占用)。前端确认后通过
|
||||||
|
/// proxy_confirm_install 命令发送信号唤醒等待。
|
||||||
|
/// 用 std Mutex 而非 tokio Mutex:锁只短暂存取 sender,不跨 await 持有。
|
||||||
|
install_confirm: std::sync::Mutex<Option<tokio::sync::oneshot::Sender<()>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MihomoManager {
|
||||||
|
pub fn new(app_data_dir: PathBuf) -> Self {
|
||||||
|
let root = app_data_dir.join("proxy");
|
||||||
|
for d in ["cores", "mihomo", "profiles", "logs"] {
|
||||||
|
fs::create_dir_all(root.join(d)).ok();
|
||||||
|
}
|
||||||
|
Self {
|
||||||
|
root,
|
||||||
|
client: Client::builder()
|
||||||
|
// 默认 30s 兜底超时,防止遗漏显式 timeout 的请求永久悬挂
|
||||||
|
.timeout(std::time::Duration::from_secs(30))
|
||||||
|
.build()
|
||||||
|
.unwrap_or_else(|_| Client::new()),
|
||||||
|
settings_cache: Mutex::new(None),
|
||||||
|
traffic_baseline: Mutex::new(None),
|
||||||
|
kernel_cancel: Arc::new(AtomicBool::new(false)),
|
||||||
|
kernel_cancel_tx: tokio::sync::watch::channel(false).0,
|
||||||
|
install_confirm: std::sync::Mutex::new(None),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 请求取消内核安装/更新(由 proxy_cancel_kernel_install 命令调用)
|
||||||
|
pub fn cancel_kernel_install(&self) {
|
||||||
|
self.kernel_cancel.store(true, Ordering::SeqCst);
|
||||||
|
// 唤醒停滞的流式下载循环,使其立即中止而不是等 30s 超时
|
||||||
|
let _ = self.kernel_cancel_tx.send(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 前端确认 mihomo 已停止,唤醒等待中的安装流程继续解压替换(由 proxy_confirm_install 命令调用)
|
||||||
|
pub fn confirm_install(&self) {
|
||||||
|
if let Some(tx) = self.install_confirm.lock().unwrap().take() {
|
||||||
|
let _ = tx.send(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cores_dir(&self) -> PathBuf {
|
||||||
|
self.root.join("cores")
|
||||||
|
}
|
||||||
|
pub fn kernel_path(&self) -> PathBuf {
|
||||||
|
self.cores_dir().join("mihomo.exe")
|
||||||
|
}
|
||||||
|
fn mihomo_dir(&self) -> PathBuf {
|
||||||
|
self.root.join("mihomo")
|
||||||
|
}
|
||||||
|
fn config_path(&self) -> PathBuf {
|
||||||
|
self.mihomo_dir().join("config.yaml")
|
||||||
|
}
|
||||||
|
fn profiles_dir(&self) -> PathBuf {
|
||||||
|
self.root.join("profiles")
|
||||||
|
}
|
||||||
|
#[allow(dead_code)]
|
||||||
|
fn logs_dir(&self) -> PathBuf {
|
||||||
|
self.root.join("logs")
|
||||||
|
}
|
||||||
|
fn settings_path(&self) -> PathBuf {
|
||||||
|
self.root.join("settings.json")
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- 设置 ----------
|
||||||
|
pub fn load_settings(&self) -> ProxySettings {
|
||||||
|
// 内存缓存:500ms 内复用(高频调用如状态轮询/测速避免反复读盘)
|
||||||
|
if let Ok(cache) = self.settings_cache.lock() {
|
||||||
|
if let Some(entry) = cache.as_ref() {
|
||||||
|
if entry.read_at.elapsed() < Duration::from_millis(500) {
|
||||||
|
return entry.settings.clone();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut settings = fs::read_to_string(self.settings_path())
|
||||||
|
.ok()
|
||||||
|
.and_then(|s| serde_json::from_str::<ProxySettings>(&s).ok())
|
||||||
|
.unwrap_or_default();
|
||||||
|
// 恢复机制:扫描磁盘 profile 文件,补全 settings.profiles
|
||||||
|
// 防止 settings.json 损坏(如反序列化失败被 default 覆盖)导致订阅丢失
|
||||||
|
if self.reconcile_profiles(&mut settings) {
|
||||||
|
let _ = self.save_settings(&settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 刷新缓存
|
||||||
|
if let Ok(mut cache) = self.settings_cache.lock() {
|
||||||
|
*cache = Some(SettingsCacheEntry {
|
||||||
|
read_at: Instant::now(),
|
||||||
|
settings: settings.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
settings
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 扫描磁盘 profile 文件,补全 settings.profiles 中缺失的条目。
|
||||||
|
/// 返回 true 表示有变化需要保存。
|
||||||
|
fn reconcile_profiles(&self, settings: &mut ProxySettings) -> bool {
|
||||||
|
let mut changed = false;
|
||||||
|
let existing_ids: std::collections::HashSet<String> =
|
||||||
|
settings.profiles.iter().map(|p| p.id.clone()).collect();
|
||||||
|
|
||||||
|
if let Ok(entries) = fs::read_dir(self.profiles_dir()) {
|
||||||
|
for entry in entries.flatten() {
|
||||||
|
let path = entry.path();
|
||||||
|
if path.extension().and_then(|e| e.to_str()) != Some("yaml") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let Some(id) = path
|
||||||
|
.file_stem()
|
||||||
|
.and_then(|s| s.to_str())
|
||||||
|
.map(|s| s.to_string())
|
||||||
|
else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
if existing_ids.contains(&id) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let size = fs::metadata(&path).map(|m| m.len()).unwrap_or(0);
|
||||||
|
let updated_at = fs::metadata(&path)
|
||||||
|
.and_then(|m| m.modified())
|
||||||
|
.ok()
|
||||||
|
.and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok())
|
||||||
|
.and_then(|d| chrono::DateTime::from_timestamp(d.as_secs() as i64, 0))
|
||||||
|
.map(|dt| dt.format("%Y-%m-%d %H:%M:%S").to_string())
|
||||||
|
.unwrap_or_default();
|
||||||
|
settings.profiles.push(ProfileMeta {
|
||||||
|
added_at: updated_at.clone(),
|
||||||
|
id: id.clone(),
|
||||||
|
name: id,
|
||||||
|
url: String::new(),
|
||||||
|
updated_at,
|
||||||
|
size,
|
||||||
|
});
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果 currentProfile 为 null 但有 profile,设置为第一个
|
||||||
|
if settings.current_profile.is_none() && !settings.profiles.is_empty() {
|
||||||
|
settings.current_profile = Some(settings.profiles[0].id.clone());
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
changed
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn save_settings(&self, settings: &ProxySettings) -> Result<(), String> {
|
||||||
|
let s = serde_json::to_string_pretty(settings).map_err(|e| e.to_string())?;
|
||||||
|
fs::write(self.settings_path(), s).map_err(|e| e.to_string())?;
|
||||||
|
// 写盘成功后同步刷新内存缓存(避免旧缓存被后续 load_settings 复用)
|
||||||
|
if let Ok(mut cache) = self.settings_cache.lock() {
|
||||||
|
*cache = Some(SettingsCacheEntry {
|
||||||
|
read_at: Instant::now(),
|
||||||
|
settings: settings.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- 配置生成 ----------
|
||||||
|
/// 合并 profile + 控制器设置,生成运行时 config.yaml
|
||||||
|
pub fn generate_config(&self) -> Result<(), String> {
|
||||||
|
let settings = self.load_settings();
|
||||||
|
let mut value: YamlValue = if let Some(id) = &settings.current_profile {
|
||||||
|
let path = self.profiles_dir().join(format!("{}.yaml", id));
|
||||||
|
if path.exists() {
|
||||||
|
let content = fs::read_to_string(&path).map_err(|e| e.to_string())?;
|
||||||
|
serde_yaml::from_str(&content).unwrap_or(YamlValue::Mapping(serde_yaml::Mapping::new()))
|
||||||
|
} else {
|
||||||
|
YamlValue::Mapping(serde_yaml::Mapping::new())
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
YamlValue::Mapping(serde_yaml::Mapping::new())
|
||||||
|
};
|
||||||
|
|
||||||
|
if !value.is_mapping() {
|
||||||
|
value = YamlValue::Mapping(serde_yaml::Mapping::new());
|
||||||
|
}
|
||||||
|
let m = value.as_mapping_mut().unwrap();
|
||||||
|
m.insert(YamlValue::String("mixed-port".into()), YamlValue::Number(settings.mixed_port.into()));
|
||||||
|
m.insert(
|
||||||
|
YamlValue::String("external-controller".into()),
|
||||||
|
YamlValue::String(settings.external_controller.clone()),
|
||||||
|
);
|
||||||
|
if !settings.secret.is_empty() {
|
||||||
|
m.insert(YamlValue::String("secret".into()), YamlValue::String(settings.secret.clone()));
|
||||||
|
}
|
||||||
|
m.insert(YamlValue::String("mode".into()), YamlValue::String(settings.mode.clone()));
|
||||||
|
m.insert(
|
||||||
|
YamlValue::String("log-level".into()),
|
||||||
|
YamlValue::String(settings.log_level.clone()),
|
||||||
|
);
|
||||||
|
m.insert(YamlValue::String("allow-lan".into()), YamlValue::Bool(settings.allow_lan));
|
||||||
|
|
||||||
|
// 日志写入文件,便于排查问题
|
||||||
|
let log_file = self.logs_dir().join("mihomo.log");
|
||||||
|
m.insert(
|
||||||
|
YamlValue::String("log-file".into()),
|
||||||
|
YamlValue::String(log_file.to_string_lossy().to_string()),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Geo 数据库下载源(使用 jsdelivr 国内可访问镜像,避免无代理时 GitHub 超时)
|
||||||
|
let mut geox = serde_yaml::Mapping::new();
|
||||||
|
geox.insert(
|
||||||
|
YamlValue::String("mmdb".into()),
|
||||||
|
YamlValue::String("https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/country.mmdb".into()),
|
||||||
|
);
|
||||||
|
geox.insert(
|
||||||
|
YamlValue::String("geosite".into()),
|
||||||
|
YamlValue::String("https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat".into()),
|
||||||
|
);
|
||||||
|
geox.insert(
|
||||||
|
YamlValue::String("asn".into()),
|
||||||
|
YamlValue::String("https://cdn.jsdelivr.net/gh/xishang0128/bdg@master/GeoLite2-ASN.mmdb".into()),
|
||||||
|
);
|
||||||
|
m.insert(YamlValue::String("geox-url".into()), YamlValue::Mapping(geox));
|
||||||
|
|
||||||
|
let yaml = serde_yaml::to_string(&value).map_err(|e| e.to_string())?;
|
||||||
|
fs::write(self.config_path(), yaml).map_err(|e| e.to_string())?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 构建启动 mihomo 所需的进程参数(含 prepare + config 生成)
|
||||||
|
pub fn prepare_for_start(&self, app: &AppHandle) -> Result<StartProcessParams, String> {
|
||||||
|
let info = self.prepare_kernel(app)?;
|
||||||
|
if !info.exists {
|
||||||
|
return Err(format!(
|
||||||
|
"mihomo 内核未安装。请将 mihomo.exe 放置到 src-tauri/binaries/ 后重新运行,或直接放到:\n{}",
|
||||||
|
self.cores_dir().to_string_lossy()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
self.generate_config()?;
|
||||||
|
Ok(StartProcessParams {
|
||||||
|
id: "proxy".into(),
|
||||||
|
executable: self.kernel_path().to_string_lossy().to_string(),
|
||||||
|
args: vec![
|
||||||
|
"-d".into(),
|
||||||
|
self.mihomo_dir().to_string_lossy().to_string(),
|
||||||
|
"-f".into(),
|
||||||
|
self.config_path().to_string_lossy().to_string(),
|
||||||
|
],
|
||||||
|
cwd: Some(self.mihomo_dir().to_string_lossy().to_string()),
|
||||||
|
name: "mihomo".into(),
|
||||||
|
restart_on_crash: true,
|
||||||
|
max_restarts: 3,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// mihomo 启动成功后,若配置了「启动时自动开启系统代理」且当前未开,则开启系统代理。
|
||||||
|
/// 手动启动与 App 自启共用,保证设置语义一致(mihomo 运行期间自动跟随系统代理)。
|
||||||
|
pub fn apply_auto_system_proxy(&self) {
|
||||||
|
let settings = self.load_settings();
|
||||||
|
if !settings.auto_system_proxy {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// 以注册表实际状态为准判断是否已开启:settings.system_proxy 是会话内标志,
|
||||||
|
// 上次退出 cleanup_on_exit 只清注册表不会回写该标志,重启后会残留 true,
|
||||||
|
// 若用它做守卫会导致「启动时自动开启系统代理」永远被短路而不生效。
|
||||||
|
if system_proxy::get_system_proxy_windows() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let addr = format!("127.0.0.1:{}", settings.mixed_port);
|
||||||
|
if let Err(e) = system_proxy::set_system_proxy_windows(&addr) {
|
||||||
|
crate::logger::log_warn("mihomo", &format!("自动开启系统代理失败: {}", e));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let mut s = settings;
|
||||||
|
s.system_proxy = true;
|
||||||
|
let _ = self.save_settings(&s);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用启动时检查是否需要自动启动 mihomo 和系统代理
|
||||||
|
pub fn auto_start_on_launch(&self, app: &AppHandle, pm: &ProcessManager) {
|
||||||
|
let settings = self.load_settings();
|
||||||
|
if !settings.auto_start {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
match self.prepare_for_start(app) {
|
||||||
|
Ok(params) => {
|
||||||
|
if let Err(e) = pm.start(params) {
|
||||||
|
crate::logger::log_error("mihomo", &format!("自动启动失败: {}", e));
|
||||||
|
} else {
|
||||||
|
// 启动成功后按「启动时自动开启系统代理」设置决定是否开启系统代理
|
||||||
|
self.apply_auto_system_proxy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_warn("mihomo", &format!("自动启动跳过: {}", e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用退出时清理:关闭系统代理
|
||||||
|
pub fn cleanup_on_exit(&self) {
|
||||||
|
let settings = self.load_settings();
|
||||||
|
if settings.system_proxy || settings.auto_system_proxy {
|
||||||
|
let _ = system_proxy::clear_system_proxy_windows();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- mihomo API ----------
|
||||||
|
fn api_url(&self, path: &str) -> String {
|
||||||
|
let s = self.load_settings();
|
||||||
|
format!("http://{}{}", s.external_controller, path)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn api_bearer(&self) -> Option<String> {
|
||||||
|
let s = self.load_settings();
|
||||||
|
if s.secret.is_empty() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(format!("Bearer {}", s.secret))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn api_get(&self, path: &str) -> Result<serde_json::Value, String> {
|
||||||
|
let mut req = self.client.get(self.api_url(path));
|
||||||
|
if let Some(b) = self.api_bearer() {
|
||||||
|
req = req.header("Authorization", b);
|
||||||
|
}
|
||||||
|
// 显式超时:mihomo 卡死/未响应时命令立即返回,避免前端按钮永久转圈
|
||||||
|
let resp = req
|
||||||
|
.timeout(std::time::Duration::from_secs(10))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("请求 mihomo 失败: {}", e))?;
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
return Err(format!("mihomo API 错误: {}", resp.status()));
|
||||||
|
}
|
||||||
|
resp.json().await.map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn api_request(
|
||||||
|
&self,
|
||||||
|
method: reqwest::Method,
|
||||||
|
path: &str,
|
||||||
|
body: Option<serde_json::Value>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let mut req = self.client.request(method, self.api_url(path));
|
||||||
|
if let Some(b) = self.api_bearer() {
|
||||||
|
req = req.header("Authorization", b);
|
||||||
|
}
|
||||||
|
if let Some(b) = body {
|
||||||
|
req = req.json(&b);
|
||||||
|
}
|
||||||
|
let resp = req
|
||||||
|
.timeout(std::time::Duration::from_secs(10))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("请求 mihomo 失败: {}", e))?;
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
return Err(format!("mihomo API 错误: {}", resp.status()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_version(&self) -> Result<serde_json::Value, String> {
|
||||||
|
self.api_get("/version").await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_proxies(&self) -> Result<serde_json::Value, String> {
|
||||||
|
self.api_get("/proxies").await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn select_proxy(&self, group: &str, name: &str) -> Result<(), String> {
|
||||||
|
self.api_request(
|
||||||
|
reqwest::Method::PUT,
|
||||||
|
&format!("/proxies/{}", url_encode(group)),
|
||||||
|
Some(serde_json::json!({ "name": name })),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn test_delay(&self, name: &str, url: &str, timeout: u32) -> Result<u32, String> {
|
||||||
|
let path = format!(
|
||||||
|
"/proxies/{}/delay?timeout={}&url={}",
|
||||||
|
url_encode(name),
|
||||||
|
timeout,
|
||||||
|
url_encode(url)
|
||||||
|
);
|
||||||
|
let v = self.api_get(&path).await?;
|
||||||
|
v.get("delay")
|
||||||
|
.and_then(|d| d.as_u64())
|
||||||
|
.map(|d| d as u32)
|
||||||
|
.ok_or_else(|| {
|
||||||
|
v.get("message")
|
||||||
|
.and_then(|m| m.as_str())
|
||||||
|
.map(|s| s.to_string())
|
||||||
|
.unwrap_or_else(|| "测速失败".into())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub async fn get_rules(&self) -> Result<serde_json::Value, String> {
|
||||||
|
self.api_get("/rules").await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_connections(&self) -> Result<serde_json::Value, String> {
|
||||||
|
self.api_get("/connections").await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 拉取 /connections 并计算实时流量快照。
|
||||||
|
/// 速率由两次采样的会话总量差分得出;mihomo 重启导致总量回退时自动重置基线。
|
||||||
|
pub async fn traffic_snapshot(&self) -> Result<TrafficSnapshot, String> {
|
||||||
|
let conns = self.get_connections().await?;
|
||||||
|
let upload_total = conns["uploadTotal"].as_u64().unwrap_or(0);
|
||||||
|
let download_total = conns["downloadTotal"].as_u64().unwrap_or(0);
|
||||||
|
let active_connections = conns["connections"].as_array().map(|a| a.len()).unwrap_or(0);
|
||||||
|
|
||||||
|
let (upload_speed, download_speed) = {
|
||||||
|
let base = self.traffic_baseline.lock().unwrap();
|
||||||
|
match base.as_ref() {
|
||||||
|
// 正常差分:总量单调递增才计算速率
|
||||||
|
Some(b) if upload_total >= b.upload_total && download_total >= b.download_total => {
|
||||||
|
let dt = b.at.elapsed().as_secs_f64();
|
||||||
|
if dt > 0.0 {
|
||||||
|
let up = ((upload_total - b.upload_total) as f64 / dt).max(0.0) as u64;
|
||||||
|
let down = ((download_total - b.download_total) as f64 / dt).max(0.0) as u64;
|
||||||
|
(up, down)
|
||||||
|
} else {
|
||||||
|
(0, 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 无基线或总量回退(mihomo 重启):本帧速率为 0,下方重置基线
|
||||||
|
_ => (0, 0),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
*self.traffic_baseline.lock().unwrap() = Some(TrafficBaseline {
|
||||||
|
download_total,
|
||||||
|
upload_total,
|
||||||
|
at: Instant::now(),
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(TrafficSnapshot {
|
||||||
|
download_total,
|
||||||
|
upload_total,
|
||||||
|
download_speed,
|
||||||
|
upload_speed,
|
||||||
|
active_connections,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn close_connection(&self, id: &str) -> Result<(), String> {
|
||||||
|
self.api_request(
|
||||||
|
reqwest::Method::DELETE,
|
||||||
|
&format!("/connections/{}", url_encode(id)),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn patch_configs(&self, body: serde_json::Value) -> Result<(), String> {
|
||||||
|
self.api_request(reqwest::Method::PATCH, "/configs", Some(body)).await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn url_encode(s: &str) -> String {
|
||||||
|
// 仅对路径段做最小编码,避免引入额外依赖
|
||||||
|
let mut out = String::with_capacity(s.len());
|
||||||
|
for b in s.bytes() {
|
||||||
|
match b {
|
||||||
|
b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' => {
|
||||||
|
out.push(b as char);
|
||||||
|
}
|
||||||
|
_ => out.push_str(&format!("%{:02X}", b)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
//! 订阅(profile)管理:导入 / 更新 / 删除 / 激活。
|
||||||
|
|
||||||
|
use chrono::Local;
|
||||||
|
use std::fs;
|
||||||
|
|
||||||
|
use super::{MihomoManager, ProfileMeta};
|
||||||
|
|
||||||
|
impl MihomoManager {
|
||||||
|
// ---------- 订阅管理 ----------
|
||||||
|
pub async fn import_profile(&self, url: &str, name: &str) -> Result<ProfileMeta, String> {
|
||||||
|
// 先读取当前 settings(此时新 profile 文件还未写入,reconcile 不会误添加)
|
||||||
|
let mut settings = self.load_settings();
|
||||||
|
|
||||||
|
let resp = self
|
||||||
|
.client
|
||||||
|
.get(url)
|
||||||
|
.header("User-Agent", "clash.meta/thing")
|
||||||
|
.timeout(std::time::Duration::from_secs(30))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("下载订阅失败: {}", e))?;
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
return Err(format!("订阅下载失败: HTTP {}", resp.status()));
|
||||||
|
}
|
||||||
|
let content = resp.text().await.map_err(|e| e.to_string())?;
|
||||||
|
if !content.contains("proxies") && !content.contains("Proxy") {
|
||||||
|
return Err("订阅内容不像有效的 Clash/mihomo 配置".into());
|
||||||
|
}
|
||||||
|
let id = format!("profile-{}", Local::now().format("%Y%m%d%H%M%S"));
|
||||||
|
let path = self.profiles_dir().join(format!("{}.yaml", id));
|
||||||
|
fs::write(&path, &content).map_err(|e| e.to_string())?;
|
||||||
|
let now = Local::now().format("%Y-%m-%d %H:%M:%S").to_string();
|
||||||
|
let meta = ProfileMeta {
|
||||||
|
id: id.clone(),
|
||||||
|
name: name.to_string(),
|
||||||
|
url: url.to_string(),
|
||||||
|
added_at: now.clone(),
|
||||||
|
updated_at: now,
|
||||||
|
size: content.len() as u64,
|
||||||
|
};
|
||||||
|
// 去重保护:避免 reconcile 已添加同 id(理论上不会,因为文件刚写入)
|
||||||
|
if !settings.profiles.iter().any(|p| p.id == id) {
|
||||||
|
settings.profiles.push(meta.clone());
|
||||||
|
}
|
||||||
|
if settings.current_profile.is_none() {
|
||||||
|
settings.current_profile = Some(id);
|
||||||
|
}
|
||||||
|
self.save_settings(&settings)?;
|
||||||
|
Ok(meta)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_profile(&self, id: &str) -> Result<ProfileMeta, String> {
|
||||||
|
let mut settings = self.load_settings();
|
||||||
|
let meta = settings
|
||||||
|
.profiles
|
||||||
|
.iter()
|
||||||
|
.find(|p| p.id == id)
|
||||||
|
.cloned()
|
||||||
|
.ok_or_else(|| "订阅不存在".to_string())?;
|
||||||
|
let resp = self
|
||||||
|
.client
|
||||||
|
.get(&meta.url)
|
||||||
|
.header("User-Agent", "clash.meta/thing")
|
||||||
|
.timeout(std::time::Duration::from_secs(30))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("更新订阅失败: {}", e))?;
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
return Err(format!("更新订阅失败: HTTP {}", resp.status()));
|
||||||
|
}
|
||||||
|
let content = resp.text().await.map_err(|e| e.to_string())?;
|
||||||
|
let path = self.profiles_dir().join(format!("{}.yaml", id));
|
||||||
|
fs::write(&path, &content).map_err(|e| e.to_string())?;
|
||||||
|
let now = Local::now().format("%Y-%m-%d %H:%M:%S").to_string();
|
||||||
|
let size = content.len() as u64;
|
||||||
|
if let Some(p) = settings.profiles.iter_mut().find(|p| p.id == id) {
|
||||||
|
p.updated_at = now.clone();
|
||||||
|
p.size = size;
|
||||||
|
}
|
||||||
|
self.save_settings(&settings)?;
|
||||||
|
Ok(ProfileMeta {
|
||||||
|
id: id.to_string(),
|
||||||
|
name: meta.name,
|
||||||
|
url: meta.url,
|
||||||
|
added_at: meta.added_at,
|
||||||
|
updated_at: now,
|
||||||
|
size,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn delete_profile(&self, id: &str) -> Result<(), String> {
|
||||||
|
let path = self.profiles_dir().join(format!("{}.yaml", id));
|
||||||
|
fs::remove_file(&path).ok();
|
||||||
|
let mut settings = self.load_settings();
|
||||||
|
settings.profiles.retain(|p| p.id != id);
|
||||||
|
if settings.current_profile.as_deref() == Some(id) {
|
||||||
|
settings.current_profile = settings.profiles.first().map(|p| p.id.clone());
|
||||||
|
}
|
||||||
|
self.save_settings(&settings)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn activate_profile(&self, id: &str) -> Result<(), String> {
|
||||||
|
let mut settings = self.load_settings();
|
||||||
|
if !settings.profiles.iter().any(|p| p.id == id) {
|
||||||
|
return Err("订阅不存在".into());
|
||||||
|
}
|
||||||
|
settings.current_profile = Some(id.to_string());
|
||||||
|
self.save_settings(&settings)?;
|
||||||
|
self.generate_config()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
// ===================== 伪节点过滤 =====================
|
||||||
|
// 单点定义:托盘菜单、自动切换、前端显示过滤(ProxyModule.vue 的 PSEUDO_NODE_KEYWORDS
|
||||||
|
// 与之对应)统一引用此处,避免多份关键词列表漂移。
|
||||||
|
|
||||||
|
/// 订阅节点名中常见的营销/占位关键词(订阅页插入的非真实节点)
|
||||||
|
const PSEUDO_KEYWORDS: &[&str] = &[
|
||||||
|
"DIRECT",
|
||||||
|
"REJECT",
|
||||||
|
"PASS",
|
||||||
|
"COMPATIBLE",
|
||||||
|
"流量",
|
||||||
|
"套餐",
|
||||||
|
"到期",
|
||||||
|
"续费",
|
||||||
|
"官网",
|
||||||
|
"网站",
|
||||||
|
"刷新",
|
||||||
|
"更新",
|
||||||
|
"⭐",
|
||||||
|
"★",
|
||||||
|
"☆",
|
||||||
|
"✕",
|
||||||
|
"✖",
|
||||||
|
"×",
|
||||||
|
];
|
||||||
|
|
||||||
|
/// 判断节点名是否为伪节点(DIRECT/REJECT 等内置策略或订阅营销占位)
|
||||||
|
pub fn is_pseudo_node(name: &str) -> bool {
|
||||||
|
let upper = name.trim().to_uppercase();
|
||||||
|
if upper == "DIRECT" || upper == "REJECT" || upper == "PASS" || upper == "GLOBAL" {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
PSEUDO_KEYWORDS.iter().any(|kw| name.contains(kw))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod pseudo_node_tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn builtin_policies_are_pseudo() {
|
||||||
|
assert!(is_pseudo_node("DIRECT"));
|
||||||
|
assert!(is_pseudo_node("REJECT"));
|
||||||
|
assert!(is_pseudo_node("PASS"));
|
||||||
|
assert!(is_pseudo_node("GLOBAL"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn case_insensitive_and_trims_whitespace() {
|
||||||
|
assert!(is_pseudo_node("direct"));
|
||||||
|
assert!(is_pseudo_node(" Reject "));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn marketing_keywords_are_pseudo() {
|
||||||
|
assert!(is_pseudo_node("香港流量套餐"));
|
||||||
|
assert!(is_pseudo_node("官网专线"));
|
||||||
|
assert!(is_pseudo_node("VIP到期续费"));
|
||||||
|
assert!(is_pseudo_node("每月更新"));
|
||||||
|
assert!(is_pseudo_node("★香港节点"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn real_nodes_are_not_pseudo() {
|
||||||
|
assert!(!is_pseudo_node("HK-01"));
|
||||||
|
assert!(!is_pseudo_node("美国洛杉矶 01"));
|
||||||
|
assert!(!is_pseudo_node("JP Tokyo 2G"));
|
||||||
|
assert!(!is_pseudo_node(""));
|
||||||
|
assert!(!is_pseudo_node("Node-2024"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
//! Windows 系统代理开关。
|
||||||
|
|
||||||
|
use super::MihomoManager;
|
||||||
|
|
||||||
|
// ===================== 系统代理(Windows) =====================
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub(crate) fn set_system_proxy_windows(addr: &str) -> Result<(), String> {
|
||||||
|
use winreg::enums::*;
|
||||||
|
use winreg::RegKey;
|
||||||
|
let hkcu = RegKey::predef(HKEY_CURRENT_USER);
|
||||||
|
let (settings, _) = hkcu
|
||||||
|
.create_subkey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings")
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
settings
|
||||||
|
.set_value("ProxyEnable", &1u32)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
settings
|
||||||
|
.set_value("ProxyServer", &addr)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
notify_wininet();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub(crate) fn clear_system_proxy_windows() -> Result<(), String> {
|
||||||
|
use winreg::enums::*;
|
||||||
|
use winreg::RegKey;
|
||||||
|
let hkcu = RegKey::predef(HKEY_CURRENT_USER);
|
||||||
|
let (settings, _) = hkcu
|
||||||
|
.create_subkey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings")
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
settings
|
||||||
|
.set_value("ProxyEnable", &0u32)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
notify_wininet();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn get_system_proxy_windows() -> bool {
|
||||||
|
use winreg::enums::*;
|
||||||
|
use winreg::RegKey;
|
||||||
|
let hkcu = RegKey::predef(HKEY_CURRENT_USER);
|
||||||
|
hkcu.open_subkey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings")
|
||||||
|
.ok()
|
||||||
|
.and_then(|s| s.get_value::<u32, _>("ProxyEnable").ok())
|
||||||
|
.map(|v| v != 0)
|
||||||
|
.unwrap_or(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn notify_wininet() {
|
||||||
|
unsafe {
|
||||||
|
use windows_sys::Win32::Networking::WinInet::*;
|
||||||
|
InternetSetOptionW(std::ptr::null(), INTERNET_OPTION_SETTINGS_CHANGED, std::ptr::null(), 0);
|
||||||
|
InternetSetOptionW(std::ptr::null(), INTERNET_OPTION_REFRESH, std::ptr::null(), 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub(crate) fn set_system_proxy_windows(_addr: &str) -> Result<(), String> {
|
||||||
|
Err("系统代理仅支持 Windows".into())
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub(crate) fn clear_system_proxy_windows() -> Result<(), String> {
|
||||||
|
Err("系统代理仅支持 Windows".into())
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn get_system_proxy_windows() -> bool {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MihomoManager {
|
||||||
|
/// 开启系统代理(托盘菜单调用)
|
||||||
|
pub fn enable_system_proxy(&self) -> Result<(), String> {
|
||||||
|
let settings = self.load_settings();
|
||||||
|
let addr = format!("127.0.0.1:{}", settings.mixed_port);
|
||||||
|
set_system_proxy_windows(&addr)?;
|
||||||
|
let mut s = settings;
|
||||||
|
s.system_proxy = true;
|
||||||
|
self.save_settings(&s)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 关闭系统代理(托盘菜单调用)
|
||||||
|
pub fn disable_system_proxy(&self) -> Result<(), String> {
|
||||||
|
clear_system_proxy_windows()?;
|
||||||
|
let mut s = self.load_settings();
|
||||||
|
s.system_proxy = false;
|
||||||
|
self.save_settings(&s)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
// ===================== 数据结构 =====================
|
||||||
|
// 代理模块的设置 / 订阅元信息 / 内核信息 / 安装进度等共享类型。
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Clone, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ProxySettings {
|
||||||
|
#[serde(default = "default_mixed_port")]
|
||||||
|
pub mixed_port: u16,
|
||||||
|
#[serde(default = "default_external_controller")]
|
||||||
|
pub external_controller: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub secret: String,
|
||||||
|
#[serde(default = "default_mode")]
|
||||||
|
pub mode: String,
|
||||||
|
#[serde(default = "default_log_level")]
|
||||||
|
pub log_level: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub allow_lan: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
pub system_proxy: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
pub auto_start: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
pub auto_system_proxy: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
pub current_profile: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub profiles: Vec<ProfileMeta>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub auto_switch_enabled: bool,
|
||||||
|
#[serde(default = "default_auto_switch_interval")]
|
||||||
|
pub auto_switch_interval: u32,
|
||||||
|
#[serde(default)]
|
||||||
|
pub auto_switch_group: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub auto_switch_region: String,
|
||||||
|
/// 内核下载镜像源列表(前缀拼接到 GitHub URL 前)。
|
||||||
|
/// 空字符串 = 直连 GitHub,其余为镜像站前缀(含尾斜杠)。
|
||||||
|
#[serde(default = "default_kernel_mirrors")]
|
||||||
|
pub kernel_mirrors: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_mixed_port() -> u16 { 7890 }
|
||||||
|
fn default_external_controller() -> String { "127.0.0.1:9090".into() }
|
||||||
|
fn default_mode() -> String { "rule".into() }
|
||||||
|
fn default_log_level() -> String { "info".into() }
|
||||||
|
fn default_auto_switch_interval() -> u32 { 5 }
|
||||||
|
/// 默认镜像源:空串=直连 GitHub 优先,后续为公益镜像(按稳定性排序)
|
||||||
|
fn default_kernel_mirrors() -> Vec<String> {
|
||||||
|
vec![
|
||||||
|
String::new(),
|
||||||
|
"https://ghproxy.net/".into(),
|
||||||
|
"https://gh-proxy.com/".into(),
|
||||||
|
"https://ghfast.top/".into(),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for ProxySettings {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
mixed_port: 7890,
|
||||||
|
external_controller: "127.0.0.1:9090".into(),
|
||||||
|
secret: String::new(),
|
||||||
|
mode: "rule".into(),
|
||||||
|
log_level: "info".into(),
|
||||||
|
allow_lan: false,
|
||||||
|
system_proxy: false,
|
||||||
|
auto_start: false,
|
||||||
|
auto_system_proxy: false,
|
||||||
|
current_profile: None,
|
||||||
|
profiles: Vec::new(),
|
||||||
|
auto_switch_enabled: false,
|
||||||
|
auto_switch_interval: 5,
|
||||||
|
auto_switch_group: String::new(),
|
||||||
|
auto_switch_region: String::new(),
|
||||||
|
kernel_mirrors: default_kernel_mirrors(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Clone, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ProfileMeta {
|
||||||
|
#[serde(default)]
|
||||||
|
pub id: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub name: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub url: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub added_at: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub updated_at: String,
|
||||||
|
#[serde(default)]
|
||||||
|
#[specta(type = f64)]
|
||||||
|
pub size: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Clone, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct KernelInfo {
|
||||||
|
pub path: String,
|
||||||
|
pub exists: bool,
|
||||||
|
pub version: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Clone, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct KernelUpdateInfo {
|
||||||
|
pub current_version: Option<String>,
|
||||||
|
pub latest_version: String,
|
||||||
|
pub download_url: String,
|
||||||
|
pub has_update: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Clone, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ProxyStatus {
|
||||||
|
pub running: bool,
|
||||||
|
pub pid: Option<u32>,
|
||||||
|
pub restart_count: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 实时流量快照(由 /connections 的会话总量差分得出实时速率)
|
||||||
|
#[derive(Serialize, Clone, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct TrafficSnapshot {
|
||||||
|
/// 本次会话累计下载字节数
|
||||||
|
pub download_total: u64,
|
||||||
|
/// 本次会话累计上传字节数
|
||||||
|
pub upload_total: u64,
|
||||||
|
/// 实时下载速率(字节/秒)
|
||||||
|
pub download_speed: u64,
|
||||||
|
/// 实时上传速率(字节/秒)
|
||||||
|
pub upload_speed: u64,
|
||||||
|
/// 当前活跃连接数
|
||||||
|
pub active_connections: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 内核安装进度事件载荷
|
||||||
|
/// - stage: downloading | extracting | replacing | done | error
|
||||||
|
/// - percent: 0-100(无 total_bytes 时为 0,前端按 downloadedBytes 显示)
|
||||||
|
#[derive(Serialize, Clone, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct InstallProgress {
|
||||||
|
pub stage: String,
|
||||||
|
pub percent: u8,
|
||||||
|
#[specta(type = f64)]
|
||||||
|
pub downloaded_bytes: u64,
|
||||||
|
#[specta(type = Option<f64>)]
|
||||||
|
pub total_bytes: Option<u64>,
|
||||||
|
pub message: String,
|
||||||
|
}
|
||||||
+167
-24
@@ -132,6 +132,41 @@ pub fn is_thing_elevated() -> bool {
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ===================== 监控设置持久化 =====================
|
||||||
|
|
||||||
|
/// 监控模块设置(存储于 {app_data_dir}/monitor/settings.json)
|
||||||
|
/// 参照代理模块 ProxySettings 的模式,仅包含需要持久化的运行时开关。
|
||||||
|
#[derive(Serialize, Deserialize, Clone, Default)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct MonitorSettings {
|
||||||
|
/// 应用启动时自动启动监控内核(默认 false)
|
||||||
|
#[serde(default)]
|
||||||
|
pub auto_start: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 监控设置文件路径: {app_data_dir}/monitor/settings.json
|
||||||
|
fn settings_path(app_data_dir: &std::path::Path) -> PathBuf {
|
||||||
|
app_data_dir.join("monitor").join("settings.json")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 读取监控设置(文件不存在或解析失败时返回默认值)
|
||||||
|
pub fn load_monitor_settings(app_data_dir: &std::path::Path) -> MonitorSettings {
|
||||||
|
fs::read_to_string(settings_path(app_data_dir))
|
||||||
|
.ok()
|
||||||
|
.and_then(|s| serde_json::from_str::<MonitorSettings>(&s).ok())
|
||||||
|
.unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 写入监控设置
|
||||||
|
pub fn save_monitor_settings(app_data_dir: &std::path::Path, settings: &MonitorSettings) -> Result<(), String> {
|
||||||
|
let path = settings_path(app_data_dir);
|
||||||
|
if let Some(parent) = path.parent() {
|
||||||
|
fs::create_dir_all(parent).map_err(|e| format!("创建目录失败: {}", e))?;
|
||||||
|
}
|
||||||
|
let content = serde_json::to_string_pretty(settings).map_err(|e| format!("序列化设置失败: {}", e))?;
|
||||||
|
fs::write(path, content).map_err(|e| format!("写入设置失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
// ===================== 永久提权标志持久化 =====================
|
// ===================== 永久提权标志持久化 =====================
|
||||||
|
|
||||||
/// 永久提权标志文件路径: {app_data_dir}/monitor/elevate.json
|
/// 永久提权标志文件路径: {app_data_dir}/monitor/elevate.json
|
||||||
@@ -175,11 +210,11 @@ pub fn check_and_relaunch_if_needed(app_data_dir: &std::path::Path) -> bool {
|
|||||||
Ok(e) => e,
|
Ok(e) => e,
|
||||||
Err(_) => return false,
|
Err(_) => return false,
|
||||||
};
|
};
|
||||||
eprintln!("[monitor] 检测到永久提权标志,以管理员权限重启 Thing");
|
crate::logger::log_info("monitor", "检测到永久提权标志,以管理员权限重启 Thing");
|
||||||
match shell_execute_elevated(&exe.to_string_lossy(), "", None) {
|
match shell_execute_elevated(&exe.to_string_lossy(), "", None) {
|
||||||
Ok(()) => true,
|
Ok(()) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("[monitor] 永久提权重启失败(用户可能取消了 UAC): {}", e);
|
crate::logger::log_warn("monitor", &format!("永久提权重启失败(用户可能取消了 UAC): {}", e));
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -193,6 +228,8 @@ pub fn check_and_relaunch_if_needed(app_data_dir: &std::path::Path) -> bool {
|
|||||||
pub struct KernelStatus {
|
pub struct KernelStatus {
|
||||||
pub ready: bool,
|
pub ready: bool,
|
||||||
pub is_admin: bool,
|
pub is_admin: bool,
|
||||||
|
/// PawnIO 驱动是否已安装;旧版内核无此字段,Option 兼容
|
||||||
|
pub pawn_io_installed: Option<bool>,
|
||||||
pub uptime_ms: f64,
|
pub uptime_ms: f64,
|
||||||
pub group_count: u32,
|
pub group_count: u32,
|
||||||
pub sensor_count: u32,
|
pub sensor_count: u32,
|
||||||
@@ -247,6 +284,17 @@ pub struct MonitorKernel {
|
|||||||
listener_ids: Arc<Mutex<Vec<tauri::EventId>>>,
|
listener_ids: Arc<Mutex<Vec<tauri::EventId>>>,
|
||||||
/// 是否以管理员权限运行(提权模式下进程不受 ProcessManager 管控,停止走 /shutdown)
|
/// 是否以管理员权限运行(提权模式下进程不受 ProcessManager 管控,停止走 /shutdown)
|
||||||
elevated: Arc<AtomicBool>,
|
elevated: Arc<AtomicBool>,
|
||||||
|
/// SSE 订阅循环活跃标志(重入守卫,防止并发/重复订阅导致双 emit monitor-data)
|
||||||
|
subscribing: Arc<AtomicBool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// SSE 订阅循环标志守卫:Drop 时复位 subscribing,覆盖所有 return / abort 路径
|
||||||
|
struct SubGuard(Arc<AtomicBool>);
|
||||||
|
|
||||||
|
impl Drop for SubGuard {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
self.0.store(false, Ordering::SeqCst);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MonitorKernel {
|
impl MonitorKernel {
|
||||||
@@ -265,6 +313,7 @@ impl MonitorKernel {
|
|||||||
sub_handle: Arc::new(Mutex::new(None)),
|
sub_handle: Arc::new(Mutex::new(None)),
|
||||||
listener_ids: Arc::new(Mutex::new(Vec::new())),
|
listener_ids: Arc::new(Mutex::new(Vec::new())),
|
||||||
elevated: Arc::new(AtomicBool::new(false)),
|
elevated: Arc::new(AtomicBool::new(false)),
|
||||||
|
subscribing: Arc::new(AtomicBool::new(false)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -283,6 +332,32 @@ impl MonitorKernel {
|
|||||||
write_elevate_flag(&self.root.join("elevate.json"), enabled)
|
write_elevate_flag(&self.root.join("elevate.json"), enabled)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 读取监控设置(auto_start 等)
|
||||||
|
pub fn load_settings(&self) -> MonitorSettings {
|
||||||
|
load_monitor_settings(&self.root.parent().unwrap_or(&self.root).to_path_buf())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 写入监控设置
|
||||||
|
pub fn save_settings(&self, settings: &MonitorSettings) -> Result<(), String> {
|
||||||
|
save_monitor_settings(&self.root.parent().unwrap_or(&self.root).to_path_buf(), settings)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用启动时检查是否需要自动启动监控内核
|
||||||
|
pub fn auto_start_on_launch(&self, app: &AppHandle) {
|
||||||
|
let settings = self.load_settings();
|
||||||
|
if !settings.auto_start {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let monitor = self.clone();
|
||||||
|
let app_handle = app.clone();
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
match monitor.start_with_subscription(&app_handle).await {
|
||||||
|
Ok(info) => crate::logger::log_info("monitor", &format!("自动启动成功, pid={:?}", info.pid)),
|
||||||
|
Err(e) => crate::logger::log_warn("monitor", &format!("自动启动跳过: {}", e)),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
fn cores_dir(&self) -> PathBuf {
|
fn cores_dir(&self) -> PathBuf {
|
||||||
self.root.join("cores")
|
self.root.join("cores")
|
||||||
}
|
}
|
||||||
@@ -297,7 +372,9 @@ impl MonitorKernel {
|
|||||||
self.root.join("hardware-config.json")
|
self.root.join("hardware-config.json")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 确保内核就位:若 cores/ 无内核或版本过期(源文件较新),从资源目录复制
|
/// 确保内核就位:若 cores/ 无内核或版本过期(源文件较新),从资源目录复制。
|
||||||
|
/// 同时把 PawnIO_setup.exe(可选资源)复制过去——内核提权启动时会静默安装它,
|
||||||
|
/// 作为 WinRing0 被系统/杀软拦截时读取温度/频率的替代驱动。
|
||||||
pub fn prepare_kernel(&self, app: &AppHandle) -> Result<MonitorKernelInfo, String> {
|
pub fn prepare_kernel(&self, app: &AppHandle) -> Result<MonitorKernelInfo, String> {
|
||||||
let kernel = self.kernel_path();
|
let kernel = self.kernel_path();
|
||||||
if let Ok(src) = app.path().resolve("binaries/ThingHK.exe", BaseDirectory::Resource) {
|
if let Ok(src) = app.path().resolve("binaries/ThingHK.exe", BaseDirectory::Resource) {
|
||||||
@@ -312,6 +389,24 @@ impl MonitorKernel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PawnIO 安装器:可选资源,缺失时仅影响自动安装能力(不影响内核运行)
|
||||||
|
if let Ok(setup_src) = app.path().resolve("binaries/PawnIO_setup.exe", BaseDirectory::Resource) {
|
||||||
|
if setup_src.exists() {
|
||||||
|
let setup_dest = self.cores_dir().join("PawnIO_setup.exe");
|
||||||
|
let need_copy = !setup_dest.exists()
|
||||||
|
|| fs::metadata(&setup_src)
|
||||||
|
.and_then(|s| fs::metadata(&setup_dest).map(|d| s.len() != d.len()))
|
||||||
|
.unwrap_or(true);
|
||||||
|
if need_copy {
|
||||||
|
fs::create_dir_all(self.cores_dir()).ok();
|
||||||
|
if let Err(e) = fs::copy(&setup_src, &setup_dest) {
|
||||||
|
crate::logger::log_warn("monitor", &format!("复制 PawnIO_setup.exe 失败: {}", e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(MonitorKernelInfo {
|
Ok(MonitorKernelInfo {
|
||||||
path: kernel.to_string_lossy().to_string(),
|
path: kernel.to_string_lossy().to_string(),
|
||||||
exists: kernel.exists(),
|
exists: kernel.exists(),
|
||||||
@@ -381,10 +476,18 @@ impl MonitorKernel {
|
|||||||
/// 流程:轮询 /status 等 ready → 订阅 /stream → 解析 SSE 事件 → emit "monitor-data"
|
/// 流程:轮询 /status 等 ready → 订阅 /stream → 解析 SSE 事件 → emit "monitor-data"
|
||||||
/// 写入熔断:SSE 断开后停止 emit,等待外部调用 reconnect 或 process-status-changed 触发重连
|
/// 写入熔断:SSE 断开后停止 emit,等待外部调用 reconnect 或 process-status-changed 触发重连
|
||||||
pub async fn start_subscription(self: Self, app: AppHandle) {
|
pub async fn start_subscription(self: Self, app: AppHandle) {
|
||||||
|
// 重入守卫:已有订阅循环在运行则跳过,防止并发/重复订阅(双 emit monitor-data)
|
||||||
|
if self.subscribing.swap(true, Ordering::SeqCst) {
|
||||||
|
crate::logger::log_warn("monitor", "已有 SSE 订阅循环运行中,跳过重复订阅");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Drop 时复位标志,覆盖所有 return 路径(含 stop 时 abort 取消)
|
||||||
|
let _guard = SubGuard(self.subscribing.clone());
|
||||||
|
|
||||||
// 1. 轮询等待 Kernel ready(冷启动约 5s)
|
// 1. 轮询等待 Kernel ready(冷启动约 5s)
|
||||||
if let Err(e) = self.wait_for_ready(&app).await {
|
if let Err(e) = self.wait_for_ready(&app).await {
|
||||||
eprintln!("[monitor] 等待 Kernel ready 失败,订阅不启动: {}", e);
|
crate::logger::log_warn("monitor", &format!("等待 Kernel ready 失败,订阅不启动: {}", e));
|
||||||
let _ = app.emit("monitor-error", serde_json::json!({ "stage": "ready", "message": e }));
|
let _ = app.emit(crate::constants::events::MONITOR_ERROR, serde_json::json!({ "stage": "ready", "message": e }));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -408,12 +511,20 @@ impl MonitorKernel {
|
|||||||
Ok(resp) if resp.status().is_success() => {
|
Ok(resp) if resp.status().is_success() => {
|
||||||
match resp.json::<KernelStatus>().await {
|
match resp.json::<KernelStatus>().await {
|
||||||
Ok(s) if s.ready => {
|
Ok(s) if s.ready => {
|
||||||
|
// PawnIO 诊断:已提权但驱动缺失时,温度/频率等 ring0 传感器大概率无法读取
|
||||||
|
if s.is_admin && s.pawn_io_installed == Some(false) {
|
||||||
|
crate::logger::log_warn(
|
||||||
|
"monitor",
|
||||||
|
"Kernel 已提权但 PawnIO 驱动未安装,CPU 温度/频率可能无法读取(检查 cores/PawnIO_setup.exe 是否随包部署)",
|
||||||
|
);
|
||||||
|
}
|
||||||
let _ = app.emit(
|
let _ = app.emit(
|
||||||
"monitor-ready",
|
crate::constants::events::MONITOR_READY,
|
||||||
serde_json::json!({
|
serde_json::json!({
|
||||||
"isAdmin": s.is_admin,
|
"isAdmin": s.is_admin,
|
||||||
"sensorCount": s.sensor_count,
|
"sensorCount": s.sensor_count,
|
||||||
"providers": s.providers,
|
"providers": s.providers,
|
||||||
|
"pawnIoInstalled": s.pawn_io_installed,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
return Ok(());
|
return Ok(());
|
||||||
@@ -426,8 +537,10 @@ impl MonitorKernel {
|
|||||||
Err(e) => last_err = e.to_string(),
|
Err(e) => last_err = e.to_string(),
|
||||||
}
|
}
|
||||||
// 通知前端正在加载(前端可显示 "Kernel 启动中...")
|
// 通知前端正在加载(前端可显示 "Kernel 启动中...")
|
||||||
let elapsed = READY_TIMEOUT_MS.saturating_sub(deadline.duration_since(std::time::Instant::now()).as_millis() as u64);
|
// 用 saturating_duration_since:now 超过 deadline 时返回 0,避免 duration_since panic
|
||||||
let _ = app.emit("monitor-loading", serde_json::json!({ "elapsedMs": elapsed }));
|
let remaining = deadline.saturating_duration_since(std::time::Instant::now()).as_millis() as u64;
|
||||||
|
let elapsed = READY_TIMEOUT_MS.saturating_sub(remaining);
|
||||||
|
let _ = app.emit(crate::constants::events::MONITOR_LOADING, serde_json::json!({ "elapsedMs": elapsed }));
|
||||||
tokio::time::sleep(Duration::from_millis(READY_POLL_INTERVAL_MS)).await;
|
tokio::time::sleep(Duration::from_millis(READY_POLL_INTERVAL_MS)).await;
|
||||||
}
|
}
|
||||||
Err(format!("Kernel 在 {}ms 内未就绪: {}", READY_TIMEOUT_MS, last_err))
|
Err(format!("Kernel 在 {}ms 内未就绪: {}", READY_TIMEOUT_MS, last_err))
|
||||||
@@ -441,24 +554,24 @@ impl MonitorKernel {
|
|||||||
match self.subscribe_once(&url, &app).await {
|
match self.subscribe_once(&url, &app).await {
|
||||||
// 正常结束(客户端取消或服务端关闭)
|
// 正常结束(客户端取消或服务端关闭)
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
eprintln!("[monitor] SSE 流正常结束");
|
crate::logger::log_info("monitor", "SSE 流正常结束");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("[monitor] SSE 流异常断开: {},3s 后重试", e);
|
crate::logger::log_warn("monitor", &format!("SSE 流异常断开: {},3s 后重试", e));
|
||||||
let _ = app.emit(
|
let _ = app.emit(
|
||||||
"monitor-disconnected",
|
crate::constants::events::MONITOR_DISCONNECTED,
|
||||||
serde_json::json!({ "message": e }),
|
serde_json::json!({ "message": e }),
|
||||||
);
|
);
|
||||||
tokio::time::sleep(Duration::from_secs(3)).await;
|
tokio::time::sleep(Duration::from_secs(3)).await;
|
||||||
// 重连前先确认 Kernel 是否还活着(可能已被 stop)
|
// 重连前先确认 Kernel 是否还活着(可能已被 stop)
|
||||||
if !self.is_kernel_alive().await {
|
if !self.is_kernel_alive().await {
|
||||||
eprintln!("[monitor] Kernel 已停止,退出 SSE 循环");
|
crate::logger::log_info("monitor", "Kernel 已停止,退出 SSE 循环");
|
||||||
// 提权模式下 Kernel 崩溃/退出后重置 elevated 标志,
|
// 提权模式下 Kernel 崩溃/退出后重置 elevated 标志,
|
||||||
// 否则 monitor_status 会一直认为提权模式但 Kernel 已死,用户无法重启
|
// 否则 monitor_status 会一直认为提权模式但 Kernel 已死,用户无法重启
|
||||||
if self.is_elevated() {
|
if self.is_elevated() {
|
||||||
self.elevated.store(false, Ordering::SeqCst);
|
self.elevated.store(false, Ordering::SeqCst);
|
||||||
eprintln!("[monitor] 提权 Kernel 已退出,重置 elevated 标志");
|
crate::logger::log_info("monitor", "提权 Kernel 已退出,重置 elevated 标志");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -497,7 +610,7 @@ impl MonitorKernel {
|
|||||||
|
|
||||||
if let Some(json_str) = parse_sse_data(&event_str) {
|
if let Some(json_str) = parse_sse_data(&event_str) {
|
||||||
if let Ok(snap) = serde_json::from_str::<SensorSnapshot>(&json_str) {
|
if let Ok(snap) = serde_json::from_str::<SensorSnapshot>(&json_str) {
|
||||||
let _ = app.emit("monitor-data", snap);
|
let _ = app.emit(crate::constants::events::MONITOR_DATA, snap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -519,9 +632,11 @@ impl MonitorKernel {
|
|||||||
|
|
||||||
/// 停止 SSE 订阅(进程由 ProcessManager.stop 负责)
|
/// 停止 SSE 订阅(进程由 ProcessManager.stop 负责)
|
||||||
pub async fn stop_subscription(&self, app: &AppHandle) {
|
pub async fn stop_subscription(&self, app: &AppHandle) {
|
||||||
// 取消 SSE 任务
|
// 取消 SSE 任务并等待其退出,确保 subscribing 重入守卫复位。
|
||||||
|
// 否则 stop 后立即 start 时旧任务仍在 Drop,新订阅会被守卫误跳过。
|
||||||
if let Some(handle) = self.sub_handle.lock().await.take() {
|
if let Some(handle) = self.sub_handle.lock().await.take() {
|
||||||
handle.abort();
|
handle.abort();
|
||||||
|
let _ = handle.await;
|
||||||
}
|
}
|
||||||
// 取消 process-status-changed 监听
|
// 取消 process-status-changed 监听
|
||||||
let ids = self.listener_ids.lock().await.drain(..).collect::<Vec<_>>();
|
let ids = self.listener_ids.lock().await.drain(..).collect::<Vec<_>>();
|
||||||
@@ -552,7 +667,7 @@ impl MonitorKernel {
|
|||||||
let this = this.clone();
|
let this = this.clone();
|
||||||
let app = app_clone.clone();
|
let app = app_clone.clone();
|
||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
eprintln!("[monitor] 检测到 Kernel 重启恢复,重新订阅 SSE");
|
crate::logger::log_info("monitor", "检测到 Kernel 重启恢复,重新订阅 SSE");
|
||||||
// 重启后需要重新等待 ready(冷启动约 5s)
|
// 重启后需要重新等待 ready(冷启动约 5s)
|
||||||
this.clone().start_subscription(app).await;
|
this.clone().start_subscription(app).await;
|
||||||
});
|
});
|
||||||
@@ -585,20 +700,23 @@ impl MonitorKernel {
|
|||||||
if status.ready {
|
if status.ready {
|
||||||
if thing_elevated {
|
if thing_elevated {
|
||||||
// Thing 是管理员:停止已有 Kernel(无论什么权限),用 ProcessManager 重启以继承权限
|
// Thing 是管理员:停止已有 Kernel(无论什么权限),用 ProcessManager 重启以继承权限
|
||||||
eprintln!("[monitor] Thing 已提权,重启 ThingHK 以继承管理员权限");
|
crate::logger::log_info("monitor", "Thing 已提权,重启 ThingHK 以继承管理员权限");
|
||||||
let _ = self.shutdown_kernel().await;
|
let _ = self.shutdown_kernel().await;
|
||||||
tokio::time::sleep(Duration::from_millis(500)).await;
|
tokio::time::sleep(Duration::from_millis(500)).await;
|
||||||
} else if status.is_admin {
|
} else if status.is_admin {
|
||||||
// Thing 非管理员,但已有提权 Kernel:直接接管
|
// Thing 非管理员,但已有提权 Kernel:直接接管
|
||||||
eprintln!("[monitor] 检测到已有提权 Kernel 运行中,直接接管");
|
crate::logger::log_info("monitor", "检测到已有提权 Kernel 运行中,直接接管");
|
||||||
self.elevated.store(true, Ordering::SeqCst);
|
self.elevated.store(true, Ordering::SeqCst);
|
||||||
let kernel = self.clone();
|
let kernel = self.clone();
|
||||||
kernel.clone().register_auto_reconnect(app.clone()).await;
|
kernel.clone().register_auto_reconnect(app.clone()).await;
|
||||||
|
// 已有订阅循环在运行则不覆盖句柄(否则旧任务句柄丢失,stop 无法取消)
|
||||||
|
if !kernel.subscribing.load(Ordering::SeqCst) {
|
||||||
let app_clone = app.clone();
|
let app_clone = app.clone();
|
||||||
let handle = tauri::async_runtime::spawn(async move {
|
let handle = tauri::async_runtime::spawn(async move {
|
||||||
kernel.start_subscription(app_clone).await;
|
kernel.start_subscription(app_clone).await;
|
||||||
});
|
});
|
||||||
*self.sub_handle.lock().await = Some(handle);
|
*self.sub_handle.lock().await = Some(handle);
|
||||||
|
}
|
||||||
// 提权模式下无 ProcessInfo,返回一个占位的
|
// 提权模式下无 ProcessInfo,返回一个占位的
|
||||||
return Ok(crate::process_manager::ProcessInfo {
|
return Ok(crate::process_manager::ProcessInfo {
|
||||||
id: PROCESS_ID.into(),
|
id: PROCESS_ID.into(),
|
||||||
@@ -609,7 +727,7 @@ impl MonitorKernel {
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// Thing 非管理员,已有普通 Kernel:先停止
|
// Thing 非管理员,已有普通 Kernel:先停止
|
||||||
eprintln!("[monitor] 检测到已有普通权限 Kernel 运行中,先停止再重启");
|
crate::logger::log_info("monitor", "检测到已有普通权限 Kernel 运行中,先停止再重启");
|
||||||
let _ = self.shutdown_kernel().await;
|
let _ = self.shutdown_kernel().await;
|
||||||
tokio::time::sleep(Duration::from_millis(500)).await;
|
tokio::time::sleep(Duration::from_millis(500)).await;
|
||||||
}
|
}
|
||||||
@@ -623,7 +741,7 @@ impl MonitorKernel {
|
|||||||
// Thing 是管理员时,ThingHK 继承权限,标记 elevated(仍由 ProcessManager 管理)
|
// Thing 是管理员时,ThingHK 继承权限,标记 elevated(仍由 ProcessManager 管理)
|
||||||
if thing_elevated {
|
if thing_elevated {
|
||||||
self.elevated.store(true, Ordering::SeqCst);
|
self.elevated.store(true, Ordering::SeqCst);
|
||||||
eprintln!("[monitor] ThingHK 已以管理员权限启动(继承自 Thing)");
|
crate::logger::log_info("monitor", "ThingHK 已以管理员权限启动(继承自 Thing)");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 用 self 的 clone(共享 Arc<Mutex> 状态)启动订阅,
|
// 用 self 的 clone(共享 Arc<Mutex> 状态)启动订阅,
|
||||||
@@ -631,11 +749,14 @@ impl MonitorKernel {
|
|||||||
// stop_subscription 时才能正确清理 listener。
|
// stop_subscription 时才能正确清理 listener。
|
||||||
let kernel = self.clone();
|
let kernel = self.clone();
|
||||||
kernel.clone().register_auto_reconnect(app.clone()).await;
|
kernel.clone().register_auto_reconnect(app.clone()).await;
|
||||||
|
// 已有订阅循环在运行则不覆盖句柄(否则旧任务句柄丢失,stop 无法取消)
|
||||||
|
if !kernel.subscribing.load(Ordering::SeqCst) {
|
||||||
let app_clone = app.clone();
|
let app_clone = app.clone();
|
||||||
let handle = tauri::async_runtime::spawn(async move {
|
let handle = tauri::async_runtime::spawn(async move {
|
||||||
kernel.start_subscription(app_clone).await;
|
kernel.start_subscription(app_clone).await;
|
||||||
});
|
});
|
||||||
*self.sub_handle.lock().await = Some(handle);
|
*self.sub_handle.lock().await = Some(handle);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(info)
|
Ok(info)
|
||||||
}
|
}
|
||||||
@@ -703,17 +824,20 @@ impl MonitorKernel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
self.elevated.store(true, Ordering::SeqCst);
|
self.elevated.store(true, Ordering::SeqCst);
|
||||||
eprintln!("[monitor] 提权启动已发起,等待 Kernel ready");
|
crate::logger::log_info("monitor", "提权启动已发起,等待 Kernel ready");
|
||||||
|
|
||||||
// 5. 启动 SSE 订阅(提权模式不注册 register_auto_reconnect:
|
// 5. 启动 SSE 订阅(提权模式不注册 register_auto_reconnect:
|
||||||
// 提权进程不归 ProcessManager 管,process-status-changed 事件不会触发,
|
// 提权进程不归 ProcessManager 管,process-status-changed 事件不会触发,
|
||||||
// 注册了反而可能在其他进程状态变化时误触发 SSE 重连)
|
// 注册了反而可能在其他进程状态变化时误触发 SSE 重连)
|
||||||
let kernel = self.clone();
|
let kernel = self.clone();
|
||||||
let app_clone = app.clone();
|
let app_clone = app.clone();
|
||||||
|
// 已有订阅循环在运行则不覆盖句柄(否则旧任务句柄丢失,stop 无法取消)
|
||||||
|
if !kernel.subscribing.load(Ordering::SeqCst) {
|
||||||
let handle = tauri::async_runtime::spawn(async move {
|
let handle = tauri::async_runtime::spawn(async move {
|
||||||
kernel.start_subscription(app_clone).await;
|
kernel.start_subscription(app_clone).await;
|
||||||
});
|
});
|
||||||
*self.sub_handle.lock().await = Some(handle);
|
*self.sub_handle.lock().await = Some(handle);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -745,7 +869,7 @@ impl MonitorKernel {
|
|||||||
self.stop_subscription(app).await;
|
self.stop_subscription(app).await;
|
||||||
// 仅当 ThingHK 提权但 Thing 未提权时才需要 /shutdown(ProcessManager 无法 kill 管理员进程)
|
// 仅当 ThingHK 提权但 Thing 未提权时才需要 /shutdown(ProcessManager 无法 kill 管理员进程)
|
||||||
if self.is_elevated() && !is_thing_elevated() {
|
if self.is_elevated() && !is_thing_elevated() {
|
||||||
eprintln!("[monitor] 退出清理:停止提权 Kernel(/shutdown)");
|
crate::logger::log_info("monitor", "退出清理:停止提权 Kernel(/shutdown)");
|
||||||
let _ = self.shutdown_kernel().await;
|
let _ = self.shutdown_kernel().await;
|
||||||
self.elevated.store(false, Ordering::SeqCst);
|
self.elevated.store(false, Ordering::SeqCst);
|
||||||
}
|
}
|
||||||
@@ -852,13 +976,13 @@ pub async fn monitor_elevate_self(
|
|||||||
|
|
||||||
if is_thing_elevated() {
|
if is_thing_elevated() {
|
||||||
// 已是管理员,只需设置标志,无需重启
|
// 已是管理员,只需设置标志,无需重启
|
||||||
eprintln!("[monitor] Thing 已是管理员,仅设置永久提权标志");
|
crate::logger::log_info("monitor", "Thing 已是管理员,仅设置永久提权标志");
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
let exe = std::env::current_exe().map_err(|e| format!("获取当前路径失败: {}", e))?;
|
let exe = std::env::current_exe().map_err(|e| format!("获取当前路径失败: {}", e))?;
|
||||||
let exe_str = exe.to_string_lossy().to_string();
|
let exe_str = exe.to_string_lossy().to_string();
|
||||||
eprintln!("[monitor] 永久提权:以管理员权限重启 Thing");
|
crate::logger::log_info("monitor", "永久提权:以管理员权限重启 Thing");
|
||||||
shell_execute_elevated(&exe_str, "", None)?;
|
shell_execute_elevated(&exe_str, "", None)?;
|
||||||
// 退出当前进程(非提权),新的提权进程会接管
|
// 退出当前进程(非提权),新的提权进程会接管
|
||||||
app.exit(0);
|
app.exit(0);
|
||||||
@@ -917,6 +1041,25 @@ pub fn monitor_set_elevate_on_launch(
|
|||||||
state.set_elevate_on_launch(enabled)
|
state.set_elevate_on_launch(enabled)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 查询"应用启动时自动启动监控内核"是否已启用
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn monitor_get_auto_start(
|
||||||
|
state: tauri::State<'_, MonitorKernel>,
|
||||||
|
) -> bool {
|
||||||
|
state.load_settings().auto_start
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置/清除"应用启动时自动启动监控内核"开关
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn monitor_set_auto_start(
|
||||||
|
state: tauri::State<'_, MonitorKernel>,
|
||||||
|
enabled: bool,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let mut settings = state.load_settings();
|
||||||
|
settings.auto_start = enabled;
|
||||||
|
state.save_settings(&settings)
|
||||||
|
}
|
||||||
|
|
||||||
/// 查询硬件监控配置(透传 Kernel GET /config/hardware)。
|
/// 查询硬件监控配置(透传 Kernel GET /config/hardware)。
|
||||||
/// 返回当前配置 + 可用硬件/传感器类型清单,供前端 Dialog 渲染。
|
/// 返回当前配置 + 可用硬件/传感器类型清单,供前端 Dialog 渲染。
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
|||||||
@@ -95,9 +95,9 @@ impl NetworkMonitor {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// emit 给前端(失败忽略:窗口可能未就绪)
|
// emit 给前端(失败忽略:窗口可能未就绪)
|
||||||
let _ = app.emit("monitor-network", &speed);
|
let _ = app.emit(crate::constants::events::MONITOR_NETWORK, &speed);
|
||||||
}
|
}
|
||||||
eprintln!("[network] 网速采样任务已退出");
|
crate::logger::log_info("network", "网速采样任务已退出");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,7 +116,7 @@ impl Default for NetworkMonitor {
|
|||||||
|
|
||||||
/// Tauri 命令:获取网速监控是否运行
|
/// Tauri 命令:获取网速监控是否运行
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn network_monitor_status(
|
pub fn network_status(
|
||||||
state: tauri::State<'_, NetworkMonitor>,
|
state: tauri::State<'_, NetworkMonitor>,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
state.running.load(Ordering::SeqCst)
|
state.running.load(Ordering::SeqCst)
|
||||||
|
|||||||
+247
-23
@@ -6,8 +6,8 @@
|
|||||||
//! - 任务栏覆盖检测:轮询 GetForegroundWindow,检测系统 UI 出现时暂时取消置顶
|
//! - 任务栏覆盖检测:轮询 GetForegroundWindow,检测系统 UI 出现时暂时取消置顶
|
||||||
|
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
use std::sync::{Arc, OnceLock};
|
use std::sync::{Arc, Mutex, OnceLock};
|
||||||
use std::thread;
|
use std::thread::{self, JoinHandle};
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
use tauri::{AppHandle, Emitter};
|
use tauri::{AppHandle, Emitter};
|
||||||
|
|
||||||
@@ -15,6 +15,12 @@ use tauri::{AppHandle, Emitter};
|
|||||||
static DRAG_STOP: OnceLock<Arc<AtomicBool>> = OnceLock::new();
|
static DRAG_STOP: OnceLock<Arc<AtomicBool>> = OnceLock::new();
|
||||||
/// 任务栏覆盖监视线程停止标志
|
/// 任务栏覆盖监视线程停止标志
|
||||||
static TOPMOST_STOP: OnceLock<Arc<AtomicBool>> = OnceLock::new();
|
static TOPMOST_STOP: OnceLock<Arc<AtomicBool>> = OnceLock::new();
|
||||||
|
/// 游戏全屏监视线程停止标志
|
||||||
|
static GAME_STOP: OnceLock<Arc<AtomicBool>> = OnceLock::new();
|
||||||
|
/// 监视线程句柄(用于停止时 join,避免 sleep 猜测式等待 + 线程泄漏)
|
||||||
|
static DRAG_HANDLE: Mutex<Option<JoinHandle<()>>> = Mutex::new(None);
|
||||||
|
static TOPMOST_HANDLE: Mutex<Option<JoinHandle<()>>> = Mutex::new(None);
|
||||||
|
static GAME_HANDLE: Mutex<Option<JoinHandle<()>>> = Mutex::new(None);
|
||||||
|
|
||||||
fn drag_stop() -> &'static Arc<AtomicBool> {
|
fn drag_stop() -> &'static Arc<AtomicBool> {
|
||||||
DRAG_STOP.get_or_init(|| Arc::new(AtomicBool::new(true)))
|
DRAG_STOP.get_or_init(|| Arc::new(AtomicBool::new(true)))
|
||||||
@@ -24,18 +30,63 @@ fn topmost_stop() -> &'static Arc<AtomicBool> {
|
|||||||
TOPMOST_STOP.get_or_init(|| Arc::new(AtomicBool::new(true)))
|
TOPMOST_STOP.get_or_init(|| Arc::new(AtomicBool::new(true)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn game_stop() -> &'static Arc<AtomicBool> {
|
||||||
|
GAME_STOP.get_or_init(|| Arc::new(AtomicBool::new(true)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 停止右键拖动监视线程并等待其退出(标志置位后线程最迟一个轮询周期退出)
|
||||||
|
fn stop_drag_thread() {
|
||||||
|
drag_stop().store(true, Ordering::SeqCst);
|
||||||
|
if let Some(h) = DRAG_HANDLE
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.take()
|
||||||
|
{
|
||||||
|
let _ = h.join();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 停止任务栏覆盖监视线程并等待其退出
|
||||||
|
fn stop_topmost_thread() {
|
||||||
|
topmost_stop().store(true, Ordering::SeqCst);
|
||||||
|
if let Some(h) = TOPMOST_HANDLE
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.take()
|
||||||
|
{
|
||||||
|
let _ = h.join();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 停止游戏全屏监视线程并等待其退出
|
||||||
|
fn stop_game_thread() {
|
||||||
|
game_stop().store(true, Ordering::SeqCst);
|
||||||
|
if let Some(h) = GAME_HANDLE
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.take()
|
||||||
|
{
|
||||||
|
let _ = h.join();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
mod win_api {
|
mod win_api {
|
||||||
use tauri::{AppHandle, Manager};
|
use tauri::{AppHandle, Manager};
|
||||||
use windows_sys::Win32::Foundation::{POINT, RECT};
|
use windows_sys::Win32::Foundation::{POINT, RECT};
|
||||||
|
use windows_sys::Win32::Graphics::Gdi::{
|
||||||
|
GetMonitorInfoW, MonitorFromWindow, MONITORINFO, MONITOR_DEFAULTTONEAREST,
|
||||||
|
};
|
||||||
use windows_sys::Win32::UI::Input::KeyboardAndMouse::{GetAsyncKeyState, VK_RBUTTON};
|
use windows_sys::Win32::UI::Input::KeyboardAndMouse::{GetAsyncKeyState, VK_RBUTTON};
|
||||||
use windows_sys::Win32::UI::WindowsAndMessaging::{
|
use windows_sys::Win32::UI::WindowsAndMessaging::{
|
||||||
GetClassNameW, GetCursorPos, GetForegroundWindow, GetWindowLongPtrW,
|
GetClassNameW, GetCursorPos, GetForegroundWindow, GetWindowLongPtrW, GetWindowLongW,
|
||||||
GetWindowRect, SendMessageW, SetWindowLongPtrW, SetWindowPos,
|
GetWindowRect, GetWindowThreadProcessId, SendMessageW, SetWindowLongPtrW, SetWindowPos,
|
||||||
GWL_EXSTYLE, HTCAPTION, HWND_NOTOPMOST, HWND_TOPMOST, SWP_NOACTIVATE, SWP_NOMOVE,
|
GWL_EXSTYLE, GWL_STYLE, HTCAPTION, HWND_NOTOPMOST, HWND_TOPMOST, SWP_NOACTIVATE,
|
||||||
SWP_NOSIZE, SWP_SHOWWINDOW, WM_NCLBUTTONDOWN, WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW,
|
SWP_NOMOVE, SWP_NOSIZE, SWP_NOZORDER, WM_NCLBUTTONDOWN, WS_EX_NOACTIVATE,
|
||||||
WS_EX_TRANSPARENT,
|
WS_EX_TOOLWINDOW, WS_EX_TRANSPARENT,
|
||||||
};
|
};
|
||||||
|
/// 供模块外全屏判定使用的窗口样式常量(pub re-export)
|
||||||
|
pub use windows_sys::Win32::UI::WindowsAndMessaging::WS_CAPTION;
|
||||||
|
|
||||||
/// windows-sys 的 HWND 类型别名(isize)
|
/// windows-sys 的 HWND 类型别名(isize)
|
||||||
pub type Hwnd = isize;
|
pub type Hwnd = isize;
|
||||||
@@ -138,6 +189,10 @@ mod win_api {
|
|||||||
} else {
|
} else {
|
||||||
HWND_NOTOPMOST
|
HWND_NOTOPMOST
|
||||||
};
|
};
|
||||||
|
// 注意:不传 SWP_SHOWWINDOW,仅调整 Z 序,绝不改变窗口可见性。
|
||||||
|
// 否则当 OSD 被 .hide() 隐藏后,任务栏覆盖监视线程在系统 UI 前景切换时
|
||||||
|
// (点击任务栏/托盘关闭主界面、打开托盘菜单)会重新显示已隐藏的 OSD,
|
||||||
|
// 表现为"托盘关闭 OSD 无效 / 关闭主界面后 OSD 又出现"。
|
||||||
SetWindowPos(
|
SetWindowPos(
|
||||||
hwnd,
|
hwnd,
|
||||||
insert_after,
|
insert_after,
|
||||||
@@ -145,7 +200,7 @@ mod win_api {
|
|||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_SHOWWINDOW,
|
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -163,6 +218,24 @@ mod win_api {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 原子设置窗口位置与尺寸(物理像素)
|
||||||
|
///
|
||||||
|
/// 一次 SetWindowPos 调用同时更新 x/y/w/h,避免 setSize + setPosition
|
||||||
|
/// 两次调用之间出现"宽度已变、位置未动"的中间帧(视觉闪烁)。
|
||||||
|
pub fn set_bounds(hwnd: Hwnd, x: i32, y: i32, w: i32, h: i32) {
|
||||||
|
unsafe {
|
||||||
|
SetWindowPos(
|
||||||
|
hwnd,
|
||||||
|
0, // 不改 Z 序
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
w,
|
||||||
|
h,
|
||||||
|
SWP_NOACTIVATE | SWP_NOZORDER,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 判断窗口类名是否为系统 UI(任务栏、开始菜单、通知区域等)
|
/// 判断窗口类名是否为系统 UI(任务栏、开始菜单、通知区域等)
|
||||||
pub fn is_system_ui_class(class_name: &str) -> bool {
|
pub fn is_system_ui_class(class_name: &str) -> bool {
|
||||||
matches!(
|
matches!(
|
||||||
@@ -176,6 +249,41 @@ mod win_api {
|
|||||||
| "Windows.UI.Shell.ShellFlyoutWindow" // Win11 Shell 弹出
|
| "Windows.UI.Shell.ShellFlyoutWindow" // Win11 Shell 弹出
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 获取窗口样式(GWL_STYLE)
|
||||||
|
pub fn get_window_style(hwnd: Hwnd) -> isize {
|
||||||
|
unsafe { GetWindowLongW(hwnd, GWL_STYLE) as isize }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 判断窗口是否属于本进程(Thing 自身窗口不参与全屏判定)
|
||||||
|
pub fn is_own_process(hwnd: Hwnd) -> bool {
|
||||||
|
let mut pid: u32 = 0;
|
||||||
|
unsafe {
|
||||||
|
GetWindowThreadProcessId(hwnd, &mut pid);
|
||||||
|
}
|
||||||
|
pid != 0 && pid == std::process::id()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取窗口所在显示器(最近匹配)的矩形(物理像素)
|
||||||
|
pub fn get_monitor_rect(hwnd: Hwnd) -> Option<RECT> {
|
||||||
|
let monitor = unsafe { MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST) };
|
||||||
|
if monitor == 0 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let mut info = MONITORINFO {
|
||||||
|
cbSize: std::mem::size_of::<MONITORINFO>() as u32,
|
||||||
|
rcMonitor: RECT { left: 0, top: 0, right: 0, bottom: 0 },
|
||||||
|
rcWork: RECT { left: 0, top: 0, right: 0, bottom: 0 },
|
||||||
|
dwFlags: 0,
|
||||||
|
};
|
||||||
|
unsafe {
|
||||||
|
if GetMonitorInfoW(monitor, &mut info) != 0 {
|
||||||
|
Some(info.rcMonitor)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 应用 OSD 悬浮窗的原生样式(NoActivate + ToolWindow)
|
/// 应用 OSD 悬浮窗的原生样式(NoActivate + ToolWindow)
|
||||||
@@ -186,7 +294,7 @@ pub fn osd_apply_overlay_style(label: String, app: AppHandle) -> Result<(), Stri
|
|||||||
let hwnd = win_api::get_hwnd(&label, &app)
|
let hwnd = win_api::get_hwnd(&label, &app)
|
||||||
.ok_or_else(|| format!("窗口 {} 不存在", label))?;
|
.ok_or_else(|| format!("窗口 {} 不存在", label))?;
|
||||||
win_api::apply_no_activate(hwnd);
|
win_api::apply_no_activate(hwnd);
|
||||||
eprintln!("[osd] 已应用 NoActivate 样式到窗口 {}", label);
|
crate::logger::log_info("osd", &format!("已应用 NoActivate 样式到窗口 {}", label));
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -198,15 +306,14 @@ pub fn osd_apply_overlay_style(label: String, app: AppHandle) -> Result<(), Stri
|
|||||||
/// 右键释放后发出 `osd-end-drag` 事件。
|
/// 右键释放后发出 `osd-end-drag` 事件。
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn osd_start_drag_watch(label: String, app: AppHandle) -> Result<(), String> {
|
pub fn osd_start_drag_watch(label: String, app: AppHandle) -> Result<(), String> {
|
||||||
// 停止旧线程,等待退出
|
// 停止旧线程,等待其退出后再启动新线程(避免新旧线程并存)
|
||||||
drag_stop().store(true, Ordering::SeqCst);
|
stop_drag_thread();
|
||||||
thread::sleep(Duration::from_millis(50));
|
|
||||||
let stop_flag = drag_stop().clone();
|
let stop_flag = drag_stop().clone();
|
||||||
stop_flag.store(false, Ordering::SeqCst);
|
stop_flag.store(false, Ordering::SeqCst);
|
||||||
|
|
||||||
let app_handle = app.clone();
|
let app_handle = app.clone();
|
||||||
|
|
||||||
thread::spawn(move || {
|
let handle = thread::spawn(move || {
|
||||||
let mut rbutton_was_down = false;
|
let mut rbutton_was_down = false;
|
||||||
let mut press_start: Option<Instant> = None;
|
let mut press_start: Option<Instant> = None;
|
||||||
let mut drag_emitted = false;
|
let mut drag_emitted = false;
|
||||||
@@ -234,7 +341,7 @@ pub fn osd_start_drag_watch(label: String, app: AppHandle) -> Result<(), String>
|
|||||||
(win_api::get_cursor_pos(), win_api::get_window_rect(hwnd))
|
(win_api::get_cursor_pos(), win_api::get_window_rect(hwnd))
|
||||||
{
|
{
|
||||||
if win_api::point_in_rect(pt, rect) {
|
if win_api::point_in_rect(pt, rect) {
|
||||||
let _ = app_handle.emit("osd-start-drag", ());
|
let _ = app_handle.emit(crate::constants::events::OSD_START_DRAG, ());
|
||||||
drag_emitted = true;
|
drag_emitted = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -245,7 +352,7 @@ pub fn osd_start_drag_watch(label: String, app: AppHandle) -> Result<(), String>
|
|||||||
} else if !rbutton_down && rbutton_was_down {
|
} else if !rbutton_down && rbutton_was_down {
|
||||||
// 右键释放
|
// 右键释放
|
||||||
if drag_emitted {
|
if drag_emitted {
|
||||||
let _ = app_handle.emit("osd-end-drag", ());
|
let _ = app_handle.emit(crate::constants::events::OSD_END_DRAG, ());
|
||||||
}
|
}
|
||||||
press_start = None;
|
press_start = None;
|
||||||
drag_emitted = false;
|
drag_emitted = false;
|
||||||
@@ -258,6 +365,10 @@ pub fn osd_start_drag_watch(label: String, app: AppHandle) -> Result<(), String>
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if let Ok(mut guard) = DRAG_HANDLE.lock() {
|
||||||
|
*guard = Some(handle);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -268,14 +379,14 @@ pub fn osd_start_drag_watch(label: String, app: AppHandle) -> Result<(), String>
|
|||||||
/// 系统 UI 关闭后发出 `osd-system-ui-inactive` 事件恢复置顶。
|
/// 系统 UI 关闭后发出 `osd-system-ui-inactive` 事件恢复置顶。
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn osd_start_topmost_watch(app: AppHandle) -> Result<(), String> {
|
pub fn osd_start_topmost_watch(app: AppHandle) -> Result<(), String> {
|
||||||
topmost_stop().store(true, Ordering::SeqCst);
|
// 停止旧线程,等待其退出后再启动新线程
|
||||||
thread::sleep(Duration::from_millis(50));
|
stop_topmost_thread();
|
||||||
let stop_flag = topmost_stop().clone();
|
let stop_flag = topmost_stop().clone();
|
||||||
stop_flag.store(false, Ordering::SeqCst);
|
stop_flag.store(false, Ordering::SeqCst);
|
||||||
|
|
||||||
let app_handle = app.clone();
|
let app_handle = app.clone();
|
||||||
|
|
||||||
thread::spawn(move || {
|
let handle = thread::spawn(move || {
|
||||||
let mut last_foreground: isize = 0;
|
let mut last_foreground: isize = 0;
|
||||||
let mut system_ui_active = false;
|
let mut system_ui_active = false;
|
||||||
|
|
||||||
@@ -293,15 +404,15 @@ pub fn osd_start_topmost_watch(app: AppHandle) -> Result<(), String> {
|
|||||||
if win_api::is_system_ui_class(&class) {
|
if win_api::is_system_ui_class(&class) {
|
||||||
if !system_ui_active {
|
if !system_ui_active {
|
||||||
system_ui_active = true;
|
system_ui_active = true;
|
||||||
let _ = app_handle.emit("osd-system-ui-active", ());
|
let _ = app_handle.emit(crate::constants::events::OSD_SYSTEM_UI_ACTIVE, ());
|
||||||
}
|
}
|
||||||
} else if system_ui_active {
|
} else if system_ui_active {
|
||||||
system_ui_active = false;
|
system_ui_active = false;
|
||||||
let _ = app_handle.emit("osd-system-ui-inactive", ());
|
let _ = app_handle.emit(crate::constants::events::OSD_SYSTEM_UI_INACTIVE, ());
|
||||||
}
|
}
|
||||||
} else if system_ui_active {
|
} else if system_ui_active {
|
||||||
system_ui_active = false;
|
system_ui_active = false;
|
||||||
let _ = app_handle.emit("osd-system-ui-inactive", ());
|
let _ = app_handle.emit(crate::constants::events::OSD_SYSTEM_UI_INACTIVE, ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -310,14 +421,105 @@ pub fn osd_start_topmost_watch(app: AppHandle) -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if let Ok(mut guard) = TOPMOST_HANDLE.lock() {
|
||||||
|
*guard = Some(handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 判断窗口是否为全屏应用(无边框/独占全屏游戏)
|
||||||
|
///
|
||||||
|
/// 判定条件(全部满足):
|
||||||
|
/// 1. 无 WS_CAPTION 样式 —— 排除普通应用的"最大化"(即使系统任务栏设为自动隐藏,
|
||||||
|
/// 最大化窗口覆盖率也接近 100%,但它们带标题栏,靠样式即可区分)
|
||||||
|
/// 2. 非本进程窗口(Thing 主窗口/悬浮窗自身)
|
||||||
|
/// 3. 窗口矩形与所在显示器矩形的交集覆盖率 ≥ 95%(兼容缩放/1px 误差)
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn is_fullscreen_game_window(hwnd: isize) -> bool {
|
||||||
|
if win_api::get_window_style(hwnd) & (win_api::WS_CAPTION as isize) != 0 {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if win_api::is_own_process(hwnd) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let (Some(win_rect), Some(mon_rect)) = (
|
||||||
|
win_api::get_window_rect(hwnd),
|
||||||
|
win_api::get_monitor_rect(hwnd),
|
||||||
|
) else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
let iw = (win_rect.right.min(mon_rect.right) - win_rect.left.max(mon_rect.left)).max(0) as i64;
|
||||||
|
let ih = (win_rect.bottom.min(mon_rect.bottom) - win_rect.top.max(mon_rect.top)).max(0) as i64;
|
||||||
|
let mw = (mon_rect.right - mon_rect.left).max(0) as i64;
|
||||||
|
let mh = (mon_rect.bottom - mon_rect.top).max(0) as i64;
|
||||||
|
let mon_area = (mw * mh).max(1);
|
||||||
|
iw * ih * 100 >= mon_area * 95
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 启动游戏全屏监视
|
||||||
|
///
|
||||||
|
/// 轮询检测前景窗口是否为全屏应用(无边框/独占全屏游戏),
|
||||||
|
/// 状态变化时发出 `osd-game-active` / `osd-game-inactive` 事件。
|
||||||
|
/// 前端据此隐藏/恢复 OSD:透明置顶 WebView 悬浮窗会占用 DWM 合成路径,
|
||||||
|
/// 禁用游戏的独立翻转(MPO),是游戏中掉帧的根源;隐藏悬浮窗即可排除影响。
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn osd_start_game_watch(app: AppHandle) -> Result<(), String> {
|
||||||
|
// 停止旧线程,等待其退出后再启动新线程
|
||||||
|
stop_game_thread();
|
||||||
|
let stop_flag = game_stop().clone();
|
||||||
|
stop_flag.store(false, Ordering::SeqCst);
|
||||||
|
|
||||||
|
let app_handle = app.clone();
|
||||||
|
|
||||||
|
let handle = thread::spawn(move || {
|
||||||
|
let mut fullscreen_active = false;
|
||||||
|
|
||||||
|
loop {
|
||||||
|
if stop_flag.load(Ordering::SeqCst) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
let fg = win_api::get_foreground_window();
|
||||||
|
let fullscreen = fg != 0
|
||||||
|
&& win_api::get_class_name(fg)
|
||||||
|
.map_or(false, |c| !win_api::is_system_ui_class(&c))
|
||||||
|
&& is_fullscreen_game_window(fg);
|
||||||
|
|
||||||
|
if fullscreen != fullscreen_active {
|
||||||
|
fullscreen_active = fullscreen;
|
||||||
|
let event = if fullscreen {
|
||||||
|
crate::constants::events::OSD_GAME_ACTIVE
|
||||||
|
} else {
|
||||||
|
crate::constants::events::OSD_GAME_INACTIVE
|
||||||
|
};
|
||||||
|
let _ = app_handle.emit(event, ());
|
||||||
|
crate::logger::log_info(
|
||||||
|
"osd",
|
||||||
|
&format!("全屏应用前台: {}", if fullscreen { "是 → 隐藏 OSD" } else { "否 → 恢复 OSD" }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
thread::sleep(Duration::from_millis(1000));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if let Ok(mut guard) = GAME_HANDLE.lock() {
|
||||||
|
*guard = Some(handle);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 停止所有 OSD 监视线程
|
/// 停止所有 OSD 监视线程
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn osd_stop_watch() {
|
pub fn osd_stop_watch() {
|
||||||
drag_stop().store(true, Ordering::SeqCst);
|
stop_drag_thread();
|
||||||
topmost_stop().store(true, Ordering::SeqCst);
|
stop_topmost_thread();
|
||||||
|
stop_game_thread();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 设置点击穿透(Rust 侧原生 WS_EX_TRANSPARENT,比 JS setIgnoreCursorEvents 更可靠)
|
/// 设置点击穿透(Rust 侧原生 WS_EX_TRANSPARENT,比 JS setIgnoreCursorEvents 更可靠)
|
||||||
@@ -344,6 +546,28 @@ pub fn osd_set_topmost(label: String, topmost: bool, app: AppHandle) -> Result<(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 原子设置窗口位置与尺寸(物理像素)
|
||||||
|
///
|
||||||
|
/// 一次调用同时更新位置和尺寸,避免 setSize + setPosition 两次 IPC 之间的
|
||||||
|
/// 中间帧(宽度已变、位置未动 → 视觉闪烁)。前端传入物理像素坐标。
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn osd_set_bounds(
|
||||||
|
label: String,
|
||||||
|
x: i32,
|
||||||
|
y: i32,
|
||||||
|
w: i32,
|
||||||
|
h: i32,
|
||||||
|
app: AppHandle,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
let hwnd = win_api::get_hwnd(&label, &app)
|
||||||
|
.ok_or_else(|| format!("窗口 {} 不存在", label))?;
|
||||||
|
win_api::set_bounds(hwnd, x, y, w, h);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// 启动原生拖动(右键长按触发)
|
/// 启动原生拖动(右键长按触发)
|
||||||
///
|
///
|
||||||
/// 同步关闭点击穿透(WS_EX_TRANSPARENT),然后在独立线程中调用
|
/// 同步关闭点击穿透(WS_EX_TRANSPARENT),然后在独立线程中调用
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
use specta::Type;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::process::{Child, Command, Stdio};
|
use std::process::{Child, Command, Stdio};
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
@@ -10,6 +11,11 @@ use tauri::{AppHandle, Emitter, Manager};
|
|||||||
// CREATE_NO_WINDOW = 0x08000000,阻止子进程创建新的控制台窗口
|
// CREATE_NO_WINDOW = 0x08000000,阻止子进程创建新的控制台窗口
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
pub const CREATE_NO_WINDOW: u32 = 0x08000000;
|
pub const CREATE_NO_WINDOW: u32 = 0x08000000;
|
||||||
|
// CREATE_NEW_CONSOLE = 0x00000010,强制为控制台类子进程新开一个可见控制台窗口。
|
||||||
|
// 从 GUI 宿主(无控制台)直接 spawn cmd/powershell 等控制台程序时若不设置,
|
||||||
|
// 子进程会挂到隐藏控制台/不显示窗口,表现为"点击没反应"。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub const CREATE_NEW_CONSOLE: u32 = 0x00000010;
|
||||||
|
|
||||||
// Windows Job Object 相关常量,用于异常退出时自动清理子进程
|
// Windows Job Object 相关常量,用于异常退出时自动清理子进程
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
@@ -80,7 +86,7 @@ fn get_job_handle() -> Option<winapi::HANDLE> {
|
|||||||
unsafe {
|
unsafe {
|
||||||
let h = winapi::CreateJobObjectW(std::ptr::null_mut(), std::ptr::null());
|
let h = winapi::CreateJobObjectW(std::ptr::null_mut(), std::ptr::null());
|
||||||
if h.is_null() {
|
if h.is_null() {
|
||||||
eprintln!("[ProcessManager] CreateJobObjectW 失败,异常退出时子进程可能残留");
|
crate::logger::log_error("process", "CreateJobObjectW 失败,异常退出时子进程可能残留");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
// 设置 KILL_ON_JOB_CLOSE:主进程退出时自动终止所有子进程
|
// 设置 KILL_ON_JOB_CLOSE:主进程退出时自动终止所有子进程
|
||||||
@@ -93,7 +99,7 @@ fn get_job_handle() -> Option<winapi::HANDLE> {
|
|||||||
std::mem::size_of::<winapi::JOBOBJECT_EXTENDED_LIMIT_INFORMATION>() as u32,
|
std::mem::size_of::<winapi::JOBOBJECT_EXTENDED_LIMIT_INFORMATION>() as u32,
|
||||||
);
|
);
|
||||||
if ok == 0 {
|
if ok == 0 {
|
||||||
eprintln!("[ProcessManager] SetInformationJobObject 失败");
|
crate::logger::log_error("process", "SetInformationJobObject 失败");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
h as usize
|
h as usize
|
||||||
@@ -136,7 +142,7 @@ fn assign_to_job(child: &Child) {
|
|||||||
fn assign_to_job(_child: &Child) {}
|
fn assign_to_job(_child: &Child) {}
|
||||||
|
|
||||||
/// 进程状态枚举
|
/// 进程状态枚举
|
||||||
#[derive(Serialize, Clone, Debug)]
|
#[derive(Serialize, Clone, Debug, Type)]
|
||||||
#[serde(rename_all = "lowercase")]
|
#[serde(rename_all = "lowercase")]
|
||||||
pub enum ProcessStatus {
|
pub enum ProcessStatus {
|
||||||
Running,
|
Running,
|
||||||
@@ -147,7 +153,8 @@ pub enum ProcessStatus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 进程信息(返回给前端)
|
/// 进程信息(返回给前端)
|
||||||
#[derive(Serialize, Clone)]
|
#[derive(Serialize, Clone, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct ProcessInfo {
|
pub struct ProcessInfo {
|
||||||
pub id: String,
|
pub id: String,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
@@ -291,7 +298,7 @@ impl ProcessManager {
|
|||||||
Ok(Some(_)) => break,
|
Ok(Some(_)) => break,
|
||||||
Ok(None) => {
|
Ok(None) => {
|
||||||
if std::time::Instant::now() >= deadline {
|
if std::time::Instant::now() >= deadline {
|
||||||
println!("[ProcessManager] 进程 {} 等待退出超时(3s),放弃等待", id);
|
crate::logger::log_warn("process", &format!("进程 {} 等待退出超时(3s),放弃等待", id));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
std::thread::sleep(Duration::from_millis(50));
|
std::thread::sleep(Duration::from_millis(50));
|
||||||
@@ -299,7 +306,7 @@ impl ProcessManager {
|
|||||||
Err(_) => break,
|
Err(_) => break,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
println!("[ProcessManager] 已停止进程: {}", id);
|
crate::logger::log_info("process", &format!("已停止进程: {}", id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -351,9 +358,15 @@ impl ProcessManager {
|
|||||||
|
|
||||||
/// 检查所有进程,处理崩溃的进程(自动重启或移除)
|
/// 检查所有进程,处理崩溃的进程(自动重启或移除)
|
||||||
/// 返回状态发生变化的进程列表
|
/// 返回状态发生变化的进程列表
|
||||||
|
/// 注意:kill/wait/sleep(800ms) 等阻塞操作一律在锁外执行,
|
||||||
|
/// 锁内仅做非阻塞的 try_wait 判定,避免阻塞其他进程的状态查询
|
||||||
pub fn check_and_cleanup(&self) -> Vec<ProcessInfo> {
|
pub fn check_and_cleanup(&self) -> Vec<ProcessInfo> {
|
||||||
let mut changes = Vec::new();
|
let mut changes = Vec::new();
|
||||||
|
// 需要重启的条目(锁外执行 kill + sleep + spawn)
|
||||||
|
let mut restarts: Vec<(String, ProcessEntry)> = Vec::new();
|
||||||
|
|
||||||
|
// 阶段 1:锁内快速判定(仅非阻塞 try_wait),收集重启/移除决策
|
||||||
|
{
|
||||||
let mut processes = match self.processes.lock() {
|
let mut processes = match self.processes.lock() {
|
||||||
Ok(p) => p,
|
Ok(p) => p,
|
||||||
Err(_) => return changes,
|
Err(_) => return changes,
|
||||||
@@ -362,7 +375,7 @@ impl ProcessManager {
|
|||||||
let ids: Vec<String> = processes.keys().cloned().collect();
|
let ids: Vec<String> = processes.keys().cloned().collect();
|
||||||
|
|
||||||
for id in ids {
|
for id in ids {
|
||||||
if let Some(entry) = processes.get_mut(&id) {
|
let Some(entry) = processes.get_mut(&id) else { continue };
|
||||||
match entry.child.try_wait() {
|
match entry.child.try_wait() {
|
||||||
Ok(None) => {
|
Ok(None) => {
|
||||||
// 仍在运行,无需处理
|
// 仍在运行,无需处理
|
||||||
@@ -373,58 +386,10 @@ impl ProcessManager {
|
|||||||
&& (entry.max_restarts == 0
|
&& (entry.max_restarts == 0
|
||||||
|| entry.restart_count < entry.max_restarts)
|
|| entry.restart_count < entry.max_restarts)
|
||||||
{
|
{
|
||||||
// 自动重启
|
// 需要自动重启:从 map 移除,锁外执行
|
||||||
let restart_count = entry.restart_count + 1;
|
if let Some(mut e) = processes.remove(&id) {
|
||||||
let executable = entry.executable.clone();
|
e.restart_count += 1;
|
||||||
let args = entry.args.clone();
|
restarts.push((id.clone(), e));
|
||||||
let cwd = entry.cwd.clone();
|
|
||||||
let name = entry.name.clone();
|
|
||||||
|
|
||||||
// 先终止旧进程
|
|
||||||
let _ = entry.child.kill();
|
|
||||||
let _ = entry.child.wait();
|
|
||||||
// 等待 TCP 端口释放(Windows 上 kill 后端口释放有延迟)
|
|
||||||
std::thread::sleep(std::time::Duration::from_millis(800));
|
|
||||||
|
|
||||||
// 重新启动
|
|
||||||
let mut cmd = Command::new(&executable);
|
|
||||||
cmd.args(&args);
|
|
||||||
if let Some(ref dir) = cwd {
|
|
||||||
cmd.current_dir(dir);
|
|
||||||
}
|
|
||||||
cmd.stdout(Stdio::null())
|
|
||||||
.stderr(Stdio::null())
|
|
||||||
.stdin(Stdio::null());
|
|
||||||
setup_creation_flags(&mut cmd);
|
|
||||||
|
|
||||||
match cmd.spawn() {
|
|
||||||
Ok(new_child) => {
|
|
||||||
let pid = new_child.id();
|
|
||||||
entry.child = new_child;
|
|
||||||
entry.restart_count = restart_count;
|
|
||||||
|
|
||||||
changes.push(ProcessInfo {
|
|
||||||
id: id.clone(),
|
|
||||||
name: name.clone(),
|
|
||||||
status: ProcessStatus::Running,
|
|
||||||
pid: Some(pid),
|
|
||||||
restart_count,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
eprintln!(
|
|
||||||
"[ProcessManager] 重启进程 '{}' 失败: {}",
|
|
||||||
id, e
|
|
||||||
);
|
|
||||||
processes.remove(&id);
|
|
||||||
changes.push(ProcessInfo {
|
|
||||||
id: id.clone(),
|
|
||||||
name,
|
|
||||||
status: ProcessStatus::Crashed,
|
|
||||||
pid: None,
|
|
||||||
restart_count,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 不自动重启,移除记录
|
// 不自动重启,移除记录
|
||||||
@@ -455,6 +420,58 @@ impl ProcessManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} // 锁在此释放
|
||||||
|
|
||||||
|
// 阶段 2:锁外执行重启(kill + wait + 端口释放等待 + spawn,不阻塞进程状态查询)
|
||||||
|
for (id, mut entry) in restarts {
|
||||||
|
// 先终止旧进程
|
||||||
|
let _ = entry.child.kill();
|
||||||
|
let _ = entry.child.wait();
|
||||||
|
// 等待 TCP 端口释放(Windows 上 kill 后端口释放有延迟)
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(800));
|
||||||
|
|
||||||
|
// 重新启动
|
||||||
|
let mut cmd = Command::new(&entry.executable);
|
||||||
|
cmd.args(&entry.args);
|
||||||
|
if let Some(ref dir) = entry.cwd {
|
||||||
|
cmd.current_dir(dir);
|
||||||
|
}
|
||||||
|
cmd.stdout(Stdio::null())
|
||||||
|
.stderr(Stdio::null())
|
||||||
|
.stdin(Stdio::null());
|
||||||
|
setup_creation_flags(&mut cmd);
|
||||||
|
|
||||||
|
let name = entry.name.clone();
|
||||||
|
let restart_count = entry.restart_count;
|
||||||
|
match cmd.spawn() {
|
||||||
|
Ok(new_child) => {
|
||||||
|
let pid = new_child.id();
|
||||||
|
entry.child = new_child;
|
||||||
|
if let Ok(mut processes) = self.processes.lock() {
|
||||||
|
processes.insert(id.clone(), entry);
|
||||||
|
}
|
||||||
|
changes.push(ProcessInfo {
|
||||||
|
id: id.clone(),
|
||||||
|
name,
|
||||||
|
status: ProcessStatus::Running,
|
||||||
|
pid: Some(pid),
|
||||||
|
restart_count,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_error(
|
||||||
|
"process",
|
||||||
|
&format!("重启进程 '{}' 失败: {}", id, e),
|
||||||
|
);
|
||||||
|
changes.push(ProcessInfo {
|
||||||
|
id: id.clone(),
|
||||||
|
name,
|
||||||
|
status: ProcessStatus::Crashed,
|
||||||
|
pid: None,
|
||||||
|
restart_count,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
changes
|
changes
|
||||||
@@ -464,7 +481,7 @@ impl ProcessManager {
|
|||||||
// ===== Tauri 命令 =====
|
// ===== Tauri 命令 =====
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn start_process(
|
pub fn process_start(
|
||||||
state: tauri::State<'_, ProcessManager>,
|
state: tauri::State<'_, ProcessManager>,
|
||||||
params: StartProcessParams,
|
params: StartProcessParams,
|
||||||
) -> Result<ProcessInfo, String> {
|
) -> Result<ProcessInfo, String> {
|
||||||
@@ -472,7 +489,7 @@ pub fn start_process(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn stop_process(
|
pub fn process_stop(
|
||||||
state: tauri::State<'_, ProcessManager>,
|
state: tauri::State<'_, ProcessManager>,
|
||||||
id: String,
|
id: String,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
@@ -480,7 +497,7 @@ pub fn stop_process(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn get_process_status(
|
pub fn process_status(
|
||||||
state: tauri::State<'_, ProcessManager>,
|
state: tauri::State<'_, ProcessManager>,
|
||||||
id: String,
|
id: String,
|
||||||
) -> Option<ProcessInfo> {
|
) -> Option<ProcessInfo> {
|
||||||
@@ -488,14 +505,14 @@ pub fn get_process_status(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn get_all_process_status(
|
pub fn process_all_status(
|
||||||
state: tauri::State<'_, ProcessManager>,
|
state: tauri::State<'_, ProcessManager>,
|
||||||
) -> Vec<ProcessInfo> {
|
) -> Vec<ProcessInfo> {
|
||||||
state.get_all_status()
|
state.get_all_status()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn stop_all_processes(state: tauri::State<'_, ProcessManager>) {
|
pub fn process_stop_all(state: tauri::State<'_, ProcessManager>) {
|
||||||
state.stop_all()
|
state.stop_all()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -509,7 +526,7 @@ pub fn start_monitoring_thread(app: AppHandle) {
|
|||||||
let changes = state.check_and_cleanup();
|
let changes = state.check_and_cleanup();
|
||||||
|
|
||||||
for change in changes {
|
for change in changes {
|
||||||
let _ = app.emit("process-status-changed", &change);
|
let _ = app.emit(crate::constants::events::PROCESS_STATUS_CHANGED, &change);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,344 @@
|
|||||||
|
//! 快速面板:基于 7-Zip(binaries/7z.exe)的批量文件操作。
|
||||||
|
//!
|
||||||
|
//! - 批量解压:逐文件调用 7z 控制台,支持一次传入统一密码(`-p`),
|
||||||
|
//! 每完成一个文件通过事件推送进度,前端可实时展示。
|
||||||
|
//! - 批量重命名:`regex` 匹配文件名生成预览,确认后执行 `fs::rename`。
|
||||||
|
//! - 目录列表:供前端展示当前目录的压缩包 / 文件列表。
|
||||||
|
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use specta::Type;
|
||||||
|
use tauri::{AppHandle, Emitter, Manager};
|
||||||
|
|
||||||
|
use crate::constants::events::QUICKPANEL_EXTRACT_PROGRESS;
|
||||||
|
|
||||||
|
/// 7z 可执行文件名(与 7z.dll 同目录,位于 resources/binaries)。
|
||||||
|
const _7Z_EXE: &str = "binaries/7z.exe";
|
||||||
|
|
||||||
|
/// 支持的压缩包扩展名(解压面板中列出)。
|
||||||
|
const ARCHIVE_EXTS: &[&str] = &[
|
||||||
|
".zip", ".7z", ".rar", ".tar", ".gz", ".tgz", ".bz2", ".tbz", ".xz", ".txz", ".zst",
|
||||||
|
".tzst", ".cab", ".lzma",
|
||||||
|
];
|
||||||
|
|
||||||
|
/// 定位 7z 可执行文件(resources/binaries/7z.exe)。
|
||||||
|
fn locate_7z(app: &AppHandle) -> Option<PathBuf> {
|
||||||
|
let path = app
|
||||||
|
.path()
|
||||||
|
.resolve(_7Z_EXE, tauri::path::BaseDirectory::Resource)
|
||||||
|
.ok()?;
|
||||||
|
if path.exists() {
|
||||||
|
Some(path)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Type, Clone)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ArchiveInfo {
|
||||||
|
pub name: String,
|
||||||
|
pub path: String,
|
||||||
|
pub size: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Type, Clone)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct FileEntry {
|
||||||
|
pub name: String,
|
||||||
|
pub path: String,
|
||||||
|
pub is_dir: bool,
|
||||||
|
pub size: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Type, Clone)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ExtractResult {
|
||||||
|
pub name: String,
|
||||||
|
pub path: String,
|
||||||
|
pub ok: bool,
|
||||||
|
pub error: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Type, Clone)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ExtractProgress {
|
||||||
|
pub done: usize,
|
||||||
|
pub total: usize,
|
||||||
|
pub current: String,
|
||||||
|
pub ok: bool,
|
||||||
|
pub error: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Type, Clone)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct RenamePreview {
|
||||||
|
pub path: String,
|
||||||
|
pub old_name: String,
|
||||||
|
pub new_name: String,
|
||||||
|
pub error: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Type, Clone)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct RenameItem {
|
||||||
|
pub path: String,
|
||||||
|
pub old_name: String,
|
||||||
|
pub new_name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Type, Clone)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct RenameResult {
|
||||||
|
pub old_name: String,
|
||||||
|
pub new_name: String,
|
||||||
|
pub ok: bool,
|
||||||
|
pub error: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_archive(name: &str) -> bool {
|
||||||
|
let lower = name.to_lowercase();
|
||||||
|
ARCHIVE_EXTS.iter().any(|ext| lower.ends_with(ext))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 列出目录下的压缩包文件(供批量解压面板使用)。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_list_archives(dir: String) -> Result<Vec<ArchiveInfo>, String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
let d = Path::new(&dir);
|
||||||
|
if !d.is_dir() {
|
||||||
|
return Err(format!("目录不存在: {dir}"));
|
||||||
|
}
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for entry in std::fs::read_dir(d).map_err(|e| format!("读取目录失败: {e}"))? {
|
||||||
|
let Ok(entry) = entry else { continue };
|
||||||
|
let path = entry.path();
|
||||||
|
if !path.is_file() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let name = path
|
||||||
|
.file_name()
|
||||||
|
.map(|s| s.to_string_lossy().to_string())
|
||||||
|
.unwrap_or_default();
|
||||||
|
if is_archive(&name) {
|
||||||
|
let size = path.metadata().map(|m| m.len()).unwrap_or(0);
|
||||||
|
out.push(ArchiveInfo {
|
||||||
|
name,
|
||||||
|
path: path.to_string_lossy().to_string(),
|
||||||
|
size,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out.sort_by(|a, b| a.name.cmp(&b.name));
|
||||||
|
Ok(out)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取压缩包失败: {e}"))?
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 列出目录下的全部条目(供批量重命名/删除面板使用,不含子目录递归)。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_list_dir(dir: String) -> Result<Vec<FileEntry>, String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
let d = Path::new(&dir);
|
||||||
|
if !d.is_dir() {
|
||||||
|
return Err(format!("目录不存在: {dir}"));
|
||||||
|
}
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for entry in std::fs::read_dir(d).map_err(|e| format!("读取目录失败: {e}"))? {
|
||||||
|
let Ok(entry) = entry else { continue };
|
||||||
|
let path = entry.path();
|
||||||
|
let is_dir = path.is_dir();
|
||||||
|
let name = path
|
||||||
|
.file_name()
|
||||||
|
.map(|s| s.to_string_lossy().to_string())
|
||||||
|
.unwrap_or_default();
|
||||||
|
let size = if is_dir {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
path.metadata().map(|m| m.len()).unwrap_or(0)
|
||||||
|
};
|
||||||
|
out.push(FileEntry {
|
||||||
|
name,
|
||||||
|
path: path.to_string_lossy().to_string(),
|
||||||
|
is_dir,
|
||||||
|
size,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
out.sort_by(|a, b| {
|
||||||
|
b.is_dir
|
||||||
|
.cmp(&a.is_dir)
|
||||||
|
.then_with(|| a.name.to_lowercase().cmp(&b.name.to_lowercase()))
|
||||||
|
});
|
||||||
|
Ok(out)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取目录失败: {e}"))?
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extract_one(
|
||||||
|
exe: &Path,
|
||||||
|
archive: &str,
|
||||||
|
dest: &str,
|
||||||
|
password: Option<&str>,
|
||||||
|
into_subfolder: bool,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let archive_path = Path::new(archive);
|
||||||
|
let mut cmd = Command::new(exe);
|
||||||
|
cmd.arg("x").arg(archive_path);
|
||||||
|
if into_subfolder {
|
||||||
|
// 解压到「压缩包同名子文件夹」,避免文件散落在当前目录。
|
||||||
|
let sub = archive_path
|
||||||
|
.file_stem()
|
||||||
|
.map(|s| s.to_string_lossy().to_string())
|
||||||
|
.unwrap_or_else(|| "extracted".into());
|
||||||
|
let sub_dir = Path::new(dest).join(&sub);
|
||||||
|
std::fs::create_dir_all(&sub_dir).map_err(|e| format!("创建目录 {sub} 失败: {e}"))?;
|
||||||
|
cmd.arg(format!("-o{}", sub_dir.display()));
|
||||||
|
} else {
|
||||||
|
cmd.arg(format!("-o{}", dest));
|
||||||
|
}
|
||||||
|
cmd.arg("-y"); // 全自动覆盖确认
|
||||||
|
if let Some(p) = password.filter(|p| !p.is_empty()) {
|
||||||
|
cmd.arg(format!("-p{p}"));
|
||||||
|
}
|
||||||
|
// 静默普通输出,仅错误进 stderr,逐文件粒度足够时无需 -bsp1 进度。
|
||||||
|
cmd.arg("-bso0").arg("-bse1").arg("-bsp0");
|
||||||
|
// 以 7z.exe 所在目录为工作目录,确保同目录的 7z.dll 可被加载。
|
||||||
|
if let Some(dir) = exe.parent() {
|
||||||
|
cmd.current_dir(dir);
|
||||||
|
}
|
||||||
|
let output = cmd.output().map_err(|e| format!("启动 7-Zip 失败: {e}"))?;
|
||||||
|
if output.status.success() {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
let msg = String::from_utf8_lossy(&output.stderr).trim().to_string();
|
||||||
|
let code = output.status.code().unwrap_or(-1);
|
||||||
|
Err(if msg.is_empty() {
|
||||||
|
format!("退出码 {code}")
|
||||||
|
} else {
|
||||||
|
msg
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 批量解压。`files` 为压缩包路径列表,`dest_dir` 为目标目录,
|
||||||
|
/// `password` 为统一解压密码(可空),`into_subfolder` 是否解压到同名子文件夹。
|
||||||
|
/// 每完成一个文件通过 `quickpanel-extract-progress` 事件推送进度。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_batch_extract(
|
||||||
|
app: AppHandle,
|
||||||
|
files: Vec<String>,
|
||||||
|
dest_dir: String,
|
||||||
|
password: Option<String>,
|
||||||
|
into_subfolder: bool,
|
||||||
|
) -> Result<Vec<ExtractResult>, String> {
|
||||||
|
let exe = locate_7z(&app).ok_or("未找到 7-Zip 组件(binaries/7z.exe),请重新安装")?;
|
||||||
|
let total = files.len();
|
||||||
|
let results = tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
let mut results = Vec::with_capacity(total);
|
||||||
|
for (idx, file) in files.iter().enumerate() {
|
||||||
|
let err = extract_one(&exe, file, &dest_dir, password.as_deref(), into_subfolder);
|
||||||
|
let name = Path::new(file)
|
||||||
|
.file_name()
|
||||||
|
.map(|s| s.to_string_lossy().to_string())
|
||||||
|
.unwrap_or_else(|| file.clone());
|
||||||
|
let (ok, error) = match err {
|
||||||
|
Ok(()) => (true, String::new()),
|
||||||
|
Err(e) => (false, e),
|
||||||
|
};
|
||||||
|
results.push(ExtractResult {
|
||||||
|
name,
|
||||||
|
path: file.clone(),
|
||||||
|
ok,
|
||||||
|
error: error.clone(),
|
||||||
|
});
|
||||||
|
let _ = app.emit(
|
||||||
|
QUICKPANEL_EXTRACT_PROGRESS,
|
||||||
|
ExtractProgress {
|
||||||
|
done: idx + 1,
|
||||||
|
total,
|
||||||
|
current: results[idx].name.clone(),
|
||||||
|
ok,
|
||||||
|
error,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
results
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("解压任务异常终止: {e}"))?;
|
||||||
|
Ok(results)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 正则批量重命名预览:对每个文件名应用 `pattern → replacement`,
|
||||||
|
/// 仅返回有匹配的文件,`newName` 为替换结果。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_preview_rename(
|
||||||
|
files: Vec<String>,
|
||||||
|
pattern: String,
|
||||||
|
replacement: String,
|
||||||
|
) -> Result<Vec<RenamePreview>, String> {
|
||||||
|
let re = regex::Regex::new(&pattern).map_err(|e| format!("正则表达式无效: {e}"))?;
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for file in files {
|
||||||
|
let name = Path::new(&file)
|
||||||
|
.file_name()
|
||||||
|
.map(|s| s.to_string_lossy().to_string())
|
||||||
|
.unwrap_or_default();
|
||||||
|
if !re.is_match(&name) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let new_name = re.replace_all(&name, replacement.as_str()).to_string();
|
||||||
|
let error = if new_name.is_empty() || new_name == name {
|
||||||
|
"名称未变化".to_string()
|
||||||
|
} else {
|
||||||
|
String::new()
|
||||||
|
};
|
||||||
|
out.push(RenamePreview {
|
||||||
|
path: file,
|
||||||
|
old_name: name,
|
||||||
|
new_name,
|
||||||
|
error,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Ok(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 执行重命名。同一目录下若目标已存在则跳过该项。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_apply_rename(items: Vec<RenameItem>) -> Result<Vec<RenameResult>, String> {
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for item in items {
|
||||||
|
let result = (|| -> Result<(), String> {
|
||||||
|
if item.new_name.is_empty() {
|
||||||
|
return Err("新文件名为空".into());
|
||||||
|
}
|
||||||
|
if item.new_name.contains(['/', '\\', ':', '*', '?', '"', '<', '>', '|']) {
|
||||||
|
return Err("文件名包含非法字符".into());
|
||||||
|
}
|
||||||
|
let old = Path::new(&item.path);
|
||||||
|
let parent = old.parent().unwrap_or(Path::new("."));
|
||||||
|
let new_path = parent.join(&item.new_name);
|
||||||
|
if new_path.exists() {
|
||||||
|
return Err("目标已存在".into());
|
||||||
|
}
|
||||||
|
std::fs::rename(old, &new_path).map_err(|e| format!("重命名失败: {e}"))?;
|
||||||
|
Ok(())
|
||||||
|
})();
|
||||||
|
out.push(RenameResult {
|
||||||
|
old_name: item.old_name,
|
||||||
|
new_name: item.new_name,
|
||||||
|
ok: result.is_ok(),
|
||||||
|
error: result.err().unwrap_or_default(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Ok(out)
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
//! 应用扫描:Windows 开始菜单 .lnk + PATH 中的可执行文件。
|
||||||
|
//!
|
||||||
|
//! 简化实现:扫描开始菜单目录(系统 + 用户)下的 .lnk 快捷方式,
|
||||||
|
//! 名称取文件名(去 .lnk 后缀)。PATH 可执行文件扫描可选(避免噪音过多)。
|
||||||
|
//! 结果不持久化,每次唤起时按需刷新(数据量小,几十毫秒内完成)。
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use serde::Serialize;
|
||||||
|
use walkdir::WalkDir;
|
||||||
|
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct AppRecord {
|
||||||
|
pub name: String,
|
||||||
|
pub path: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 扫描开始菜单(系统 + 用户)。返回去重后的应用列表。
|
||||||
|
pub fn scan_apps() -> Vec<AppRecord> {
|
||||||
|
let mut apps = Vec::new();
|
||||||
|
let mut seen = std::collections::HashSet::new();
|
||||||
|
|
||||||
|
// 开始菜单目录
|
||||||
|
let mut dirs = Vec::new();
|
||||||
|
|
||||||
|
// 系统开始菜单:C:\ProgramData\Microsoft\Windows\Start Menu\Programs
|
||||||
|
if let Ok(prog_data) = std::env::var("ProgramData") {
|
||||||
|
dirs.push(
|
||||||
|
PathBuf::from(prog_data)
|
||||||
|
.join("Microsoft")
|
||||||
|
.join("Windows")
|
||||||
|
.join("Start Menu")
|
||||||
|
.join("Programs"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// 用户开始菜单:%APPDATA%\Microsoft\Windows\Start Menu\Programs
|
||||||
|
if let Ok(appdata) = std::env::var("APPDATA") {
|
||||||
|
dirs.push(
|
||||||
|
PathBuf::from(appdata)
|
||||||
|
.join("Microsoft")
|
||||||
|
.join("Windows")
|
||||||
|
.join("Start Menu")
|
||||||
|
.join("Programs"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
for dir in dirs {
|
||||||
|
if !dir.exists() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for entry in WalkDir::new(&dir)
|
||||||
|
.max_depth(5)
|
||||||
|
.follow_links(false)
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|e| e.ok())
|
||||||
|
{
|
||||||
|
let p = entry.path();
|
||||||
|
if !p.is_file() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let ext = p.extension().map(|e| e.to_string_lossy().to_lowercase()).unwrap_or_default();
|
||||||
|
if ext != "lnk" {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let Some(name_os) = p.file_stem() else { continue };
|
||||||
|
let name = name_os.to_string_lossy().to_string();
|
||||||
|
let path_str = p.to_string_lossy().to_string();
|
||||||
|
// 去重:同名应用保留第一个
|
||||||
|
if seen.insert(name.to_lowercase()) {
|
||||||
|
apps.push(AppRecord { name, path: path_str });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 按名称排序
|
||||||
|
apps.sort_by(|a, b| a.name.to_lowercase().cmp(&b.name.to_lowercase()));
|
||||||
|
apps
|
||||||
|
}
|
||||||
@@ -0,0 +1,539 @@
|
|||||||
|
//! Tauri 命令:快速面板模块
|
||||||
|
|
||||||
|
use tauri::{AppHandle, Emitter, Manager};
|
||||||
|
|
||||||
|
use super::popup::{self, QuickPanelSettings};
|
||||||
|
use super::{file_index, app_scanner, icon_extractor};
|
||||||
|
|
||||||
|
/// 批量删除单个条目的结果。
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize, specta::Type, Clone)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct DeleteResult {
|
||||||
|
pub name: String,
|
||||||
|
pub path: String,
|
||||||
|
pub ok: bool,
|
||||||
|
pub error: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 读取快速面板设置(快捷键等)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_get_settings(app: AppHandle) -> Result<QuickPanelSettings, String> {
|
||||||
|
Ok(popup::load_settings(&app))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 保存快速面板设置;快捷键变化时自动重新注册 + 预创建窗口,
|
||||||
|
/// 索引目录变化时闲时自动重建索引。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_save_settings(
|
||||||
|
settings: QuickPanelSettings,
|
||||||
|
app: AppHandle,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let prev = popup::load_settings(&app);
|
||||||
|
let prev_shortcut = prev.shortcut.clone();
|
||||||
|
let dirs_changed = prev.index_dirs != settings.index_dirs;
|
||||||
|
popup::save_settings(&app, &settings)?;
|
||||||
|
// 快捷键变化时重新注册(共享工具模块,原子化 + 冲突检测)
|
||||||
|
if settings.shortcut != prev_shortcut {
|
||||||
|
crate::shortcut::register_shortcut(&app, "快速面板", &settings.shortcut, |a| {
|
||||||
|
popup::show_popup(a)
|
||||||
|
})?;
|
||||||
|
// 新快捷键非空时确保弹窗窗口已预创建
|
||||||
|
if !settings.shortcut.trim().is_empty() {
|
||||||
|
popup::ensure_window(&app);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 索引目录变更:闲时自动重建(新增/移除路径后无需手动点"构建索引")
|
||||||
|
if dirs_changed {
|
||||||
|
schedule_auto_build(app, true);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 注册(或切换)快速面板全局快捷键
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_register_shortcut(
|
||||||
|
shortcut: String,
|
||||||
|
app: AppHandle,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
crate::shortcut::register_shortcut(&app, "快速面板", &shortcut, |a| popup::show_popup(a))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 注销快速面板全局快捷键
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_unregister_shortcut(app: AppHandle) -> Result<(), String> {
|
||||||
|
crate::shortcut::unregister_shortcut(&app, "快速面板");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 手动触发显示快速面板(供 UI 按钮调用)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_show_popup(app: AppHandle) -> Result<(), String> {
|
||||||
|
popup::show_popup(&app);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 隐藏快速面板
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_hide_popup(app: AppHandle) -> Result<(), String> {
|
||||||
|
popup::hide_popup(&app);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 显示已创建的弹窗窗口(前端 onMounted 后调用)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_show_window(app: AppHandle) -> Result<(), String> {
|
||||||
|
popup::show_window(&app);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 显示主窗口并强制置为前台。
|
||||||
|
/// Tauri 的 set_focus 在 Windows 上受前台锁定限制,主窗口被其他应用遮挡时无法到前台;
|
||||||
|
/// 改用原生 SetForegroundWindow + BringWindowToTop(模拟 Alt 键重置前台锁定)。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_focus_main_window(app: AppHandle) -> Result<(), String> {
|
||||||
|
use crate::constants::windows::MAIN;
|
||||||
|
if let Some(window) = app.get_webview_window(MAIN) {
|
||||||
|
window.show().map_err(|e| e.to_string())?;
|
||||||
|
window.unminimize().map_err(|e| e.to_string())?;
|
||||||
|
match window.hwnd() {
|
||||||
|
Ok(hwnd) => crate::win32_util::force_foreground(hwnd.0 as isize),
|
||||||
|
Err(_) => {
|
||||||
|
window.set_focus().ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 锁定屏幕(Windows: rundll32 user32.dll,LockWorkStation,CREATE_NO_WINDOW 避免黑窗)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn quickpanel_lock_screen() -> Result<(), String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
use crate::process_manager::setup_creation_flags;
|
||||||
|
let mut cmd = std::process::Command::new("rundll32.exe");
|
||||||
|
cmd.arg("user32.dll,LockWorkStation");
|
||||||
|
setup_creation_flags(&mut cmd);
|
||||||
|
cmd.spawn().map_err(|e| format!("锁屏失败: {}", e))?;
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
return Err("当前平台不支持锁屏".into());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 闲时自动建立索引的启动延迟(秒):避开应用启动/模块加载的 IO 高峰
|
||||||
|
const AUTO_BUILD_START_DELAY: u64 = 6;
|
||||||
|
/// 判定"系统空闲"的阈值(毫秒):用户停止输入超过该时长才执行构建
|
||||||
|
const AUTO_BUILD_IDLE_MS: u64 = 3000;
|
||||||
|
/// 等待系统空闲的最长轮询次数(每次间隔 2s,约 60s 上限,超时后不再等待直接构建)
|
||||||
|
const AUTO_BUILD_MAX_WAIT_ITERS: u32 = 30;
|
||||||
|
|
||||||
|
/// 解析要索引的目录:设置为空时用默认(桌面/文档/下载)
|
||||||
|
fn resolve_index_dirs(app: &AppHandle) -> Vec<String> {
|
||||||
|
let settings = popup::load_settings(app);
|
||||||
|
if settings.index_dirs.is_empty() {
|
||||||
|
popup::QuickPanelSettings::default().index_dirs
|
||||||
|
} else {
|
||||||
|
settings.index_dirs
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 闲时自动建立/重建文件索引。
|
||||||
|
/// - `force=false`:仅首次(从未构建过)自动建立
|
||||||
|
/// - `force=true`:忽略是否已构建,直接重建(索引目录变更后调用)
|
||||||
|
///
|
||||||
|
/// 流程:先延迟避开启动 IO 高峰,再轮询等待系统空闲(用户停止输入),
|
||||||
|
/// 空闲后才开始构建,避免与应用运行/用户操作抢 IO 导致卡顿。
|
||||||
|
/// 构建完成后向前端广播 `quickpanel-index-updated` 事件(负载为条目数),
|
||||||
|
/// 供设置页刷新统计、弹窗启用文件搜索。
|
||||||
|
fn schedule_auto_build(app: AppHandle, force: bool) {
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
// 1. 启动延迟:避开应用启动、模块加载等 IO 高峰
|
||||||
|
tokio::time::sleep(std::time::Duration::from_secs(AUTO_BUILD_START_DELAY)).await;
|
||||||
|
// 2. 轮询等待系统空闲(判定阈值见 AUTO_BUILD_IDLE_MS)
|
||||||
|
for _ in 0..AUTO_BUILD_MAX_WAIT_ITERS {
|
||||||
|
if crate::win32_util::get_idle_time_ms() >= AUTO_BUILD_IDLE_MS {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
tokio::time::sleep(std::time::Duration::from_secs(2)).await;
|
||||||
|
}
|
||||||
|
// 3. 非强制模式:已构建过则跳过(幂等,避免每次启动重建)
|
||||||
|
if !force {
|
||||||
|
file_index::ensure_initialized(&app);
|
||||||
|
let stats = file_index::stats();
|
||||||
|
if stats.last_built_at > 0 && !stats.last_built_dirs.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 4. 构建(build_index 内部有并发保护,重复调度/手动构建并发时幂等跳过)
|
||||||
|
let dirs = resolve_index_dirs(&app);
|
||||||
|
match tauri::async_runtime::spawn_blocking(move || file_index::build_index(&dirs)).await {
|
||||||
|
Ok(Ok(count)) => {
|
||||||
|
crate::logger::log_info(
|
||||||
|
"quickpanel",
|
||||||
|
&format!("闲时自动索引完成,共 {} 条", count),
|
||||||
|
);
|
||||||
|
let _ = app.emit(crate::constants::events::QUICKPANEL_INDEX_UPDATED, count);
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
crate::logger::log_error("quickpanel", "闲时自动索引失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 初始化文件索引数据库(应用启动时调用)。
|
||||||
|
/// 若存在上次构建的索引(last_built_dirs 非空),自动恢复 notify 增量监听,
|
||||||
|
/// 无需重建即可继续自动同步文件变更。
|
||||||
|
/// 若从未构建过(首次运行),闲时自动建立索引,无需用户手动点"构建索引"。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_init_file_index(app: AppHandle) -> Result<(), String> {
|
||||||
|
let app_for_build = app.clone();
|
||||||
|
let need_auto_build = tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
file_index::init(&app_for_build);
|
||||||
|
let stats = file_index::stats();
|
||||||
|
if stats.last_built_at > 0 && !stats.last_built_dirs.is_empty() {
|
||||||
|
file_index::start_watcher(&stats.last_built_dirs);
|
||||||
|
}
|
||||||
|
// 从未构建过索引 → 需要闲时自动建立
|
||||||
|
stats.last_built_at == 0 || stats.last_built_dirs.is_empty()
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("索引初始化任务失败: {}", e))?;
|
||||||
|
|
||||||
|
if need_auto_build {
|
||||||
|
schedule_auto_build(app, false);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 构建文件索引(全量重建,阻塞操作建议在 spawn_blocking 调用)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_build_file_index(app: AppHandle) -> Result<i64, String> {
|
||||||
|
let dirs = resolve_index_dirs(&app);
|
||||||
|
// 懒加载:首次构建时自动初始化 DB 连接
|
||||||
|
file_index::ensure_initialized(&app);
|
||||||
|
// 阻塞操作放到 spawn_blocking
|
||||||
|
tauri::async_runtime::spawn_blocking(move || file_index::build_index(&dirs))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("索引任务失败: {}", e))?
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 搜索文件索引(SQLite 查询移出主线程)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_search_files(
|
||||||
|
query: String,
|
||||||
|
limit: Option<i64>,
|
||||||
|
app: AppHandle,
|
||||||
|
) -> Result<Vec<file_index::FileRecord>, String> {
|
||||||
|
// 懒加载:首次搜索时自动初始化 DB 连接
|
||||||
|
file_index::ensure_initialized(&app);
|
||||||
|
tauri::async_runtime::spawn_blocking(move || file_index::search(&query, limit.unwrap_or(50)))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("搜索任务失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取索引状态
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_file_index_stats(app: AppHandle) -> file_index::IndexStats {
|
||||||
|
// 懒加载:查询状态前确保 DB 已初始化(未初始化时 stats 返回全 0)
|
||||||
|
file_index::ensure_initialized(&app);
|
||||||
|
file_index::stats()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 扫描已安装应用(遍历开始菜单/桌面/磁盘,移出主线程)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_scan_apps() -> Result<Vec<app_scanner::AppRecord>, String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(app_scanner::scan_apps)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("扫描应用任务失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取应用图标(data URL)。命中内存/磁盘缓存时零 Windows API 调用。
|
||||||
|
/// 前端按需为可见项调用,避免一次性加载全部图标。
|
||||||
|
/// 未命中缓存时 SHGetFileInfoW + 编码 + 落盘为阻塞操作,移出主线程。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_get_app_icon(
|
||||||
|
app: AppHandle,
|
||||||
|
path: String,
|
||||||
|
) -> Result<Option<String>, String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || icon_extractor::get_icon_data_url(&app, &path))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("图标提取任务失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 清理图标缓存(磁盘 + 内存)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn quickpanel_clear_app_icon_cache(app: AppHandle) -> Result<(), String> {
|
||||||
|
icon_extractor::clear_cache(&app);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 在资源管理器中显示文件(选中)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn quickpanel_reveal_in_explorer(path: String) -> Result<(), String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
use std::ffi::OsStr;
|
||||||
|
use std::os::windows::ffi::OsStrExt;
|
||||||
|
use windows_sys::Win32::Foundation::HWND;
|
||||||
|
use windows_sys::Win32::UI::Shell::ShellExecuteW;
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::SW_SHOWNORMAL;
|
||||||
|
|
||||||
|
// 规范化路径分隔符
|
||||||
|
let normalized = path.replace('/', "\\");
|
||||||
|
// explorer.exe /select,"path" — 用 ShellExecuteW 直接传参,
|
||||||
|
// 避免 std::process::Command 的 arg 转义破坏 /select 语法。
|
||||||
|
// 对 .lnk 文件也能正确选中(explorer 直接选中 .lnk 文件本身)。
|
||||||
|
let params = format!("/select,\"{}\"", normalized);
|
||||||
|
let wide_exe: Vec<u16> = OsStr::new("explorer.exe")
|
||||||
|
.encode_wide()
|
||||||
|
.chain(std::iter::once(0))
|
||||||
|
.collect();
|
||||||
|
let wide_params: Vec<u16> = OsStr::new(¶ms)
|
||||||
|
.encode_wide()
|
||||||
|
.chain(std::iter::once(0))
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
let hinst = ShellExecuteW(
|
||||||
|
0 as HWND,
|
||||||
|
std::ptr::null(),
|
||||||
|
wide_exe.as_ptr(),
|
||||||
|
wide_params.as_ptr(),
|
||||||
|
std::ptr::null(),
|
||||||
|
SW_SHOWNORMAL,
|
||||||
|
);
|
||||||
|
// ShellExecuteW 返回值 <= 32 表示错误
|
||||||
|
if hinst <= 32 {
|
||||||
|
return Err(format!("打开资源管理器失败 (code: {})", hinst as i32));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
let _ = path;
|
||||||
|
return Err("当前平台不支持".into());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 用系统默认程序打开文件/文件夹。
|
||||||
|
/// - 目录:explorer.exe 直接打开(修复索引目录点击后未打开的问题)
|
||||||
|
/// - 文件:ShellExecuteW open,无关联应用时自动 fallback 到「打开方式」对话框(verb: openas)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn quickpanel_open_file(path: String) -> Result<(), String> {
|
||||||
|
super::special_locations::open_path(&path)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取 Windows 常用快捷位置(hosts、回收站、此电脑、用户目录、系统管理工具等)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn quickpanel_get_special_locations() -> Vec<super::special_locations::SpecialLocation> {
|
||||||
|
super::special_locations::get_special_locations()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 打开快捷位置(kind: file | shell | cmd)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn quickpanel_open_special(
|
||||||
|
kind: String,
|
||||||
|
target: String,
|
||||||
|
args: Vec<String>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
match kind.as_str() {
|
||||||
|
"shell" => super::special_locations::open_shell(&target),
|
||||||
|
"cmd" => super::special_locations::open_cmd(&target, &args),
|
||||||
|
_ => super::special_locations::open_path(&target),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除文件(移到回收站,PowerShell 阻塞等待移出主线程)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_delete_file(path: String) -> Result<(), String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || delete_file_impl(&path))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("删除任务失败: {}", e))?
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除文件实现:PowerShell + Microsoft.VisualBasic 移到回收站
|
||||||
|
fn delete_file_impl(path: &str) -> Result<(), String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
use crate::process_manager::setup_creation_flags;
|
||||||
|
let p = std::path::Path::new(path);
|
||||||
|
let is_dir = p.is_dir();
|
||||||
|
// 用 PowerShell + Microsoft.VisualBasic 移到回收站
|
||||||
|
let script = if is_dir {
|
||||||
|
format!(
|
||||||
|
"Add-Type -AssemblyName Microsoft.VisualBasic; [Microsoft.VisualBasic.FileIO.FileSystem]::DeleteDirectory('{}','OnlyErrorDialogs','SendToRecycleBin')",
|
||||||
|
path.replace('\'', "''")
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
format!(
|
||||||
|
"Add-Type -AssemblyName Microsoft.VisualBasic; [Microsoft.VisualBasic.FileIO.FileSystem]::DeleteFile('{}','OnlyErrorDialogs','SendToRecycleBin')",
|
||||||
|
path.replace('\'', "''")
|
||||||
|
)
|
||||||
|
};
|
||||||
|
let mut cmd = std::process::Command::new("powershell.exe");
|
||||||
|
cmd.args(["-NoProfile", "-NonInteractive", "-Command", &script]);
|
||||||
|
setup_creation_flags(&mut cmd);
|
||||||
|
let output = cmd.output().map_err(|e| format!("删除失败: {}", e))?;
|
||||||
|
if !output.status.success() {
|
||||||
|
return Err(format!(
|
||||||
|
"删除失败: {}",
|
||||||
|
String::from_utf8_lossy(&output.stderr)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
let _ = path;
|
||||||
|
return Err("当前平台不支持".into());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 批量删除文件/目录。`force=false` 时移动至回收站;`force=true` 时先递归清除
|
||||||
|
/// 只读属性再永久删除(可绕过只读/部分占用导致的删除失败,但被其他进程真正
|
||||||
|
/// 锁定的文件仍会失败并返回原因)。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn quickpanel_delete_files(
|
||||||
|
paths: Vec<String>,
|
||||||
|
force: bool,
|
||||||
|
) -> Result<Vec<DeleteResult>, String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for path in paths {
|
||||||
|
let name = std::path::Path::new(&path)
|
||||||
|
.file_name()
|
||||||
|
.map(|s| s.to_string_lossy().to_string())
|
||||||
|
.unwrap_or_else(|| path.clone());
|
||||||
|
let result = if force {
|
||||||
|
delete_force_impl(&path)
|
||||||
|
} else {
|
||||||
|
delete_file_impl(&path)
|
||||||
|
};
|
||||||
|
out.push(DeleteResult {
|
||||||
|
name,
|
||||||
|
path: path.clone(),
|
||||||
|
ok: result.is_ok(),
|
||||||
|
error: result.err().unwrap_or_default(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Ok(out)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("删除任务失败: {e}"))?
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 强行删除:递归清除只读属性后永久删除(不经过回收站)。
|
||||||
|
fn delete_force_impl(path: &str) -> Result<(), String> {
|
||||||
|
let p = std::path::Path::new(path);
|
||||||
|
clear_readonly(p);
|
||||||
|
if p.is_dir() {
|
||||||
|
std::fs::remove_dir_all(p).map_err(|e| format!("删除失败: {e}"))
|
||||||
|
} else {
|
||||||
|
std::fs::remove_file(p).map_err(|e| format!("删除失败: {e}"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 递归清除只读属性(只读文件/目录无法直接删除)。
|
||||||
|
fn clear_readonly(path: &std::path::Path) {
|
||||||
|
if let Ok(meta) = std::fs::metadata(path) {
|
||||||
|
if meta.permissions().readonly() {
|
||||||
|
let mut perms = meta.permissions();
|
||||||
|
perms.set_readonly(false);
|
||||||
|
let _ = std::fs::set_permissions(path, perms);
|
||||||
|
}
|
||||||
|
if meta.is_dir() {
|
||||||
|
if let Ok(rd) = std::fs::read_dir(path) {
|
||||||
|
for entry in rd.flatten() {
|
||||||
|
clear_readonly(&entry.path());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 运行自定义命令(执行可执行文件 + 参数)
|
||||||
|
/// .lnk 快捷方式不能直接 spawn(os error 193),需通过 cmd /C 启动
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn quickpanel_run_custom_command(command: String, args: Vec<String>) -> Result<(), String> {
|
||||||
|
use crate::process_manager::setup_creation_flags;
|
||||||
|
let is_lnk = command
|
||||||
|
.to_lowercase()
|
||||||
|
.ends_with(".lnk");
|
||||||
|
let mut cmd = if is_lnk {
|
||||||
|
// cmd /C start "" "path.lnk" arg1 arg2
|
||||||
|
let mut c = std::process::Command::new("cmd");
|
||||||
|
c.args(["/C", "start", "", &command]);
|
||||||
|
c.args(&args);
|
||||||
|
c
|
||||||
|
} else {
|
||||||
|
let mut c = std::process::Command::new(&command);
|
||||||
|
c.args(&args);
|
||||||
|
c
|
||||||
|
};
|
||||||
|
setup_creation_flags(&mut cmd);
|
||||||
|
cmd.spawn().map_err(|e| format!("运行命令失败: {}", e))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 运行系统命令(不设置 CREATE_NO_WINDOW,使 cmd/powershell/regedit 等显示自身窗口)
|
||||||
|
/// 适用于内置系统工具:regedit、shutdown、cmd、powershell、taskmgr 等。
|
||||||
|
/// - 控制台类交互程序(cmd/powershell/pwsh)额外设置 CREATE_NEW_CONSOLE,
|
||||||
|
/// 否则从 GUI 宿主启动时无可见控制台窗口(表现为"点击没反应")。
|
||||||
|
/// - .msc 控制台文件(如 devmgmt.msc)不可被 CreateProcess 直接执行,
|
||||||
|
/// 改由 mmc 打开(路径解析到 System32,不受当前工作目录影响)。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn quickpanel_run_system_command(command: String, args: Vec<String>) -> Result<(), String> {
|
||||||
|
let lower = command.to_lowercase();
|
||||||
|
if lower.ends_with(".msc") {
|
||||||
|
// 控制台文件:通过 mmc 打开(GUI 程序,无需新控制台)
|
||||||
|
let system_root = std::env::var("SystemRoot").unwrap_or_else(|_| "C:\\Windows".into());
|
||||||
|
let path = format!("{}\\System32\\{}", system_root, command);
|
||||||
|
let mut c = std::process::Command::new("mmc");
|
||||||
|
c.arg(&path);
|
||||||
|
return c
|
||||||
|
.spawn()
|
||||||
|
.map(|_| ())
|
||||||
|
.map_err(|e| format!("运行系统命令失败: {}", e));
|
||||||
|
}
|
||||||
|
let mut cmd = std::process::Command::new(&command);
|
||||||
|
cmd.args(&args);
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
use std::os::windows::process::CommandExt;
|
||||||
|
let c = lower;
|
||||||
|
if c == "cmd" || c == "powershell" || c == "pwsh" {
|
||||||
|
cmd.creation_flags(crate::process_manager::CREATE_NEW_CONSOLE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cmd.spawn().map_err(|e| format!("运行系统命令失败: {}", e))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
//! 快速面板:检测前台 Explorer 窗口的当前目录。
|
||||||
|
//!
|
||||||
|
//! 必须在快捷键回调(`show_popup`)内调用:此时前台窗口仍是资源管理器,
|
||||||
|
//! 面板尚未取得焦点,`GetForegroundWindow` 拿到的才是 Explorer 主窗口;
|
||||||
|
//! 若等面板显示后再调用,前台就变成面板自身了。
|
||||||
|
//!
|
||||||
|
//! 思路(Listary / PowerToys Run 同款):前台窗口 HWND 匹配 `IShellWindows`
|
||||||
|
//! 中某个 Shell 窗口 → 取其 `LocationURL`(file:///...)→ 转成本地路径。
|
||||||
|
//!
|
||||||
|
//! Win11 多选项卡:同一顶层窗口下每个选项卡都是独立的 `IShellWindows` 条目,
|
||||||
|
//! 共享顶层 HWND。活动选项卡的内容窗口(`ShellTabWindowClass`)在子窗口
|
||||||
|
//! z-order 顶层,用 `IID_IShellBrowser` 作为 `QueryService` 的 service ID 获取
|
||||||
|
//! 每个选项卡自己的 `IShellBrowser`(而非 `SID_STopLevelBrowser` 返回的顶层
|
||||||
|
//! browser),再通过 `GetWindow()` 拿到该选项卡的内容窗口句柄,与活动选项卡
|
||||||
|
//! 的内容窗口比对,从而定位当前正在浏览的选项卡(`IsWindowVisible` 对所有
|
||||||
|
//! 选项卡都成立,不可用)。
|
||||||
|
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
use windows::core::ComInterface;
|
||||||
|
#[cfg(windows)]
|
||||||
|
use windows::Win32::Foundation::HWND;
|
||||||
|
#[cfg(windows)]
|
||||||
|
use windows::Win32::System::Com::{
|
||||||
|
CoCreateInstance, CoInitializeEx, CoUninitialize, CLSCTX_ALL, COINIT_APARTMENTTHREADED,
|
||||||
|
IServiceProvider,
|
||||||
|
};
|
||||||
|
#[cfg(windows)]
|
||||||
|
use windows::Win32::System::Variant::{VARIANT, VT_I4};
|
||||||
|
#[cfg(windows)]
|
||||||
|
use windows::Win32::UI::Shell::{
|
||||||
|
IWebBrowserApp, IShellBrowser, IShellWindows, ShellWindows,
|
||||||
|
};
|
||||||
|
#[cfg(windows)]
|
||||||
|
use windows::Win32::UI::WindowsAndMessaging::{
|
||||||
|
GetClassNameW, GetForegroundWindow, GetWindow, GW_CHILD, GW_HWNDNEXT,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// 检测前台 Explorer 窗口的当前目录。
|
||||||
|
/// 返回 `None`:前台不是 Explorer / COM 初始化失败 / URL 无法转路径。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn detect_explorer_folder() -> Option<String> {
|
||||||
|
// 首次 COM 初始化失败(例如已在 MTA 线程)时,后续 COM 调用一般仍可用,忽略错误继续。
|
||||||
|
let _ = unsafe { CoInitializeEx(None, COINIT_APARTMENTTHREADED) };
|
||||||
|
let fg = unsafe { GetForegroundWindow() };
|
||||||
|
let result = if fg.0 == 0 {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
unsafe { find_folder_for_hwnd(fg) }
|
||||||
|
};
|
||||||
|
unsafe { CoUninitialize() };
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
unsafe fn find_folder_for_hwnd(fg: HWND) -> Option<String> {
|
||||||
|
let shell: IShellWindows = CoCreateInstance(&ShellWindows, None, CLSCTX_ALL).ok()?;
|
||||||
|
let count = shell.Count().ok()?;
|
||||||
|
// Win11 多选项卡:活动选项卡的内容窗口(ShellTabWindowClass)在子窗口 z-order
|
||||||
|
// 顶层。在 IShellWindows 条目中,用 IShellBrowser::GetWindow() 取到的内容窗口
|
||||||
|
// HWND 与它比对,即可定位当前正在浏览的选项卡(IsWindowVisible 对所有选项卡
|
||||||
|
// 都成立,不可用)。
|
||||||
|
let active_tab = find_active_shell_tab(fg);
|
||||||
|
for i in 0..count {
|
||||||
|
// 索引过期的窗口会返回失败,跳过继续即可,不能 `?` 提前结束整个循环。
|
||||||
|
// 0.52 的 Win32 VARIANT 无 From<i32>,手动构造 VT_I4 变体。
|
||||||
|
let mut index = VARIANT::default();
|
||||||
|
{
|
||||||
|
let value = &mut *index.Anonymous.Anonymous;
|
||||||
|
value.vt = VT_I4;
|
||||||
|
value.Anonymous.lVal = i;
|
||||||
|
}
|
||||||
|
let Ok(dispatch) = shell.Item(index) else { continue };
|
||||||
|
let Ok(app) = dispatch.cast::<IWebBrowserApp>() else { continue };
|
||||||
|
// 只考虑前台顶层窗口对应的条目;同一窗口的多个选项卡条目共享顶层句柄。
|
||||||
|
let Ok(hwnd) = app.HWND() else { continue };
|
||||||
|
if HWND(hwnd.0) != fg {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// 有选项卡时,必须匹配活动选项卡的内容窗口;否则退化为任意条目(旧版无选项卡)。
|
||||||
|
if let Some(active) = active_tab {
|
||||||
|
let Ok(svc) = app.cast::<IServiceProvider>() else { continue };
|
||||||
|
let Ok(browser) = svc.QueryService::<IShellBrowser>(&IShellBrowser::IID) else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let Ok(this_tab) = browser.GetWindow() else { continue };
|
||||||
|
if this_tab != active {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Ok(url) = app.LocationURL() {
|
||||||
|
return url_to_path(&url.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 枚举前台窗口的子窗口(z-order 自上而下),返回第一个类名为 `ShellTabWindowClass`
|
||||||
|
/// 的窗口句柄,即 Win11 资源管理器活动选项卡的内容窗口;无选项卡时返回 `None`。
|
||||||
|
#[cfg(windows)]
|
||||||
|
unsafe fn find_active_shell_tab(fg: HWND) -> Option<HWND> {
|
||||||
|
const CLASS: &str = "ShellTabWindowClass";
|
||||||
|
let mut hwnd = GetWindow(fg, GW_CHILD);
|
||||||
|
while hwnd.0 != 0 {
|
||||||
|
let mut buf = [0u16; 64];
|
||||||
|
let len = GetClassNameW(hwnd, &mut buf);
|
||||||
|
if len > 0 {
|
||||||
|
let name = String::from_utf16_lossy(&buf[..len as usize]);
|
||||||
|
if name == CLASS {
|
||||||
|
return Some(hwnd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
hwnd = GetWindow(hwnd, GW_HWNDNEXT);
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 把 `file:///C:/xxx`(可能带百分号编码)转成本地路径,仅接受目录。
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn url_to_path(url: &str) -> Option<String> {
|
||||||
|
if !url.starts_with("file:") {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let parsed = url::Url::parse(url).ok()?;
|
||||||
|
let path = parsed.to_file_path().ok()?;
|
||||||
|
let path = Path::new(&path);
|
||||||
|
if path.is_dir() {
|
||||||
|
Some(path.to_string_lossy().to_string())
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 非 Windows 平台占位:保持模块可编译。
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn detect_explorer_folder() -> Option<String> {
|
||||||
|
None
|
||||||
|
}
|
||||||
@@ -0,0 +1,429 @@
|
|||||||
|
//! 文件索引:walkdir 遍历 + rusqlite 存储/搜索。
|
||||||
|
//!
|
||||||
|
//! schema:
|
||||||
|
//! files(path TEXT PK, name TEXT, ext TEXT, size INT, mtime INT, is_dir INT)
|
||||||
|
//! 索引:name LIKE 搜索(name_lower 已预存为小写,避免 lower() 全表扫描)。
|
||||||
|
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::sync::Mutex;
|
||||||
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
use std::time::UNIX_EPOCH;
|
||||||
|
|
||||||
|
use rusqlite::{params, Connection};
|
||||||
|
use serde::Serialize;
|
||||||
|
use tauri::{AppHandle, Manager};
|
||||||
|
use walkdir::WalkDir;
|
||||||
|
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
/// 单个文件记录(返回给前端)
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct FileRecord {
|
||||||
|
pub path: String,
|
||||||
|
pub name: String,
|
||||||
|
pub ext: String,
|
||||||
|
pub size: i64,
|
||||||
|
pub is_dir: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 索引状态(返回给前端)
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct IndexStats {
|
||||||
|
pub total: i64,
|
||||||
|
pub last_built_at: i64,
|
||||||
|
pub last_built_dirs: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Inner {
|
||||||
|
conn: Mutex<Connection>,
|
||||||
|
}
|
||||||
|
|
||||||
|
static INDEX: std::sync::OnceLock<Mutex<Option<Inner>>> = std::sync::OnceLock::new();
|
||||||
|
|
||||||
|
fn index_slot() -> &'static Mutex<Option<Inner>> {
|
||||||
|
INDEX.get_or_init(|| Mutex::new(None))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 数据库路径:{app_data_dir}/quickpanel/files.db
|
||||||
|
fn db_path(app: &AppHandle) -> PathBuf {
|
||||||
|
app.path()
|
||||||
|
.app_data_dir()
|
||||||
|
.unwrap_or_else(|_| PathBuf::from("."))
|
||||||
|
.join("quickpanel")
|
||||||
|
.join("files.db")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 初始化数据库连接(创建表 + 索引)。若已初始化则跳过。
|
||||||
|
pub fn init(app: &AppHandle) {
|
||||||
|
let path = db_path(app);
|
||||||
|
if let Some(parent) = path.parent() {
|
||||||
|
std::fs::create_dir_all(parent).ok();
|
||||||
|
}
|
||||||
|
let conn = match Connection::open(&path) {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_error("quickpanel", &format!("文件索引 DB 初始化失败: {}", e));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
conn.busy_timeout(std::time::Duration::from_secs(3)).ok();
|
||||||
|
let _ = conn.execute_batch(
|
||||||
|
"CREATE TABLE IF NOT EXISTS files (
|
||||||
|
path TEXT PRIMARY KEY,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
name_lower TEXT NOT NULL,
|
||||||
|
ext TEXT NOT NULL DEFAULT '',
|
||||||
|
size INTEGER NOT NULL DEFAULT 0,
|
||||||
|
mtime INTEGER NOT NULL DEFAULT 0,
|
||||||
|
is_dir INTEGER NOT NULL DEFAULT 0
|
||||||
|
);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_name_lower ON files(name_lower);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_ext ON files(ext);
|
||||||
|
CREATE TABLE IF NOT EXISTS files_meta (
|
||||||
|
key TEXT PRIMARY KEY,
|
||||||
|
value TEXT NOT NULL
|
||||||
|
);",
|
||||||
|
);
|
||||||
|
|
||||||
|
let mut guard = index_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
*guard = Some(Inner {
|
||||||
|
conn: Mutex::new(conn),
|
||||||
|
});
|
||||||
|
crate::logger::log_info("quickpanel", &format!("文件索引 DB 已就绪: {}", path.display()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 懒加载:首次访问文件索引时自动初始化(若尚未初始化)。
|
||||||
|
/// 避免应用启动时即打开 SQLite 连接,降低启动 IO 开销。
|
||||||
|
pub fn ensure_initialized(app: &AppHandle) {
|
||||||
|
let guard = index_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
if guard.is_some() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
drop(guard);
|
||||||
|
init(app);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 判断索引是否已初始化
|
||||||
|
fn with_conn<F, R>(f: F) -> Option<R>
|
||||||
|
where
|
||||||
|
F: FnOnce(&Connection) -> R,
|
||||||
|
{
|
||||||
|
let guard = index_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
if let Some(inner) = guard.as_ref() {
|
||||||
|
if let Ok(conn) = inner.conn.lock() {
|
||||||
|
return Some(f(&conn));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 构建锁:防止手动构建与闲时自动构建并发执行(全量重建含 DELETE+INSERT,
|
||||||
|
/// 两个构建交错会互相清空对方刚写入的数据,导致索引残缺)。
|
||||||
|
static BUILDING: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
/// 尝试开始构建;已在构建中则返回 false。
|
||||||
|
pub fn try_begin_build() -> bool {
|
||||||
|
BUILDING
|
||||||
|
.compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
|
||||||
|
.is_ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 构建结束(成功/失败)后调用,释放构建锁。
|
||||||
|
pub fn end_build() {
|
||||||
|
BUILDING.store(false, Ordering::SeqCst);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 遍历指定目录列表建立索引(全量重建)。
|
||||||
|
/// 返回索引条目数。在 spawn_blocking 中调用。
|
||||||
|
/// 重建完成后自动启动 notify 监听器做增量更新。
|
||||||
|
/// 若已有构建正在进行(手动/自动并发),直接返回 Ok(0),由进行中的构建负责更新索引。
|
||||||
|
pub fn build_index(dirs: &[String]) -> Result<i64, String> {
|
||||||
|
if !try_begin_build() {
|
||||||
|
crate::logger::log_info("quickpanel", "索引构建已在进行中,跳过本次请求");
|
||||||
|
return Ok(0);
|
||||||
|
}
|
||||||
|
let result = build_index_inner(dirs);
|
||||||
|
end_build();
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_index_inner(dirs: &[String]) -> Result<i64, String> {
|
||||||
|
// 清空旧数据
|
||||||
|
let cleared = with_conn(|conn| {
|
||||||
|
conn.execute("DELETE FROM files", []).ok()
|
||||||
|
}).unwrap_or(None);
|
||||||
|
|
||||||
|
if cleared.is_none() {
|
||||||
|
return Err("文件索引未初始化".into());
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut count = 0i64;
|
||||||
|
for dir in dirs {
|
||||||
|
count += walk_and_index(dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 记录构建元信息
|
||||||
|
let now = now_secs();
|
||||||
|
let dirs_json = serde_json::to_string(dirs).unwrap_or_default();
|
||||||
|
let _ = with_conn(|conn| {
|
||||||
|
conn.execute(
|
||||||
|
"INSERT OR REPLACE INTO files_meta (key, value) VALUES ('last_built_at', ?1)",
|
||||||
|
params![now.to_string()],
|
||||||
|
).ok();
|
||||||
|
conn.execute(
|
||||||
|
"INSERT OR REPLACE INTO files_meta (key, value) VALUES ('last_built_dirs', ?1)",
|
||||||
|
params![dirs_json],
|
||||||
|
).ok()
|
||||||
|
});
|
||||||
|
|
||||||
|
// 启动/刷新 notify 监听器
|
||||||
|
start_watcher(dirs);
|
||||||
|
|
||||||
|
crate::logger::log_info("quickpanel", &format!("文件索引完成,共 {} 条", count));
|
||||||
|
Ok(count)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 遍历单个目录并写入索引,返回新增条目数
|
||||||
|
fn walk_and_index(dir: &str) -> i64 {
|
||||||
|
let path = Path::new(dir);
|
||||||
|
if !path.exists() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
let mut count = 0i64;
|
||||||
|
for entry in WalkDir::new(path)
|
||||||
|
.max_depth(10)
|
||||||
|
.follow_links(false)
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|e| e.ok())
|
||||||
|
{
|
||||||
|
let p = entry.path();
|
||||||
|
if upsert_path(p) {
|
||||||
|
count += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
count
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 将单个路径写入索引(创建/修改)。返回 true 表示已写入。
|
||||||
|
/// 跳过隐藏文件(. 开头)、不存在的路径。
|
||||||
|
fn upsert_path(p: &Path) -> bool {
|
||||||
|
let Some(name_os) = p.file_name() else { return false };
|
||||||
|
let name = name_os.to_string_lossy().to_string();
|
||||||
|
if name.starts_with('.') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let meta = match std::fs::metadata(p) {
|
||||||
|
Ok(m) => m,
|
||||||
|
Err(_) => return false,
|
||||||
|
};
|
||||||
|
let name_lower = name.to_lowercase();
|
||||||
|
let ext = p.extension()
|
||||||
|
.map(|e| e.to_string_lossy().to_lowercase())
|
||||||
|
.unwrap_or_default();
|
||||||
|
let size = meta.len() as i64;
|
||||||
|
let mtime = meta.modified().ok()
|
||||||
|
.and_then(|t| t.duration_since(UNIX_EPOCH).ok())
|
||||||
|
.map(|d| d.as_secs() as i64)
|
||||||
|
.unwrap_or(0);
|
||||||
|
let is_dir = meta.is_dir() as i32;
|
||||||
|
let path_str = p.to_string_lossy().to_string();
|
||||||
|
|
||||||
|
let _ = with_conn(|conn| {
|
||||||
|
conn.execute(
|
||||||
|
"INSERT OR REPLACE INTO files (path, name, name_lower, ext, size, mtime, is_dir)
|
||||||
|
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)",
|
||||||
|
params![path_str, name, name_lower, ext, size, mtime, is_dir],
|
||||||
|
)
|
||||||
|
});
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从索引中删除指定路径
|
||||||
|
fn remove_path(p: &Path) {
|
||||||
|
let path_str = p.to_string_lossy().to_string();
|
||||||
|
let _ = with_conn(|conn| {
|
||||||
|
// 删除该路径本身及其直接子项(目录被删除时,子文件也失效)。
|
||||||
|
// 用"路径 + 分隔符"的前缀匹配(而非裸前缀),避免误删 dir2/directory 等兄弟目录。
|
||||||
|
let backslash_prefix = format!("{}\\{}", path_str, "%");
|
||||||
|
let slash_prefix = format!("{}/{}", path_str, "%");
|
||||||
|
conn.execute(
|
||||||
|
"DELETE FROM files WHERE path = ?1 OR path LIKE ?2 OR path LIKE ?3",
|
||||||
|
params![path_str, backslash_prefix, slash_prefix],
|
||||||
|
)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 搜索文件:name_lower LIKE %query%,按名字长度升序(短名优先)。
|
||||||
|
pub fn search(query: &str, limit: i64) -> Vec<FileRecord> {
|
||||||
|
let like = format!("%{}%", query.to_lowercase());
|
||||||
|
with_conn(|conn| {
|
||||||
|
let mut stmt = match conn.prepare(
|
||||||
|
"SELECT path, name, ext, size, is_dir FROM files
|
||||||
|
WHERE name_lower LIKE ?1
|
||||||
|
ORDER BY LENGTH(name) ASC, name ASC LIMIT ?2",
|
||||||
|
) {
|
||||||
|
Ok(s) => s,
|
||||||
|
Err(_) => return vec![],
|
||||||
|
};
|
||||||
|
stmt.query_map(params![like, limit], |r| {
|
||||||
|
Ok(FileRecord {
|
||||||
|
path: r.get(0)?,
|
||||||
|
name: r.get(1)?,
|
||||||
|
ext: r.get(2)?,
|
||||||
|
size: r.get(3)?,
|
||||||
|
is_dir: r.get::<_, i32>(4)? != 0,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.map(|r| r.filter_map(|i| i.ok()).collect())
|
||||||
|
.unwrap_or_default()
|
||||||
|
})
|
||||||
|
.unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 索引状态
|
||||||
|
pub fn stats() -> IndexStats {
|
||||||
|
let total = with_conn(|conn| {
|
||||||
|
conn.query_row("SELECT COUNT(*) FROM files", [], |r| r.get::<_, i64>(0))
|
||||||
|
.unwrap_or(0)
|
||||||
|
})
|
||||||
|
.unwrap_or(0);
|
||||||
|
|
||||||
|
let last_built_at = with_conn(|conn| {
|
||||||
|
// query_row 返回 Result<String, Error>,统一处理失败
|
||||||
|
let res: rusqlite::Result<String> = conn.query_row(
|
||||||
|
"SELECT value FROM files_meta WHERE key = 'last_built_at'",
|
||||||
|
[],
|
||||||
|
|r| r.get::<_, String>(0),
|
||||||
|
);
|
||||||
|
res.ok().and_then(|s| s.parse().ok()).unwrap_or(0)
|
||||||
|
})
|
||||||
|
.unwrap_or(0);
|
||||||
|
|
||||||
|
let last_built_dirs = with_conn(|conn| {
|
||||||
|
conn.query_row(
|
||||||
|
"SELECT value FROM files_meta WHERE key = 'last_built_dirs'",
|
||||||
|
[],
|
||||||
|
|r| r.get::<_, String>(0),
|
||||||
|
)
|
||||||
|
.ok()
|
||||||
|
.and_then(|s| serde_json::from_str::<Vec<String>>(&s).ok())
|
||||||
|
.unwrap_or_default()
|
||||||
|
})
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
IndexStats {
|
||||||
|
total,
|
||||||
|
last_built_at,
|
||||||
|
last_built_dirs,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn now_secs() -> i64 {
|
||||||
|
std::time::SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)
|
||||||
|
.map(|d| d.as_secs() as i64)
|
||||||
|
.unwrap_or(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== notify 增量监听 =====
|
||||||
|
|
||||||
|
use notify::{EventKind, RecommendedWatcher, RecursiveMode, Watcher};
|
||||||
|
|
||||||
|
static WATCHER: std::sync::OnceLock<Mutex<Option<RecommendedWatcher>>> = std::sync::OnceLock::new();
|
||||||
|
|
||||||
|
fn watcher_slot() -> &'static Mutex<Option<RecommendedWatcher>> {
|
||||||
|
WATCHER.get_or_init(|| Mutex::new(None))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 启动/刷新 notify 监听器。重建索引或修改索引目录后调用。
|
||||||
|
/// 会先停止旧监听器,再为新目录列表添加递归监听。
|
||||||
|
pub fn start_watcher(dirs: &[String]) {
|
||||||
|
// 创建新 watcher(notify v6: recommended_watcher 只接受回调,Config 默认)
|
||||||
|
let mut watcher = match notify::recommended_watcher(
|
||||||
|
move |res: notify::Result<notify::Event>| {
|
||||||
|
if let Ok(event) = res {
|
||||||
|
handle_fs_event(&event);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
Ok(w) => w,
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_error("quickpanel", &format!("notify watcher 创建失败: {}", e));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 为每个目录添加递归监听
|
||||||
|
for dir in dirs {
|
||||||
|
let path = Path::new(dir);
|
||||||
|
if !path.exists() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if let Err(e) = watcher.watch(path, RecursiveMode::Recursive) {
|
||||||
|
crate::logger::log_error("quickpanel", &format!("watch {} 失败: {}", dir, e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 替换旧 watcher(drop 时自动 unwatch)
|
||||||
|
let mut guard = watcher_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
*guard = Some(watcher);
|
||||||
|
crate::logger::log_info("quickpanel", &format!("notify 监听已启动,监听 {} 个目录", dirs.len()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 处理文件系统事件:
|
||||||
|
/// - 创建/数据或元数据修改 → upsert
|
||||||
|
/// - 重命名:旧路径(From) → remove,新路径(To) → upsert
|
||||||
|
/// - 删除 → remove
|
||||||
|
fn handle_fs_event(event: ¬ify::Event) {
|
||||||
|
use notify::event::{ModifyKind, RenameMode};
|
||||||
|
|
||||||
|
match event.kind {
|
||||||
|
// 创建、数据/元数据修改、类型未知 → upsert
|
||||||
|
EventKind::Create(_)
|
||||||
|
| EventKind::Modify(ModifyKind::Data(_))
|
||||||
|
| EventKind::Modify(ModifyKind::Metadata(_))
|
||||||
|
| EventKind::Modify(ModifyKind::Other)
|
||||||
|
| EventKind::Modify(ModifyKind::Any) => {
|
||||||
|
for path in &event.paths {
|
||||||
|
if path.exists() {
|
||||||
|
upsert_path(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 重命名旧路径 → 删除旧记录(含目录子项,避免索引残留失效路径)
|
||||||
|
EventKind::Modify(ModifyKind::Name(RenameMode::From)) => {
|
||||||
|
for path in &event.paths {
|
||||||
|
remove_path(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 重命名新路径 → 写入新记录
|
||||||
|
EventKind::Modify(ModifyKind::Name(RenameMode::To)) => {
|
||||||
|
for path in &event.paths {
|
||||||
|
if path.exists() {
|
||||||
|
upsert_path(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 重命名模式未知:存在则写入,不存在则删除(幂等兜底)
|
||||||
|
EventKind::Modify(ModifyKind::Name(RenameMode::Any | RenameMode::Both)) => {
|
||||||
|
for path in &event.paths {
|
||||||
|
if path.exists() {
|
||||||
|
upsert_path(path);
|
||||||
|
} else {
|
||||||
|
remove_path(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 删除 → remove(含子项)
|
||||||
|
EventKind::Remove(_) => {
|
||||||
|
for path in &event.paths {
|
||||||
|
remove_path(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
// 忽略访问/其他事件
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,351 @@
|
|||||||
|
//! 应用图标提取:Windows SHGetFileInfo → HICON → RGBA → PNG,带磁盘 + 内存缓存。
|
||||||
|
//!
|
||||||
|
//! 流程:
|
||||||
|
//! 1. 内存缓存命中 → 直接返回 data URL
|
||||||
|
//! 2. 磁盘缓存命中({app_data_dir}/quickpanel/icons/{hash}.png) → 读取并缓存
|
||||||
|
//! 3. 调用 SHGetFileInfoW 提取 HICON → GetDIBits 取 32bit BGRA → 转 RGBA → PNG
|
||||||
|
//! 4. 写入磁盘缓存 + 内存缓存,返回 data URL
|
||||||
|
//!
|
||||||
|
//! 设计取舍:
|
||||||
|
//! - 返回 base64 data URL 而非文件路径,避免独立弹窗窗口的 asset 协议配置问题
|
||||||
|
//! - 磁盘缓存避免重复 Windows API 调用(昂贵),内存缓存避免重复磁盘读取 + 编码
|
||||||
|
|
||||||
|
use std::collections::{HashMap, VecDeque};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::Mutex;
|
||||||
|
|
||||||
|
use base64::Engine as _;
|
||||||
|
use tauri::{AppHandle, Manager};
|
||||||
|
|
||||||
|
// ===== 内存缓存 =====
|
||||||
|
/// (path → data URL) + FIFO 淘汰队列(队头最旧,超限时先淘汰)
|
||||||
|
static MEM_CACHE: Mutex<Option<(HashMap<String, String>, VecDeque<String>)>> = Mutex::new(None);
|
||||||
|
const MEM_CACHE_MAX: usize = 512;
|
||||||
|
|
||||||
|
fn mem_get(path: &str) -> Option<String> {
|
||||||
|
let cache = MEM_CACHE.lock().ok()?;
|
||||||
|
cache.as_ref()?.0.get(path).cloned()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mem_put(path: String, url: String) {
|
||||||
|
if let Ok(mut guard) = MEM_CACHE.lock() {
|
||||||
|
let slot = guard.get_or_insert_with(|| (HashMap::new(), VecDeque::new()));
|
||||||
|
let (map, order) = &mut *slot;
|
||||||
|
if map.contains_key(&path) {
|
||||||
|
// 已存在:仅更新值,不重复入队
|
||||||
|
map.insert(path, url);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if map.len() >= MEM_CACHE_MAX {
|
||||||
|
// FIFO 淘汰最旧条目(O(1)),避免无序淘汰把刚插入的常用图标清掉
|
||||||
|
if let Some(oldest) = order.pop_front() {
|
||||||
|
map.remove(&oldest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
map.insert(path.clone(), url);
|
||||||
|
order.push_back(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 磁盘缓存路径 =====
|
||||||
|
fn cache_dir(app: &AppHandle) -> PathBuf {
|
||||||
|
app.path()
|
||||||
|
.app_data_dir()
|
||||||
|
.unwrap_or_else(|_| PathBuf::from("."))
|
||||||
|
.join("quickpanel")
|
||||||
|
.join("icons")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn path_hash(path: &str) -> String {
|
||||||
|
use std::collections::hash_map::DefaultHasher;
|
||||||
|
use std::hash::{Hash, Hasher};
|
||||||
|
// 统一小写 + 正斜杠,避免大小写/分隔符差异导致缓存未命中
|
||||||
|
let normalized = path.to_lowercase().replace('\\', "/");
|
||||||
|
let mut hasher = DefaultHasher::new();
|
||||||
|
normalized.hash(&mut hasher);
|
||||||
|
format!("{:016x}", hasher.finish())
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 公共 API =====
|
||||||
|
|
||||||
|
/// 获取应用图标 data URL。命中缓存则零开销;未命中则提取 + 编码 + 落盘。
|
||||||
|
/// 返回 Ok(None) 表示提取失败或不支持的平台。
|
||||||
|
pub fn get_icon_data_url(app: &AppHandle, path: &str) -> Option<String> {
|
||||||
|
if path.is_empty() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
// 规范化路径分隔符:混合 / 和 \ 会导致 SHGetFileInfoW 失败
|
||||||
|
let normalized = path.replace('/', "\\");
|
||||||
|
let path = normalized.as_str();
|
||||||
|
|
||||||
|
// 1. 内存缓存
|
||||||
|
if let Some(url) = mem_get(path) {
|
||||||
|
return Some(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
let dir = cache_dir(app);
|
||||||
|
let hash = path_hash(path);
|
||||||
|
let cache_path = dir.join(format!("{}.png", hash));
|
||||||
|
|
||||||
|
// 2. 磁盘缓存
|
||||||
|
if cache_path.exists() {
|
||||||
|
if let Ok(bytes) = std::fs::read(&cache_path) {
|
||||||
|
let url = png_to_data_url(&bytes);
|
||||||
|
mem_put(path.to_string(), url.clone());
|
||||||
|
return Some(url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. 提取
|
||||||
|
let png = extract_icon_png(path)?;
|
||||||
|
|
||||||
|
// 4. 落盘(失败不影响返回)
|
||||||
|
std::fs::create_dir_all(&dir).ok();
|
||||||
|
std::fs::write(&cache_path, &png).ok();
|
||||||
|
|
||||||
|
// 5. 缓存 + 返回
|
||||||
|
let url = png_to_data_url(&png);
|
||||||
|
mem_put(path.to_string(), url.clone());
|
||||||
|
Some(url)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 清理整个图标磁盘缓存(设置页可调用)
|
||||||
|
pub fn clear_cache(app: &AppHandle) {
|
||||||
|
let dir = cache_dir(app);
|
||||||
|
if dir.exists() {
|
||||||
|
std::fs::remove_dir_all(&dir).ok();
|
||||||
|
std::fs::create_dir_all(&dir).ok();
|
||||||
|
}
|
||||||
|
if let Ok(mut guard) = MEM_CACHE.lock() {
|
||||||
|
*guard = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn png_to_data_url(png: &[u8]) -> String {
|
||||||
|
let b64 = base64::engine::general_purpose::STANDARD.encode(png);
|
||||||
|
format!("data:image/png;base64,{}", b64)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== Windows 图标提取 =====
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn extract_icon_png(path: &str) -> Option<Vec<u8>> {
|
||||||
|
use std::ffi::OsStr;
|
||||||
|
use std::os::windows::ffi::OsStrExt;
|
||||||
|
use windows_sys::Win32::UI::Shell::{
|
||||||
|
SHGetFileInfoW, SHFILEINFOW, SHGFI_ICON, SHGFI_LARGEICON,
|
||||||
|
};
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::DestroyIcon;
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
let wide: Vec<u16> = OsStr::new(path)
|
||||||
|
.encode_wide()
|
||||||
|
.chain(std::iter::once(0))
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
let mut shfi: SHFILEINFOW = std::mem::zeroed();
|
||||||
|
let _ = SHGetFileInfoW(
|
||||||
|
wide.as_ptr(),
|
||||||
|
0,
|
||||||
|
&mut shfi,
|
||||||
|
std::mem::size_of::<SHFILEINFOW>() as u32,
|
||||||
|
SHGFI_ICON | SHGFI_LARGEICON,
|
||||||
|
);
|
||||||
|
|
||||||
|
// hIcon 为 0 表示无图标
|
||||||
|
if shfi.hIcon == 0 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let result = hicon_to_png(shfi.hIcon);
|
||||||
|
let _ = DestroyIcon(shfi.hIcon);
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
fn extract_icon_png(_path: &str) -> Option<Vec<u8>> {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// HICON → PNG bytes
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn hicon_to_png(hicon: windows_sys::Win32::UI::WindowsAndMessaging::HICON) -> Option<Vec<u8>> {
|
||||||
|
use windows_sys::Win32::Graphics::Gdi::DeleteObject;
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::{GetIconInfo, ICONINFO};
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
let mut icon_info: ICONINFO = std::mem::zeroed();
|
||||||
|
if GetIconInfo(hicon, &mut icon_info) == 0 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let has_color = icon_info.hbmColor != 0;
|
||||||
|
let has_mask = icon_info.hbmMask != 0;
|
||||||
|
|
||||||
|
let result: Option<(Vec<u8>, u32, u32)> = if has_color {
|
||||||
|
// 32-bit BGRA → RGBA
|
||||||
|
let (mut rgba, w, h) = bitmap_to_rgba32(icon_info.hbmColor)?;
|
||||||
|
|
||||||
|
// 检查 alpha 是否全 0(旧式无 alpha 通道图标)
|
||||||
|
let alpha_any = rgba.chunks_exact(4).any(|c| c[3] != 0);
|
||||||
|
if !alpha_any {
|
||||||
|
if has_mask {
|
||||||
|
// 用 mask 补 alpha(白=透明,黑=不透明)
|
||||||
|
let _ = apply_mask_alpha(&mut rgba, w, h, icon_info.hbmMask);
|
||||||
|
} else {
|
||||||
|
// 无 mask,设为全不透明
|
||||||
|
for c in rgba.chunks_exact_mut(4) {
|
||||||
|
c[3] = 255;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Some((rgba, w, h))
|
||||||
|
} else {
|
||||||
|
// 无颜色位图:monochrome 图标,罕见且无色,跳过
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
|
// 清理 GDI 对象
|
||||||
|
if has_color {
|
||||||
|
let _ = DeleteObject(icon_info.hbmColor);
|
||||||
|
}
|
||||||
|
if has_mask {
|
||||||
|
let _ = DeleteObject(icon_info.hbmMask);
|
||||||
|
}
|
||||||
|
|
||||||
|
let (rgba, w, h) = result?;
|
||||||
|
encode_png(&rgba, w, h)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 读取 32-bit 位图为 RGBA(top-down),BGRA→RGBA
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn bitmap_to_rgba32(
|
||||||
|
hbm: windows_sys::Win32::Graphics::Gdi::HBITMAP,
|
||||||
|
) -> Option<(Vec<u8>, u32, u32)> {
|
||||||
|
use windows_sys::Win32::Foundation::HWND;
|
||||||
|
use windows_sys::Win32::Graphics::Gdi::{
|
||||||
|
GetDC, GetDIBits, GetObjectW, BITMAP, BITMAPINFO, BITMAPINFOHEADER, BI_RGB, DIB_RGB_COLORS,
|
||||||
|
ReleaseDC,
|
||||||
|
};
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
// 取尺寸
|
||||||
|
let mut bmp: BITMAP = std::mem::zeroed();
|
||||||
|
let got = GetObjectW(
|
||||||
|
hbm,
|
||||||
|
std::mem::size_of::<BITMAP>() as i32,
|
||||||
|
&mut bmp as *mut _ as *mut _,
|
||||||
|
);
|
||||||
|
if got == 0 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let w = bmp.bmWidth as u32;
|
||||||
|
let h = bmp.bmHeight as u32;
|
||||||
|
if w == 0 || h == 0 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 32-bit top-down DIB
|
||||||
|
let mut bi: BITMAPINFO = std::mem::zeroed();
|
||||||
|
bi.bmiHeader.biSize = std::mem::size_of::<BITMAPINFOHEADER>() as u32;
|
||||||
|
bi.bmiHeader.biWidth = w as i32;
|
||||||
|
bi.bmiHeader.biHeight = -(h as i32); // 负值 = top-down
|
||||||
|
bi.bmiHeader.biPlanes = 1;
|
||||||
|
bi.bmiHeader.biBitCount = 32;
|
||||||
|
bi.bmiHeader.biCompression = BI_RGB;
|
||||||
|
|
||||||
|
let mut pixels = vec![0u8; (w * h * 4) as usize];
|
||||||
|
let hdc = GetDC(0 as HWND);
|
||||||
|
if hdc == 0 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let ret = GetDIBits(
|
||||||
|
hdc,
|
||||||
|
hbm,
|
||||||
|
0,
|
||||||
|
h,
|
||||||
|
pixels.as_mut_ptr() as *mut _,
|
||||||
|
&mut bi,
|
||||||
|
DIB_RGB_COLORS,
|
||||||
|
);
|
||||||
|
let _ = ReleaseDC(0 as HWND, hdc);
|
||||||
|
if ret == 0 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
// BGRA → RGBA
|
||||||
|
for chunk in pixels.chunks_exact_mut(4) {
|
||||||
|
chunk.swap(0, 2);
|
||||||
|
}
|
||||||
|
Some((pixels, w, h))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 用 1bpp mask 设置 alpha:mask 白(1)=透明,黑(0)=不透明
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn apply_mask_alpha(
|
||||||
|
rgba: &mut [u8],
|
||||||
|
w: u32,
|
||||||
|
h: u32,
|
||||||
|
hbm_mask: windows_sys::Win32::Graphics::Gdi::HBITMAP,
|
||||||
|
) -> Result<(), ()> {
|
||||||
|
use windows_sys::Win32::Foundation::HWND;
|
||||||
|
use windows_sys::Win32::Graphics::Gdi::{
|
||||||
|
GetDC, GetDIBits, BITMAPINFO, BITMAPINFOHEADER, BI_RGB, DIB_RGB_COLORS, ReleaseDC,
|
||||||
|
};
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
let mut bi: BITMAPINFO = std::mem::zeroed();
|
||||||
|
bi.bmiHeader.biSize = std::mem::size_of::<BITMAPINFOHEADER>() as u32;
|
||||||
|
bi.bmiHeader.biWidth = w as i32;
|
||||||
|
bi.bmiHeader.biHeight = -(h as i32);
|
||||||
|
bi.bmiHeader.biPlanes = 1;
|
||||||
|
bi.bmiHeader.biBitCount = 1;
|
||||||
|
bi.bmiHeader.biCompression = BI_RGB;
|
||||||
|
|
||||||
|
// 1bpp,每行 4 字节对齐
|
||||||
|
let row_bytes = ((w + 31) / 32 * 4) as usize;
|
||||||
|
let mut mask = vec![0u8; row_bytes * h as usize];
|
||||||
|
|
||||||
|
let hdc = GetDC(0 as HWND);
|
||||||
|
if hdc == 0 {
|
||||||
|
return Err(());
|
||||||
|
}
|
||||||
|
let ret = GetDIBits(
|
||||||
|
hdc,
|
||||||
|
hbm_mask,
|
||||||
|
0,
|
||||||
|
h,
|
||||||
|
mask.as_mut_ptr() as *mut _,
|
||||||
|
&mut bi,
|
||||||
|
DIB_RGB_COLORS,
|
||||||
|
);
|
||||||
|
let _ = ReleaseDC(0 as HWND, hdc);
|
||||||
|
if ret == 0 {
|
||||||
|
return Err(());
|
||||||
|
}
|
||||||
|
|
||||||
|
for y in 0..h as usize {
|
||||||
|
for x in 0..w as usize {
|
||||||
|
let byte_idx = y * row_bytes + x / 8;
|
||||||
|
let bit = (mask[byte_idx] >> (7 - (x % 8))) & 1;
|
||||||
|
let alpha = if bit == 1 { 0 } else { 255 };
|
||||||
|
rgba[(y * w as usize + x) * 4 + 3] = alpha;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// RGBA → PNG
|
||||||
|
fn encode_png(rgba: &[u8], w: u32, h: u32) -> Option<Vec<u8>> {
|
||||||
|
use image::{ImageBuffer, RgbaImage};
|
||||||
|
let img: RgbaImage = ImageBuffer::from_raw(w, h, rgba.to_vec())?;
|
||||||
|
let mut buf = std::io::Cursor::new(Vec::new());
|
||||||
|
image::DynamicImage::ImageRgba8(img)
|
||||||
|
.write_to(&mut buf, image::ImageFormat::Png)
|
||||||
|
.ok()?;
|
||||||
|
Some(buf.into_inner())
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
//! 快速面板模块:全局快捷键唤起的多源命令面板。
|
||||||
|
//!
|
||||||
|
//! Phase 1:窗口骨架(预创建隐藏窗口 + 快捷键 + 失焦隐藏)
|
||||||
|
//! Phase 2:fuzzy + 拼音引擎,command/calc/web/system Provider
|
||||||
|
//! Phase 3:文件索引(walkdir + rusqlite)、应用扫描、剪贴板历史复用
|
||||||
|
|
||||||
|
pub mod actions;
|
||||||
|
pub mod app_scanner;
|
||||||
|
pub mod commands;
|
||||||
|
pub mod explorer;
|
||||||
|
pub mod file_index;
|
||||||
|
pub mod icon_extractor;
|
||||||
|
pub mod popup;
|
||||||
|
pub mod special_locations;
|
||||||
|
|
||||||
|
pub use actions::{
|
||||||
|
quickpanel_apply_rename, quickpanel_batch_extract, quickpanel_list_archives,
|
||||||
|
quickpanel_list_dir, quickpanel_preview_rename,
|
||||||
|
};
|
||||||
|
pub use commands::{
|
||||||
|
quickpanel_build_file_index, quickpanel_clear_app_icon_cache, quickpanel_delete_file,
|
||||||
|
quickpanel_delete_files, quickpanel_file_index_stats, quickpanel_focus_main_window,
|
||||||
|
quickpanel_get_app_icon, quickpanel_get_settings, quickpanel_get_special_locations,
|
||||||
|
quickpanel_hide_popup, quickpanel_init_file_index, quickpanel_lock_screen,
|
||||||
|
quickpanel_open_file, quickpanel_open_special, quickpanel_register_shortcut,
|
||||||
|
quickpanel_reveal_in_explorer, quickpanel_run_custom_command, quickpanel_run_system_command,
|
||||||
|
quickpanel_save_settings, quickpanel_scan_apps, quickpanel_search_files, quickpanel_show_popup,
|
||||||
|
quickpanel_show_window, quickpanel_unregister_shortcut,
|
||||||
|
};
|
||||||
|
pub use popup::{ensure_window, load_settings};
|
||||||
@@ -0,0 +1,355 @@
|
|||||||
|
//! 快速面板弹窗:全局快捷键唤起的多源命令面板。
|
||||||
|
//!
|
||||||
|
//! 流程(与剪贴板弹窗同构):
|
||||||
|
//! 1. 应用启动 → `ensure_window` 预创建隐藏窗口(屏幕外)
|
||||||
|
//! 2. 全局快捷键按下 → `show_popup` 在鼠标所在显示器中央定位并显示
|
||||||
|
//! 3. 前端 Vue 挂载完成、主题应用后调用 `quickpanel_show_window` 显示窗口
|
||||||
|
//! 4. 前端监听 `quickpanel-show` 事件刷新数据/聚焦输入
|
||||||
|
//! 5. 窗口失焦自动隐藏(保留窗口复用,不销毁)
|
||||||
|
//!
|
||||||
|
//! Win32 API(鼠标/显示器/DPI)复用 clipboard::popup 已 pub use 的实现,
|
||||||
|
//! 避免重复封装。
|
||||||
|
|
||||||
|
use std::sync::Mutex;
|
||||||
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use tauri::{AppHandle, Emitter, Manager, WebviewUrl, WebviewWindowBuilder};
|
||||||
|
use tauri::window::{Effect, EffectsBuilder};
|
||||||
|
|
||||||
|
use crate::win32_util::{get_cursor_pos, get_work_area_at_point, get_dpi_for_point};
|
||||||
|
|
||||||
|
use super::explorer;
|
||||||
|
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
/// 弹窗窗口标签
|
||||||
|
pub const POPUP_LABEL: &str = "quick-panel";
|
||||||
|
|
||||||
|
/// 窗口尺寸(逻辑像素)
|
||||||
|
const WIN_W: f64 = 600.0;
|
||||||
|
const WIN_H: f64 = 420.0;
|
||||||
|
|
||||||
|
/// `quickpanel-show` 事件负载:携带快捷键按下时检测到的 Explorer 当前目录,
|
||||||
|
/// 前端据此渲染"当前目录"文件操作分组。
|
||||||
|
#[derive(Clone, Serialize)]
|
||||||
|
pub struct QuickPanelShowPayload {
|
||||||
|
pub dir: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 检测前台 Explorer 目录并连同 show 事件一起下发。
|
||||||
|
/// 必须在快捷键回调内调用:此时前台窗口仍是 Explorer,面板尚未抢焦点。
|
||||||
|
fn emit_show(app: &AppHandle) {
|
||||||
|
let dir = explorer::detect_explorer_folder();
|
||||||
|
crate::logger::log_info("quickpanel", &format!("show_popup: explorer_dir={:?}", dir));
|
||||||
|
let _ = app.emit(
|
||||||
|
crate::constants::events::QUICKPANEL_SHOW,
|
||||||
|
QuickPanelShowPayload { dir },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 标志:show_popup 兜底创建路径设为 true,前端 onMounted 回调 show_window 时据此判断是否显示。
|
||||||
|
/// 预创建路径不设置,避免应用启动时弹窗自动弹出。
|
||||||
|
static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
/// 兜底创建路径下 show_popup 计算出的待显示位置(物理坐标),供 show_window 应用,
|
||||||
|
/// 避免窗口重建后仍停留在屏幕外 (-10000, -10000)。
|
||||||
|
static PENDING_POS: Mutex<Option<(f64, f64)>> = Mutex::new(None);
|
||||||
|
|
||||||
|
/// 失焦隐藏的宽限期:show 后窗口激活期间焦点可能短暂弹跳(透明 + focus:false 的
|
||||||
|
/// WebView2 窗口在透明激活时尤其容易出现),导致 Focused(false) 紧跟在 show 之后
|
||||||
|
/// 触发并把刚显示的窗口立即隐藏。距上次 show 不足该时长的失焦事件直接忽略。
|
||||||
|
const SHOW_GRACE: Duration = Duration::from_millis(500);
|
||||||
|
|
||||||
|
/// 最近一次 show 的时间,用于失焦宽限期判断。
|
||||||
|
static LAST_SHOWN: Mutex<Option<Instant>> = Mutex::new(None);
|
||||||
|
|
||||||
|
/// 标记"已发起显示",并记录时间供失焦宽限期使用。
|
||||||
|
fn mark_shown() {
|
||||||
|
if let Ok(mut t) = LAST_SHOWN.lock() {
|
||||||
|
*t = Some(Instant::now());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 判断距上次 show 是否仍在宽限期内(是则忽略失焦自动隐藏)。
|
||||||
|
fn within_show_grace() -> bool {
|
||||||
|
LAST_SHOWN
|
||||||
|
.lock()
|
||||||
|
.ok()
|
||||||
|
.and_then(|t| *t)
|
||||||
|
.map(|t| t.elapsed() < SHOW_GRACE)
|
||||||
|
.unwrap_or(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 显示窗口并确保其到达前台。
|
||||||
|
/// set_focus 受 Windows 前台锁定限制,可能静默失败;此时用 win32_util::force_foreground
|
||||||
|
/// (模拟 Alt 释放重置前台锁定 + SetForegroundWindow + BringWindowToTop)兜底。
|
||||||
|
fn show_and_focus(win: &tauri::WebviewWindow) {
|
||||||
|
if let Err(e) = win.show() {
|
||||||
|
crate::logger::log_error("quickpanel", &format!("show popup failed: {}", e));
|
||||||
|
}
|
||||||
|
mark_shown();
|
||||||
|
let focused = win.set_focus();
|
||||||
|
if focused.is_err() {
|
||||||
|
// set_focus 被前台锁定拒绝时,退回到强制置前(与主窗口焦点命令同法)
|
||||||
|
if let Ok(hwnd) = win.hwnd() {
|
||||||
|
crate::win32_util::force_foreground(hwnd.0 as isize);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 自定义命令
|
||||||
|
#[derive(Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct CustomCommand {
|
||||||
|
pub id: String,
|
||||||
|
pub title: String,
|
||||||
|
pub command: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub args: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 快速面板设置
|
||||||
|
#[derive(Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct QuickPanelSettings {
|
||||||
|
/// 全局快捷键(如 "Alt+Space"),空字符串表示不注册。
|
||||||
|
#[serde(default = "default_shortcut")]
|
||||||
|
pub shortcut: String,
|
||||||
|
/// 唤起位置:center(鼠标所在显示器中央)| cursor(鼠标位置)
|
||||||
|
#[serde(default = "default_popup_position")]
|
||||||
|
pub popup_position: String,
|
||||||
|
/// 默认搜索引擎:google | bing | baidu
|
||||||
|
#[serde(default = "default_search_engine")]
|
||||||
|
pub search_engine: String,
|
||||||
|
/// 文件索引目录列表(空列表表示使用默认:桌面/文档/下载)
|
||||||
|
#[serde(default = "default_index_dirs")]
|
||||||
|
pub index_dirs: Vec<String>,
|
||||||
|
/// 自定义命令列表
|
||||||
|
#[serde(default)]
|
||||||
|
pub custom_commands: Vec<CustomCommand>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_shortcut() -> String {
|
||||||
|
"Alt+Space".to_string()
|
||||||
|
}
|
||||||
|
fn default_popup_position() -> String {
|
||||||
|
"center".to_string()
|
||||||
|
}
|
||||||
|
fn default_search_engine() -> String {
|
||||||
|
"bing".to_string()
|
||||||
|
}
|
||||||
|
fn default_index_dirs() -> Vec<String> {
|
||||||
|
// 桌面/文档/下载目录(延迟到实际使用时解析,避免启动时失败)
|
||||||
|
let mut dirs = Vec::new();
|
||||||
|
if let Some(d) = dirs::desktop_dir() {
|
||||||
|
dirs.push(d.to_string_lossy().to_string());
|
||||||
|
}
|
||||||
|
if let Some(d) = dirs::document_dir() {
|
||||||
|
dirs.push(d.to_string_lossy().to_string());
|
||||||
|
}
|
||||||
|
if let Some(d) = dirs::download_dir() {
|
||||||
|
dirs.push(d.to_string_lossy().to_string());
|
||||||
|
}
|
||||||
|
dirs
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for QuickPanelSettings {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
shortcut: default_shortcut(),
|
||||||
|
popup_position: default_popup_position(),
|
||||||
|
search_engine: default_search_engine(),
|
||||||
|
index_dirs: default_index_dirs(),
|
||||||
|
custom_commands: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置文件路径:{app_data_dir}/quickpanel/settings.json
|
||||||
|
fn settings_path(app: &AppHandle) -> PathBuf {
|
||||||
|
app.path()
|
||||||
|
.app_data_dir()
|
||||||
|
.unwrap_or_else(|_| PathBuf::from("."))
|
||||||
|
.join("quickpanel")
|
||||||
|
.join("settings.json")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 读取设置,文件不存在或解析失败返回默认值
|
||||||
|
pub fn load_settings(app: &AppHandle) -> QuickPanelSettings {
|
||||||
|
let path = settings_path(app);
|
||||||
|
std::fs::read_to_string(&path)
|
||||||
|
.ok()
|
||||||
|
.and_then(|s| serde_json::from_str(&s).ok())
|
||||||
|
.unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 保存设置到磁盘
|
||||||
|
pub fn save_settings(app: &AppHandle, settings: &QuickPanelSettings) -> Result<(), String> {
|
||||||
|
let path = settings_path(app);
|
||||||
|
if let Some(parent) = path.parent() {
|
||||||
|
std::fs::create_dir_all(parent).map_err(|e| format!("创建设置目录失败: {}", e))?;
|
||||||
|
}
|
||||||
|
let json = serde_json::to_string_pretty(settings).map_err(|e| format!("序列化设置失败: {}", e))?;
|
||||||
|
std::fs::write(&path, json).map_err(|e| format!("写入设置文件失败: {}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 创建弹窗窗口(隐藏状态)并注册失焦监听。
|
||||||
|
/// 位置默认在屏幕外,show_popup 时会重新定位到鼠标所在显示器中央。
|
||||||
|
/// 预创建后首次按快捷键走"窗口已存在"分支直接 show,避免首次创建的时序问题。
|
||||||
|
fn create_popup_window(app: &AppHandle) {
|
||||||
|
let win = match WebviewWindowBuilder::new(
|
||||||
|
app,
|
||||||
|
POPUP_LABEL,
|
||||||
|
WebviewUrl::App("index.html#quick-panel".into()),
|
||||||
|
)
|
||||||
|
.title("快速面板")
|
||||||
|
.inner_size(WIN_W, WIN_H)
|
||||||
|
.position(-10000.0, -10000.0) // 屏幕外,避免隐藏时一闪
|
||||||
|
.decorations(false)
|
||||||
|
.transparent(true)
|
||||||
|
.shadow(true)
|
||||||
|
.always_on_top(true)
|
||||||
|
.skip_taskbar(true)
|
||||||
|
.resizable(false)
|
||||||
|
.visible(false)
|
||||||
|
.focused(false) // 不抢占焦点,避免创建即触发 Focused(false)
|
||||||
|
.effects(EffectsBuilder::new().effects(vec![Effect::Mica]).build())
|
||||||
|
.build()
|
||||||
|
{
|
||||||
|
Ok(w) => w,
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_error("quickpanel", &format!("创建弹窗失败: {}", e));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 监听窗口失焦:自动隐藏
|
||||||
|
// 距上次 show 不足宽限期(激活中焦点弹跳)的失焦事件忽略,避免弹窗刚显示就被隐藏
|
||||||
|
let app_handle = app.clone();
|
||||||
|
let win_handle = win.clone();
|
||||||
|
win.on_window_event(move |event| {
|
||||||
|
if let tauri::WindowEvent::Focused(false) = event {
|
||||||
|
if within_show_grace() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let _ = win_handle.hide();
|
||||||
|
let _ = app_handle.emit(crate::constants::events::QUICKPANEL_HIDE, ());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
crate::logger::log_info("quickpanel", "弹窗窗口已预创建(隐藏状态)");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用启动时预创建弹窗窗口(隐藏)。
|
||||||
|
/// 这样首次按快捷键时窗口已存在,直接 show + 定位,避免首次创建时序问题。
|
||||||
|
pub fn ensure_window(app: &AppHandle) {
|
||||||
|
if app.get_webview_window(POPUP_LABEL).is_some() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
create_popup_window(app);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 在指定位置显示弹窗。
|
||||||
|
/// popup_position = "cursor" 时在鼠标位置附近显示,否则在鼠标所在显示器中央显示。
|
||||||
|
/// 窗口不存在则创建(隐藏状态,等前端挂载后调用 show_window 显示)。
|
||||||
|
pub fn show_popup(app: &AppHandle) {
|
||||||
|
crate::logger::log_info("quickpanel", "show_popup triggered");
|
||||||
|
let settings = load_settings(app);
|
||||||
|
let cursor_mode = settings.popup_position == "cursor";
|
||||||
|
|
||||||
|
// 获取鼠标位置(物理像素)
|
||||||
|
let (mx, my) = match get_cursor_pos() {
|
||||||
|
Some(p) => p,
|
||||||
|
None => return,
|
||||||
|
};
|
||||||
|
|
||||||
|
// 获取光标所在显示器的工作区(物理像素,与 get_cursor_pos 同一坐标系)
|
||||||
|
let (wa_left, wa_top, wa_right, wa_bottom) = get_work_area_at_point(mx, my)
|
||||||
|
.unwrap_or((0, 0, 1920, 1040));
|
||||||
|
|
||||||
|
// 光标所在显示器的 DPI:窗口尺寸需按物理像素换算
|
||||||
|
let dpi = get_dpi_for_point(mx, my).unwrap_or(96);
|
||||||
|
let scale = dpi as f64 / 96.0;
|
||||||
|
let win_w_px = WIN_W * scale;
|
||||||
|
let win_h_px = WIN_H * scale;
|
||||||
|
|
||||||
|
// 直接以物理坐标计算(光标 + 工作区均为物理像素,避免混合 DPI 下换算偏移)
|
||||||
|
let (x, y) = if cursor_mode {
|
||||||
|
// 鼠标位置模式:以鼠标为基准偏移,clamp 到工作区内
|
||||||
|
let x = (mx as f64 + 12.0 * scale).min(wa_right as f64 - win_w_px).max(wa_left as f64);
|
||||||
|
let y = (my as f64 + 12.0 * scale).min(wa_bottom as f64 - win_h_px).max(wa_top as f64);
|
||||||
|
(x, y)
|
||||||
|
} else {
|
||||||
|
// 中央模式:窗口居中于鼠标所在显示器工作区
|
||||||
|
let wa_w = (wa_right - wa_left) as f64;
|
||||||
|
let wa_h = (wa_bottom - wa_top) as f64;
|
||||||
|
(
|
||||||
|
wa_left as f64 + (wa_w - win_w_px) / 2.0,
|
||||||
|
wa_top as f64 + (wa_h - win_h_px) / 2.0,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
// 窗口已存在:移动 + 显示 + 请求焦点
|
||||||
|
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
||||||
|
// 必须先于窗口显示/聚焦检测 Explorer 目录:show/set_focus 会立即抢走前台焦点,
|
||||||
|
// 之后调用 GetForegroundWindow 拿到的就是面板自身了。
|
||||||
|
emit_show(app);
|
||||||
|
let _ = win.set_position(tauri::Position::Physical(tauri::PhysicalPosition {
|
||||||
|
x: x as i32,
|
||||||
|
y: y as i32,
|
||||||
|
}));
|
||||||
|
show_and_focus(&win);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 兜底:窗口被销毁时重新创建(隐藏),等前端 onMounted 回调 show_window
|
||||||
|
POPUP_PENDING_SHOW.store(true, Ordering::SeqCst);
|
||||||
|
if let Ok(mut pos) = PENDING_POS.lock() {
|
||||||
|
*pos = Some((x, y));
|
||||||
|
}
|
||||||
|
create_popup_window(app);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 显示已创建的弹窗窗口(由前端 onMounted 后调用)。
|
||||||
|
///
|
||||||
|
/// 两个路径:
|
||||||
|
/// 1. 预创建路径(POPUP_PENDING_SHOW = false):show_popup 已调用 show_and_focus 显示窗口,
|
||||||
|
/// 但若 Vue 尚未挂载,quickpanel-show 事件可能丢失。检查窗口是否可见,若可见则重新发送事件。
|
||||||
|
/// 2. 兜底创建路径(POPUP_PENDING_SHOW = true):窗口尚未显示,位置为 PENDING_POS,
|
||||||
|
/// 先定位再发事件最后显示+聚焦。
|
||||||
|
pub fn show_window(app: &AppHandle) {
|
||||||
|
if !POPUP_PENDING_SHOW.swap(false, Ordering::SeqCst) {
|
||||||
|
// 预创建路径:窗口已由 show_popup 显示,但事件可能因前端未挂载而丢失。
|
||||||
|
// 窗口可见时重新发送事件,让刚注册的监听器处理(清空输入、聚焦、刷新等)。
|
||||||
|
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
||||||
|
if win.is_visible().unwrap_or(false) {
|
||||||
|
emit_show(app);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// 兜底创建路径:show_popup 兜底重建,窗口尚未显示
|
||||||
|
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
||||||
|
// 应用 show_popup 计算的兜底位置(物理坐标),避免停留在屏幕外
|
||||||
|
let pos = PENDING_POS.lock().ok().and_then(|p| *p);
|
||||||
|
if let Some((x, y)) = pos {
|
||||||
|
let _ = win.set_position(tauri::Position::Physical(tauri::PhysicalPosition {
|
||||||
|
x: x as i32,
|
||||||
|
y: y as i32,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
// 同样先检测 Explorer 目录再显示,避免面板抢焦点导致检测失败。
|
||||||
|
emit_show(app);
|
||||||
|
show_and_focus(&win);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 隐藏弹窗(不销毁,保留复用)
|
||||||
|
pub fn hide_popup(app: &AppHandle) {
|
||||||
|
if let Some(win) = app.get_webview_window(POPUP_LABEL) {
|
||||||
|
let _ = win.hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,234 @@
|
|||||||
|
//! 快捷位置:Windows 常用系统位置/工具。
|
||||||
|
//!
|
||||||
|
//! 提供两类能力:
|
||||||
|
//! - `get_special_locations`:返回预定义列表(hosts、回收站、此电脑、用户目录、系统管理工具),
|
||||||
|
//! 路径在 Rust 侧解析(环境变量 / dirs crate),前端只负责展示与搜索。
|
||||||
|
//! - 打开逻辑:目录走 explorer.exe(比 ShellExecute "open" 目录更可靠),
|
||||||
|
//! 文件走 ShellExecuteW(open + openas fallback),shell 位置与系统工具走 ShellExecuteW。
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
/// 快捷位置条目
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct SpecialLocation {
|
||||||
|
pub id: String,
|
||||||
|
pub title: String,
|
||||||
|
pub subtitle: String,
|
||||||
|
pub keywords: Vec<String>,
|
||||||
|
/// file: 真实文件/文件夹路径;shell: explorer 打开的 shell 路径;cmd: 可执行命令
|
||||||
|
pub kind: String,
|
||||||
|
pub target: String,
|
||||||
|
pub args: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn sl(
|
||||||
|
id: &str,
|
||||||
|
title: &str,
|
||||||
|
subtitle: &str,
|
||||||
|
keywords: &[&str],
|
||||||
|
kind: &str,
|
||||||
|
target: &str,
|
||||||
|
args: &[&str],
|
||||||
|
) -> SpecialLocation {
|
||||||
|
SpecialLocation {
|
||||||
|
id: id.to_string(),
|
||||||
|
title: title.to_string(),
|
||||||
|
subtitle: subtitle.to_string(),
|
||||||
|
keywords: keywords.iter().map(|s| s.to_string()).collect(),
|
||||||
|
kind: kind.to_string(),
|
||||||
|
target: target.to_string(),
|
||||||
|
args: args.iter().map(|s| s.to_string()).collect(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Windows 系统目录(%SystemRoot%)
|
||||||
|
fn system_root() -> String {
|
||||||
|
std::env::var("SystemRoot")
|
||||||
|
.or_else(|_| std::env::var("windir"))
|
||||||
|
.unwrap_or_else(|_| "C:\\Windows".to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn dir_str(d: Option<PathBuf>) -> Option<String> {
|
||||||
|
d.map(|p| p.to_string_lossy().to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 返回全部快捷位置(路径已在 Rust 侧解析,避免前端硬编码)
|
||||||
|
pub fn get_special_locations() -> Vec<SpecialLocation> {
|
||||||
|
let mut list = Vec::new();
|
||||||
|
|
||||||
|
// ===== shell 位置(explorer 打开,CLSID 格式) =====
|
||||||
|
list.push(sl(
|
||||||
|
"sp-recycle-bin",
|
||||||
|
"回收站",
|
||||||
|
"Windows 回收站",
|
||||||
|
&["recycle", "bin", "trash", "回收站", "垃圾桶", "垃圾箱"],
|
||||||
|
"shell",
|
||||||
|
"::{645FF040-5081-101B-9F08-00AA002F954E}",
|
||||||
|
&[],
|
||||||
|
));
|
||||||
|
list.push(sl(
|
||||||
|
"sp-this-pc",
|
||||||
|
"此电脑",
|
||||||
|
"我的电脑",
|
||||||
|
&["此电脑", "我的电脑", "computer", "pc", "thispc"],
|
||||||
|
"shell",
|
||||||
|
"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}",
|
||||||
|
&[],
|
||||||
|
));
|
||||||
|
list.push(sl(
|
||||||
|
"sp-network",
|
||||||
|
"网络",
|
||||||
|
"网络位置",
|
||||||
|
&["网络", "network", "网上邻居"],
|
||||||
|
"shell",
|
||||||
|
"::{208D2C60-3AEA-1069-A2D7-08002B30309D}",
|
||||||
|
&[],
|
||||||
|
));
|
||||||
|
|
||||||
|
// ===== 常用文件 =====
|
||||||
|
let hosts = format!("{}\\System32\\drivers\\etc\\hosts", system_root());
|
||||||
|
list.push(sl(
|
||||||
|
"sp-hosts",
|
||||||
|
"hosts 文件",
|
||||||
|
&hosts,
|
||||||
|
&["hosts", "host", "主机文件", "域名映射"],
|
||||||
|
"file",
|
||||||
|
&hosts,
|
||||||
|
&[],
|
||||||
|
));
|
||||||
|
|
||||||
|
// ===== 用户目录(真实路径) =====
|
||||||
|
let user_dirs: &[(&str, &str, &[&str], Option<PathBuf>)] = &[
|
||||||
|
("sp-documents", "我的文档", &["文档", "我的文档", "documents", "docs"], dirs::document_dir()),
|
||||||
|
("sp-desktop", "桌面", &["桌面", "desktop"], dirs::desktop_dir()),
|
||||||
|
("sp-downloads", "下载", &["下载", "download", "downloads"], dirs::download_dir()),
|
||||||
|
("sp-pictures", "图片", &["图片", "照片", "pictures", "photos"], dirs::picture_dir()),
|
||||||
|
("sp-music", "音乐", &["音乐", "music"], dirs::audio_dir()),
|
||||||
|
("sp-videos", "视频", &["视频", "videos"], dirs::video_dir()),
|
||||||
|
];
|
||||||
|
for (id, title, keywords, path) in user_dirs {
|
||||||
|
if let Some(p) = dir_str(path.clone()) {
|
||||||
|
list.push(sl(id, title, &p, keywords, "file", &p, &[]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 系统管理工具(ShellExecuteW 直接启动 .msc/.cpl/.exe) =====
|
||||||
|
let tools: &[(&str, &str, &[&str], &str)] = &[
|
||||||
|
("sp-devmgmt", "设备管理器", &["设备管理器", "设备", "devmgmt", "device"], "devmgmt.msc"),
|
||||||
|
("sp-diskmgmt", "磁盘管理", &["磁盘管理", "磁盘", "diskmgmt", "disk"], "diskmgmt.msc"),
|
||||||
|
("sp-compmgmt", "计算机管理", &["计算机管理", "compmgmt"], "compmgmt.msc"),
|
||||||
|
("sp-services", "服务", &["服务", "services", "service"], "services.msc"),
|
||||||
|
("sp-perfmon", "性能监视器", &["性能监视器", "性能", "perfmon"], "perfmon.msc"),
|
||||||
|
("sp-msinfo", "系统信息", &["系统信息", "msinfo", "systeminfo"], "msinfo32.exe"),
|
||||||
|
("sp-ncpa", "网络连接", &["网络连接", "ncpa", "网卡"], "ncpa.cpl"),
|
||||||
|
("sp-appwiz", "程序和功能", &["程序和功能", "卸载", "appwiz", "uninstall"], "appwiz.cpl"),
|
||||||
|
("sp-powercfg", "电源选项", &["电源选项", "电源", "powercfg", "power"], "powercfg.cpl"),
|
||||||
|
("sp-osk", "屏幕键盘", &["屏幕键盘", "键盘", "osk", "virtual keyboard"], "osk.exe"),
|
||||||
|
("sp-magnify", "放大镜", &["放大镜", "magnify", "magnifier"], "magnify.exe"),
|
||||||
|
];
|
||||||
|
for (id, title, keywords, exe) in tools {
|
||||||
|
list.push(sl(id, title, exe, keywords, "cmd", exe, &[]));
|
||||||
|
}
|
||||||
|
list.push(sl(
|
||||||
|
"sp-envvar",
|
||||||
|
"环境变量",
|
||||||
|
"rundll32 sysdm.cpl,EditEnvironmentVariables",
|
||||||
|
&["环境变量", "环境", "env", "environment"],
|
||||||
|
"cmd",
|
||||||
|
"rundll32.exe",
|
||||||
|
&["sysdm.cpl,EditEnvironmentVariables"],
|
||||||
|
));
|
||||||
|
|
||||||
|
list
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 打开逻辑 =====
|
||||||
|
|
||||||
|
/// ShellExecuteW 调用(verb 可指定,如 "open" / "openas")
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn shell_execute_verb(exe: &str, params: &str, verb: &str) -> Result<(), String> {
|
||||||
|
use std::ffi::OsStr;
|
||||||
|
use std::os::windows::ffi::OsStrExt;
|
||||||
|
use windows_sys::Win32::Foundation::HWND;
|
||||||
|
use windows_sys::Win32::UI::Shell::ShellExecuteW;
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::SW_SHOWNORMAL;
|
||||||
|
|
||||||
|
let wide_exe: Vec<u16> = OsStr::new(exe)
|
||||||
|
.encode_wide()
|
||||||
|
.chain(std::iter::once(0))
|
||||||
|
.collect();
|
||||||
|
let wide_params: Vec<u16> = OsStr::new(params)
|
||||||
|
.encode_wide()
|
||||||
|
.chain(std::iter::once(0))
|
||||||
|
.collect();
|
||||||
|
let wide_verb: Vec<u16> = OsStr::new(verb)
|
||||||
|
.encode_wide()
|
||||||
|
.chain(std::iter::once(0))
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
let hinst = ShellExecuteW(
|
||||||
|
0 as HWND,
|
||||||
|
wide_verb.as_ptr(),
|
||||||
|
wide_exe.as_ptr(),
|
||||||
|
wide_params.as_ptr(),
|
||||||
|
std::ptr::null(),
|
||||||
|
SW_SHOWNORMAL,
|
||||||
|
);
|
||||||
|
// ShellExecuteW 返回值 <= 32 表示错误
|
||||||
|
if hinst <= 32 {
|
||||||
|
return Err(format!("打开失败 (code: {})", hinst as i32));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
fn shell_execute_verb(_exe: &str, _params: &str, _verb: &str) -> Result<(), String> {
|
||||||
|
Err("当前平台不支持".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 打开文件/文件夹路径:
|
||||||
|
/// - 目录:explorer.exe 直接打开(比 ShellExecute "open" 目录更可靠,修复索引目录点击不生效问题)
|
||||||
|
/// - 文件:ShellExecuteW open,无关联程序时 fallback 到「打开方式」对话框
|
||||||
|
pub fn open_path(path: &str) -> Result<(), String> {
|
||||||
|
let p = std::path::Path::new(path);
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
if p.is_dir() {
|
||||||
|
use crate::process_manager::setup_creation_flags;
|
||||||
|
let mut cmd = std::process::Command::new("explorer.exe");
|
||||||
|
cmd.arg(path);
|
||||||
|
setup_creation_flags(&mut cmd);
|
||||||
|
return cmd
|
||||||
|
.spawn()
|
||||||
|
.map(|_| ())
|
||||||
|
.map_err(|e| format!("打开文件夹失败: {}", e));
|
||||||
|
}
|
||||||
|
let params = String::new();
|
||||||
|
if shell_execute_verb(path, ¶ms, "open").is_err() {
|
||||||
|
return shell_execute_verb(path, ¶ms, "openas");
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
let _ = p;
|
||||||
|
Err("当前平台不支持".into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 打开 shell 位置(explorer shell: 或 ::{CLSID})
|
||||||
|
pub fn open_shell(target: &str) -> Result<(), String> {
|
||||||
|
shell_execute_verb("explorer.exe", target, "open")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 打开系统工具(.msc / .cpl / .exe,参数空格连接)
|
||||||
|
pub fn open_cmd(exe: &str, args: &[String]) -> Result<(), String> {
|
||||||
|
let params = args.join(" ");
|
||||||
|
shell_execute_verb(exe, ¶ms, "open")
|
||||||
|
}
|
||||||
@@ -3,7 +3,8 @@
|
|||||||
//! 实现:
|
//! 实现:
|
||||||
//! - 全屏(虚拟屏)捕获:BitBlt 从屏幕 DC 拷贝到兼容位图,GetDIBits 取像素
|
//! - 全屏(虚拟屏)捕获:BitBlt 从屏幕 DC 拷贝到兼容位图,GetDIBits 取像素
|
||||||
//! - 窗口捕获:PrintWindow(PW_RENDERFULLCONTENT) 捕获 DWM 内容(覆盖硬件加速窗口)
|
//! - 窗口捕获:PrintWindow(PW_RENDERFULLCONTENT) 捕获 DWM 内容(覆盖硬件加速窗口)
|
||||||
//! - 窗口拾取:WindowFromPoint + GetAncestor(GA_ROOT) 取顶层窗口
|
//! - 窗口拾取:pick_windows 枚举 Z 序窗口列表(排除本进程,避免命中覆盖层自身),
|
||||||
|
//! 前端缓存列表后本地命中测试
|
||||||
//! - 顶层窗口枚举:EnumWindows
|
//! - 顶层窗口枚举:EnumWindows
|
||||||
//! - 像素 → PNG / CF_DIB 转换
|
//! - 像素 → PNG / CF_DIB 转换
|
||||||
//!
|
//!
|
||||||
@@ -15,7 +16,7 @@
|
|||||||
//! 直接编码 PNG 会得到全透明图,故强制不透明。
|
//! 直接编码 PNG 会得到全透明图,故强制不透明。
|
||||||
|
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
use windows_sys::Win32::Foundation::{HWND, POINT, RECT};
|
use windows_sys::Win32::Foundation::{BOOL, HWND, POINT, RECT};
|
||||||
use windows_sys::Win32::Graphics::Gdi::{
|
use windows_sys::Win32::Graphics::Gdi::{
|
||||||
BitBlt, CreateCompatibleBitmap, CreateCompatibleDC, DeleteDC, DeleteObject, GetDC, GetDIBits,
|
BitBlt, CreateCompatibleBitmap, CreateCompatibleDC, DeleteDC, DeleteObject, GetDC, GetDIBits,
|
||||||
PatBlt, ReleaseDC, SelectObject, BITMAPINFO, BITMAPINFOHEADER, BLACKNESS, DIB_RGB_COLORS,
|
PatBlt, ReleaseDC, SelectObject, BITMAPINFO, BITMAPINFOHEADER, BLACKNESS, DIB_RGB_COLORS,
|
||||||
@@ -28,8 +29,9 @@ use windows_sys::Win32::System::DataExchange::{
|
|||||||
use windows_sys::Win32::System::Memory::{GlobalAlloc, GlobalLock, GlobalUnlock, GMEM_MOVEABLE};
|
use windows_sys::Win32::System::Memory::{GlobalAlloc, GlobalLock, GlobalUnlock, GMEM_MOVEABLE};
|
||||||
use windows_sys::Win32::System::Ole::CF_DIB;
|
use windows_sys::Win32::System::Ole::CF_DIB;
|
||||||
use windows_sys::Win32::UI::WindowsAndMessaging::{
|
use windows_sys::Win32::UI::WindowsAndMessaging::{
|
||||||
EnumWindows, GetAncestor, GetSystemMetrics, GetWindowLongPtrW, GetWindowRect,
|
EnumWindows, GetCursorPos, GetSystemMetrics, GetWindowLongPtrW, GetWindowRect,
|
||||||
GetWindowTextLengthW, GetWindowTextW, GWL_EXSTYLE, GA_ROOT, WS_EX_TOOLWINDOW, WindowFromPoint,
|
GetWindowTextLengthW, GetWindowTextW, GetWindowThreadProcessId, GWL_EXSTYLE,
|
||||||
|
WS_EX_TOOLWINDOW,
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::{CaptureData, ScreenRect, WindowInfo};
|
use super::{CaptureData, ScreenRect, WindowInfo};
|
||||||
@@ -64,24 +66,72 @@ const SM_CYVIRTUALSCREEN: i32 = 79;
|
|||||||
const PW_RENDERFULLCONTENT: u32 = 0x00000002;
|
const PW_RENDERFULLCONTENT: u32 = 0x00000002;
|
||||||
const BI_RGB: u32 = 0;
|
const BI_RGB: u32 = 0;
|
||||||
|
|
||||||
/// 将 BGRA top-down 像素编码为 PNG(强制 alpha=255)
|
/// 将 BGRA top-down 像素编码为 BMP(强制 alpha=255)
|
||||||
fn bgra_to_png(bgra: &[u8], width: i32, height: i32) -> Result<Vec<u8>, String> {
|
///
|
||||||
use image::codecs::png::PngEncoder;
|
/// 用于覆盖层/编辑器快速显示:相比 PNG 编码几乎零 CPU 开销,
|
||||||
use image::ImageEncoder;
|
/// Chromium(WebView2)原生支持 top-down 32bpp BMP。
|
||||||
|
fn bgra_to_bmp(bgra: &[u8], width: i32, height: i32) -> Result<Vec<u8>, String> {
|
||||||
if width <= 0 || height <= 0 {
|
if width <= 0 || height <= 0 {
|
||||||
return Err("无效尺寸".into());
|
return Err("无效尺寸".into());
|
||||||
}
|
}
|
||||||
let w = width as usize;
|
let w = width as usize;
|
||||||
let h = height as usize;
|
let h = height as usize;
|
||||||
let mut rgba = vec![0u8; w * h * 4];
|
let data_size = w * h * 4;
|
||||||
for i in 0..(w * h) {
|
let file_size = 14 + 40 + data_size;
|
||||||
rgba[i * 4] = bgra[i * 4 + 2]; // R
|
|
||||||
rgba[i * 4 + 1] = bgra[i * 4 + 1]; // G
|
let mut bmp = Vec::with_capacity(file_size);
|
||||||
rgba[i * 4 + 2] = bgra[i * 4]; // B
|
// BITMAPFILEHEADER
|
||||||
rgba[i * 4 + 3] = 255; // 强制不透明
|
bmp.extend_from_slice(b"BM");
|
||||||
|
bmp.extend_from_slice(&(file_size as u32).to_le_bytes());
|
||||||
|
bmp.extend_from_slice(&0u16.to_le_bytes()); // reserved
|
||||||
|
bmp.extend_from_slice(&0u16.to_le_bytes()); // reserved
|
||||||
|
bmp.extend_from_slice(&54u32.to_le_bytes()); // 像素数据偏移
|
||||||
|
// BITMAPINFOHEADER
|
||||||
|
bmp.extend_from_slice(&40u32.to_le_bytes()); // header size
|
||||||
|
bmp.extend_from_slice(&(width as i32).to_le_bytes());
|
||||||
|
bmp.extend_from_slice(&(-(height as i32)).to_le_bytes()); // 负值 = top-down
|
||||||
|
bmp.extend_from_slice(&1u16.to_le_bytes()); // planes
|
||||||
|
bmp.extend_from_slice(&32u16.to_le_bytes()); // bpp
|
||||||
|
bmp.extend_from_slice(&0u32.to_le_bytes()); // BI_RGB
|
||||||
|
bmp.extend_from_slice(&(data_size as u32).to_le_bytes());
|
||||||
|
bmp.extend_from_slice(&0u32.to_le_bytes()); // x ppm
|
||||||
|
bmp.extend_from_slice(&0u32.to_le_bytes()); // y ppm
|
||||||
|
bmp.extend_from_slice(&0u32.to_le_bytes()); // colors used
|
||||||
|
bmp.extend_from_slice(&0u32.to_le_bytes()); // important colors
|
||||||
|
// 像素数据:memcpy 一次性拷贝,再原地修正 alpha(避免 to_vec 中间分配)
|
||||||
|
let pixel_start = bmp.len();
|
||||||
|
bmp.extend_from_slice(bgra);
|
||||||
|
for i in (pixel_start + 3..bmp.len()).step_by(4) {
|
||||||
|
bmp[i] = 255;
|
||||||
}
|
}
|
||||||
let mut buf = Vec::with_capacity(w * h * 4 / 3);
|
Ok(bmp)
|
||||||
PngEncoder::new(&mut buf)
|
}
|
||||||
|
|
||||||
|
/// 将 BGRA top-down 像素编码为 PNG(强制 alpha=255)
|
||||||
|
///
|
||||||
|
/// 使用 Fast 压缩 + 无过滤:历史缩略图/自动保存不需要最优压缩比,
|
||||||
|
/// 大幅降低"点击完成 → 关闭窗口"的编码延迟。
|
||||||
|
fn bgra_to_png(bgra: &[u8], width: i32, height: i32) -> Result<Vec<u8>, String> {
|
||||||
|
use image::codecs::png::{CompressionType, FilterType, PngEncoder};
|
||||||
|
use image::ImageEncoder;
|
||||||
|
if width <= 0 || height <= 0 {
|
||||||
|
return Err("无效尺寸".into());
|
||||||
|
}
|
||||||
|
let pixel_count = (width as usize) * (height as usize);
|
||||||
|
let mut rgba = vec![0u8; pixel_count * 4];
|
||||||
|
// chunks_exact 迭代器写法:4 字节对齐连续读取,编译器更容易自动向量化
|
||||||
|
for (src, dst) in bgra.chunks_exact(4).zip(rgba.chunks_exact_mut(4)) {
|
||||||
|
dst[0] = src[2]; // R
|
||||||
|
dst[1] = src[1]; // G
|
||||||
|
dst[2] = src[0]; // B
|
||||||
|
dst[3] = 255; // A 强制不透明
|
||||||
|
}
|
||||||
|
let mut buf = Vec::with_capacity(pixel_count * 4 / 3);
|
||||||
|
PngEncoder::new_with_quality(
|
||||||
|
&mut buf,
|
||||||
|
CompressionType::Fast,
|
||||||
|
FilterType::NoFilter,
|
||||||
|
)
|
||||||
.write_image(&rgba, width as u32, height as u32, image::ExtendedColorType::Rgba8)
|
.write_image(&rgba, width as u32, height as u32, image::ExtendedColorType::Rgba8)
|
||||||
.map_err(|e| format!("PNG 编码失败: {}", e))?;
|
.map_err(|e| format!("PNG 编码失败: {}", e))?;
|
||||||
Ok(buf)
|
Ok(buf)
|
||||||
@@ -164,14 +214,12 @@ pub fn capture_virtual_screen() -> Result<CapturedImage, String> {
|
|||||||
let result = if ok == 0 {
|
let result = if ok == 0 {
|
||||||
Err("BitBlt 失败".into())
|
Err("BitBlt 失败".into())
|
||||||
} else {
|
} else {
|
||||||
extract_pixels(hdc_mem, hbm, w, h).and_then(|bgra| {
|
extract_pixels(hdc_mem, hbm, w, h).map(|bgra| CapturedImage {
|
||||||
bgra_to_png(&bgra, w, h).map(|png| CapturedImage {
|
|
||||||
width: w,
|
width: w,
|
||||||
height: h,
|
height: h,
|
||||||
png,
|
png: Vec::new(), // 全屏捕获不做 PNG 编码,显示/裁剪走 raw BMP
|
||||||
bgra,
|
bgra,
|
||||||
})
|
})
|
||||||
})
|
|
||||||
};
|
};
|
||||||
|
|
||||||
SelectObject(hdc_mem, old);
|
SelectObject(hdc_mem, old);
|
||||||
@@ -229,37 +277,112 @@ pub fn capture_window(hwnd: isize) -> Result<CapturedImage, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 获取指定屏幕坐标下的顶层窗口(窗口拾取)
|
/// 枚举可拾取的顶层窗口(Z 序顶→底)
|
||||||
///
|
///
|
||||||
/// 入参 x/y 为物理屏幕坐标(前端需按显示器 scaleFactor 从逻辑坐标换算)。
|
/// 与逐点拾取同语义:排除本进程窗口(覆盖层/主窗口/编辑器)、不可见窗口、工具窗口。
|
||||||
pub fn window_from_point(x: i32, y: i32) -> Option<WindowInfo> {
|
/// 前端在截图开始时缓存该列表,鼠标移动时在 JS 侧做命中测试(rect 包含点,取 Z 序
|
||||||
unsafe {
|
/// 最顶的第一个命中),消除逐帧 window_from_point 的 IPC 往返;且列表与冻结底图
|
||||||
let pt = POINT { x, y };
|
/// 同一时刻生成,命中结果与画面严格一致。
|
||||||
let mut hwnd = WindowFromPoint(pt);
|
pub fn pick_windows() -> Vec<WindowInfo> {
|
||||||
if hwnd == 0 {
|
struct PickContext {
|
||||||
return None;
|
my_pid: u32,
|
||||||
|
out: Vec<WindowInfo>,
|
||||||
}
|
}
|
||||||
// 取顶层父窗口(WindowFromPoint 可能返回子窗口)
|
|
||||||
let root = GetAncestor(hwnd, GA_ROOT);
|
extern "system" fn enum_proc(hwnd: HWND, lparam: isize) -> i32 {
|
||||||
if root != 0 {
|
unsafe {
|
||||||
hwnd = root;
|
let ctx = &mut *(lparam as *mut PickContext);
|
||||||
|
// 跳过本进程窗口(覆盖层 / 主窗口 / 编辑器等)
|
||||||
|
let mut pid: u32 = 0;
|
||||||
|
GetWindowThreadProcessId(hwnd, &mut pid);
|
||||||
|
if pid == ctx.my_pid {
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
if windows_sys::Win32::UI::WindowsAndMessaging::IsWindowVisible(hwnd) == 0 {
|
if windows_sys::Win32::UI::WindowsAndMessaging::IsWindowVisible(hwnd) == 0 {
|
||||||
return None;
|
return 1;
|
||||||
|
}
|
||||||
|
// 跳过工具窗口(如本应用 OSD / 托盘菜单)
|
||||||
|
let ex = GetWindowLongPtrW(hwnd, GWL_EXSTYLE);
|
||||||
|
if ex & (WS_EX_TOOLWINDOW as isize) != 0 {
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
let mut rect: RECT = std::mem::zeroed();
|
let mut rect: RECT = std::mem::zeroed();
|
||||||
if GetWindowRect(hwnd, &mut rect) == 0 {
|
if GetWindowRect(hwnd, &mut rect) == 0 {
|
||||||
return None;
|
return 1;
|
||||||
}
|
}
|
||||||
let srect = ScreenRect::from(rect);
|
ctx.out.push(WindowInfo {
|
||||||
if srect.width <= 0 || srect.height <= 0 {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
Some(WindowInfo {
|
|
||||||
hwnd,
|
hwnd,
|
||||||
title: get_window_title(hwnd),
|
title: get_window_title(hwnd),
|
||||||
rect: srect,
|
rect: ScreenRect::from(rect),
|
||||||
})
|
visual_rect: extended_frame_bounds(hwnd),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
1
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut ctx = PickContext {
|
||||||
|
my_pid: std::process::id(),
|
||||||
|
out: Vec::new(),
|
||||||
|
};
|
||||||
|
unsafe {
|
||||||
|
EnumWindows(Some(enum_proc), &mut ctx as *mut _ as isize);
|
||||||
|
}
|
||||||
|
ctx.out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取当前鼠标物理屏幕坐标(覆盖层打开时定位初始悬停窗口)
|
||||||
|
pub fn cursor_pos() -> Result<(i32, i32), String> {
|
||||||
|
unsafe {
|
||||||
|
let mut pt: POINT = std::mem::zeroed();
|
||||||
|
if GetCursorPos(&mut pt) == 0 {
|
||||||
|
return Err("GetCursorPos 失败".into());
|
||||||
|
}
|
||||||
|
Ok((pt.x, pt.y))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// DWM 扩展边框矩形(视觉边界)
|
||||||
|
///
|
||||||
|
/// GetWindowRect 对最大化窗口包含屏幕外的隐形缩放边框(各向 7~8px),
|
||||||
|
/// 导致窗口高亮框比实际窗口大一圈;DWMWA_EXTENDED_FRAME_BOUNDS 返回可视边界。
|
||||||
|
fn extended_frame_bounds(hwnd: HWND) -> Option<ScreenRect> {
|
||||||
|
use windows_sys::Win32::Graphics::Dwm::{DwmGetWindowAttribute, DWMWA_EXTENDED_FRAME_BOUNDS};
|
||||||
|
let mut r: RECT = unsafe { std::mem::zeroed() };
|
||||||
|
let hr = unsafe {
|
||||||
|
DwmGetWindowAttribute(
|
||||||
|
hwnd,
|
||||||
|
DWMWA_EXTENDED_FRAME_BOUNDS as u32,
|
||||||
|
&mut r as *mut _ as *mut core::ffi::c_void,
|
||||||
|
std::mem::size_of::<RECT>() as u32,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
if hr == 0 {
|
||||||
|
Some(ScreenRect::from(r))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 禁用指定窗口的显示/隐藏过渡动画
|
||||||
|
///
|
||||||
|
/// Windows 默认对 show/hide 播放"缩放+淡入淡出"动画,截图覆盖层会出现
|
||||||
|
/// "从小变大/从大变小"的过渡;DWMWA_TRANSITIONS_FORCEDISABLED 对该窗口永久关闭过渡。
|
||||||
|
pub fn disable_window_transitions(hwnd: isize) -> Result<(), String> {
|
||||||
|
use windows_sys::Win32::Graphics::Dwm::DwmSetWindowAttribute;
|
||||||
|
const DWMWA_TRANSITIONS_FORCEDISABLED: u32 = 3;
|
||||||
|
let mut disabled: BOOL = 1;
|
||||||
|
let hr = unsafe {
|
||||||
|
DwmSetWindowAttribute(
|
||||||
|
hwnd as HWND,
|
||||||
|
DWMWA_TRANSITIONS_FORCEDISABLED,
|
||||||
|
&mut disabled as *mut _ as *mut core::ffi::c_void,
|
||||||
|
std::mem::size_of::<BOOL>() as u32,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
if hr == 0 {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(format!("DwmSetWindowAttribute 失败: {}", hr))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -292,6 +415,7 @@ pub fn enum_visible_windows() -> Vec<WindowInfo> {
|
|||||||
hwnd,
|
hwnd,
|
||||||
title,
|
title,
|
||||||
rect: srect,
|
rect: srect,
|
||||||
|
visual_rect: extended_frame_bounds(hwnd),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
1
|
1
|
||||||
@@ -334,6 +458,71 @@ pub fn crop_stored(x: i32, y: i32, w: i32, h: i32) -> Result<CaptureData, String
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 裁剪已存储的全屏捕获并直接写入剪贴板(一次 IPC 完成"裁剪+复制")
|
||||||
|
///
|
||||||
|
/// 相比前端 crop_stored → copy_image 两次大 base64 往返:
|
||||||
|
/// 直接从原始 BGRA 构造成 bottom-up DIB,省去 PNG 解码,显著降低"点击完成"延迟。
|
||||||
|
pub fn crop_copy_stored(x: i32, y: i32, w: i32, h: i32) -> Result<CaptureData, String> {
|
||||||
|
let guard = FULLSCREEN_CAPTURE.lock().map_err(|e| e.to_string())?;
|
||||||
|
let img = guard.as_ref().ok_or("无已存储的全屏捕获")?;
|
||||||
|
if x < 0 || y < 0 || w <= 0 || h <= 0 || x + w > img.width || y + h > img.height {
|
||||||
|
return Err("裁剪区域越界".into());
|
||||||
|
}
|
||||||
|
let sw = img.width as usize;
|
||||||
|
let sub = crop_bgra(&img.bgra, sw, x, y, w, h)?;
|
||||||
|
let dib = bgra_to_dib(&sub, w, h);
|
||||||
|
write_dib_to_clipboard(&dib)?;
|
||||||
|
let png = bgra_to_png(&sub, w, h)?;
|
||||||
|
Ok(CaptureData {
|
||||||
|
png_base64: base64_encode(&png),
|
||||||
|
width: w,
|
||||||
|
height: h,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 将 BGRA top-down 像素构造为 CF_DIB(bottom-up,alpha 强制 255)
|
||||||
|
fn bgra_to_dib(bgra: &[u8], width: i32, height: i32) -> Vec<u8> {
|
||||||
|
let header_size = std::mem::size_of::<BITMAPINFOHEADER>() as u32;
|
||||||
|
let w = width as usize;
|
||||||
|
let h = height as usize;
|
||||||
|
let row_size = w * 4;
|
||||||
|
let pixel_size = row_size * h;
|
||||||
|
let mut dib = Vec::with_capacity(header_size as usize + pixel_size);
|
||||||
|
let header = BITMAPINFOHEADER {
|
||||||
|
biSize: header_size,
|
||||||
|
biWidth: width,
|
||||||
|
biHeight: height, // 正值 = bottom-up
|
||||||
|
biPlanes: 1,
|
||||||
|
biBitCount: 32,
|
||||||
|
biCompression: BI_RGB,
|
||||||
|
biSizeImage: (pixel_size) as u32,
|
||||||
|
biXPelsPerMeter: 0,
|
||||||
|
biYPelsPerMeter: 0,
|
||||||
|
biClrUsed: 0,
|
||||||
|
biClrImportant: 0,
|
||||||
|
};
|
||||||
|
let raw = unsafe {
|
||||||
|
std::slice::from_raw_parts(
|
||||||
|
&header as *const _ as *const u8,
|
||||||
|
std::mem::size_of::<BITMAPINFOHEADER>(),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
dib.extend_from_slice(raw);
|
||||||
|
// 预分配像素区,按行 memcpy 拷贝(top-down → bottom-up 行序翻转),再原地修正 alpha
|
||||||
|
let pixel_start = dib.len();
|
||||||
|
dib.resize(dib.len() + pixel_size, 0);
|
||||||
|
for y in 0..h {
|
||||||
|
let src = y * row_size;
|
||||||
|
let dst = (h - 1 - y) * row_size;
|
||||||
|
dib[pixel_start + dst..pixel_start + dst + row_size]
|
||||||
|
.copy_from_slice(&bgra[src..src + row_size]);
|
||||||
|
}
|
||||||
|
for i in (pixel_start + 3..pixel_start + pixel_size).step_by(4) {
|
||||||
|
dib[i] = 255;
|
||||||
|
}
|
||||||
|
dib
|
||||||
|
}
|
||||||
|
|
||||||
fn crop_bgra(
|
fn crop_bgra(
|
||||||
src: &[u8],
|
src: &[u8],
|
||||||
src_width: usize,
|
src_width: usize,
|
||||||
@@ -352,30 +541,40 @@ fn crop_bgra(
|
|||||||
Ok(out)
|
Ok(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 存储全屏捕获(覆盖层选区裁剪时取用)
|
/// 存储全屏捕获(覆盖层显示/裁剪取用),返回是否成功
|
||||||
pub fn store_fullscreen(img: CapturedImage) -> CaptureData {
|
pub fn store_fullscreen(img: CapturedImage) -> Result<(), String> {
|
||||||
let data = CaptureData {
|
FULLSCREEN_CAPTURE
|
||||||
png_base64: base64_encode(&img.png),
|
.lock()
|
||||||
width: img.width,
|
.map(|mut g| *g = Some(img))
|
||||||
height: img.height,
|
.map_err(|e| e.to_string())
|
||||||
};
|
|
||||||
if let Ok(mut g) = FULLSCREEN_CAPTURE.lock() {
|
|
||||||
*g = Some(img);
|
|
||||||
}
|
|
||||||
data
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 取出并清除全屏捕获
|
/// 取出全屏捕获的 BMP 字节用于显示(不移除,裁剪仍依赖原始像素)
|
||||||
pub fn take_fullscreen() -> Option<CaptureData> {
|
pub fn fullscreen_bmp() -> Result<Vec<u8>, String> {
|
||||||
let mut g = FULLSCREEN_CAPTURE.lock().ok()?;
|
let guard = FULLSCREEN_CAPTURE.lock().map_err(|e| e.to_string())?;
|
||||||
let img = g.take()?;
|
let img = guard.as_ref().ok_or("无已存储的全屏捕获")?;
|
||||||
Some(CaptureData {
|
bgra_to_bmp(&img.bgra, img.width, img.height)
|
||||||
png_base64: base64_encode(&img.png),
|
}
|
||||||
|
|
||||||
|
/// 全屏捕获编码为 PNG base64 并移除(全屏截图直接进编辑器时用)
|
||||||
|
pub fn fullscreen_png() -> Result<CaptureData, String> {
|
||||||
|
let mut g = FULLSCREEN_CAPTURE.lock().map_err(|e| e.to_string())?;
|
||||||
|
let img = g.take().ok_or("无已存储的全屏捕获")?;
|
||||||
|
let png = bgra_to_png(&img.bgra, img.width, img.height)?;
|
||||||
|
Ok(CaptureData {
|
||||||
|
png_base64: base64_encode(&png),
|
||||||
width: img.width,
|
width: img.width,
|
||||||
height: img.height,
|
height: img.height,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 清除全屏捕获(覆盖层关闭/取消时释放内存)
|
||||||
|
pub fn clear_fullscreen() {
|
||||||
|
if let Ok(mut g) = FULLSCREEN_CAPTURE.lock() {
|
||||||
|
*g = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ===== 输出:剪贴板 / 文件 =====
|
// ===== 输出:剪贴板 / 文件 =====
|
||||||
|
|
||||||
/// 将 PNG base64 解码为像素,构造 CF_DIB 并写入剪贴板
|
/// 将 PNG base64 解码为像素,构造 CF_DIB 并写入剪贴板
|
||||||
@@ -389,11 +588,17 @@ pub fn copy_png_to_clipboard(png_base64: &str) -> Result<(), String> {
|
|||||||
write_dib_to_clipboard(&dib)
|
write_dib_to_clipboard(&dib)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// RGBA → CF_DIB(BITMAPINFOHEADER + BGRA bottom-up,alpha 强制 255)
|
/// raw RGBA 像素 → CF_DIB(直接从连续像素切片构造,无需 image crate 解码)
|
||||||
fn rgba_to_dib(rgba: &image::RgbaImage, width: i32, height: i32) -> Vec<u8> {
|
///
|
||||||
|
/// 用于有标注导出路径:前端 canvas.getImageData() 直传 raw RGBA,
|
||||||
|
/// 省去 toDataURL(PNG 编码+base64) → Rust base64 解码 → PNG 解码 的三次往返。
|
||||||
|
fn rgba_raw_to_dib(rgba: &[u8], width: i32, height: i32) -> Vec<u8> {
|
||||||
let header_size = std::mem::size_of::<BITMAPINFOHEADER>() as u32;
|
let header_size = std::mem::size_of::<BITMAPINFOHEADER>() as u32;
|
||||||
let row_size = (width as usize) * 4;
|
let w = width as usize;
|
||||||
let mut dib = Vec::with_capacity(header_size as usize + row_size * height as usize);
|
let h = height as usize;
|
||||||
|
let row_size = w * 4;
|
||||||
|
let pixel_size = row_size * h;
|
||||||
|
let mut dib = Vec::with_capacity(header_size as usize + pixel_size);
|
||||||
let header = BITMAPINFOHEADER {
|
let header = BITMAPINFOHEADER {
|
||||||
biSize: header_size,
|
biSize: header_size,
|
||||||
biWidth: width,
|
biWidth: width,
|
||||||
@@ -401,7 +606,7 @@ fn rgba_to_dib(rgba: &image::RgbaImage, width: i32, height: i32) -> Vec<u8> {
|
|||||||
biPlanes: 1,
|
biPlanes: 1,
|
||||||
biBitCount: 32,
|
biBitCount: 32,
|
||||||
biCompression: BI_RGB,
|
biCompression: BI_RGB,
|
||||||
biSizeImage: (row_size * height as usize) as u32,
|
biSizeImage: (pixel_size) as u32,
|
||||||
biXPelsPerMeter: 0,
|
biXPelsPerMeter: 0,
|
||||||
biYPelsPerMeter: 0,
|
biYPelsPerMeter: 0,
|
||||||
biClrUsed: 0,
|
biClrUsed: 0,
|
||||||
@@ -414,14 +619,105 @@ fn rgba_to_dib(rgba: &image::RgbaImage, width: i32, height: i32) -> Vec<u8> {
|
|||||||
)
|
)
|
||||||
};
|
};
|
||||||
dib.extend_from_slice(raw);
|
dib.extend_from_slice(raw);
|
||||||
// bottom-up 行序,BGRA 像素,alpha 强制 255
|
let pixel_start = dib.len();
|
||||||
for y in (0..height as usize).rev() {
|
dib.resize(dib.len() + pixel_size, 0);
|
||||||
for x in 0..width as usize {
|
// RGBA top-down → BGRA bottom-up,alpha 强制 255
|
||||||
let p = rgba.get_pixel(x as u32, y as u32).0;
|
for y in 0..h {
|
||||||
dib.push(p[2]); // B
|
let src_off = (h - 1 - y) * row_size;
|
||||||
dib.push(p[1]); // G
|
let dst_off = y * row_size;
|
||||||
dib.push(p[0]); // R
|
for x in 0..w {
|
||||||
dib.push(255); // A
|
let si = src_off + x * 4;
|
||||||
|
let di = pixel_start + dst_off + x * 4;
|
||||||
|
dib[di] = rgba[si + 2]; // B
|
||||||
|
dib[di + 1] = rgba[si + 1]; // G
|
||||||
|
dib[di + 2] = rgba[si]; // R
|
||||||
|
dib[di + 3] = 255; // A
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dib
|
||||||
|
}
|
||||||
|
|
||||||
|
/// raw RGBA → PNG(直接从连续像素切片编码,跳过 image crate 的 RgbaImage 包装)
|
||||||
|
fn rgba_raw_to_png(rgba: &[u8], width: i32, height: i32) -> Result<Vec<u8>, String> {
|
||||||
|
use image::codecs::png::{CompressionType, FilterType, PngEncoder};
|
||||||
|
use image::ImageEncoder;
|
||||||
|
if width <= 0 || height <= 0 {
|
||||||
|
return Err("无效尺寸".into());
|
||||||
|
}
|
||||||
|
let mut buf = Vec::with_capacity(rgba.len() / 3);
|
||||||
|
PngEncoder::new_with_quality(
|
||||||
|
&mut buf,
|
||||||
|
CompressionType::Fast,
|
||||||
|
FilterType::NoFilter,
|
||||||
|
)
|
||||||
|
.write_image(rgba, width as u32, height as u32, image::ExtendedColorType::Rgba8)
|
||||||
|
.map_err(|e| format!("PNG 编码失败: {}", e))?;
|
||||||
|
Ok(buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 有标注导出:raw RGBA → 剪贴板 DIB + PNG base64(一次调用完成复制+编码)
|
||||||
|
///
|
||||||
|
/// 替代原 composeBase64 + screenshot_copy_image 两步:
|
||||||
|
/// 省去前端 toDataURL(PNG 编码+base64) + Rust base64 解码 + PNG 解码,
|
||||||
|
/// 直接 raw RGBA 传输 → DIB 写剪贴板 + PNG 编码返回。
|
||||||
|
pub fn compose_copy_rgba(rgba: &[u8], width: i32, height: i32) -> Result<CaptureData, String> {
|
||||||
|
let expected = (width as usize) * (height as usize) * 4;
|
||||||
|
if rgba.len() < expected {
|
||||||
|
return Err(format!("像素数据不足: {} < {}", rgba.len(), expected));
|
||||||
|
}
|
||||||
|
let dib = rgba_raw_to_dib(rgba, width, height);
|
||||||
|
write_dib_to_clipboard(&dib)?;
|
||||||
|
let png = rgba_raw_to_png(rgba, width, height)?;
|
||||||
|
Ok(CaptureData {
|
||||||
|
png_base64: base64_encode(&png),
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// RGBA → CF_DIB(BITMAPINFOHEADER + BGRA bottom-up,alpha 强制 255)
|
||||||
|
fn rgba_to_dib(rgba: &image::RgbaImage, width: i32, height: i32) -> Vec<u8> {
|
||||||
|
let header_size = std::mem::size_of::<BITMAPINFOHEADER>() as u32;
|
||||||
|
let w = width as usize;
|
||||||
|
let h = height as usize;
|
||||||
|
let row_size = w * 4;
|
||||||
|
let pixel_size = row_size * h;
|
||||||
|
let mut dib = Vec::with_capacity(header_size as usize + pixel_size);
|
||||||
|
let header = BITMAPINFOHEADER {
|
||||||
|
biSize: header_size,
|
||||||
|
biWidth: width,
|
||||||
|
biHeight: height, // 正值 = bottom-up
|
||||||
|
biPlanes: 1,
|
||||||
|
biBitCount: 32,
|
||||||
|
biCompression: BI_RGB,
|
||||||
|
biSizeImage: (pixel_size) as u32,
|
||||||
|
biXPelsPerMeter: 0,
|
||||||
|
biYPelsPerMeter: 0,
|
||||||
|
biClrUsed: 0,
|
||||||
|
biClrImportant: 0,
|
||||||
|
};
|
||||||
|
let raw = unsafe {
|
||||||
|
std::slice::from_raw_parts(
|
||||||
|
&header as *const _ as *const u8,
|
||||||
|
std::mem::size_of::<BITMAPINFOHEADER>(),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
dib.extend_from_slice(raw);
|
||||||
|
// 预分配像素区,用 as_raw() 连续切片替代逐像素 get_pixel
|
||||||
|
let pixel_start = dib.len();
|
||||||
|
dib.resize(dib.len() + pixel_size, 0);
|
||||||
|
let src = rgba.as_raw(); // &[u8] RGBA top-down
|
||||||
|
for y in 0..h {
|
||||||
|
// bottom-up: DIB 第一行 = 图像最后一行
|
||||||
|
let src_off = (h - 1 - y) * row_size;
|
||||||
|
let dst_off = y * row_size;
|
||||||
|
for x in 0..w {
|
||||||
|
let si = src_off + x * 4;
|
||||||
|
let di = pixel_start + dst_off + x * 4;
|
||||||
|
dib[di] = src[si + 2]; // B
|
||||||
|
dib[di + 1] = src[si + 1]; // G
|
||||||
|
dib[di + 2] = src[si]; // R
|
||||||
|
dib[di + 3] = 255; // A
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dib
|
dib
|
||||||
|
|||||||
@@ -1,30 +1,110 @@
|
|||||||
//! Tauri 命令:截图模块
|
//! Tauri 命令:截图模块
|
||||||
//!
|
//!
|
||||||
//! 命令清单:
|
//! 命令清单:
|
||||||
//! - screenshot_capture_fullscreen:捕获虚拟屏并存入静态,返回元数据 + base64
|
//! - screenshot_capture_fullscreen:捕获虚拟屏并存入静态(不做 PNG 编码),返回捕获时刻光标坐标
|
||||||
//! - screenshot_take_fullscreen:取出并清除静态存储的全屏捕获
|
//! - screenshot_get_fullscreen_bmp:取出全屏捕获的 BMP 原始字节(raw IPC,覆盖层显示用,不移除)
|
||||||
|
//! - screenshot_fullscreen_png:全屏捕获编码 PNG base64 并清除(全屏截图进编辑器用)
|
||||||
|
//! - screenshot_clear_fullscreen:清除静态全屏捕获(覆盖层关闭时)
|
||||||
//! - screenshot_crop_stored:按物理像素裁剪已存储的全屏捕获
|
//! - screenshot_crop_stored:按物理像素裁剪已存储的全屏捕获
|
||||||
//! - screenshot_window_from_point:拾取指定屏幕坐标下的顶层窗口
|
//! - screenshot_pick_list:枚举可拾取顶层窗口(Z 序,前端缓存后本地命中测试)
|
||||||
|
//! - screenshot_show_overlay:一次 IPC 完成覆盖层 show + focus(关键路径减少往返)
|
||||||
//! - screenshot_enum_windows:枚举可见顶层窗口
|
//! - screenshot_enum_windows:枚举可见顶层窗口
|
||||||
//! - screenshot_capture_window:按 hwnd 捕获指定窗口
|
//! - screenshot_capture_window:按 hwnd 捕获指定窗口
|
||||||
//! - screenshot_set_editor_image / screenshot_get_editor_image:编辑器图片传递
|
//! - screenshot_set_editor_image / screenshot_get_editor_image:编辑器图片传递
|
||||||
//! - screenshot_copy_image:写入剪贴板(CF_DIB)
|
//! - screenshot_copy_image:写入剪贴板(CF_DIB)
|
||||||
//! - screenshot_save_png:写入文件
|
//! - screenshot_save_png:写入文件
|
||||||
|
//! - screenshot_disable_transitions:禁用窗口显示/隐藏过渡动画(消除覆盖层缩放动画)
|
||||||
|
|
||||||
use super::{CaptureData, WindowInfo};
|
use super::{CaptureData, CaptureStart, WindowInfo};
|
||||||
|
use tauri::{Emitter, Manager};
|
||||||
|
|
||||||
/// 捕获整个虚拟屏(多显示器拼接),存入静态供后续裁剪,并返回 base64
|
/// 禁用指定窗口(按 label 查找)的显示/隐藏过渡动画,消除覆盖层出现/消失时的缩放动画
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn screenshot_capture_fullscreen() -> Result<CaptureData, String> {
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_disable_transitions(
|
||||||
|
app: tauri::AppHandle,
|
||||||
|
label: String,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
use raw_window_handle::HasWindowHandle;
|
||||||
|
let win = app
|
||||||
|
.get_webview_window(&label)
|
||||||
|
.ok_or_else(|| format!("窗口不存在: {}", label))?;
|
||||||
|
let handle = win
|
||||||
|
.window_handle()
|
||||||
|
.map_err(|e| format!("获取窗口句柄失败: {}", e))?;
|
||||||
|
match handle.as_raw() {
|
||||||
|
raw_window_handle::RawWindowHandle::Win32(h) => {
|
||||||
|
super::capture::disable_window_transitions(h.hwnd.get() as isize)
|
||||||
|
}
|
||||||
|
_ => Ok(()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
let _ = (app, label);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 注册(或切换)截图全局快捷键。传入空字符串则禁用快捷键。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_register_shortcut(
|
||||||
|
app: tauri::AppHandle,
|
||||||
|
shortcut: String,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
crate::shortcut::register_shortcut(&app, "截图", &shortcut, |a| {
|
||||||
|
let _ = a.emit(crate::constants::events::SCREENSHOT_SHORTCUT, ());
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 注销截图全局快捷键
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_unregister_shortcut(app: tauri::AppHandle) -> Result<(), String> {
|
||||||
|
crate::shortcut::unregister_shortcut(&app, "截图");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 注册(或切换)贴图全局快捷键。传入空字符串则禁用快捷键。
|
||||||
|
/// 按下时 emit 'screenshot-pin-shortcut',由前端切换贴图窗口显示/隐藏。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_register_pin_shortcut(
|
||||||
|
app: tauri::AppHandle,
|
||||||
|
shortcut: String,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
crate::shortcut::register_shortcut(&app, "贴图", &shortcut, |a| {
|
||||||
|
let _ = a.emit(crate::constants::events::SCREENSHOT_PIN_SHORTCUT, ());
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 注销贴图全局快捷键
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_unregister_pin_shortcut(app: tauri::AppHandle) -> Result<(), String> {
|
||||||
|
crate::shortcut::unregister_shortcut(&app, "贴图");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 捕获整个虚拟屏(多显示器拼接)存入静态,不做 PNG 编码。
|
||||||
|
/// 同时返回捕获时刻的光标物理坐标(覆盖层据此做初始窗口拾取,省一次 IPC 往返)。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_capture_fullscreen() -> Result<CaptureStart, String> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
// 屏幕捕获涉及 GDI 调用,放线程池避免阻塞 async 调度
|
// 屏幕捕获涉及 GDI 调用,放线程池避免阻塞 async 调度
|
||||||
let img = tauri::async_runtime::spawn_blocking(|| {
|
tauri::async_runtime::spawn_blocking(|| {
|
||||||
super::capture::capture_virtual_screen()
|
let img = super::capture::capture_virtual_screen()?;
|
||||||
|
super::capture::store_fullscreen(img)?;
|
||||||
|
let (cursor_x, cursor_y) = super::capture::cursor_pos().unwrap_or((0, 0));
|
||||||
|
Ok(CaptureStart { cursor_x, cursor_y })
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
.map_err(|e| format!("捕获任务失败: {}", e))??;
|
.map_err(|e| format!("捕获任务失败: {}", e))?
|
||||||
Ok(super::capture::store_fullscreen(img))
|
|
||||||
}
|
}
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
{
|
{
|
||||||
@@ -32,21 +112,58 @@ pub async fn screenshot_capture_fullscreen() -> Result<CaptureData, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 取出并清除静态存储的全屏捕获(覆盖层取消时清理用)
|
/// 取出全屏捕获的 BMP 原始字节(raw IPC → 前端 ArrayBuffer),不移除
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn screenshot_take_fullscreen() -> Result<Option<CaptureData>, String> {
|
pub async fn screenshot_get_fullscreen_bmp() -> Result<tauri::ipc::Response, String> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
Ok(super::capture::take_fullscreen())
|
tauri::async_runtime::spawn_blocking(|| {
|
||||||
|
let bmp = super::capture::fullscreen_bmp()?;
|
||||||
|
Ok(tauri::ipc::Response::new(bmp))
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取捕获失败: {}", e))?
|
||||||
}
|
}
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
{
|
{
|
||||||
Ok(None)
|
Err("截图仅支持 Windows".into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 全屏捕获编码为 PNG base64 并清除(全屏截图直接进编辑器)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_fullscreen_png() -> Result<CaptureData, String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
tauri::async_runtime::spawn_blocking(|| super::capture::fullscreen_png())
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("编码任务失败: {}", e))?
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
Err("截图仅支持 Windows".into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 清除静态全屏捕获(覆盖层关闭/取消时释放内存)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_clear_fullscreen() -> Result<(), String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
super::capture::clear_fullscreen();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 按物理像素坐标裁剪已存储的全屏捕获
|
/// 按物理像素坐标裁剪已存储的全屏捕获
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn screenshot_crop_stored(
|
pub async fn screenshot_crop_stored(
|
||||||
x: i32,
|
x: i32,
|
||||||
y: i32,
|
y: i32,
|
||||||
@@ -68,29 +185,81 @@ pub async fn screenshot_crop_stored(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 拾取指定物理屏幕坐标下的顶层窗口
|
/// 裁剪已存储的全屏捕获并直接写入剪贴板(一次 IPC 完成"裁剪+复制")
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn screenshot_window_from_point(
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_crop_copy_stored(
|
||||||
x: i32,
|
x: i32,
|
||||||
y: i32,
|
y: i32,
|
||||||
) -> Result<Option<WindowInfo>, String> {
|
w: i32,
|
||||||
|
h: i32,
|
||||||
|
) -> Result<CaptureData, String> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
tauri::async_runtime::spawn_blocking(move || {
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
Ok(super::capture::window_from_point(x, y))
|
super::capture::crop_copy_stored(x, y, w, h)
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
.map_err(|e| format!("查询失败: {}", e))?
|
.map_err(|e| format!("裁剪复制任务失败: {}", e))?
|
||||||
}
|
}
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
{
|
{
|
||||||
let _ = (x, y);
|
let _ = (x, y, w, h);
|
||||||
Ok(None)
|
Err("截图仅支持 Windows".into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 枚举可拾取的顶层窗口(Z 序顶→底,排除本进程/不可见/工具窗口)。
|
||||||
|
/// 前端在截图开始时缓存列表,鼠标移动时在 JS 侧本地命中测试,消除逐帧 IPC 往返。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_pick_list() -> Result<Vec<WindowInfo>, String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
tauri::async_runtime::spawn_blocking(super::capture::pick_windows)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("枚举失败: {}", e))
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
Ok(vec![])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 一次 IPC 完成指定窗口的显示与聚焦(截图覆盖层显示关键路径,减少串行往返)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_show_overlay(
|
||||||
|
app: tauri::AppHandle,
|
||||||
|
label: String,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let win = app
|
||||||
|
.get_webview_window(&label)
|
||||||
|
.ok_or_else(|| format!("窗口不存在: {}", label))?;
|
||||||
|
win.show().map_err(|e| format!("显示窗口失败: {}", e))?;
|
||||||
|
win.set_focus().map_err(|e| format!("聚焦窗口失败: {}", e))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取当前鼠标物理屏幕坐标(贴图窗口拖动跟随等场景使用)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_cursor_pos() -> Result<(i32, i32), String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
tauri::async_runtime::spawn_blocking(super::capture::cursor_pos)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("查询任务失败: {}", e))?
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
Err("截图仅支持 Windows".into())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 枚举所有可见顶层窗口
|
/// 枚举所有可见顶层窗口
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn screenshot_enum_windows() -> Result<Vec<WindowInfo>, String> {
|
pub async fn screenshot_enum_windows() -> Result<Vec<WindowInfo>, String> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
@@ -106,6 +275,7 @@ pub async fn screenshot_enum_windows() -> Result<Vec<WindowInfo>, String> {
|
|||||||
|
|
||||||
/// 按 hwnd 捕获指定窗口
|
/// 按 hwnd 捕获指定窗口
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn screenshot_capture_window(hwnd: isize) -> Result<CaptureData, String> {
|
pub async fn screenshot_capture_window(hwnd: isize) -> Result<CaptureData, String> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
@@ -129,6 +299,7 @@ pub async fn screenshot_capture_window(hwnd: isize) -> Result<CaptureData, Strin
|
|||||||
|
|
||||||
/// 存入编辑器图片(base64 PNG)
|
/// 存入编辑器图片(base64 PNG)
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn screenshot_set_editor_image(png_base64: String) -> Result<(), String> {
|
pub async fn screenshot_set_editor_image(png_base64: String) -> Result<(), String> {
|
||||||
super::set_editor_image(png_base64);
|
super::set_editor_image(png_base64);
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -136,12 +307,14 @@ pub async fn screenshot_set_editor_image(png_base64: String) -> Result<(), Strin
|
|||||||
|
|
||||||
/// 取出编辑器图片(编辑器窗口加载时调用,取出即清除)
|
/// 取出编辑器图片(编辑器窗口加载时调用,取出即清除)
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn screenshot_get_editor_image() -> Result<Option<String>, String> {
|
pub async fn screenshot_get_editor_image() -> Result<Option<String>, String> {
|
||||||
Ok(super::take_editor_image())
|
Ok(super::take_editor_image())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 将 PNG base64 写入系统剪贴板(转 CF_DIB)
|
/// 将 PNG base64 写入系统剪贴板(转 CF_DIB)
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn screenshot_copy_image(png_base64: String) -> Result<(), String> {
|
pub async fn screenshot_copy_image(png_base64: String) -> Result<(), String> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
@@ -158,8 +331,43 @@ pub async fn screenshot_copy_image(png_base64: String) -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 有标注导出:接收 raw RGBA(前端 canvas.getImageData 直传),一次完成 剪贴板+PNG base64。
|
||||||
|
///
|
||||||
|
/// 省去前端 toDataURL(PNG 编码+base64) → Rust base64 解码 → PNG 解码 三次往返。
|
||||||
|
/// body 格式:前 8 字节 = width(i32 LE) + height(i32 LE),之后为 raw RGBA 像素。
|
||||||
|
/// 注:参数为 tauri::ipc::Request(原始 body),specta 无法生成,豁免标注。
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn screenshot_compose_copy(
|
||||||
|
request: tauri::ipc::Request<'_>,
|
||||||
|
) -> Result<super::CaptureData, String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
let body = match request.body() {
|
||||||
|
tauri::ipc::InvokeBody::Raw(data) => data.clone(),
|
||||||
|
_ => return Err("需要 raw body(ArrayBuffer)".into()),
|
||||||
|
};
|
||||||
|
if body.len() < 8 {
|
||||||
|
return Err("数据不足:缺少尺寸头".into());
|
||||||
|
}
|
||||||
|
let width = i32::from_le_bytes([body[0], body[1], body[2], body[3]]);
|
||||||
|
let height = i32::from_le_bytes([body[4], body[5], body[6], body[7]]);
|
||||||
|
let rgba = body[8..].to_vec();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
super::capture::compose_copy_rgba(&rgba, width, height)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("合成复制任务失败: {}", e))?
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
let _ = request;
|
||||||
|
Err("截图仅支持 Windows".into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 将 PNG base64 写入文件
|
/// 将 PNG base64 写入文件
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
pub async fn screenshot_save_png(png_base64: String, path: String) -> Result<(), String> {
|
pub async fn screenshot_save_png(png_base64: String, path: String) -> Result<(), String> {
|
||||||
tauri::async_runtime::spawn_blocking(move || {
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
@@ -175,3 +383,96 @@ pub async fn screenshot_save_png(png_base64: String, path: String) -> Result<(),
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| format!("保存任务失败: {}", e))?
|
.map_err(|e| format!("保存任务失败: {}", e))?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ===== 截图历史缓存:完整 PNG 落盘到应用数据目录(持久化,随历史保留数量清理),内存只保留缩略图 =====
|
||||||
|
|
||||||
|
/// 历史根目录(app_data_dir/screenshot/history)
|
||||||
|
fn history_cache_dir(app: &tauri::AppHandle) -> Result<std::path::PathBuf, String> {
|
||||||
|
let dir = app
|
||||||
|
.path()
|
||||||
|
.app_data_dir()
|
||||||
|
.map_err(|e| format!("获取应用数据目录失败: {}", e))?
|
||||||
|
.join("screenshot")
|
||||||
|
.join("history");
|
||||||
|
std::fs::create_dir_all(&dir).map_err(|e| format!("创建历史目录失败: {}", e))?;
|
||||||
|
Ok(dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 校验 path 属于历史缓存目录(防止路径穿越/任意文件读写)
|
||||||
|
fn ensure_in_history_dir(app: &tauri::AppHandle, path: &str) -> Result<std::path::PathBuf, String> {
|
||||||
|
let dir = history_cache_dir(app)?;
|
||||||
|
let p = std::path::PathBuf::from(path);
|
||||||
|
if !p.starts_with(&dir) {
|
||||||
|
return Err("非法路径:不在截图历史缓存目录内".into());
|
||||||
|
}
|
||||||
|
Ok(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 将完整 PNG 写入历史缓存目录,返回文件路径
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_save_cache(
|
||||||
|
app: tauri::AppHandle,
|
||||||
|
png_base64: String,
|
||||||
|
) -> Result<String, String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
let dir = history_cache_dir(&app)?;
|
||||||
|
// 时间戳微秒命名(避免引入额外依赖;并发截图的同微秒碰撞可忽略)
|
||||||
|
let ts = std::time::SystemTime::now()
|
||||||
|
.duration_since(std::time::UNIX_EPOCH)
|
||||||
|
.map(|d| d.as_micros())
|
||||||
|
.unwrap_or(0);
|
||||||
|
let path = dir.join(format!("{}.png", ts));
|
||||||
|
super::capture::save_png_to_file(&png_base64, &path.to_string_lossy())?;
|
||||||
|
Ok(path.to_string_lossy().into_owned())
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("缓存任务失败: {}", e))?
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从历史缓存目录读取 PNG 并返回 base64(点击历史项复制/保存时一次性加载,不常驻内存)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_load_cache(
|
||||||
|
app: tauri::AppHandle,
|
||||||
|
path: String,
|
||||||
|
) -> Result<String, String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
let p = ensure_in_history_dir(&app, &path)?;
|
||||||
|
let bytes = std::fs::read(&p).map_err(|e| format!("读取缓存失败: {}", e))?;
|
||||||
|
use base64::Engine as _;
|
||||||
|
Ok(base64::engine::general_purpose::STANDARD.encode(bytes))
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取缓存任务失败: {}", e))?
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 读取历史缓存 PNG 原始字节(raw IPC → 前端 ArrayBuffer,贴图窗口显示用:
|
||||||
|
/// 跳过 base64 编码,IPC 传输与前端内存占用均省 ~33%;同 get_fullscreen_bmp 豁免 specta)
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn screenshot_load_cache_raw(
|
||||||
|
app: tauri::AppHandle,
|
||||||
|
path: String,
|
||||||
|
) -> Result<tauri::ipc::Response, String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
let p = ensure_in_history_dir(&app, &path)?;
|
||||||
|
let bytes = std::fs::read(&p).map_err(|e| format!("读取缓存失败: {}", e))?;
|
||||||
|
Ok(tauri::ipc::Response::new(bytes))
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取缓存任务失败: {}", e))?
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除历史缓存文件(历史项移除/清空时调用,静默忽略不存在文件)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn screenshot_delete_cache(app: tauri::AppHandle, path: String) -> Result<(), String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
if let Ok(p) = ensure_in_history_dir(&app, &path) {
|
||||||
|
let _ = std::fs::remove_file(p);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("删除缓存任务失败: {}", e))?
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,12 +5,14 @@
|
|||||||
|
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
|
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
pub mod capture;
|
pub mod capture;
|
||||||
pub mod commands;
|
pub mod commands;
|
||||||
|
|
||||||
/// 前端可见的捕获数据
|
/// 前端可见的捕获数据
|
||||||
#[derive(serde::Serialize)]
|
#[derive(serde::Serialize, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct CaptureData {
|
pub struct CaptureData {
|
||||||
pub png_base64: String,
|
pub png_base64: String,
|
||||||
@@ -18,16 +20,26 @@ pub struct CaptureData {
|
|||||||
pub height: i32,
|
pub height: i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 截图启动信息:捕获时刻的光标物理坐标(覆盖层据此做初始窗口拾取,省一次 IPC 往返)
|
||||||
|
#[derive(serde::Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct CaptureStart {
|
||||||
|
pub cursor_x: i32,
|
||||||
|
pub cursor_y: i32,
|
||||||
|
}
|
||||||
|
|
||||||
/// 窗口信息(窗口拾取 / 枚举)
|
/// 窗口信息(窗口拾取 / 枚举)
|
||||||
#[derive(serde::Serialize)]
|
#[derive(serde::Serialize, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct WindowInfo {
|
pub struct WindowInfo {
|
||||||
pub hwnd: isize,
|
pub hwnd: isize,
|
||||||
pub title: String,
|
pub title: String,
|
||||||
pub rect: ScreenRect,
|
pub rect: ScreenRect,
|
||||||
|
/// DWM 扩展边框矩形(视觉边界,去掉最大化窗口的隐形缩放边框),命中测试用 rect,高亮用 visual_rect
|
||||||
|
pub visual_rect: Option<ScreenRect>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(serde::Serialize, Clone, Copy)]
|
#[derive(serde::Serialize, Clone, Copy, Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct ScreenRect {
|
pub struct ScreenRect {
|
||||||
pub x: i32,
|
pub x: i32,
|
||||||
|
|||||||
@@ -0,0 +1,141 @@
|
|||||||
|
//! 应用启动初始化 —— 从 lib.rs 的 setup 闭包拆出,按子系统分组。
|
||||||
|
//!
|
||||||
|
//! 各子系统职责边界:
|
||||||
|
//! - 日志:LogManager(全局日志)
|
||||||
|
//! - 代理:MihomoManager + 自动启动
|
||||||
|
//! - 监控:MonitorKernel + NetworkMonitor + 自动启动
|
||||||
|
//! - 下载:DownloadEngine + 扩展 HTTP API 服务
|
||||||
|
//! - 剪贴板:ClipboardManager + 快捷键 + 预创建弹窗
|
||||||
|
//! - 快速面板:快捷键 + 预创建弹窗 + 文件索引
|
||||||
|
//! - 托盘:自定义菜单窗口
|
||||||
|
//! - 进程:监控线程
|
||||||
|
|
||||||
|
use std::sync::Arc;
|
||||||
|
use tauri::{App, Manager, Wry};
|
||||||
|
|
||||||
|
use crate::download_engine::{DownloadEngine, ExtensionServer};
|
||||||
|
use crate::logger::LogManager;
|
||||||
|
use crate::mihomo_manager::MihomoManager;
|
||||||
|
use crate::monitor_kernel::{MonitorKernel, check_and_relaunch_if_needed};
|
||||||
|
use crate::network_monitor::NetworkMonitor;
|
||||||
|
use crate::process_manager::{ProcessManager, start_monitoring_thread};
|
||||||
|
|
||||||
|
/// 应用启动初始化入口(setup 闭包调用)。
|
||||||
|
/// 初始化顺序即依赖顺序:日志 → 数据目录 → 各管理器 → 托盘 → 进程监控 → 自动启动。
|
||||||
|
pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
// ===== 日志系统:{app_data_dir}/logs/ =====
|
||||||
|
let log_dir = app
|
||||||
|
.path()
|
||||||
|
.app_data_dir()
|
||||||
|
.unwrap_or_else(|_| std::path::PathBuf::from("."))
|
||||||
|
.join("logs");
|
||||||
|
let log_manager = LogManager::new(log_dir);
|
||||||
|
// 注册为 Tauri State(供 log_* 命令),同时安装进程级全局日志器(供后端模块 log_line 使用)
|
||||||
|
crate::logger::install_global(log_manager.clone());
|
||||||
|
app.manage(log_manager);
|
||||||
|
// ===== 数据目录:{app_data_dir}/ =====
|
||||||
|
let app_data_dir = app
|
||||||
|
.path()
|
||||||
|
.app_data_dir()
|
||||||
|
.unwrap_or_else(|_| std::path::PathBuf::from("."));
|
||||||
|
|
||||||
|
// 永久提权检查:如果标志已设置且当前非管理员,以管理员权限重启自身并退出
|
||||||
|
// 必须在所有模块初始化之前执行(此时无资源需要清理)
|
||||||
|
if check_and_relaunch_if_needed(&app_data_dir) {
|
||||||
|
std::process::exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 代理模块:MihomoManager =====
|
||||||
|
let mihomo = MihomoManager::new(app_data_dir.clone());
|
||||||
|
app.manage(mihomo);
|
||||||
|
|
||||||
|
// ===== 监控模块:MonitorKernel(硬件)+ NetworkMonitor(网速) =====
|
||||||
|
let monitor = MonitorKernel::new(app_data_dir.clone());
|
||||||
|
app.manage(monitor);
|
||||||
|
|
||||||
|
// 网速采样不依赖提权,应用启动即开始
|
||||||
|
let network_monitor = Arc::new(NetworkMonitor::new());
|
||||||
|
app.manage(network_monitor.clone());
|
||||||
|
network_monitor.start(app.handle().clone());
|
||||||
|
|
||||||
|
// ===== 下载模块:DownloadEngine + 扩展 HTTP API 服务 =====
|
||||||
|
let engine = DownloadEngine::new(app_data_dir.join("downloader"), app.handle().clone());
|
||||||
|
let settings = engine.get_settings();
|
||||||
|
app.manage(engine.clone());
|
||||||
|
|
||||||
|
let server_engine = engine.clone();
|
||||||
|
let server_port = settings.extension_port;
|
||||||
|
let server_secret = settings.extension_secret.clone();
|
||||||
|
let server_app = app.handle().clone();
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
ExtensionServer::start(server_engine, server_port, server_secret, server_app).await;
|
||||||
|
});
|
||||||
|
|
||||||
|
// ===== 剪贴板模块:监听 + 快捷键 + 预创建弹窗 =====
|
||||||
|
let clipboard = crate::clipboard::ClipboardManager::new(app_data_dir.clone());
|
||||||
|
// 应用启动时若已启用则自动开始监听
|
||||||
|
if clipboard.get_settings().enabled {
|
||||||
|
clipboard.start(&app.handle());
|
||||||
|
}
|
||||||
|
// 应用启动时注册快捷弹窗全局快捷键(共享工具模块)
|
||||||
|
let shortcut = clipboard.get_settings().shortcut.clone();
|
||||||
|
if !shortcut.trim().is_empty() {
|
||||||
|
let app_handle = app.handle().clone();
|
||||||
|
if let Err(e) = crate::shortcut::register_shortcut(&app_handle, "剪贴板", &shortcut, |a| {
|
||||||
|
crate::clipboard::popup::show_popup(a)
|
||||||
|
}) {
|
||||||
|
crate::logger::log_error("clipboard", &format!("快捷键注册失败: {}", e));
|
||||||
|
}
|
||||||
|
// 预创建弹窗窗口(隐藏),首次按快捷键时直接 show,避免首次创建时序问题
|
||||||
|
crate::clipboard::popup::ensure_popup_window(&app_handle);
|
||||||
|
// 同时预创建独立预览窗口(隐藏),弹窗悬停条目时直接显示
|
||||||
|
crate::clipboard::popup::ensure_preview_window(&app_handle);
|
||||||
|
}
|
||||||
|
app.manage(clipboard);
|
||||||
|
|
||||||
|
// ===== 快速面板:快捷键 + 预创建弹窗 =====
|
||||||
|
// defaultEnabled:true 假设启用;用户在设置页禁用模块时由前端 onDisable 钩子注销快捷键。
|
||||||
|
// 文件索引 DB 连接改为懒加载(首次搜索/构建时由 commands 中的 ensure_initialized 触发),
|
||||||
|
// 避免应用启动时即打开 SQLite 连接,降低启动 IO 开销。
|
||||||
|
let qp_settings = crate::quickpanel::load_settings(&app.handle());
|
||||||
|
if !qp_settings.shortcut.trim().is_empty() {
|
||||||
|
let app_handle = app.handle().clone();
|
||||||
|
if let Err(e) = crate::shortcut::register_shortcut(
|
||||||
|
&app_handle,
|
||||||
|
"快速面板",
|
||||||
|
&qp_settings.shortcut,
|
||||||
|
|a| crate::quickpanel::popup::show_popup(a),
|
||||||
|
) {
|
||||||
|
crate::logger::log_error("quickpanel", &format!("快捷键注册失败: {}", e));
|
||||||
|
}
|
||||||
|
// 预创建弹窗窗口(隐藏),首次按快捷键时直接 show,避免首次创建时序问题
|
||||||
|
crate::quickpanel::ensure_window(&app_handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 托盘菜单 =====
|
||||||
|
crate::tray_menu::create_tray_menu(app.handle())?;
|
||||||
|
|
||||||
|
// ===== 进程监控线程 =====
|
||||||
|
start_monitoring_thread(app.handle().clone());
|
||||||
|
|
||||||
|
// ===== 代理:自动切换节点后台调度(独立于模块激活状态) =====
|
||||||
|
crate::mihomo_manager::start_auto_switch_loop(app.handle().clone());
|
||||||
|
|
||||||
|
// ===== 自动启动(随应用启动,不依赖模块启用) =====
|
||||||
|
// mihomo:用户在设置中开启"自动启动"时随应用启动
|
||||||
|
if let Some(mihomo) = app.try_state::<MihomoManager>() {
|
||||||
|
if let Some(pm) = app.try_state::<ProcessManager>() {
|
||||||
|
mihomo.auto_start_on_launch(app.handle(), &pm);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// monitor Kernel:用户在设置中开启"自动启动"时随应用启动
|
||||||
|
if let Some(monitor) = app.try_state::<MonitorKernel>() {
|
||||||
|
monitor.auto_start_on_launch(app.handle());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 截图快捷键由前端 screenshotStore 启动时调用 screenshot_register_shortcut 注册
|
||||||
|
// (支持自定义,默认 Ctrl+Alt+A),此处不再硬编码注册
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
//! 全局快捷键共享工具:剪贴板 / 快速面板 / 截图三处复用的注册逻辑。
|
||||||
|
//!
|
||||||
|
//! 提供:
|
||||||
|
//! - 原子化注册:先注销本模块旧快捷键,冲突检测通过后再注册新的,
|
||||||
|
//! 注册失败返回错误(快捷键被系统或其他应用占用时前端可提示用户)。
|
||||||
|
//! - 应用内冲突检测:同一组合键不允许被两个模块同时占用,
|
||||||
|
//! 避免后注册的 `on_shortcut` 静默覆盖先注册的处理器。
|
||||||
|
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::sync::{Mutex, OnceLock};
|
||||||
|
use tauri::AppHandle;
|
||||||
|
use tauri_plugin_global_shortcut::{GlobalShortcutExt, Shortcut, ShortcutState};
|
||||||
|
|
||||||
|
/// 快捷键占用表:模块名(中文,用于错误提示)→ 快捷键字符串
|
||||||
|
static REGISTRY: OnceLock<Mutex<HashMap<String, String>>> = OnceLock::new();
|
||||||
|
|
||||||
|
fn registry() -> &'static Mutex<HashMap<String, String>> {
|
||||||
|
REGISTRY.get_or_init(|| Mutex::new(HashMap::new()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 解析快捷键字符串为 Shortcut(格式如 "Alt+V"、"Ctrl+Shift+V")
|
||||||
|
/// 失败返回 None。
|
||||||
|
pub fn parse_shortcut(s: &str) -> Option<Shortcut> {
|
||||||
|
s.trim().parse::<Shortcut>().ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 原子化注册全局快捷键。
|
||||||
|
///
|
||||||
|
/// - 先注销 `module` 已注册的旧快捷键(空字符串则仅注销,用于禁用)。
|
||||||
|
/// - 注册前做应用内冲突检测:同一组合键被其他模块占用时返回错误。
|
||||||
|
/// - 注册成功后登记占用表;失败则返回错误且不登记(此时本模块快捷键为未注册状态)。
|
||||||
|
pub fn register_shortcut<F>(
|
||||||
|
app: &AppHandle,
|
||||||
|
module: &str,
|
||||||
|
shortcut_str: &str,
|
||||||
|
handler: F,
|
||||||
|
) -> Result<(), String>
|
||||||
|
where
|
||||||
|
F: Fn(&AppHandle) + Send + Sync + 'static,
|
||||||
|
{
|
||||||
|
// 1. 注销本模块旧快捷键(释放占用条目)
|
||||||
|
unregister_shortcut(app, module);
|
||||||
|
|
||||||
|
let key = shortcut_str.trim().to_string();
|
||||||
|
if key.is_empty() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. 应用内冲突检测
|
||||||
|
if let Ok(reg) = registry().lock() {
|
||||||
|
if let Some(owner) = reg.values().find(|v| **v == key) {
|
||||||
|
return Err(format!("快捷键 {} 已被「{}」模块占用,请更换", key, owner));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let shortcut = parse_shortcut(&key).ok_or_else(|| format!("无效的快捷键: {}", key))?;
|
||||||
|
|
||||||
|
let app_handle = app.clone();
|
||||||
|
app.global_shortcut()
|
||||||
|
.on_shortcut(shortcut, move |_a, _s, event| {
|
||||||
|
// 仅在按下时触发(松开不触发)
|
||||||
|
if event.state == ShortcutState::Pressed {
|
||||||
|
handler(&app_handle);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.map_err(|e| format!("注册快捷键 {} 失败: {}", key, e))?;
|
||||||
|
|
||||||
|
// 3. 登记占用
|
||||||
|
if let Ok(mut reg) = registry().lock() {
|
||||||
|
reg.insert(module.to_string(), key.clone());
|
||||||
|
}
|
||||||
|
crate::logger::log_info(module, &format!("已注册快捷键: {}", shortcut_str));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 注销 `module` 的全局快捷键并释放占用条目
|
||||||
|
pub fn unregister_shortcut(app: &AppHandle, module: &str) {
|
||||||
|
let old = registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.remove(module);
|
||||||
|
if let Some(s) = old {
|
||||||
|
if let Some(shortcut) = parse_shortcut(&s) {
|
||||||
|
let _ = app.global_shortcut().unregister(shortcut);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -63,7 +63,7 @@ unsafe extern "system" fn fix_subclass_proc(
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn fix_snap_background(app: AppHandle) -> Result<(), String> {
|
pub async fn fix_snap_background(app: AppHandle) -> Result<(), String> {
|
||||||
let main_window = app
|
let main_window = app
|
||||||
.get_webview_window("main")
|
.get_webview_window(crate::constants::windows::MAIN)
|
||||||
.ok_or("main window not found")?;
|
.ok_or("main window not found")?;
|
||||||
|
|
||||||
let hwnd_isize: isize = {
|
let hwnd_isize: isize = {
|
||||||
|
|||||||
+198
-197
@@ -20,14 +20,12 @@ use tauri::{
|
|||||||
/// 记录窗口最后显示时间,用于失焦防抖(避免显示瞬间因焦点未稳定而被立即隐藏)
|
/// 记录窗口最后显示时间,用于失焦防抖(避免显示瞬间因焦点未稳定而被立即隐藏)
|
||||||
static LAST_SHOW_TIME: Mutex<Option<Instant>> = Mutex::new(None);
|
static LAST_SHOW_TIME: Mutex<Option<Instant>> = Mutex::new(None);
|
||||||
|
|
||||||
/// 保存最近一次右键时计算出的定位参数(逻辑坐标),供 `tray_menu_ready` 使用
|
/// 保存最近一次右键时计算出的定位参数(物理坐标),供 `tray_menu_ready` 使用
|
||||||
/// (x, tray_top_l, wa_top_l, wa_bottom_l, scale)
|
/// (x, cursor_y, screen_top, screen_bottom, scale)
|
||||||
static LAST_MENU_LAYOUT: Mutex<Option<(f64, f64, f64, f64, f64)>> = Mutex::new(None);
|
static LAST_MENU_LAYOUT: Mutex<Option<(f64, f64, f64, f64, f64)>> = Mutex::new(None);
|
||||||
|
|
||||||
use crate::clipboard::popup::{get_work_area, get_work_area_at_point, get_dpi_for_point};
|
use crate::win32_util::{get_work_area, get_monitor_bounds_at_point, get_dpi_for_point};
|
||||||
use crate::clipboard::ClipboardManager;
|
use crate::mihomo_manager::{MihomoManager, is_pseudo_node};
|
||||||
use crate::download_engine::DownloadEngine;
|
|
||||||
use crate::mihomo_manager::MihomoManager;
|
|
||||||
use crate::monitor_kernel::MonitorKernel;
|
use crate::monitor_kernel::MonitorKernel;
|
||||||
use crate::process_manager::{ProcessManager, ProcessStatus};
|
use crate::process_manager::{ProcessManager, ProcessStatus};
|
||||||
|
|
||||||
@@ -48,43 +46,13 @@ pub struct ProxyNodeInfo {
|
|||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct TrayMenuState {
|
pub struct TrayMenuState {
|
||||||
pub proxy_running: bool,
|
pub proxy_running: bool,
|
||||||
|
pub system_proxy: bool,
|
||||||
pub monitor_running: bool,
|
pub monitor_running: bool,
|
||||||
pub proxy_group: Option<String>,
|
pub proxy_group: Option<String>,
|
||||||
pub proxy_nodes: Vec<ProxyNodeInfo>,
|
pub proxy_nodes: Vec<ProxyNodeInfo>,
|
||||||
pub proxy_current: Option<String>,
|
pub proxy_current: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===== 伪节点过滤(与前端 ProxyModule 保持一致) =====
|
|
||||||
|
|
||||||
const PSEUDO_KEYWORDS: &[&str] = &[
|
|
||||||
"DIRECT",
|
|
||||||
"REJECT",
|
|
||||||
"PASS",
|
|
||||||
"COMPATIBLE",
|
|
||||||
"流量",
|
|
||||||
"套餐",
|
|
||||||
"到期",
|
|
||||||
"续费",
|
|
||||||
"官网",
|
|
||||||
"网站",
|
|
||||||
"刷新",
|
|
||||||
"更新",
|
|
||||||
"⭐",
|
|
||||||
"★",
|
|
||||||
"☆",
|
|
||||||
"✕",
|
|
||||||
"✖",
|
|
||||||
"×",
|
|
||||||
];
|
|
||||||
|
|
||||||
fn is_pseudo_node(name: &str) -> bool {
|
|
||||||
let upper = name.trim().to_uppercase();
|
|
||||||
if upper == "DIRECT" || upper == "REJECT" || upper == "PASS" || upper == "GLOBAL" {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
PSEUDO_KEYWORDS.iter().any(|kw| name.contains(kw))
|
|
||||||
}
|
|
||||||
|
|
||||||
// ===== 状态查询 =====
|
// ===== 状态查询 =====
|
||||||
|
|
||||||
fn is_proxy_running(app: &AppHandle) -> bool {
|
fn is_proxy_running(app: &AppHandle) -> bool {
|
||||||
@@ -180,9 +148,29 @@ async fn fetch_proxy_nodes(app: &AppHandle) -> Option<(String, Vec<(String, Opti
|
|||||||
|
|
||||||
// ===== 获取菜单状态 =====
|
// ===== 获取菜单状态 =====
|
||||||
|
|
||||||
pub async fn get_tray_menu_state(app: &AppHandle) -> TrayMenuState {
|
/// 基础状态(不含代理节点)。托盘菜单显示不应受 mihomo API 慢/卡死影响,
|
||||||
|
/// 因此先秒发基础状态让菜单立即出现,代理节点随后异步补充。
|
||||||
|
fn get_base_tray_state(app: &AppHandle) -> TrayMenuState {
|
||||||
let proxy_running = is_proxy_running(app);
|
let proxy_running = is_proxy_running(app);
|
||||||
let monitor_running = is_monitor_running(app);
|
let monitor_running = is_monitor_running(app);
|
||||||
|
// 读取 Windows 注册表中的真实系统代理状态(不依赖 settings.json 缓存)
|
||||||
|
let system_proxy = crate::mihomo_manager::get_system_proxy_windows();
|
||||||
|
TrayMenuState {
|
||||||
|
proxy_running,
|
||||||
|
system_proxy,
|
||||||
|
monitor_running,
|
||||||
|
proxy_group: None,
|
||||||
|
proxy_nodes: vec![],
|
||||||
|
proxy_current: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 完整状态(含代理节点)。可能因调用 mihomo /proxies 而耗时(最长 10s)。
|
||||||
|
async fn get_full_tray_state(app: &AppHandle) -> TrayMenuState {
|
||||||
|
let proxy_running = is_proxy_running(app);
|
||||||
|
let monitor_running = is_monitor_running(app);
|
||||||
|
// 读取 Windows 注册表中的真实系统代理状态(不依赖 settings.json 缓存)
|
||||||
|
let system_proxy = crate::mihomo_manager::get_system_proxy_windows();
|
||||||
|
|
||||||
let (proxy_group, proxy_nodes, proxy_current) = if proxy_running {
|
let (proxy_group, proxy_nodes, proxy_current) = if proxy_running {
|
||||||
match fetch_proxy_nodes(app).await {
|
match fetch_proxy_nodes(app).await {
|
||||||
@@ -205,6 +193,7 @@ pub async fn get_tray_menu_state(app: &AppHandle) -> TrayMenuState {
|
|||||||
|
|
||||||
TrayMenuState {
|
TrayMenuState {
|
||||||
proxy_running,
|
proxy_running,
|
||||||
|
system_proxy,
|
||||||
monitor_running,
|
monitor_running,
|
||||||
proxy_group,
|
proxy_group,
|
||||||
proxy_nodes,
|
proxy_nodes,
|
||||||
@@ -212,6 +201,10 @@ pub async fn get_tray_menu_state(app: &AppHandle) -> TrayMenuState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn get_tray_menu_state(app: &AppHandle) -> TrayMenuState {
|
||||||
|
get_full_tray_state(app).await
|
||||||
|
}
|
||||||
|
|
||||||
// ===== 显示/隐藏托盘菜单窗口 =====
|
// ===== 显示/隐藏托盘菜单窗口 =====
|
||||||
|
|
||||||
/// 托盘菜单窗口尺寸(逻辑像素)
|
/// 托盘菜单窗口尺寸(逻辑像素)
|
||||||
@@ -252,7 +245,7 @@ pub fn precreate_tray_menu_window(app: &AppHandle) {
|
|||||||
{
|
{
|
||||||
Ok(w) => w,
|
Ok(w) => w,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("[tray-menu] 预创建菜单窗口失败: {}", e);
|
crate::logger::log_error("tray", &format!("预创建菜单窗口失败: {}", e));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -262,7 +255,7 @@ pub fn precreate_tray_menu_window(app: &AppHandle) {
|
|||||||
win.on_window_event(move |event| {
|
win.on_window_event(move |event| {
|
||||||
if let tauri::WindowEvent::Focused(false) = event {
|
if let tauri::WindowEvent::Focused(false) = event {
|
||||||
let should_hide = {
|
let should_hide = {
|
||||||
let t = LAST_SHOW_TIME.lock().unwrap();
|
let t = LAST_SHOW_TIME.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
match *t {
|
match *t {
|
||||||
Some(time) => time.elapsed() > Duration::from_millis(300),
|
Some(time) => time.elapsed() > Duration::from_millis(300),
|
||||||
None => true,
|
None => true,
|
||||||
@@ -274,44 +267,39 @@ pub fn precreate_tray_menu_window(app: &AppHandle) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
eprintln!("[tray-menu] 菜单窗口已预创建(隐藏渲染)");
|
crate::logger::log_info("tray", "菜单窗口已预创建(隐藏渲染)");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 右键托盘时调用:计算定位参数、发送状态给前端,但不立即显示窗口。
|
/// 右键托盘时调用:计算定位参数、发送状态给前端,但不立即显示窗口。
|
||||||
/// 窗口等待前端测量内容高度后调用 `tray_menu_ready` 才显示,确保底部精确对齐托盘图标。
|
/// 窗口等待前端测量内容高度后调用 `tray_menu_ready` 才显示,确保底部对齐鼠标点击位置。
|
||||||
///
|
///
|
||||||
/// `cursor_pos`: 事件报告的鼠标物理坐标;`tray_rect`: 托盘图标区域(物理像素)。
|
/// `cursor_pos`: 事件报告的鼠标物理坐标。
|
||||||
pub fn show_tray_menu(app: &AppHandle, cursor_pos: (f64, f64), tray_rect: (f64, f64, f64, f64)) {
|
pub fn show_tray_menu(app: &AppHandle, cursor_pos: (f64, f64)) {
|
||||||
let (mx, my) = (cursor_pos.0, cursor_pos.1);
|
let (mx, my) = (cursor_pos.0, cursor_pos.1);
|
||||||
let tray_top = tray_rect.1;
|
|
||||||
|
|
||||||
// 获取光标所在显示器的工作区(物理像素)
|
// 获取光标所在显示器的完整边界(含任务栏,物理像素)。
|
||||||
let (wa_left, wa_top, wa_right, wa_bottom) = get_work_area_at_point(mx as i32, my as i32)
|
// 托盘图标位于任务栏上,菜单需在鼠标位置弹出,因此用屏幕边界而非工作区做 clamp,
|
||||||
.unwrap_or((0, 0, 1920, 1040));
|
// 否则会被工作区底部(任务栏顶部)截断,导致菜单整体被推到任务栏上方。
|
||||||
|
let (scr_left, scr_top, scr_right, scr_bottom) = get_monitor_bounds_at_point(mx as i32, my as i32)
|
||||||
|
.unwrap_or((0, 0, 1920, 1080));
|
||||||
|
|
||||||
// 获取光标所在显示器的 DPI,将物理坐标转为逻辑坐标(DIP)
|
// 光标所在显示器的 DPI:菜单宽度按物理像素换算
|
||||||
let dpi = get_dpi_for_point(mx as i32, my as i32).unwrap_or(96);
|
let dpi = get_dpi_for_point(mx as i32, my as i32).unwrap_or(96);
|
||||||
let scale = dpi as f64 / 96.0;
|
let scale = dpi as f64 / 96.0;
|
||||||
|
let menu_w_px = MENU_W * scale;
|
||||||
|
|
||||||
let mx_l = mx / scale;
|
// 水平:菜单左边缘对齐鼠标 X(向右延伸),超出屏幕右边界则左移(物理坐标)
|
||||||
let tray_top_l = tray_top / scale;
|
let x = mx.max(scr_left as f64).min(scr_right as f64 - menu_w_px);
|
||||||
let wa_left_l = wa_left as f64 / scale;
|
|
||||||
let wa_right_l = wa_right as f64 / scale;
|
|
||||||
let wa_top_l = wa_top as f64 / scale;
|
|
||||||
let wa_bottom_l = wa_bottom as f64 / scale;
|
|
||||||
|
|
||||||
// 水平:菜单左边缘对齐鼠标 X(向右延伸),超出右边界则左移
|
// 保存布局参数(全部物理坐标 + scale,供 tray_menu_ready 换算前端上报的逻辑高度)
|
||||||
let x = mx_l.max(wa_left_l).min(wa_right_l - MENU_W);
|
|
||||||
|
|
||||||
// 保存布局参数,供 tray_menu_ready 使用
|
|
||||||
{
|
{
|
||||||
let mut layout = LAST_MENU_LAYOUT.lock().unwrap();
|
let mut layout = LAST_MENU_LAYOUT.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
*layout = Some((x, tray_top_l, wa_top_l, wa_bottom_l, scale));
|
*layout = Some((x, my, scr_top as f64, scr_bottom as f64, scale));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 记录显示时间,用于失焦防抖
|
// 记录显示时间,用于失焦防抖
|
||||||
{
|
{
|
||||||
let mut t = LAST_SHOW_TIME.lock().unwrap();
|
let mut t = LAST_SHOW_TIME.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
*t = Some(Instant::now());
|
*t = Some(Instant::now());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -320,11 +308,26 @@ pub fn show_tray_menu(app: &AppHandle, cursor_pos: (f64, f64), tray_rect: (f64,
|
|||||||
precreate_tray_menu_window(app);
|
precreate_tray_menu_window(app);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 发送状态给前端(前端测量内容高度后调用 tray_menu_ready 显示窗口)
|
// 1) 立即发送基础状态(不含代理节点,纯本地查询),菜单秒开——
|
||||||
|
// 前端测量内容高度后调用 tray_menu_ready 显示窗口。
|
||||||
|
let base = get_base_tray_state(app);
|
||||||
|
let _ = app.emit(crate::constants::events::TRAY_MENU_SHOW, base);
|
||||||
|
|
||||||
|
// 2) 异步拉取完整状态(含 mihomo /proxies 节点),到达后经 TRAY_MENU_STATE_UPDATED
|
||||||
|
// 补充给前端(前端在窗口可见时重新测量调整尺寸)。
|
||||||
|
// mihomo API 慢/挂起时不再阻塞菜单显示;超时 5s 放弃(保持基础状态)。
|
||||||
let app_clone = app.clone();
|
let app_clone = app.clone();
|
||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
let state = get_tray_menu_state(&app_clone).await;
|
let state = match tokio::time::timeout(
|
||||||
let _ = app_clone.emit("tray-menu-show", state);
|
Duration::from_millis(5000),
|
||||||
|
get_full_tray_state(&app_clone),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(s) => s,
|
||||||
|
Err(_) => return,
|
||||||
|
};
|
||||||
|
let _ = app_clone.emit(crate::constants::events::TRAY_MENU_STATE_UPDATED, state);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -338,7 +341,23 @@ pub fn hide_tray_menu(app: &AppHandle) {
|
|||||||
/// 刷新菜单状态并发送给前端
|
/// 刷新菜单状态并发送给前端
|
||||||
async fn refresh_and_emit_state(app: &AppHandle) {
|
async fn refresh_and_emit_state(app: &AppHandle) {
|
||||||
let state = get_tray_menu_state(app).await;
|
let state = get_tray_menu_state(app).await;
|
||||||
let _ = app.emit("tray-menu-state-updated", state);
|
let _ = app.emit(crate::constants::events::TRAY_MENU_STATE_UPDATED, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 显示主窗口并强制置为前台。
|
||||||
|
/// Tauri 的 set_focus 在 Windows 上受前台锁定限制,主窗口被其他应用遮挡时无法到前台;
|
||||||
|
/// 改用原生 SetForegroundWindow + BringWindowToTop(模拟 Alt 键重置前台锁定)。
|
||||||
|
pub fn focus_main_window(app: &AppHandle) {
|
||||||
|
if let Some(window) = app.get_webview_window(crate::constants::windows::MAIN) {
|
||||||
|
let _ = window.show();
|
||||||
|
let _ = window.unminimize();
|
||||||
|
match window.hwnd() {
|
||||||
|
Ok(hwnd) => crate::win32_util::force_foreground(hwnd.0 as isize),
|
||||||
|
Err(_) => {
|
||||||
|
window.set_focus().ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===== Tauri 命令 =====
|
// ===== Tauri 命令 =====
|
||||||
@@ -353,13 +372,13 @@ pub async fn tray_menu_action(
|
|||||||
match action.as_str() {
|
match action.as_str() {
|
||||||
"proxy_enable" => {
|
"proxy_enable" => {
|
||||||
if let Err(e) = enable_proxy(&app).await {
|
if let Err(e) = enable_proxy(&app).await {
|
||||||
eprintln!("[tray] 开启代理失败: {}", e);
|
crate::logger::log_error("tray", &format!("开启代理失败: {}", e));
|
||||||
send_notification(&app, "代理启动失败", &e);
|
send_notification(&app, "代理启动失败", &e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"proxy_disable" => {
|
"proxy_disable" => {
|
||||||
if let Err(e) = disable_proxy(&app).await {
|
if let Err(e) = disable_proxy(&app).await {
|
||||||
eprintln!("[tray] 关闭代理失败: {}", e);
|
crate::logger::log_error("tray", &format!("关闭代理失败: {}", e));
|
||||||
send_notification(&app, "代理关闭失败", &e);
|
send_notification(&app, "代理关闭失败", &e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -377,34 +396,38 @@ pub async fn tray_menu_action(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
"system_proxy_toggle" => {
|
||||||
|
// 根据注册表当前真实状态切换(不依赖 settings.json 缓存,避免与主界面不同步)
|
||||||
|
let mihomo = app.state::<MihomoManager>();
|
||||||
|
if crate::mihomo_manager::get_system_proxy_windows() {
|
||||||
|
if let Err(e) = mihomo.disable_system_proxy() {
|
||||||
|
crate::logger::log_error("tray", &format!("关闭系统代理失败: {}", e));
|
||||||
|
send_notification(&app, "系统代理关闭失败", &e);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if let Err(e) = mihomo.enable_system_proxy() {
|
||||||
|
crate::logger::log_error("tray", &format!("开启系统代理失败: {}", e));
|
||||||
|
send_notification(&app, "系统代理开启失败", &e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
"osd_toggle" => {
|
"osd_toggle" => {
|
||||||
let _ = app.emit("tray:toggle-osd", ());
|
let _ = app.emit(crate::constants::events::TRAY_TOGGLE_OSD, ());
|
||||||
}
|
}
|
||||||
"kernel_restart" => {
|
"kernel_restart" => {
|
||||||
if let Err(e) = restart_kernel(&app).await {
|
if let Err(e) = restart_kernel(&app).await {
|
||||||
eprintln!("[tray] 重启 Kernel 失败: {}", e);
|
crate::logger::log_error("tray", &format!("重启 Kernel 失败: {}", e));
|
||||||
send_notification(&app, "Kernel 重启失败", &e);
|
send_notification(&app, "Kernel 重启失败", &e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"download_new" => {
|
"download_new" => {
|
||||||
if let Some(window) = app.get_webview_window("main") {
|
focus_main_window(&app);
|
||||||
window.show().ok();
|
let _ = app.emit(crate::constants::events::TRAY_NEW_DOWNLOAD, ());
|
||||||
window.set_focus().ok();
|
|
||||||
}
|
|
||||||
let _ = app.emit("tray:new-download", ());
|
|
||||||
hide_tray_menu(&app);
|
hide_tray_menu(&app);
|
||||||
}
|
}
|
||||||
"screenshot_region" => {
|
|
||||||
hide_tray_menu(&app);
|
|
||||||
// 主窗口(隐藏运行中)接收事件后调用 screenshotStore.startCapture('region')
|
|
||||||
let _ = app.emit("tray:start-screenshot", "region");
|
|
||||||
}
|
|
||||||
"settings" => {
|
"settings" => {
|
||||||
if let Some(window) = app.get_webview_window("main") {
|
focus_main_window(&app);
|
||||||
window.show().ok();
|
let _ = app.emit(crate::constants::events::TRAY_OPEN_SETTINGS, ());
|
||||||
window.set_focus().ok();
|
|
||||||
}
|
|
||||||
let _ = app.emit("tray:open-settings", ());
|
|
||||||
hide_tray_menu(&app);
|
hide_tray_menu(&app);
|
||||||
}
|
}
|
||||||
"quit" => {
|
"quit" => {
|
||||||
@@ -414,10 +437,21 @@ pub async fn tray_menu_action(
|
|||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 刷新状态并发送给前端(quit 除外,quit 后进程已退出)
|
// 按动作类型选择性刷新,避免无关动作(OSD 开关/跳转设置)也全量请求 mihomo API:
|
||||||
if action != "quit" {
|
// - 代理相关动作:全量刷新(节点列表/延迟可能已变化)
|
||||||
|
// - Kernel/OSD:仅刷新本地基础状态(monitor 运行状态)
|
||||||
|
// - 跳转/退出:不刷新(quit 后进程已退出)
|
||||||
|
match action.as_str() {
|
||||||
|
"proxy_enable" | "proxy_disable" | "proxy_refresh" | "proxy_select_node"
|
||||||
|
| "system_proxy_toggle" => {
|
||||||
refresh_and_emit_state(&app).await;
|
refresh_and_emit_state(&app).await;
|
||||||
}
|
}
|
||||||
|
"kernel_restart" | "osd_toggle" => {
|
||||||
|
let state = get_base_tray_state(&app);
|
||||||
|
let _ = app.emit(crate::constants::events::TRAY_MENU_STATE_UPDATED, state);
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -436,25 +470,38 @@ pub async fn tray_menu_ready(content_height: f64, app: AppHandle) -> Result<(),
|
|||||||
let win = app.get_webview_window(TRAY_MENU_LABEL)
|
let win = app.get_webview_window(TRAY_MENU_LABEL)
|
||||||
.ok_or("tray-menu window not found")?;
|
.ok_or("tray-menu window not found")?;
|
||||||
|
|
||||||
let (x, tray_top_l, wa_top_l, wa_bottom_l, _scale) = {
|
let (x, cursor_y, scr_top, scr_bottom, scale) = {
|
||||||
let layout = LAST_MENU_LAYOUT.lock().unwrap();
|
let layout = LAST_MENU_LAYOUT.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
layout.unwrap_or((0.0, 1040.0, 0.0, 1040.0, 1.0))
|
layout.unwrap_or((0.0, 1040.0, 0.0, 1080.0, 1.0))
|
||||||
};
|
};
|
||||||
|
|
||||||
// 将内容高度限制在合理范围内
|
// 将内容高度限制在合理范围内(前端上报为逻辑像素)
|
||||||
let h = content_height.max(100.0).min(520.0);
|
let h = content_height.max(100.0).min(520.0);
|
||||||
|
|
||||||
// 调整窗口尺寸
|
// 调整窗口尺寸(物理像素,与物理坐标定位保持一致,避免混合 DPI 换算偏移)
|
||||||
let _ = win.set_size(tauri::Size::Logical(tauri::LogicalSize {
|
let win_w_px = MENU_W * scale;
|
||||||
width: MENU_W,
|
let win_h_px = h * scale;
|
||||||
height: h,
|
let _ = win.set_size(tauri::Size::Physical(tauri::PhysicalSize {
|
||||||
|
width: win_w_px as u32,
|
||||||
|
height: win_h_px as u32,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// 垂直:菜单下边缘紧贴托盘图标顶部(向上弹出)
|
// 垂直:菜单底部对齐鼠标点击位置(向上弹出,物理坐标)。
|
||||||
let y = (tray_top_l - h).max(wa_top_l).min(wa_bottom_l - h);
|
// 用屏幕边界而非工作区 clamp,使菜单贴近/覆盖任务栏上的鼠标位置,
|
||||||
|
// 而不是被工作区底部(任务栏顶部)截断后整体出现在任务栏上方。
|
||||||
|
let y = (cursor_y - win_h_px).max(scr_top).min(scr_bottom - win_h_px);
|
||||||
|
|
||||||
let pos = tauri::Position::Logical(tauri::LogicalPosition { x, y });
|
let pos = tauri::Position::Physical(tauri::PhysicalPosition {
|
||||||
|
x: x as i32,
|
||||||
|
y: y as i32,
|
||||||
|
});
|
||||||
let _ = win.set_position(pos);
|
let _ = win.set_position(pos);
|
||||||
|
// 以实际显示时刻重置失焦防抖起点:右键到此处可能间隔较久(前端测量 + 基础状态),
|
||||||
|
// 若沿用右键时刻,WebView2 显示瞬间的焦点抖动会被误判为失焦而立即隐藏菜单。
|
||||||
|
{
|
||||||
|
let mut t = LAST_SHOW_TIME.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
*t = Some(Instant::now());
|
||||||
|
}
|
||||||
let _ = win.show();
|
let _ = win.show();
|
||||||
let _ = win.set_focus();
|
let _ = win.set_focus();
|
||||||
|
|
||||||
@@ -485,33 +532,57 @@ async fn enable_proxy(app: &AppHandle) -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. 获取节点列表
|
// 2. 获取节点并择优:遵循自动切换的目标组与地区筛选(关闭自动切换时退化为主组 + 全量节点)
|
||||||
let proxies = mihomo.get_proxies().await?;
|
let settings = mihomo.load_settings();
|
||||||
let (group, nodes, _now) = parse_main_group(&proxies)
|
|
||||||
.ok_or_else(|| "无法解析代理组".to_string())?;
|
|
||||||
|
|
||||||
if !nodes.is_empty() {
|
match crate::mihomo_manager::pick_best(&mihomo, &settings).await {
|
||||||
// 3. 并行测试所有节点延迟
|
Ok(Some((group, name, delay, now))) => {
|
||||||
let best = test_and_select_best(&mihomo, &group, &nodes).await;
|
// 与自动切换一样,仅当当前节点不是最优时才切换
|
||||||
|
if name != now {
|
||||||
// 4. 发送通知
|
let _ = mihomo.select_proxy(&group, &name).await;
|
||||||
match &best {
|
|
||||||
Some((name, delay)) => {
|
|
||||||
send_notification(
|
|
||||||
app,
|
|
||||||
"代理已开启",
|
|
||||||
&format!("当前节点: {} ({}ms)", name, delay),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
send_notification(app, "代理已开启", "所有节点均超时,未自动选择");
|
|
||||||
}
|
}
|
||||||
|
send_notification(app, "代理已开启", &format!("当前节点: {} ({}ms)", name, delay));
|
||||||
}
|
}
|
||||||
|
Ok(None) | Err(_) => {
|
||||||
|
// 区分「无可用节点」与「全部超时」两种情况
|
||||||
|
let unavailable = {
|
||||||
|
let proxies = mihomo.get_proxies().await.ok();
|
||||||
|
let group_name: Option<String> = if !settings.auto_switch_group.is_empty() {
|
||||||
|
Some(settings.auto_switch_group.clone())
|
||||||
} else {
|
} else {
|
||||||
|
proxies
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|p| p.get("proxies"))
|
||||||
|
.and_then(|m| m.as_object())
|
||||||
|
.and_then(|map| {
|
||||||
|
let mut names = map.iter().filter(|(_, v)| {
|
||||||
|
v.get("type").and_then(|t| t.as_str()) == Some("Selector")
|
||||||
|
});
|
||||||
|
names.next().map(|(n, _)| n.clone())
|
||||||
|
})
|
||||||
|
};
|
||||||
|
let empty = group_name.map(|g| {
|
||||||
|
proxies
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|p| p.get("proxies"))
|
||||||
|
.and_then(|m| m.as_object())
|
||||||
|
.and_then(|map| map.get(&g))
|
||||||
|
.and_then(|v| v.get("all"))
|
||||||
|
.and_then(|v| v.as_array())
|
||||||
|
.map(|a| a.is_empty())
|
||||||
|
.unwrap_or(true)
|
||||||
|
}).unwrap_or(true);
|
||||||
|
empty
|
||||||
|
};
|
||||||
|
if unavailable {
|
||||||
send_notification(app, "代理已开启", "无可用节点");
|
send_notification(app, "代理已开启", "无可用节点");
|
||||||
|
} else {
|
||||||
|
send_notification(app, "代理已开启", "所有候选节点均超时,未自动选择");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 5. 开启系统代理
|
// 3. 开启系统代理
|
||||||
mihomo.enable_system_proxy()?;
|
mihomo.enable_system_proxy()?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -534,40 +605,6 @@ async fn disable_proxy(app: &AppHandle) -> Result<(), String> {
|
|||||||
|
|
||||||
// ===== 择优选择节点 =====
|
// ===== 择优选择节点 =====
|
||||||
|
|
||||||
/// 并行测试所有节点延迟,选择最低延迟节点
|
|
||||||
async fn test_and_select_best(
|
|
||||||
mihomo: &MihomoManager,
|
|
||||||
group: &str,
|
|
||||||
nodes: &[String],
|
|
||||||
) -> Option<(String, u32)> {
|
|
||||||
use futures_util::future::join_all;
|
|
||||||
|
|
||||||
let futures: Vec<_> = nodes
|
|
||||||
.iter()
|
|
||||||
.map(|name| async move {
|
|
||||||
let delay = mihomo
|
|
||||||
.test_delay(name, "https://www.gstatic.com/generate_204", 5000)
|
|
||||||
.await
|
|
||||||
.ok();
|
|
||||||
(name.clone(), delay)
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let results = join_all(futures).await;
|
|
||||||
|
|
||||||
let best = results
|
|
||||||
.into_iter()
|
|
||||||
.filter_map(|(name, delay)| delay.map(|d| (name, d)))
|
|
||||||
.filter(|(_, d)| *d > 0)
|
|
||||||
.min_by_key(|(_, d)| *d);
|
|
||||||
|
|
||||||
if let Some((ref name, _)) = best {
|
|
||||||
let _ = mihomo.select_proxy(group, name).await;
|
|
||||||
}
|
|
||||||
|
|
||||||
best
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 并行测试所有节点延迟(更新 mihomo 内部 history)
|
/// 并行测试所有节点延迟(更新 mihomo 内部 history)
|
||||||
async fn test_all_delays(app: &AppHandle) {
|
async fn test_all_delays(app: &AppHandle) {
|
||||||
let mihomo = app.state::<MihomoManager>();
|
let mihomo = app.state::<MihomoManager>();
|
||||||
@@ -610,7 +647,7 @@ async fn select_proxy_node(app: &AppHandle, group: &str, name: &str) {
|
|||||||
send_notification(app, "节点已切换", &format!("{}\n延迟: {}", name, delay_text));
|
send_notification(app, "节点已切换", &format!("{}\n延迟: {}", name, delay_text));
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("[tray] 切换节点失败: {}", e);
|
crate::logger::log_error("tray", &format!("切换节点失败: {}", e));
|
||||||
send_notification(app, "切换节点失败", &e);
|
send_notification(app, "切换节点失败", &e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -662,34 +699,12 @@ fn send_notification(app: &AppHandle, title: &str, message: &str) {
|
|||||||
.show();
|
.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===== 退出清理 =====
|
// ===== 退出入口 =====
|
||||||
|
|
||||||
|
/// 托盘菜单"退出"调用。
|
||||||
|
/// 资源清理统一收敛到 RunEvent::ExitRequested(覆盖所有退出路径),此处仅请求退出,
|
||||||
|
/// 避免清理逻辑双份执行(monitor 的 cleanup 涉及子进程/网络,重复执行有竞态风险)。
|
||||||
pub fn quit_cleanup(app: &AppHandle) {
|
pub fn quit_cleanup(app: &AppHandle) {
|
||||||
if let Some(mihomo) = app.try_state::<MihomoManager>() {
|
|
||||||
mihomo.cleanup_on_exit();
|
|
||||||
}
|
|
||||||
if let Some(engine) = app.try_state::<DownloadEngine>() {
|
|
||||||
engine.cleanup_on_exit();
|
|
||||||
}
|
|
||||||
// monitor.cleanup_on_exit 是 async,在 tokio worker 线程中直接 block_on 会 panic,
|
|
||||||
// 放到独立 OS 线程执行 block_on,避免嵌套 runtime。
|
|
||||||
if let Some(monitor) = app.try_state::<MonitorKernel>() {
|
|
||||||
let app_clone = app.clone();
|
|
||||||
let monitor_clone = monitor.inner().clone();
|
|
||||||
std::thread::spawn(move || {
|
|
||||||
tauri::async_runtime::block_on(async move {
|
|
||||||
monitor_clone.cleanup_on_exit(&app_clone).await;
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.join()
|
|
||||||
.ok();
|
|
||||||
}
|
|
||||||
if let Some(clip) = app.try_state::<ClipboardManager>() {
|
|
||||||
clip.stop();
|
|
||||||
}
|
|
||||||
if let Some(pm) = app.try_state::<ProcessManager>() {
|
|
||||||
pm.stop_all();
|
|
||||||
}
|
|
||||||
app.exit(0);
|
app.exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -708,31 +723,17 @@ pub fn create_tray_menu(app: &AppHandle) -> Result<(), tauri::Error> {
|
|||||||
button: MouseButton::Left,
|
button: MouseButton::Left,
|
||||||
..
|
..
|
||||||
} => {
|
} => {
|
||||||
// 左键:显示主窗口
|
// 左键:显示主窗口(强制置前,绕过前台锁定)
|
||||||
if let Some(window) = app.get_webview_window("main") {
|
focus_main_window(&app);
|
||||||
window.show().ok();
|
|
||||||
window.set_focus().ok();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
TrayIconEvent::Click {
|
TrayIconEvent::Click {
|
||||||
button: MouseButton::Right,
|
button: MouseButton::Right,
|
||||||
position,
|
position,
|
||||||
rect,
|
|
||||||
..
|
..
|
||||||
} => {
|
} => {
|
||||||
// 右键:显示自定义菜单窗口(使用事件中的精确坐标)
|
// 右键:显示自定义菜单窗口(使用事件中的鼠标坐标)
|
||||||
let cursor = (position.x, position.y);
|
let cursor = (position.x, position.y);
|
||||||
// 从 Rect 的 Position/Size 枚举中提取物理像素值
|
show_tray_menu(&app, cursor);
|
||||||
let (rx, ry) = match rect.position {
|
|
||||||
tauri::Position::Physical(p) => (p.x as f64, p.y as f64),
|
|
||||||
tauri::Position::Logical(p) => (p.x, p.y),
|
|
||||||
};
|
|
||||||
let (_rw, rh) = match rect.size {
|
|
||||||
tauri::Size::Physical(s) => (s.width as f64, s.height as f64),
|
|
||||||
tauri::Size::Logical(s) => (s.width, s.height),
|
|
||||||
};
|
|
||||||
let tray_r = (rx, ry, _rw, rh);
|
|
||||||
show_tray_menu(&app, cursor, tray_r);
|
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,506 @@
|
|||||||
|
//! 应用自更新模块。
|
||||||
|
//! 更新源为自建 Gitea:`https://gitea.atie.fun/LFeng/Thing` 的 release 资产。
|
||||||
|
//! - 便携版(无 unins000.exe 且不在 Program Files):下载新 thing.exe → update.bat 覆盖重启
|
||||||
|
//! - 安装版(NSIS):下载新 setup.exe → 提权静默安装 /S
|
||||||
|
//! - ThingHK 内核:下载由前端下载模块完成 → apply 命令 need_stop 等待确认 → 解压覆盖
|
||||||
|
//! {app_data}/monitor/cores/ThingHK.exe(与代理模块 mihomo 内核更新同模式)
|
||||||
|
use serde::Serialize;
|
||||||
|
use specta::Type;
|
||||||
|
use std::fs;
|
||||||
|
use std::io::{Read, Write};
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::sync::{atomic::{AtomicBool, Ordering}, Mutex};
|
||||||
|
use tauri::{AppHandle, Emitter, Manager};
|
||||||
|
use tokio::sync::{oneshot, watch};
|
||||||
|
|
||||||
|
use crate::constants::events::UPDATE_PROGRESS;
|
||||||
|
|
||||||
|
/// 用户主动取消 ThingHK 更新的标记错误信息(前端据此静默处理,不弹错误 toast)
|
||||||
|
const THINGHK_UPDATE_CANCELLED: &str = "更新已取消";
|
||||||
|
|
||||||
|
/// ThingHK 内核更新的跨命令状态:apply 过程中 need_stop 阶段等待前端确认。
|
||||||
|
/// 与 MihomoManager 的 install_confirm/kernel_cancel 同构。
|
||||||
|
pub struct ThinghkUpdateState {
|
||||||
|
/// need_stop 等待阶段的确认通道(前端调 confirm 命令时唤醒 apply 继续)
|
||||||
|
confirm_tx: Mutex<Option<oneshot::Sender<()>>>,
|
||||||
|
/// 取消标志 + 唤醒通道(前端调 cancel 命令时置位,apply 等待循环立即返回)
|
||||||
|
cancel_flag: AtomicBool,
|
||||||
|
cancel_tx: watch::Sender<bool>,
|
||||||
|
cancel_rx: watch::Receiver<bool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ThinghkUpdateState {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
let (tx, rx) = watch::channel(false);
|
||||||
|
Self {
|
||||||
|
confirm_tx: Mutex::new(None),
|
||||||
|
cancel_flag: AtomicBool::new(false),
|
||||||
|
cancel_tx: tx,
|
||||||
|
cancel_rx: rx,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 前端已停止监控内核,唤醒 apply 继续解压替换
|
||||||
|
fn confirm(&self) {
|
||||||
|
if let Some(tx) = self.confirm_tx.lock().unwrap_or_else(|e| e.into_inner()).take() {
|
||||||
|
let _ = tx.send(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 取消更新:置位取消标志并唤醒 apply 等待循环
|
||||||
|
fn cancel(&self) {
|
||||||
|
self.cancel_flag.store(true, Ordering::SeqCst);
|
||||||
|
let _ = self.cancel_tx.send(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 进入新的 apply 流程前复位取消标志
|
||||||
|
fn reset(&self) {
|
||||||
|
self.cancel_flag.store(false, Ordering::SeqCst);
|
||||||
|
let _ = self.cancel_tx.send(false);
|
||||||
|
*self.confirm_tx.lock().unwrap_or_else(|e| e.into_inner()) = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 发布仓库(Gitea)
|
||||||
|
const GITEA_REPO: &str = "LFeng/Thing";
|
||||||
|
const GITEA_BASE: &str = "https://gitea.atie.fun";
|
||||||
|
|
||||||
|
/// release 中的一个资产
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct UpdateAsset {
|
||||||
|
pub name: String,
|
||||||
|
pub size: u64,
|
||||||
|
pub browser_download_url: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 检查更新的结果
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct UpdateCheckResult {
|
||||||
|
pub current_version: String,
|
||||||
|
pub latest_version: String,
|
||||||
|
pub has_update: bool,
|
||||||
|
/// portable | installed
|
||||||
|
pub install_type: String,
|
||||||
|
pub release_name: String,
|
||||||
|
pub release_body: String,
|
||||||
|
pub assets: Vec<UpdateAsset>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 更新进度事件载荷(与内核安装进度同构,独立事件便于 UI 区分)
|
||||||
|
#[derive(Serialize, Clone, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct UpdateProgress {
|
||||||
|
pub stage: String,
|
||||||
|
pub percent: u8,
|
||||||
|
#[specta(type = f64)]
|
||||||
|
pub downloaded_bytes: u64,
|
||||||
|
#[specta(type = Option<f64>)]
|
||||||
|
pub total_bytes: Option<u64>,
|
||||||
|
pub message: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- 版本比较 ----------
|
||||||
|
|
||||||
|
/// 解析 vX.Y.Z 为数字元组用于比较;解析失败返回 (0,0,0)
|
||||||
|
fn parse_version(v: &str) -> (u32, u32, u32) {
|
||||||
|
let s = v.trim().trim_start_matches('v');
|
||||||
|
let mut parts = s.split('.');
|
||||||
|
let major = parts.next().and_then(|p| p.parse().ok()).unwrap_or(0);
|
||||||
|
let minor = parts.next().and_then(|p| p.parse().ok()).unwrap_or(0);
|
||||||
|
let patch = parts
|
||||||
|
.next()
|
||||||
|
.map(|p| p.chars().take_while(|c| c.is_ascii_digit()).collect::<String>())
|
||||||
|
.and_then(|p| p.parse().ok())
|
||||||
|
.unwrap_or(0);
|
||||||
|
(major, minor, patch)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn version_gt(a: &str, b: &str) -> bool {
|
||||||
|
parse_version(a) > parse_version(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- Gitea API ----------
|
||||||
|
|
||||||
|
struct LatestRelease {
|
||||||
|
tag_name: String,
|
||||||
|
name: String,
|
||||||
|
body: String,
|
||||||
|
assets: Vec<UpdateAsset>,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn fetch_latest_release() -> Result<LatestRelease, String> {
|
||||||
|
let url = format!("{}/api/v1/repos/{}/releases/latest", GITEA_BASE, GITEA_REPO);
|
||||||
|
let client = reqwest::Client::builder()
|
||||||
|
.timeout(std::time::Duration::from_secs(15))
|
||||||
|
.build()
|
||||||
|
.map_err(|e| format!("创建 HTTP 客户端失败: {}", e))?;
|
||||||
|
let resp = client
|
||||||
|
.get(&url)
|
||||||
|
.header("User-Agent", "thing-app")
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("请求 Gitea API 失败: {}", e))?;
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
return Err(format!("Gitea API 返回 HTTP {}", resp.status()));
|
||||||
|
}
|
||||||
|
let json: serde_json::Value = resp
|
||||||
|
.json()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("解析 Gitea 响应失败: {}", e))?;
|
||||||
|
let mut assets = Vec::new();
|
||||||
|
if let Some(list) = json.get("assets").and_then(|v| v.as_array()) {
|
||||||
|
for a in list {
|
||||||
|
if let (Some(name), Some(url)) = (
|
||||||
|
a.get("name").and_then(|v| v.as_str()),
|
||||||
|
a.get("browser_download_url").and_then(|v| v.as_str()),
|
||||||
|
) {
|
||||||
|
assets.push(UpdateAsset {
|
||||||
|
name: name.to_string(),
|
||||||
|
size: a.get("size").and_then(|v| v.as_u64()).unwrap_or(0),
|
||||||
|
browser_download_url: url.to_string(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(LatestRelease {
|
||||||
|
tag_name: json.get("tag_name").and_then(|v| v.as_str()).unwrap_or("").to_string(),
|
||||||
|
name: json.get("name").and_then(|v| v.as_str()).unwrap_or("").to_string(),
|
||||||
|
body: json.get("body").and_then(|v| v.as_str()).unwrap_or("").to_string(),
|
||||||
|
assets,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- 解压 ----------
|
||||||
|
// ThingHK 内核更新包由前端下载模块负责下载(同 mihomo),此处仅解压替换。
|
||||||
|
|
||||||
|
/// 用 zip crate 解压(纯 Rust,避免 PowerShell 执行策略问题)
|
||||||
|
fn extract_zip(zip_path: &Path, dest: &Path) -> Result<(), String> {
|
||||||
|
let file = fs::File::open(zip_path).map_err(|e| format!("打开 zip 失败: {}", e))?;
|
||||||
|
let mut archive = zip::ZipArchive::new(file).map_err(|e| format!("读取 zip 失败: {}", e))?;
|
||||||
|
for i in 0..archive.len() {
|
||||||
|
let mut entry = archive
|
||||||
|
.by_index(i)
|
||||||
|
.map_err(|e| format!("读取条目失败: {}", e))?;
|
||||||
|
let outpath = match entry.enclosed_name() {
|
||||||
|
Some(p) => dest.join(p),
|
||||||
|
None => continue,
|
||||||
|
};
|
||||||
|
if entry.is_dir() {
|
||||||
|
fs::create_dir_all(&outpath).map_err(|e| e.to_string())?;
|
||||||
|
} else {
|
||||||
|
if let Some(parent) = outpath.parent() {
|
||||||
|
fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
let mut outfile = fs::File::create(&outpath).map_err(|e| e.to_string())?;
|
||||||
|
let mut buf = [0u8; 8192];
|
||||||
|
loop {
|
||||||
|
let n = entry.read(&mut buf).map_err(|e| e.to_string())?;
|
||||||
|
if n == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
outfile.write_all(&buf[..n]).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- 安装类型 / ShellExecute ----------
|
||||||
|
|
||||||
|
/// 判断当前是便携版还是安装版。
|
||||||
|
/// NSIS 安装会在程序目录生成 unins000.exe;MSI 通常安装到 Program Files。
|
||||||
|
fn is_installed_version() -> bool {
|
||||||
|
if let Ok(exe) = std::env::current_exe() {
|
||||||
|
if let Some(dir) = exe.parent() {
|
||||||
|
if dir.join("unins000.exe").exists() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
let p = dir.to_string_lossy().to_lowercase();
|
||||||
|
if p.contains("program files") {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 通过 ShellExecuteW 启动程序/文档(绕过 Job Object,脱离主进程生命周期)
|
||||||
|
fn shell_execute(verb: &str, file: &Path, params: &str, show: i32) -> Result<(), String> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
use std::os::windows::ffi::OsStrExt;
|
||||||
|
use windows_sys::Win32::UI::Shell::ShellExecuteW;
|
||||||
|
let file_w: Vec<u16> = file.as_os_str().encode_wide().chain(std::iter::once(0)).collect();
|
||||||
|
let verb_w: Vec<u16> = verb.encode_utf16().chain(std::iter::once(0)).collect();
|
||||||
|
let params_w: Vec<u16> = params.encode_utf16().chain(std::iter::once(0)).collect();
|
||||||
|
let res = unsafe {
|
||||||
|
ShellExecuteW(
|
||||||
|
0 as isize,
|
||||||
|
verb_w.as_ptr(),
|
||||||
|
file_w.as_ptr(),
|
||||||
|
params_w.as_ptr(),
|
||||||
|
std::ptr::null(),
|
||||||
|
show,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
if (res as isize) <= 32 {
|
||||||
|
return Err(format!("ShellExecuteW 失败 (code={})", res));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
let _ = (verb, file, params, show);
|
||||||
|
Err("仅支持 Windows".into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 便携版:写 update.bat 等待主进程退出 → 覆盖 exe → 重新启动
|
||||||
|
fn apply_portable_update(new_exe: &Path) -> Result<(), String> {
|
||||||
|
let cur_exe = std::env::current_exe().map_err(|e| format!("获取当前程序路径失败: {}", e))?;
|
||||||
|
let cur_dir = cur_exe.parent().ok_or("无法确定程序目录".to_string())?;
|
||||||
|
let bat_path = cur_dir.join("update.bat");
|
||||||
|
let script = format!(
|
||||||
|
"@echo off\r\n\
|
||||||
|
:wait\r\n\
|
||||||
|
tasklist /FI \"IMAGENAME eq thing.exe\" 2>nul | findstr /i \"thing.exe\" >nul\r\n\
|
||||||
|
if not errorlevel 1 (\r\n\
|
||||||
|
ping -n 2 127.0.0.1 >nul\r\n\
|
||||||
|
goto wait\r\n\
|
||||||
|
)\r\n\
|
||||||
|
copy /y \"{new}\" \"{cur}\" >nul\r\n\
|
||||||
|
if errorlevel 1 exit /b 1\r\n\
|
||||||
|
start \"\" \"{cur}\"\r\n\
|
||||||
|
del \"{new}\" >nul 2>nul\r\n\
|
||||||
|
del \"%~f0\" >nul 2>nul\r\n",
|
||||||
|
new = new_exe.display(),
|
||||||
|
cur = cur_exe.display()
|
||||||
|
);
|
||||||
|
fs::write(&bat_path, script).map_err(|e| format!("写入更新脚本失败: {}", e))?;
|
||||||
|
// 用 cmd /c 启动 bat 并隐藏窗口;ShellExecute 启动的进程不属于本进程 Job,
|
||||||
|
// 主进程退出后 update.bat 仍能继续执行
|
||||||
|
let windir = std::env::var("WINDIR").unwrap_or_else(|_| "C:\\Windows".into());
|
||||||
|
let cmd_exe = Path::new(&windir).join("System32").join("cmd.exe");
|
||||||
|
shell_execute("open", &cmd_exe, &format!("/c \"{}\"", bat_path.display()), 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- 命令 ----------
|
||||||
|
|
||||||
|
/// 获取当前应用版本
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn app_version(app: AppHandle) -> String {
|
||||||
|
app.package_info().version.to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 检查 Gitea 最新 release,返回版本对比与可用资产
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn update_check(app: AppHandle) -> Result<UpdateCheckResult, String> {
|
||||||
|
let latest = fetch_latest_release().await?;
|
||||||
|
let latest_version = latest.tag_name.trim_start_matches('v').to_string();
|
||||||
|
let current_version = app.package_info().version.to_string();
|
||||||
|
let has_update = version_gt(&latest_version, ¤t_version);
|
||||||
|
Ok(UpdateCheckResult {
|
||||||
|
current_version,
|
||||||
|
latest_version,
|
||||||
|
has_update,
|
||||||
|
install_type: if is_installed_version() { "installed".into() } else { "portable".into() },
|
||||||
|
release_name: latest.name,
|
||||||
|
release_body: latest.body,
|
||||||
|
assets: latest.assets,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 更新应用本体(安装阶段)。下载由前端下载模块完成,本命令接收已下载的
|
||||||
|
/// 安装包路径(便携版 thing_{v}_x64.exe / 安装版 thing_{v}_x64-setup.exe)。
|
||||||
|
/// 便携版:copy 到临时目录 → update.bat 覆盖重启;
|
||||||
|
/// 安装版:copy 到临时目录 → 提权静默安装 /S。
|
||||||
|
/// 调用返回前会触发应用退出。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn update_install(app: AppHandle, downloaded_path: String) -> Result<(), String> {
|
||||||
|
let src = PathBuf::from(&downloaded_path);
|
||||||
|
if !src.exists() {
|
||||||
|
return Err(format!("下载文件不存在: {}", downloaded_path));
|
||||||
|
}
|
||||||
|
let installed = is_installed_version();
|
||||||
|
// copy 到临时目录:与 update.bat / 安装器解耦,随后即可删除下载目录中的源文件
|
||||||
|
let temp_dir = std::env::temp_dir().join("thing-update");
|
||||||
|
fs::create_dir_all(&temp_dir).map_err(|e| format!("创建临时目录失败: {}", e))?;
|
||||||
|
let file_name = src
|
||||||
|
.file_name()
|
||||||
|
.map(|n| n.to_string_lossy().to_string())
|
||||||
|
.unwrap_or_else(|| "thing_update.exe".into());
|
||||||
|
let dest = temp_dir.join(&file_name);
|
||||||
|
fs::copy(&src, &dest).map_err(|e| format!("复制安装包到临时目录失败: {}", e))?;
|
||||||
|
// 临时副本就绪后清理下载目录中的源文件(失败不影响更新流程)
|
||||||
|
let _ = fs::remove_file(&src);
|
||||||
|
|
||||||
|
let _ = app.emit(
|
||||||
|
UPDATE_PROGRESS,
|
||||||
|
UpdateProgress {
|
||||||
|
stage: "applying".into(),
|
||||||
|
percent: 100,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: if installed { "正在启动安装程序...".into() } else { "正在替换程序文件...".into() },
|
||||||
|
},
|
||||||
|
);
|
||||||
|
if installed {
|
||||||
|
// 提权静默安装 /S;UAC 确认期间主进程已退出,安装器可正常覆盖
|
||||||
|
shell_execute("runas", &dest, "/S", 0)?;
|
||||||
|
} else {
|
||||||
|
apply_portable_update(&dest)?;
|
||||||
|
}
|
||||||
|
// 延迟退出,确保 ShellExecute 已拉起子进程
|
||||||
|
app.exit(0);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用 ThingHK 内核更新:下载阶段已由下载模块完成,本命令仅做
|
||||||
|
/// need_stop(等待前端停止监控内核并确认)→ 解压 → 替换。
|
||||||
|
/// 进度通过 UPDATE_PROGRESS 事件上报,前端据 need_stop 弹出确认对话框。
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub async fn update_thinghk_apply(
|
||||||
|
app: AppHandle,
|
||||||
|
state: tauri::State<'_, ThinghkUpdateState>,
|
||||||
|
zip_path: String,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
state.reset();
|
||||||
|
let result = update_thinghk_apply_inner(&app, &state, PathBuf::from(&zip_path)).await;
|
||||||
|
if let Err(ref e) = result {
|
||||||
|
// 取消是用户主动行为,静默返回即可;其余失败 emit error 阶段避免前端进度卡死
|
||||||
|
if e != THINGHK_UPDATE_CANCELLED {
|
||||||
|
let _ = app.emit(
|
||||||
|
UPDATE_PROGRESS,
|
||||||
|
UpdateProgress {
|
||||||
|
stage: "error".into(),
|
||||||
|
percent: 0,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: e.clone(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn update_thinghk_apply_inner(
|
||||||
|
app: &AppHandle,
|
||||||
|
state: &ThinghkUpdateState,
|
||||||
|
zip_path: PathBuf,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
if !zip_path.exists() {
|
||||||
|
return Err(format!("下载文件不存在: {}", zip_path.display()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// need_stop:等待前端停止监控内核并确认(exe 被占用会导致覆盖失败)。
|
||||||
|
// 确认/取消由 confirm/cancel 命令跨命令唤醒(与 mihomo need_stop 同构)。
|
||||||
|
let _ = app.emit(
|
||||||
|
UPDATE_PROGRESS,
|
||||||
|
UpdateProgress {
|
||||||
|
stage: "need_stop".into(),
|
||||||
|
percent: 90,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: "需要停止监控内核才能继续安装".into(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let (tx, mut rx) = oneshot::channel::<()>();
|
||||||
|
*state.confirm_tx.lock().unwrap_or_else(|e| e.into_inner()) = Some(tx);
|
||||||
|
let mut cancel_rx = state.cancel_rx.clone();
|
||||||
|
loop {
|
||||||
|
if state.cancel_flag.load(Ordering::SeqCst) {
|
||||||
|
*state.confirm_tx.lock().unwrap_or_else(|e| e.into_inner()) = None;
|
||||||
|
return Err(THINGHK_UPDATE_CANCELLED.to_string());
|
||||||
|
}
|
||||||
|
tokio::select! {
|
||||||
|
_ = &mut rx => break,
|
||||||
|
_ = cancel_rx.changed() => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解压阶段
|
||||||
|
let _ = app.emit(
|
||||||
|
UPDATE_PROGRESS,
|
||||||
|
UpdateProgress {
|
||||||
|
stage: "extracting".into(),
|
||||||
|
percent: 95,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: "正在解压内核...".into(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let temp_dir = std::env::temp_dir().join("thing-update");
|
||||||
|
let extract_dir = temp_dir.join("thinghk_extract");
|
||||||
|
let _ = fs::remove_dir_all(&extract_dir);
|
||||||
|
extract_zip(&zip_path, &extract_dir)?;
|
||||||
|
|
||||||
|
// 在解压目录中查找 ThingHK.exe
|
||||||
|
let exe_path = find_thinghk_exe(&extract_dir).ok_or("内核包中未找到 ThingHK.exe".to_string())?;
|
||||||
|
let app_data = app
|
||||||
|
.path()
|
||||||
|
.app_data_dir()
|
||||||
|
.map_err(|e| format!("获取数据目录失败: {}", e))?;
|
||||||
|
let cores_dir = app_data.join("monitor").join("cores");
|
||||||
|
fs::create_dir_all(&cores_dir).map_err(|e| format!("创建内核目录失败: {}", e))?;
|
||||||
|
fs::copy(&exe_path, cores_dir.join("ThingHK.exe"))
|
||||||
|
.map_err(|e| format!("覆盖内核文件失败(请确认监控模块已停止): {}", e))?;
|
||||||
|
|
||||||
|
// 清理临时文件
|
||||||
|
let _ = fs::remove_file(&zip_path);
|
||||||
|
let _ = fs::remove_dir_all(&extract_dir);
|
||||||
|
let _ = app.emit(
|
||||||
|
UPDATE_PROGRESS,
|
||||||
|
UpdateProgress {
|
||||||
|
stage: "done".into(),
|
||||||
|
percent: 100,
|
||||||
|
downloaded_bytes: 0,
|
||||||
|
total_bytes: None,
|
||||||
|
message: "ThingHK 内核更新完成".into(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 前端已停止监控内核,确认继续解压替换(唤醒 need_stop 等待)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn update_thinghk_confirm(state: tauri::State<'_, ThinghkUpdateState>) -> Result<(), String> {
|
||||||
|
state.confirm();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 取消 ThingHK 内核更新(need_stop 等待阶段有效:唤醒 apply 以「已取消」返回,zip 保留便于重试)
|
||||||
|
#[tauri::command]
|
||||||
|
#[specta::specta]
|
||||||
|
pub fn update_thinghk_cancel(state: tauri::State<'_, ThinghkUpdateState>) -> Result<(), String> {
|
||||||
|
state.cancel();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn find_thinghk_exe(dir: &Path) -> Option<PathBuf> {
|
||||||
|
if let Ok(entries) = fs::read_dir(dir) {
|
||||||
|
for entry in entries.flatten() {
|
||||||
|
let path = entry.path();
|
||||||
|
if path.is_dir() {
|
||||||
|
if let Some(found) = find_thinghk_exe(&path) {
|
||||||
|
return Some(found);
|
||||||
|
}
|
||||||
|
} else if path
|
||||||
|
.file_name()
|
||||||
|
.and_then(|n| n.to_str())
|
||||||
|
.map(|s| s.eq_ignore_ascii_case("ThingHK.exe"))
|
||||||
|
.unwrap_or(false)
|
||||||
|
{
|
||||||
|
return Some(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
@@ -0,0 +1,250 @@
|
|||||||
|
//! Win32 屏幕/光标/DPI 工具 —— 跨模块共享的平台封装。
|
||||||
|
//!
|
||||||
|
//! 从 `clipboard::popup` 迁出,供剪贴板弹窗、快速面板、托盘菜单等多窗口模块统一引用,
|
||||||
|
//! 避免其他模块反向依赖剪贴板模块。
|
||||||
|
|
||||||
|
/// 获取鼠标位置(屏幕坐标,物理像素)
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn get_cursor_pos() -> Option<(i32, i32)> {
|
||||||
|
use windows_sys::Win32::Foundation::POINT;
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::GetCursorPos;
|
||||||
|
|
||||||
|
let mut pt = POINT { x: 0, y: 0 };
|
||||||
|
unsafe {
|
||||||
|
if GetCursorPos(&mut pt) != 0 {
|
||||||
|
Some((pt.x, pt.y))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取主屏工作区尺寸(排除任务栏,物理像素)
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn get_work_area() -> Option<(f64, f64)> {
|
||||||
|
use windows_sys::Win32::Foundation::RECT;
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::{
|
||||||
|
SystemParametersInfoW, SPI_GETWORKAREA,
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut rect = RECT { left: 0, top: 0, right: 0, bottom: 0 };
|
||||||
|
unsafe {
|
||||||
|
if SystemParametersInfoW(SPI_GETWORKAREA, 0, &mut rect as *mut _ as *mut _, 0) != 0 {
|
||||||
|
Some(((rect.right - rect.left) as f64, (rect.bottom - rect.top) as f64))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取指定点所在显示器的工作区(排除任务栏),返回 (left, top, right, bottom) 物理像素。
|
||||||
|
/// 使用 MonitorFromPoint 支持多显示器环境。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn get_work_area_at_point(x: i32, y: i32) -> Option<(i32, i32, i32, i32)> {
|
||||||
|
use windows_sys::Win32::Foundation::POINT;
|
||||||
|
use windows_sys::Win32::Graphics::Gdi::{
|
||||||
|
GetMonitorInfoW, MonitorFromPoint, MONITORINFO, MONITOR_DEFAULTTONEAREST,
|
||||||
|
};
|
||||||
|
|
||||||
|
let pt = POINT { x, y };
|
||||||
|
let hmon = unsafe { MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST) };
|
||||||
|
let mut mi: MONITORINFO = unsafe { std::mem::zeroed() };
|
||||||
|
mi.cbSize = std::mem::size_of::<MONITORINFO>() as u32;
|
||||||
|
unsafe {
|
||||||
|
if GetMonitorInfoW(hmon, &mut mi) != 0 {
|
||||||
|
let rc = mi.rcWork;
|
||||||
|
Some((rc.left, rc.top, rc.right, rc.bottom))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取指定点所在显示器的完整边界(含任务栏),返回 (left, top, right, bottom) 物理像素。
|
||||||
|
/// 与 get_work_area_at_point 不同,这里用 rcMonitor 而非 rcWork,
|
||||||
|
/// 用于需要在鼠标位置弹出、允许贴近/覆盖任务栏的场景(如托盘菜单)。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn get_monitor_bounds_at_point(x: i32, y: i32) -> Option<(i32, i32, i32, i32)> {
|
||||||
|
use windows_sys::Win32::Foundation::POINT;
|
||||||
|
use windows_sys::Win32::Graphics::Gdi::{
|
||||||
|
GetMonitorInfoW, MonitorFromPoint, MONITORINFO, MONITOR_DEFAULTTONEAREST,
|
||||||
|
};
|
||||||
|
|
||||||
|
let pt = POINT { x, y };
|
||||||
|
let hmon = unsafe { MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST) };
|
||||||
|
let mut mi: MONITORINFO = unsafe { std::mem::zeroed() };
|
||||||
|
mi.cbSize = std::mem::size_of::<MONITORINFO>() as u32;
|
||||||
|
unsafe {
|
||||||
|
if GetMonitorInfoW(hmon, &mut mi) != 0 {
|
||||||
|
let rc = mi.rcMonitor;
|
||||||
|
Some((rc.left, rc.top, rc.right, rc.bottom))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取指定点所在显示器的有效 DPI。
|
||||||
|
/// scale factor = dpi / 96。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn get_dpi_for_point(x: i32, y: i32) -> Option<u32> {
|
||||||
|
use windows_sys::Win32::Foundation::POINT;
|
||||||
|
use windows_sys::Win32::Graphics::Gdi::{MonitorFromPoint, MONITOR_DEFAULTTONEAREST};
|
||||||
|
use windows_sys::Win32::UI::HiDpi::{GetDpiForMonitor, MDT_EFFECTIVE_DPI};
|
||||||
|
|
||||||
|
let pt = POINT { x, y };
|
||||||
|
let hmon = unsafe { MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST) };
|
||||||
|
let mut dpi_x: u32 = 0;
|
||||||
|
let mut dpi_y: u32 = 0;
|
||||||
|
unsafe {
|
||||||
|
if GetDpiForMonitor(hmon, MDT_EFFECTIVE_DPI, &mut dpi_x, &mut dpi_y) == 0 {
|
||||||
|
Some(dpi_x)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 强制将窗口置为前台(绕过 Windows 前台锁定限制)。
|
||||||
|
/// Tauri 的 set_focus 内部调用 SetForegroundWindow,受前台锁定(foreground lock)限制:
|
||||||
|
/// 本进程不拥有前台时调用会被系统忽略,导致已打开但被遮挡的窗口无法到前台。
|
||||||
|
/// 先模拟 Alt 键释放以重置前台锁定,再 SetForegroundWindow + BringWindowToTop。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn force_foreground(hwnd: isize) {
|
||||||
|
use windows_sys::Win32::UI::Input::KeyboardAndMouse::{
|
||||||
|
keybd_event, KEYEVENTF_KEYUP, VK_MENU,
|
||||||
|
};
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::{BringWindowToTop, SetForegroundWindow};
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
keybd_event(VK_MENU as u8, 0, KEYEVENTF_KEYUP, 0);
|
||||||
|
let _ = SetForegroundWindow(hwnd);
|
||||||
|
let _ = BringWindowToTop(hwnd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用 WS_EX_NOACTIVATE | WS_EX_TOOLWINDOW 扩展样式到指定窗口。
|
||||||
|
/// 用于预览窗等不抢焦点的悬浮窗:窗口可接收鼠标交互但不激活、不进 Alt-Tab。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn apply_no_activate(hwnd: isize) {
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::{
|
||||||
|
GetWindowLongPtrW, SetWindowLongPtrW, GWL_EXSTYLE, WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW,
|
||||||
|
};
|
||||||
|
unsafe {
|
||||||
|
let ex = GetWindowLongPtrW(hwnd, GWL_EXSTYLE);
|
||||||
|
let new_ex = ex | (WS_EX_NOACTIVATE as isize) | (WS_EX_TOOLWINDOW as isize);
|
||||||
|
SetWindowLongPtrW(hwnd, GWL_EXSTYLE, new_ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 鼠标左键当前是否按下(GetAsyncKeyState,全局异步状态,无需窗口焦点)。
|
||||||
|
/// 供看护线程轮询检测"点击外部"(配合按下沿判定)。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn is_left_button_down() -> bool {
|
||||||
|
use windows_sys::Win32::UI::Input::KeyboardAndMouse::GetAsyncKeyState;
|
||||||
|
|
||||||
|
const VK_LBUTTON: i32 = 0x01;
|
||||||
|
((unsafe { GetAsyncKeyState(VK_LBUTTON) } as u32) & 0x8000) != 0
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn is_left_button_down() -> bool {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 强制窗口应用系统圆角(DWMWCP_ROUND,Win11 约 8px)。
|
||||||
|
/// 带 WS_EX_NOACTIVATE 等扩展样式的悬浮窗系统不会自动圆角(呈现直角),
|
||||||
|
/// 与常规弹窗外观不一致;通过 DWMWA_WINDOW_CORNER_PREFERENCE 显式指定圆角偏好。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn apply_rounded_corners(hwnd: isize) {
|
||||||
|
use windows_sys::Win32::Graphics::Dwm::{
|
||||||
|
DwmSetWindowAttribute, DWMWA_WINDOW_CORNER_PREFERENCE, DWMWCP_ROUND,
|
||||||
|
};
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
let pref: i32 = DWMWCP_ROUND;
|
||||||
|
let _ = DwmSetWindowAttribute(
|
||||||
|
hwnd,
|
||||||
|
DWMWA_WINDOW_CORNER_PREFERENCE as u32,
|
||||||
|
&pref as *const i32 as *const core::ffi::c_void,
|
||||||
|
std::mem::size_of::<i32>() as u32,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 以不激活方式显示窗口(SW_SHOWNOACTIVATE),避免抢走弹窗等前台窗口的焦点。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn show_no_activate(hwnd: isize) {
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::{ShowWindow, SW_SHOWNOACTIVATE};
|
||||||
|
unsafe {
|
||||||
|
ShowWindow(hwnd, SW_SHOWNOACTIVATE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 隐藏窗口(SW_HIDE)。供以原生方式显示(SW_SHOWNOACTIVATE)的悬浮窗兜底隐藏,
|
||||||
|
/// 与 Tauri 的 hide() 并存以确保任何路径下都被可靠隐藏。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn hide_window(hwnd: isize) {
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::{ShowWindow, SW_HIDE};
|
||||||
|
unsafe {
|
||||||
|
ShowWindow(hwnd, SW_HIDE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 系统自上次用户输入(鼠标/键盘)以来的空闲时长(毫秒)。
|
||||||
|
/// 用于闲时执行耗时后台任务(如文件索引构建),避免与应用运行/用户操作抢 IO。
|
||||||
|
/// GetLastInputInfo 的 dwTime 与 GetTickCount 同为系统启动后毫秒数,用 wrapping 减法防回绕。
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn get_idle_time_ms() -> u64 {
|
||||||
|
use windows_sys::Win32::System::SystemInformation::GetTickCount;
|
||||||
|
use windows_sys::Win32::UI::Input::KeyboardAndMouse::{
|
||||||
|
GetLastInputInfo, LASTINPUTINFO,
|
||||||
|
};
|
||||||
|
use std::mem::size_of;
|
||||||
|
|
||||||
|
let mut lii = LASTINPUTINFO {
|
||||||
|
cbSize: size_of::<LASTINPUTINFO>() as u32,
|
||||||
|
dwTime: 0,
|
||||||
|
};
|
||||||
|
unsafe {
|
||||||
|
if GetLastInputInfo(&mut lii) != 0 {
|
||||||
|
return GetTickCount().wrapping_sub(lii.dwTime) as u64;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
0
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 非 Windows 平台空实现 =====
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn get_cursor_pos() -> Option<(i32, i32)> { None }
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn get_work_area() -> Option<(f64, f64)> { None }
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn get_work_area_at_point(_x: i32, _y: i32) -> Option<(i32, i32, i32, i32)> { None }
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn get_dpi_for_point(_x: i32, _y: i32) -> Option<u32> { None }
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn get_monitor_bounds_at_point(_x: i32, _y: i32) -> Option<(i32, i32, i32, i32)> { None }
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn force_foreground(_hwnd: isize) {}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn apply_no_activate(_hwnd: isize) {}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn apply_rounded_corners(_hwnd: isize) {}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn show_no_activate(_hwnd: isize) {}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn hide_window(_hwnd: isize) {}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn get_idle_time_ms() -> u64 { 0 }
|
||||||
@@ -1,30 +1,30 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "thing",
|
"productName": "thing",
|
||||||
"version": "0.1.0",
|
"version": "26.8.4",
|
||||||
"identifier": "thing.lfeng.me",
|
"identifier": "thing.lfeng.me",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "bun run dev",
|
"beforeDevCommand": "bun run dev",
|
||||||
"devUrl": "http://localhost:1420",
|
"devUrl": "http://localhost:14210",
|
||||||
"beforeBuildCommand": "bun run build",
|
"beforeBuildCommand": "bun run build",
|
||||||
"frontendDist": "../dist"
|
"frontendDist": "../dist"
|
||||||
},
|
},
|
||||||
"app": {
|
"app": {
|
||||||
"windows": [
|
"windows": [
|
||||||
{
|
{
|
||||||
"title": "thing",
|
"title": "Thing",
|
||||||
"width": 1000,
|
"width": 1000,
|
||||||
"height": 700,
|
"height": 700,
|
||||||
"decorations": false,
|
"decorations": false,
|
||||||
"transparent": true,
|
"transparent": true,
|
||||||
"visible": false,
|
"visible": false,
|
||||||
"windowEffects": {
|
"windowEffects": {
|
||||||
"effects": ["acrylic", "mica"]
|
"effects": ["mica", "acrylic"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"security": {
|
"security": {
|
||||||
"csp": null
|
"csp": "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data: blob: asset: http://asset.localhost; font-src 'self' data:; connect-src ipc: http://ipc.localhost; media-src 'self' data: blob:"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
@@ -37,6 +37,11 @@
|
|||||||
"icons/icon.icns",
|
"icons/icon.icns",
|
||||||
"icons/icon.ico"
|
"icons/icon.ico"
|
||||||
],
|
],
|
||||||
"resources": ["binaries/*", "resources/thing-extension/**/*"]
|
"resources": ["binaries/*", "resources/thing-extension/**/*"],
|
||||||
|
"windows": {
|
||||||
|
"nsis": {
|
||||||
|
"compression": "lzma"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+132
-39
@@ -1,19 +1,28 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, onMounted, onUnmounted, shallowRef, computed, watch, type Component } from 'vue'
|
import { ref, onMounted, onUnmounted, shallowRef, computed, watch, type Component } from 'vue'
|
||||||
import { listen, type UnlistenFn } from '@tauri-apps/api/event'
|
import { listen, type UnlistenFn } from '@tauri-apps/api/event'
|
||||||
|
import { getCurrentWindow } from '@tauri-apps/api/window'
|
||||||
import TitleBar from '@/components/layout/TitleBar.vue'
|
import TitleBar from '@/components/layout/TitleBar.vue'
|
||||||
import Sidebar from '@/components/layout/Sidebar.vue'
|
import Sidebar from '@/components/layout/Sidebar.vue'
|
||||||
import ModuleContainer from '@/components/layout/ModuleContainer.vue'
|
import ModuleContainer from '@/components/layout/ModuleContainer.vue'
|
||||||
import { Toaster } from '@/components/ui/sonner'
|
import { Toaster } from '@/components/ui/sonner'
|
||||||
import { useAppStore } from '@/stores/appStore'
|
import { useAppStore } from '@/stores/appStore'
|
||||||
import { useScreenshotStore, type CaptureMode } from '@/stores/screenshotStore'
|
import { useScreenshotStore } from '@/stores/screenshotStore'
|
||||||
|
import { useQuickPanelStore } from '@/stores/quickpanelStore'
|
||||||
|
import { useMonitorStore } from '@/stores/monitorStore'
|
||||||
|
import { useProcessStore } from '@/stores/processStore'
|
||||||
import { TooltipProvider } from '@/components/ui/tooltip'
|
import { TooltipProvider } from '@/components/ui/tooltip'
|
||||||
import { moduleRegistry } from '@/modules/registry'
|
import { moduleRegistry } from '@/modules/registry'
|
||||||
import type { ModuleMeta } from '@/types/module'
|
import type { ModuleMeta } from '@/types/module'
|
||||||
import { pendingNewDownload, pendingOpenSettings } from '@/lib/trayEvents'
|
import { pendingNewDownload } from '@/lib/trayEvents'
|
||||||
|
import { EVENTS, STORAGE_KEYS, WINDOWS } from '@/lib/constants'
|
||||||
|
import { commands } from '@/lib/bindings'
|
||||||
|
|
||||||
const appStore = useAppStore()
|
const appStore = useAppStore()
|
||||||
const screenshotStore = useScreenshotStore()
|
const screenshotStore = useScreenshotStore()
|
||||||
|
const quickpanelStore = useQuickPanelStore()
|
||||||
|
const monitorStore = useMonitorStore()
|
||||||
|
const processStore = useProcessStore()
|
||||||
|
|
||||||
/** 侧边栏 / 标题栏需要的模块信息(id + name + icon) */
|
/** 侧边栏 / 标题栏需要的模块信息(id + name + icon) */
|
||||||
interface NavModule {
|
interface NavModule {
|
||||||
@@ -30,18 +39,13 @@ const toNavModule = (meta: ModuleMeta): NavModule => ({
|
|||||||
})
|
})
|
||||||
|
|
||||||
/** 上次激活的模块 ID(localStorage 持久化) */
|
/** 上次激活的模块 ID(localStorage 持久化) */
|
||||||
const LAST_MODULE_KEY = 'thing_last_module'
|
const LAST_MODULE_KEY = STORAGE_KEYS.lastModule
|
||||||
const activeModule = ref('')
|
const activeModule = ref('')
|
||||||
|
|
||||||
const activeComponent = shallowRef<Component | null>(null)
|
const activeComponent = shallowRef<Component | null>(null)
|
||||||
|
|
||||||
/** 预加载的监控模块组件(用于隐藏预渲染,确保 OSD 在启动时创建) */
|
/** 模块组件加载中(异步 import 未完成)标志,避免切换期间仍显示上一个模块内容 */
|
||||||
const monitorComponent = shallowRef<Component | null>(null)
|
const moduleLoading = ref(false)
|
||||||
|
|
||||||
/** 监控模块是否已启用 */
|
|
||||||
const monitorEnabled = computed(() =>
|
|
||||||
appStore.modules.find(m => m.id === 'monitor')?.enabled ?? false
|
|
||||||
)
|
|
||||||
|
|
||||||
/** 当前可显示的模块(内置模块 + 已启用的用户模块),按用户排序显示 */
|
/** 当前可显示的模块(内置模块 + 已启用的用户模块),按用户排序显示 */
|
||||||
const availableModules = computed<NavModule[]>(() => {
|
const availableModules = computed<NavModule[]>(() => {
|
||||||
@@ -63,9 +67,19 @@ const availableModules = computed<NavModule[]>(() => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** 模块加载请求序号:快速切换模块时丢弃过期加载结果,避免旧组件覆盖新组件 */
|
||||||
|
let moduleLoadSeq = 0
|
||||||
const loadModule = async (moduleId: string) => {
|
const loadModule = async (moduleId: string) => {
|
||||||
|
const seq = ++moduleLoadSeq
|
||||||
|
// 立即清空旧组件并进入加载态,避免异步 import 期间仍渲染上一个模块内容
|
||||||
|
// (否则 ModuleContainer 以 :key="activeModule" 重挂载旧组件,用户误以为切换失败)
|
||||||
|
activeComponent.value = null
|
||||||
|
moduleLoading.value = true
|
||||||
const component = await moduleRegistry.loadComponent(moduleId)
|
const component = await moduleRegistry.loadComponent(moduleId)
|
||||||
|
// 过期请求(期间用户又切换了模块)直接丢弃,不覆盖 activeComponent 也不触发钩子
|
||||||
|
if (seq !== moduleLoadSeq) return
|
||||||
activeComponent.value = component
|
activeComponent.value = component
|
||||||
|
moduleLoading.value = false
|
||||||
|
|
||||||
// 调用模块的 onActivate 生命周期钩子
|
// 调用模块的 onActivate 生命周期钩子
|
||||||
const config = moduleRegistry.getConfig(moduleId)
|
const config = moduleRegistry.getConfig(moduleId)
|
||||||
@@ -73,6 +87,9 @@ const loadModule = async (moduleId: string) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const handleModuleChange = (moduleId: string) => {
|
const handleModuleChange = (moduleId: string) => {
|
||||||
|
// 同模块不重新加载(保留组件状态);搜索/托盘跳转到当前模块时仅触发 tab 导航
|
||||||
|
if (activeModule.value === moduleId) return
|
||||||
|
|
||||||
// 调用上一个模块的 onDeactivate 钩子
|
// 调用上一个模块的 onDeactivate 钩子
|
||||||
const prevConfig = moduleRegistry.getConfig(activeModule.value)
|
const prevConfig = moduleRegistry.getConfig(activeModule.value)
|
||||||
prevConfig?.lifecycle?.onDeactivate?.()
|
prevConfig?.lifecycle?.onDeactivate?.()
|
||||||
@@ -82,10 +99,59 @@ const handleModuleChange = (moduleId: string) => {
|
|||||||
loadModule(moduleId)
|
loadModule(moduleId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 搜索跳转与普通切换同路径:补齐 onDeactivate 钩子,避免旧模块资源泄漏
|
||||||
const handleSearch = (moduleId: string) => {
|
const handleSearch = (moduleId: string) => {
|
||||||
activeModule.value = moduleId
|
handleModuleChange(moduleId)
|
||||||
localStorage.setItem(LAST_MODULE_KEY, moduleId)
|
}
|
||||||
loadModule(moduleId)
|
|
||||||
|
// 为单个下载任务创建专属的一次性下载窗口(浏览器扩展发起)。
|
||||||
|
// label 带 task id 保证同时多个下载时各占一个窗口;对应 capabilities/download-window.json 的 glob "download-window-*"
|
||||||
|
async function openDownloadWindow(taskId: string) {
|
||||||
|
const { WebviewWindow } = await import('@tauri-apps/api/webviewWindow')
|
||||||
|
const { currentMonitor } = await import('@tauri-apps/api/window')
|
||||||
|
const label = `${WINDOWS.downloadWindow}-${taskId}`
|
||||||
|
try {
|
||||||
|
const existing = await WebviewWindow.getByLabel(label)
|
||||||
|
if (existing) {
|
||||||
|
// 已存在:用 Rust 端强制置前(绕过前台锁定,双屏/后台创建也能到前台)
|
||||||
|
await commands.downloaderFocusWindow(label)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// 定位到主窗口当前所在显示器的中央偏上
|
||||||
|
const monitor = await currentMonitor()
|
||||||
|
const scale = monitor?.scaleFactor ?? 1
|
||||||
|
const w = 420
|
||||||
|
const h = 176
|
||||||
|
const x = Math.round(((monitor?.size.width ?? 1920) / scale - w) / 2)
|
||||||
|
const y = Math.round(((monitor?.size.height ?? 1080) / scale - h) / 2 * 0.8)
|
||||||
|
const win = new WebviewWindow(label, {
|
||||||
|
url: `index.html#download-window?task=${encodeURIComponent(taskId)}`,
|
||||||
|
title: '下载',
|
||||||
|
width: w,
|
||||||
|
height: h,
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
decorations: false,
|
||||||
|
transparent: true,
|
||||||
|
resizable: false,
|
||||||
|
maximizable: false,
|
||||||
|
minimizable: true,
|
||||||
|
shadow: true,
|
||||||
|
visible: false,
|
||||||
|
focus: false,
|
||||||
|
// 默认不置顶、放入任务栏(可最小化,任务栏图标唤出);下载完成时窗口置前提醒。
|
||||||
|
// 隐藏创建:由 DownloadWindow 贴合内容高度后一次性 show,避免显示后再 resize 闪烁
|
||||||
|
})
|
||||||
|
win.once('tauri://error', (e) => console.error('创建下载窗口失败:', e))
|
||||||
|
// 窗口改为隐藏创建:由 DownloadWindow 在 onMounted 贴合内容高度后一次性 show,
|
||||||
|
// 避免"先以 176 高度显示、再 resize 到内容高度"造成的闪烁。
|
||||||
|
// 此处仅保留异常兜底:WebView 加载异常导致 DownloadWindow 未 reveal 时,强制显示。
|
||||||
|
win.once('tauri://created', () => {
|
||||||
|
window.setTimeout(() => { void commands.downloaderFocusWindow(label) }, 2500)
|
||||||
|
})
|
||||||
|
} catch (e) {
|
||||||
|
console.error('创建下载窗口失败:', e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const getFallbackModule = () => {
|
const getFallbackModule = () => {
|
||||||
@@ -96,15 +162,17 @@ const getFallbackModule = () => {
|
|||||||
return fallback?.id || 'settings'
|
return fallback?.id || 'settings'
|
||||||
}
|
}
|
||||||
|
|
||||||
watch(() => appStore.enabledModules.length, () => {
|
// 按 id 列表监听(而非 length):同时禁用一个 + 启用另一个时 length 不变,会漏检回退
|
||||||
|
watch(() => appStore.enabledModules.map(m => m.id).join(','), () => {
|
||||||
// 启动期间 activeModule 尚未确定,跳过
|
// 启动期间 activeModule 尚未确定,跳过
|
||||||
if (!activeModule.value) return
|
if (!activeModule.value) return
|
||||||
const enabledIds = appStore.enabledModules.map(m => m.id)
|
const enabledIds = appStore.enabledModules.map(m => m.id)
|
||||||
if (activeModule.value !== 'settings' && !enabledIds.includes(activeModule.value)) {
|
if (activeModule.value !== 'settings' && !enabledIds.includes(activeModule.value)) {
|
||||||
const fallback = getFallbackModule()
|
const fallback = getFallbackModule()
|
||||||
activeModule.value = fallback
|
handleModuleChange(fallback)
|
||||||
loadModule(fallback)
|
|
||||||
}
|
}
|
||||||
|
// 模块启用/禁用变化时重新同步快速面板命令缓存
|
||||||
|
quickpanelStore.syncCommands()
|
||||||
})
|
})
|
||||||
|
|
||||||
/** 计算启动时应打开的默认模块:优先上次记忆,其次排序第一个 */
|
/** 计算启动时应打开的默认模块:优先上次记忆,其次排序第一个 */
|
||||||
@@ -129,21 +197,48 @@ const resolveDefaultModule = (): string => {
|
|||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
await appStore.init().catch(e => console.error('App init error:', e))
|
await appStore.init().catch(e => console.error('App init error:', e))
|
||||||
|
|
||||||
// 预加载监控模块组件,用于隐藏预渲染
|
// 初始化监控 store:订阅后端 monitor-data / monitor-network 等事件,
|
||||||
// 这样即使启动时默认模块不是监控,MonitorModule 的 onMounted 也会执行
|
// 使 OSD 窗口在应用启动后即可接收数据流,不依赖用户手动打开监控模块。
|
||||||
// 从而在应用启动时自动创建 OSD 窗口(如果 OSD 配置已开启)
|
// init() 幂等:MonitorModule 挂载时再次调用不会重复订阅。
|
||||||
if (monitorEnabled.value) {
|
monitorStore.init()
|
||||||
monitorComponent.value = await moduleRegistry.loadComponent('monitor')
|
// 显式初始化 OSD
|
||||||
}
|
// 使 OSD 窗口在应用启动时创建(若配置已开启),且不依赖监控模块挂载/卸载
|
||||||
|
monitorStore.initOsd()
|
||||||
|
|
||||||
const defaultModule = resolveDefaultModule()
|
const defaultModule = resolveDefaultModule()
|
||||||
activeModule.value = defaultModule
|
activeModule.value = defaultModule
|
||||||
loadModule(defaultModule)
|
loadModule(defaultModule)
|
||||||
|
|
||||||
// 监听托盘菜单事件
|
// 快速面板:同步命令缓存与设置到 localStorage,供独立窗口读取
|
||||||
// tray:toggle-osd 由 MonitorModule 直接监听(预渲染实例始终挂载)
|
quickpanelStore.syncCommands()
|
||||||
|
quickpanelStore.syncSettings()
|
||||||
|
// 初始化文件索引 DB 并恢复增量监听(上次构建过索引时自动恢复,不重建)
|
||||||
|
commands.quickpanelInitFileIndex().catch(e => console.error('文件索引初始化失败:', e))
|
||||||
|
// 监听快速面板执行命令事件:显示主窗口 + 切换模块
|
||||||
trayUnlisteners.push(
|
trayUnlisteners.push(
|
||||||
await listen('tray:new-download', () => {
|
await listen<{ moduleId: string }>('quickpanel-execute-command', async (e) => {
|
||||||
|
// Rust 端强制置前(绕过 Windows 前台锁定,主窗口被遮挡时也能到前台)
|
||||||
|
try {
|
||||||
|
await commands.quickpanelFocusMainWindow()
|
||||||
|
} catch {
|
||||||
|
// 回退:前端 show + setFocus
|
||||||
|
const win = getCurrentWindow()
|
||||||
|
try {
|
||||||
|
await win.show()
|
||||||
|
await win.unminimize()
|
||||||
|
await win.setFocus()
|
||||||
|
} catch {
|
||||||
|
/* 忽略窗口操作失败 */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
handleSearch(e.payload.moduleId)
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
// 监听托盘菜单事件
|
||||||
|
// tray:toggle-osd 由 monitorStore.initOsd() 注册的监听处理(与监控模块生命周期解耦)
|
||||||
|
trayUnlisteners.push(
|
||||||
|
await listen(EVENTS.trayNewDownload, () => {
|
||||||
// 设置标志位,DownloaderModule 挂载后消费
|
// 设置标志位,DownloaderModule 挂载后消费
|
||||||
pendingNewDownload.value = true
|
pendingNewDownload.value = true
|
||||||
// 切换到下载模块(如果未启用则切换到设置)
|
// 切换到下载模块(如果未启用则切换到设置)
|
||||||
@@ -153,18 +248,17 @@ onMounted(async () => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
// 浏览器扩展新增下载:为该任务创建一个专属的一次性下载窗口(不打断主界面)。
|
||||||
|
// 主窗口本身无需置前,下载进度/完成事件由独立窗口自行监听。
|
||||||
trayUnlisteners.push(
|
trayUnlisteners.push(
|
||||||
await listen('tray:open-settings', () => {
|
await listen<{ id: string }>(EVENTS.downloadExtensionAdded, (e) => {
|
||||||
pendingOpenSettings.value = true
|
if (!e.payload?.id) return
|
||||||
handleModuleChange('settings')
|
void openDownloadWindow(e.payload.id)
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
// 托盘截图:直接触发截图流程(不切换模块,覆盖层/编辑器独立窗口)
|
|
||||||
trayUnlisteners.push(
|
trayUnlisteners.push(
|
||||||
await listen<CaptureMode>('tray:start-screenshot', (e) => {
|
await listen(EVENTS.trayOpenSettings, () => {
|
||||||
screenshotStore.startCapture(e.payload || 'region').catch(err =>
|
handleModuleChange('settings')
|
||||||
console.error('[screenshot] 托盘触发截图失败:', err)
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
// 截图导出监听(应用级常驻,确保任何来源的截图都记录到历史)
|
// 截图导出监听(应用级常驻,确保任何来源的截图都记录到历史)
|
||||||
@@ -176,6 +270,10 @@ const trayUnlisteners: UnlistenFn[] = []
|
|||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
trayUnlisteners.forEach(fn => fn())
|
trayUnlisteners.forEach(fn => fn())
|
||||||
screenshotStore.destroyExportListener()
|
screenshotStore.destroyExportListener()
|
||||||
|
// 释放 OSD 事件监听与配置 watcher
|
||||||
|
monitorStore.disposeOsd()
|
||||||
|
// 释放进程状态事件监听
|
||||||
|
processStore.destroyListener()
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -189,14 +287,9 @@ onUnmounted(() => {
|
|||||||
:active-module="activeModule"
|
:active-module="activeModule"
|
||||||
@change="handleModuleChange"
|
@change="handleModuleChange"
|
||||||
/>
|
/>
|
||||||
<ModuleContainer :active-component="activeComponent" :active-module="activeModule" />
|
<ModuleContainer :active-component="activeComponent" :active-module="activeModule" :loading="moduleLoading" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Toaster position="bottom-right" rich-colors close-button :style="{ zIndex: 99999 }" />
|
<Toaster position="bottom-right" rich-colors close-button :style="{ zIndex: 99999 }" />
|
||||||
<!-- 预渲染监控模块(隐藏):确保 OSD 窗口在应用启动时创建,不依赖用户切换到监控模块。
|
|
||||||
当 activeModule === 'monitor' 时不渲染(由 ModuleContainer 正常渲染),避免重复实例 -->
|
|
||||||
<div v-if="monitorComponent && monitorEnabled && activeModule !== 'monitor'" style="display:none">
|
|
||||||
<component :is="monitorComponent" />
|
|
||||||
</div>
|
|
||||||
</TooltipProvider>
|
</TooltipProvider>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,16 +1,33 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type { Component } from 'vue'
|
import type { Component } from 'vue'
|
||||||
|
import { ref, watch } from 'vue'
|
||||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||||
|
import { Skeleton } from '@/components/ui/skeleton'
|
||||||
|
|
||||||
defineProps<{
|
const props = defineProps<{
|
||||||
activeComponent: Component | null
|
activeComponent: Component | null
|
||||||
activeModule: string
|
activeModule: string
|
||||||
|
loading: boolean
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
const containerRef = ref<HTMLElement | null>(null)
|
||||||
|
|
||||||
|
// 切换模块时重置主滚动区位置,避免新模块沿用上一个模块的滚动距离
|
||||||
|
watch(
|
||||||
|
() => props.activeModule,
|
||||||
|
() => {
|
||||||
|
const viewport = containerRef.value?.querySelector<HTMLElement>(
|
||||||
|
'[data-slot="scroll-area-viewport"]'
|
||||||
|
)
|
||||||
|
if (viewport) viewport.scrollTop = 0
|
||||||
|
}
|
||||||
|
)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<main
|
<main
|
||||||
class="flex-1"
|
ref="containerRef"
|
||||||
|
class="flex-1 min-w-0"
|
||||||
:style="{ backgroundColor: 'var(--effect-bg)', backdropFilter: 'var(--effect-blur)' }"
|
:style="{ backgroundColor: 'var(--effect-bg)', backdropFilter: 'var(--effect-blur)' }"
|
||||||
>
|
>
|
||||||
<ScrollArea data-main-scroll class="h-full w-full">
|
<ScrollArea data-main-scroll class="h-full w-full">
|
||||||
@@ -22,6 +39,30 @@ defineProps<{
|
|||||||
>
|
>
|
||||||
<component :is="activeComponent" />
|
<component :is="activeComponent" />
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
v-else-if="loading"
|
||||||
|
key="loading"
|
||||||
|
class="h-full w-full p-6"
|
||||||
|
>
|
||||||
|
<!-- 模块加载骨架:撑起画面,避免空白闪屏 -->
|
||||||
|
<div class="h-full max-w-5xl mx-auto space-y-5">
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
<Skeleton class="h-8 w-40" />
|
||||||
|
<Skeleton class="h-6 w-24 ml-auto" />
|
||||||
|
</div>
|
||||||
|
<div class="grid gap-4 md:grid-cols-2">
|
||||||
|
<div v-for="n in 4" :key="n" class="rounded-lg border p-5 space-y-4">
|
||||||
|
<div class="flex items-center justify-between">
|
||||||
|
<Skeleton class="h-5 w-32" />
|
||||||
|
<Skeleton class="h-5 w-16" />
|
||||||
|
</div>
|
||||||
|
<Skeleton class="h-4 w-full" />
|
||||||
|
<Skeleton class="h-4 w-5/6" />
|
||||||
|
<Skeleton class="h-4 w-2/3" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div
|
<div
|
||||||
v-else
|
v-else
|
||||||
key="empty"
|
key="empty"
|
||||||
|
|||||||
@@ -31,14 +31,14 @@ const displayModules = computed(() => {
|
|||||||
<Button
|
<Button
|
||||||
:variant="activeModule === module.id ? 'default' : 'ghost'"
|
:variant="activeModule === module.id ? 'default' : 'ghost'"
|
||||||
size="icon"
|
size="icon"
|
||||||
class="h-10 w-10 rounded-lg transition-[background-color,color,box-shadow] duration-300"
|
class="size-10 rounded-lg transition-[background-color,color,box-shadow] duration-300"
|
||||||
:class="{
|
:class="{
|
||||||
'bg-primary text-primary-foreground shadow-md': activeModule === module.id,
|
'bg-primary text-primary-foreground shadow-md': activeModule === module.id,
|
||||||
'hover:bg-secondary/50': activeModule !== module.id
|
'hover:bg-secondary/50': activeModule !== module.id
|
||||||
}"
|
}"
|
||||||
@click="emit('change', module.id)"
|
@click="activeModule !== module.id && emit('change', module.id)"
|
||||||
>
|
>
|
||||||
<component :is="getModuleIcon(module.icon)" class="h-5 w-5" />
|
<component :is="getModuleIcon(module.icon)" class="size-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent side="right" class="w-fit">
|
<TooltipContent side="right" class="w-fit">
|
||||||
@@ -55,14 +55,14 @@ const displayModules = computed(() => {
|
|||||||
<Button
|
<Button
|
||||||
:variant="activeModule === 'settings' ? 'default' : 'ghost'"
|
:variant="activeModule === 'settings' ? 'default' : 'ghost'"
|
||||||
size="icon"
|
size="icon"
|
||||||
class="h-10 w-10 rounded-lg transition-[background-color,color,box-shadow] duration-300"
|
class="size-10 rounded-lg transition-[background-color,color,box-shadow] duration-300"
|
||||||
:class="{
|
:class="{
|
||||||
'bg-primary text-primary-foreground shadow-md': activeModule === 'settings',
|
'bg-primary text-primary-foreground shadow-md': activeModule === 'settings',
|
||||||
'hover:bg-secondary/50': activeModule !== 'settings'
|
'hover:bg-secondary/50': activeModule !== 'settings'
|
||||||
}"
|
}"
|
||||||
@click="emit('change', 'settings')"
|
@click="activeModule !== 'settings' && emit('change', 'settings')"
|
||||||
>
|
>
|
||||||
<Settings class="h-5 w-5" />
|
<Settings class="size-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent side="right" class="w-fit">
|
<TooltipContent side="right" class="w-fit">
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, computed, onMounted, onUnmounted, nextTick } from 'vue'
|
import { ref, computed, onMounted, onUnmounted, nextTick, watch } from 'vue'
|
||||||
import { Search, Settings, ChevronRight, ArrowUp } from '@lucide/vue'
|
import { Search, Settings, ChevronRight, ArrowUp, Check, Loader2 } from '@lucide/vue'
|
||||||
import { Input } from '@/components/ui/input'
|
import { Input } from '@/components/ui/input'
|
||||||
import { invoke } from '@tauri-apps/api/core'
|
import { invoke } from '@tauri-apps/api/core'
|
||||||
import { getCurrentWindow } from '@tauri-apps/api/window'
|
import { getCurrentWindow } from '@tauri-apps/api/window'
|
||||||
import { useSearchStore, type SearchItem } from '@/stores/searchStore'
|
import { useSearchStore, type SearchItem } from '@/stores/searchStore'
|
||||||
import { useModuleTabsStore } from '@/stores/moduleTabsStore'
|
import { useModuleTabsStore } from '@/stores/moduleTabsStore'
|
||||||
|
// 复用快速面板匹配引擎(支持拼音/子序列模糊匹配)
|
||||||
|
import { getTextForms, bestScore } from '@/modules/quickpanel/engine'
|
||||||
|
|
||||||
const tabsStore = useModuleTabsStore()
|
const tabsStore = useModuleTabsStore()
|
||||||
|
|
||||||
@@ -23,10 +25,12 @@ const searchStore = useSearchStore()
|
|||||||
|
|
||||||
const filteredModules = computed(() => {
|
const filteredModules = computed(() => {
|
||||||
if (!searchQuery.value.trim()) return []
|
if (!searchQuery.value.trim()) return []
|
||||||
const query = searchQuery.value.toLowerCase()
|
const query = searchQuery.value.trim()
|
||||||
return props.modules.filter(m =>
|
return props.modules
|
||||||
m.name.toLowerCase().includes(query) || m.id.toLowerCase().includes(query)
|
.map(m => ({ m, score: Math.max(bestScore(query, getTextForms(m.name)), bestScore(query, getTextForms(m.id))) }))
|
||||||
)
|
.filter(e => e.score > 0)
|
||||||
|
.sort((a, b) => b.score - a.score)
|
||||||
|
.map(e => e.m)
|
||||||
})
|
})
|
||||||
|
|
||||||
const searchResults = computed(() => {
|
const searchResults = computed(() => {
|
||||||
@@ -38,6 +42,11 @@ const hasSearchContent = computed(() => {
|
|||||||
return searchQuery.value.trim().length > 0
|
return searchQuery.value.trim().length > 0
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** 模块 id → 名称 查找表(用于搜索结果中标注所属模块) */
|
||||||
|
const moduleNameById = computed(() => {
|
||||||
|
return new Map(props.modules.map(m => [m.id, m.name]))
|
||||||
|
})
|
||||||
|
|
||||||
const handleSearchSelect = (moduleId: string) => {
|
const handleSearchSelect = (moduleId: string) => {
|
||||||
emit('search', moduleId)
|
emit('search', moduleId)
|
||||||
searchQuery.value = ''
|
searchQuery.value = ''
|
||||||
@@ -46,6 +55,10 @@ const handleSearchSelect = (moduleId: string) => {
|
|||||||
|
|
||||||
const handleSettingSelect = (item: SearchItem) => {
|
const handleSettingSelect = (item: SearchItem) => {
|
||||||
emit('search', item.moduleId)
|
emit('search', item.moduleId)
|
||||||
|
// 记录待跳转 tab:模块挂载后由 useModuleTabs 自动切换(模块已挂载时同样生效)
|
||||||
|
if (item.tab) {
|
||||||
|
tabsStore.setPendingTab(item.moduleId, item.tab)
|
||||||
|
}
|
||||||
if (item.action) {
|
if (item.action) {
|
||||||
item.action()
|
item.action()
|
||||||
}
|
}
|
||||||
@@ -53,6 +66,65 @@ const handleSettingSelect = (item: SearchItem) => {
|
|||||||
isSearchFocused.value = false
|
isSearchFocused.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ===== 搜索下拉键盘导航(↑↓ 移动 / Enter 选择 / ESC 清空) =====
|
||||||
|
|
||||||
|
/** 下拉扁平结果(模块在前、设置项在后),用于统一索引 */
|
||||||
|
const flatResults = computed(() => [
|
||||||
|
...filteredModules.value.map(m => ({ kind: 'module' as const, id: m.id })),
|
||||||
|
...searchResults.value.map(s => ({ kind: 'setting' as const, id: s.id }))
|
||||||
|
])
|
||||||
|
|
||||||
|
/** 当前高亮索引(-1 无高亮) */
|
||||||
|
const highlightIndex = ref(-1)
|
||||||
|
|
||||||
|
const isDropdownOpen = computed(() => isSearchFocused.value && hasSearchContent.value)
|
||||||
|
|
||||||
|
// 查询变化时重置高亮到第一项
|
||||||
|
watch(searchQuery, () => {
|
||||||
|
highlightIndex.value = flatResults.value.length > 0 ? 0 : -1
|
||||||
|
})
|
||||||
|
|
||||||
|
const selectIndex = (index: number) => {
|
||||||
|
const entry = flatResults.value[index]
|
||||||
|
if (!entry) return
|
||||||
|
if (entry.kind === 'module') {
|
||||||
|
handleSearchSelect(entry.id)
|
||||||
|
} else {
|
||||||
|
const item = searchResults.value.find(s => s.id === entry.id)
|
||||||
|
if (item) handleSettingSelect(item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleSearchKeydown = (e: KeyboardEvent) => {
|
||||||
|
if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
|
||||||
|
if (!isDropdownOpen.value || flatResults.value.length === 0) return
|
||||||
|
e.preventDefault()
|
||||||
|
const delta = e.key === 'ArrowDown' ? 1 : -1
|
||||||
|
const len = flatResults.value.length
|
||||||
|
highlightIndex.value = (highlightIndex.value + delta + len) % len
|
||||||
|
// 高亮项滚动到下拉可视区(容器 overflow-y-auto)
|
||||||
|
nextTick(() => {
|
||||||
|
document
|
||||||
|
.querySelector(`[data-search-idx="${highlightIndex.value}"]`)
|
||||||
|
?.scrollIntoView({ block: 'nearest' })
|
||||||
|
})
|
||||||
|
} else if (e.key === 'Enter') {
|
||||||
|
if (isDropdownOpen.value && highlightIndex.value >= 0) {
|
||||||
|
e.preventDefault()
|
||||||
|
selectIndex(highlightIndex.value)
|
||||||
|
}
|
||||||
|
} else if (e.key === 'Escape') {
|
||||||
|
e.preventDefault()
|
||||||
|
if (searchQuery.value) {
|
||||||
|
// 第一阶段:清空查询(下拉随内容消失)
|
||||||
|
searchQuery.value = ''
|
||||||
|
} else {
|
||||||
|
// 第二阶段:失焦收起
|
||||||
|
;(e.target as HTMLElement).blur()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let tauriWindow: ReturnType<typeof getCurrentWindow> | null = null
|
let tauriWindow: ReturnType<typeof getCurrentWindow> | null = null
|
||||||
try {
|
try {
|
||||||
tauriWindow = getCurrentWindow()
|
tauriWindow = getCurrentWindow()
|
||||||
@@ -68,6 +140,7 @@ const minimize = async () => {
|
|||||||
// 窗口最大化状态:切换最大化/还原图标
|
// 窗口最大化状态:切换最大化/还原图标
|
||||||
const isMaximized = ref(false)
|
const isMaximized = ref(false)
|
||||||
let unlistenMaximize: (() => void) | null = null
|
let unlistenMaximize: (() => void) | null = null
|
||||||
|
let unlistenFocus: (() => void) | null = null
|
||||||
|
|
||||||
const maximize = async () => {
|
const maximize = async () => {
|
||||||
await tauriWindow?.toggleMaximize()
|
await tauriWindow?.toggleMaximize()
|
||||||
@@ -118,7 +191,8 @@ const close = async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (tauriWindow) {
|
if (tauriWindow) {
|
||||||
tauriWindow.onFocusChanged(({ payload: focused }) => {
|
// 保存 unlisten,onUnmounted 时释放(onFocusChanged 返回 Promise<UnlistenFn>)
|
||||||
|
void tauriWindow.onFocusChanged(({ payload: focused }) => {
|
||||||
if (focused) {
|
if (focused) {
|
||||||
hoverSuppressed.value = true
|
hoverSuppressed.value = true
|
||||||
if (document.activeElement instanceof HTMLElement) {
|
if (document.activeElement instanceof HTMLElement) {
|
||||||
@@ -131,6 +205,8 @@ if (tauriWindow) {
|
|||||||
} else {
|
} else {
|
||||||
hoverSuppressed.value = true
|
hoverSuppressed.value = true
|
||||||
}
|
}
|
||||||
|
}).then(fn => {
|
||||||
|
unlistenFocus = fn
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -179,12 +255,23 @@ const initScrollListener = () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// resize 节流定时器:拖拽调整大小时 onResized 高频触发,避免每次都发 isMaximized IPC
|
||||||
|
let resizeDebounce: ReturnType<typeof setTimeout> | null = null
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
if (tauriWindow) {
|
if (tauriWindow) {
|
||||||
try {
|
try {
|
||||||
isMaximized.value = await tauriWindow.isMaximized()
|
isMaximized.value = await tauriWindow.isMaximized()
|
||||||
unlistenMaximize = await tauriWindow.onResized(async () => {
|
unlistenMaximize = await tauriWindow.onResized(() => {
|
||||||
|
if (resizeDebounce) return
|
||||||
|
resizeDebounce = setTimeout(async () => {
|
||||||
|
resizeDebounce = null
|
||||||
|
try {
|
||||||
isMaximized.value = await tauriWindow!.isMaximized()
|
isMaximized.value = await tauriWindow!.isMaximized()
|
||||||
|
} catch {
|
||||||
|
/* 窗口已销毁等异常忽略 */
|
||||||
|
}
|
||||||
|
}, 150)
|
||||||
})
|
})
|
||||||
} catch {
|
} catch {
|
||||||
// 非 Tauri 环境忽略
|
// 非 Tauri 环境忽略
|
||||||
@@ -201,7 +288,9 @@ onMounted(async () => {
|
|||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
window.removeEventListener('mousemove', handleFirstMouseMove)
|
window.removeEventListener('mousemove', handleFirstMouseMove)
|
||||||
if (restoreHoverTimer) clearTimeout(restoreHoverTimer)
|
if (restoreHoverTimer) clearTimeout(restoreHoverTimer)
|
||||||
|
if (resizeDebounce) clearTimeout(resizeDebounce)
|
||||||
if (unlistenMaximize) unlistenMaximize()
|
if (unlistenMaximize) unlistenMaximize()
|
||||||
|
if (unlistenFocus) unlistenFocus()
|
||||||
if (scrollViewport) scrollViewport.removeEventListener('scroll', handleMainScroll)
|
if (scrollViewport) scrollViewport.removeEventListener('scroll', handleMainScroll)
|
||||||
if (rafId !== null) cancelAnimationFrame(rafId)
|
if (rafId !== null) cancelAnimationFrame(rafId)
|
||||||
})
|
})
|
||||||
@@ -250,8 +339,7 @@ const handleBlur = () => {
|
|||||||
<Transition name="floating-tabs">
|
<Transition name="floating-tabs">
|
||||||
<button
|
<button
|
||||||
v-if="showScrollTop"
|
v-if="showScrollTop"
|
||||||
class="flex items-center justify-center h-6 w-6 rounded-md text-muted-foreground hover:text-foreground hover:bg-secondary/60 transition-colors"
|
class="flex items-center justify-center size-6 rounded-md text-muted-foreground hover:text-foreground hover:bg-secondary/60 transition-colors"
|
||||||
title="回到顶部"
|
|
||||||
@click="scrollToTop"
|
@click="scrollToTop"
|
||||||
@mousedown.stop
|
@mousedown.stop
|
||||||
>
|
>
|
||||||
@@ -261,9 +349,23 @@ const handleBlur = () => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
|
<!-- 保存设置按钮(当前模块在设置 tab 且注册了保存函数时显示,从右向左弹出) -->
|
||||||
|
<Transition name="save-btn">
|
||||||
|
<button
|
||||||
|
v-if="tabsStore.saveVisible"
|
||||||
|
class="flex items-center gap-1.5 h-7 px-3 mr-1 text-xs font-medium rounded-md bg-primary text-primary-foreground hover:bg-primary/90 disabled:opacity-60 disabled:pointer-events-none transition-colors pointer-events-auto"
|
||||||
|
:disabled="tabsStore.saving"
|
||||||
|
@click="tabsStore.runSave"
|
||||||
|
@mousedown.stop
|
||||||
|
>
|
||||||
|
<Loader2 v-if="tabsStore.saving" class="size-3.5 animate-spin" />
|
||||||
|
<Check v-else class="size-3.5" />
|
||||||
|
保存设置
|
||||||
|
</button>
|
||||||
|
</Transition>
|
||||||
<div class="relative max-w-xs mr-3 pointer-events-auto">
|
<div class="relative max-w-xs mr-3 pointer-events-auto">
|
||||||
<Search
|
<Search
|
||||||
class="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground"
|
class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground"
|
||||||
/>
|
/>
|
||||||
<Input
|
<Input
|
||||||
v-model="searchQuery"
|
v-model="searchQuery"
|
||||||
@@ -271,9 +373,10 @@ const handleBlur = () => {
|
|||||||
class="h-7 pl-8 text-sm bg-secondary/50 border-0 focus-visible:ring-1"
|
class="h-7 pl-8 text-sm bg-secondary/50 border-0 focus-visible:ring-1"
|
||||||
@focus="isSearchFocused = true"
|
@focus="isSearchFocused = true"
|
||||||
@blur="handleBlur"
|
@blur="handleBlur"
|
||||||
|
@keydown="handleSearchKeydown"
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
v-if="isSearchFocused && hasSearchContent"
|
v-if="isDropdownOpen"
|
||||||
class="absolute top-full left-0 right-0 mt-1 bg-popover border border-border rounded-md shadow-lg z-50 overflow-hidden max-h-64 overflow-y-auto"
|
class="absolute top-full left-0 right-0 mt-1 bg-popover border border-border rounded-md shadow-lg z-50 overflow-hidden max-h-64 overflow-y-auto"
|
||||||
>
|
>
|
||||||
<template v-if="filteredModules.length > 0">
|
<template v-if="filteredModules.length > 0">
|
||||||
@@ -281,10 +384,13 @@ const handleBlur = () => {
|
|||||||
模块
|
模块
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
v-for="module in filteredModules"
|
v-for="(module, mi) in filteredModules"
|
||||||
:key="module.id"
|
:key="module.id"
|
||||||
class="w-full px-3 py-2 text-left text-sm hover:bg-accent transition-colors flex items-center gap-2"
|
class="w-full px-3 py-2 text-left text-sm hover:bg-accent transition-colors flex items-center gap-2"
|
||||||
|
:class="highlightIndex === mi ? 'bg-accent' : ''"
|
||||||
|
:data-search-idx="mi"
|
||||||
@click="handleSearchSelect(module.id)"
|
@click="handleSearchSelect(module.id)"
|
||||||
|
@mouseenter="highlightIndex = mi"
|
||||||
>
|
>
|
||||||
<span>{{ module.name }}</span>
|
<span>{{ module.name }}</span>
|
||||||
</button>
|
</button>
|
||||||
@@ -296,19 +402,27 @@ const handleBlur = () => {
|
|||||||
设置项
|
设置项
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
v-for="item in searchResults"
|
v-for="(item, si) in searchResults"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
class="w-full px-3 py-2 text-left text-sm hover:bg-accent transition-colors flex items-center gap-2"
|
class="w-full px-3 py-2 text-left text-sm hover:bg-accent transition-colors flex items-center gap-2"
|
||||||
|
:class="highlightIndex === filteredModules.length + si ? 'bg-accent' : ''"
|
||||||
|
:data-search-idx="filteredModules.length + si"
|
||||||
@click="handleSettingSelect(item)"
|
@click="handleSettingSelect(item)"
|
||||||
|
@mouseenter="highlightIndex = filteredModules.length + si"
|
||||||
>
|
>
|
||||||
<Settings class="h-4 w-4 text-muted-foreground" />
|
<Settings class="size-4 text-muted-foreground shrink-0" />
|
||||||
<div class="flex-1 min-w-0">
|
<div class="flex-1 min-w-0">
|
||||||
|
<div class="flex items-center gap-1.5">
|
||||||
<span class="truncate">{{ item.title }}</span>
|
<span class="truncate">{{ item.title }}</span>
|
||||||
|
<span class="shrink-0 text-[10px] text-muted-foreground/70 px-1 py-px rounded bg-muted">
|
||||||
|
{{ moduleNameById.get(item.moduleId) || item.moduleId }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
<span v-if="item.description" class="block text-xs text-muted-foreground truncate">
|
<span v-if="item.description" class="block text-xs text-muted-foreground truncate">
|
||||||
{{ item.description }}
|
{{ item.description }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<ChevronRight class="h-4 w-4 text-muted-foreground" />
|
<ChevronRight class="size-4 text-muted-foreground shrink-0" />
|
||||||
</button>
|
</button>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -323,7 +437,7 @@ const handleBlur = () => {
|
|||||||
|
|
||||||
<div class="flex items-center pointer-events-auto" :class="{ 'hover-suppressed': hoverSuppressed }">
|
<div class="flex items-center pointer-events-auto" :class="{ 'hover-suppressed': hoverSuppressed }">
|
||||||
<button
|
<button
|
||||||
class="h-10 w-10 flex items-center justify-center hover:bg-foreground/5 transition-colors rounded-sm"
|
class="size-10 flex items-center justify-center hover:bg-foreground/5 transition-colors rounded-sm"
|
||||||
@click="minimize"
|
@click="minimize"
|
||||||
@mousedown.stop
|
@mousedown.stop
|
||||||
>
|
>
|
||||||
@@ -334,7 +448,7 @@ const handleBlur = () => {
|
|||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
id="titlebar-maximize"
|
id="titlebar-maximize"
|
||||||
class="h-10 w-10 flex items-center justify-center transition-colors rounded-sm titlebar-maximize-btn"
|
class="size-10 flex items-center justify-center transition-colors rounded-sm titlebar-maximize-btn"
|
||||||
@click="maximize"
|
@click="maximize"
|
||||||
@mousedown.stop
|
@mousedown.stop
|
||||||
>
|
>
|
||||||
@@ -351,7 +465,7 @@ const handleBlur = () => {
|
|||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
class="h-10 w-10 flex items-center justify-center hover:bg-red-500 hover:text-white text-foreground transition-colors rounded-sm"
|
class="size-10 flex items-center justify-center hover:bg-red-500 hover:text-white text-foreground transition-colors rounded-sm"
|
||||||
@click="close"
|
@click="close"
|
||||||
@mousedown.stop
|
@mousedown.stop
|
||||||
>
|
>
|
||||||
@@ -388,4 +502,15 @@ const handleBlur = () => {
|
|||||||
opacity: 0;
|
opacity: 0;
|
||||||
transform: translateX(-12px);
|
transform: translateX(-12px);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 保存设置按钮进出动画:淡入 + 从右侧滑入(从右向左弹出) */
|
||||||
|
.save-btn-enter-active,
|
||||||
|
.save-btn-leave-active {
|
||||||
|
transition: opacity 0.25s ease, transform 0.25s ease;
|
||||||
|
}
|
||||||
|
.save-btn-enter-from,
|
||||||
|
.save-btn-leave-to {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateX(12px);
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { HTMLAttributes } from "vue"
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
class?: HTMLAttributes["class"]
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
data-slot="empty"
|
||||||
|
:class="cn(
|
||||||
|
'flex min-w-0 flex-1 flex-col items-center justify-center gap-6 text-balance rounded-lg border-dashed p-6 text-center md:p-12',
|
||||||
|
props.class,
|
||||||
|
)"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { HTMLAttributes } from "vue"
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
class?: HTMLAttributes["class"]
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
data-slot="empty-content"
|
||||||
|
:class="cn(
|
||||||
|
'flex w-full min-w-0 max-w-sm flex-col items-center gap-4 text-balance text-sm',
|
||||||
|
props.class,
|
||||||
|
)"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { HTMLAttributes } from "vue"
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
defineProps<{
|
||||||
|
class?: HTMLAttributes["class"]
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<p
|
||||||
|
data-slot="empty-description"
|
||||||
|
:class="cn(
|
||||||
|
'text-muted-foreground [&>a:hover]:text-primary text-sm/relaxed [&>a]:underline [&>a]:underline-offset-4',
|
||||||
|
$attrs.class ?? '',
|
||||||
|
)"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</p>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { HTMLAttributes } from "vue"
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
class?: HTMLAttributes["class"]
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
data-slot="empty-header"
|
||||||
|
:class="cn(
|
||||||
|
'flex max-w-sm flex-col items-center gap-2 text-center',
|
||||||
|
props.class,
|
||||||
|
)"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { HTMLAttributes } from "vue"
|
||||||
|
import type { EmptyMediaVariants } from "."
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
import { emptyMediaVariants } from "."
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
class?: HTMLAttributes["class"]
|
||||||
|
variant?: EmptyMediaVariants["variant"]
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
data-slot="empty-icon"
|
||||||
|
:data-variant="variant"
|
||||||
|
:class="cn(emptyMediaVariants({ variant }), props.class)"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { HTMLAttributes } from "vue"
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
class?: HTMLAttributes["class"]
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
data-slot="empty-title"
|
||||||
|
:class="cn('text-lg font-medium tracking-tight', props.class)"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import type { VariantProps } from "class-variance-authority"
|
||||||
|
import { cva } from "class-variance-authority"
|
||||||
|
|
||||||
|
export { default as Empty } from "./Empty.vue"
|
||||||
|
export { default as EmptyContent } from "./EmptyContent.vue"
|
||||||
|
export { default as EmptyDescription } from "./EmptyDescription.vue"
|
||||||
|
export { default as EmptyHeader } from "./EmptyHeader.vue"
|
||||||
|
export { default as EmptyMedia } from "./EmptyMedia.vue"
|
||||||
|
export { default as EmptyTitle } from "./EmptyTitle.vue"
|
||||||
|
|
||||||
|
export const emptyMediaVariants = cva(
|
||||||
|
"mb-2 flex shrink-0 items-center justify-center [&_svg]:pointer-events-none [&_svg]:shrink-0",
|
||||||
|
{
|
||||||
|
variants: {
|
||||||
|
variant: {
|
||||||
|
default: "bg-transparent",
|
||||||
|
icon: "bg-muted text-foreground flex size-10 shrink-0 items-center justify-center rounded-lg [&_svg:not([class*='size-'])]:size-6",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
defaultVariants: {
|
||||||
|
variant: "default",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
export type EmptyMediaVariants = VariantProps<typeof emptyMediaVariants>
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type { HTMLAttributes } from "vue"
|
import type { HTMLAttributes } from "vue"
|
||||||
|
import { ref } from "vue"
|
||||||
import { useVModel } from "@vueuse/core"
|
import { useVModel } from "@vueuse/core"
|
||||||
import { cn } from "@/lib/utils"
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
@@ -17,10 +18,19 @@ const modelValue = useVModel(props, "modelValue", emits, {
|
|||||||
passive: true,
|
passive: true,
|
||||||
defaultValue: props.defaultValue,
|
defaultValue: props.defaultValue,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// 暴露原生 input 元素与 focus,供父级 `ref="xx"` 后调用 xx.focus()
|
||||||
|
// (组件默认不转发,ref 拿到的是组件实例,调用 .focus() 会报 "focus is not a function")
|
||||||
|
const inputEl = ref<HTMLInputElement | null>(null)
|
||||||
|
defineExpose({
|
||||||
|
focus: () => inputEl.value?.focus(),
|
||||||
|
element: () => inputEl.value,
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<input
|
<input
|
||||||
|
ref="inputEl"
|
||||||
v-model="modelValue"
|
v-model="modelValue"
|
||||||
data-slot="input"
|
data-slot="input"
|
||||||
:class="cn(
|
:class="cn(
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { HTMLAttributes } from "vue"
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
class?: HTMLAttributes["class"]
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
data-slot="skeleton"
|
||||||
|
:class="cn('animate-pulse rounded-md bg-muted', props.class)"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export { default as Skeleton } from "./Skeleton.vue"
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { SliderRootEmits, SliderRootProps } from "reka-ui"
|
||||||
|
import type { HTMLAttributes } from "vue"
|
||||||
|
import { reactiveOmit } from "@vueuse/core"
|
||||||
|
import { SliderRange, SliderRoot, SliderThumb, SliderTrack, useForwardPropsEmits } from "reka-ui"
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
const props = defineProps<SliderRootProps & { class?: HTMLAttributes["class"] }>()
|
||||||
|
const emits = defineEmits<SliderRootEmits>()
|
||||||
|
|
||||||
|
const delegatedProps = reactiveOmit(props, "class")
|
||||||
|
|
||||||
|
const forwarded = useForwardPropsEmits(delegatedProps, emits)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<SliderRoot
|
||||||
|
v-slot="{ modelValue }"
|
||||||
|
data-slot="slider"
|
||||||
|
:class="cn(
|
||||||
|
'relative flex w-full touch-none items-center select-none data-[disabled]:opacity-50 data-[orientation=vertical]:h-full data-[orientation=vertical]:min-h-44 data-[orientation=vertical]:w-auto data-[orientation=vertical]:flex-col',
|
||||||
|
props.class,
|
||||||
|
)"
|
||||||
|
v-bind="forwarded"
|
||||||
|
>
|
||||||
|
<SliderTrack
|
||||||
|
data-slot="slider-track"
|
||||||
|
class="bg-muted relative grow overflow-hidden rounded-full data-[orientation=horizontal]:h-1.5 data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-1.5"
|
||||||
|
>
|
||||||
|
<SliderRange
|
||||||
|
data-slot="slider-range"
|
||||||
|
class="bg-primary absolute data-[orientation=horizontal]:h-full data-[orientation=vertical]:w-full"
|
||||||
|
/>
|
||||||
|
</SliderTrack>
|
||||||
|
|
||||||
|
<SliderThumb
|
||||||
|
v-for="(_, key) in modelValue"
|
||||||
|
:key="key"
|
||||||
|
data-slot="slider-thumb"
|
||||||
|
class="bg-white border-primary ring-ring/50 block size-4 shrink-0 rounded-full border shadow-sm transition-[color,box-shadow] hover:ring-4 focus-visible:ring-4 focus-visible:outline-hidden disabled:pointer-events-none disabled:opacity-50"
|
||||||
|
/>
|
||||||
|
</SliderRoot>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export { default as Slider } from "./Slider.vue"
|
||||||
@@ -24,7 +24,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
|
|||||||
data-slot="switch"
|
data-slot="switch"
|
||||||
v-bind="forwarded"
|
v-bind="forwarded"
|
||||||
:class="cn(
|
:class="cn(
|
||||||
'peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50',
|
'peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50 cursor-pointer hover:data-[state=checked]:bg-primary/90 hover:data-[state=unchecked]:bg-input/70 active:scale-95',
|
||||||
props.class,
|
props.class,
|
||||||
)"
|
)"
|
||||||
>
|
>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user