11 Commits
Author SHA1 Message Date
zhongluofeng 27ad5d89a5 滚动截图,细节调整 2026-09-04 19:56:23 +08:00
zhongluofeng 6b9f71da08 bug修复调整 2026-08-31 18:05:27 +08:00
zhongluofeng 28e0c4664a 构建修正 2026-08-27 18:32:33 +08:00
zhongluofeng d21649c60e 优化调整、BT下载(有bug) 2026-08-27 18:25:45 +08:00
zhongluofeng 4dd60f42a1 细节调整及优化(26.8.3) 2026-08-21 17:25:47 +08:00
zhongluofeng 0a19b4b38a Merge branch 'main' of https://gitea.atie.fun/LFeng/Thing 2026-08-14 17:47:28 +08:00
zhongluofeng 7d49a7395f 优化调整 2026-08-14 17:47:06 +08:00
LFeng d0705b1ffe 进度更正 2026-08-11 17:33:37 +08:00
zhongluofeng 6c7897bf47 版本管理,优化 2026-08-11 17:19:36 +08:00
zhongluofeng 2f20161010 状态栏修正 2026-08-11 15:12:30 +08:00
zhongluofeng d09599fa95 优化,贴图 2026-08-07 18:09:13 +08:00
139 changed files with 19520 additions and 2435 deletions
+3
View File
@@ -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
+6 -6
View File
@@ -100,7 +100,7 @@ Thing/
#### 📸 截图 #### 📸 截图
- [x] 截图及相关 - [x] 截图及相关
- [ ] 滚动截图(后续支持) - [ ] 滚动截图(后续支持)
- [ ] 贴图(后续支持) - [x] 贴图
#### 📊 硬件监控 #### 📊 硬件监控
- [x] 悬浮窗显示 - [x] 悬浮窗显示
@@ -111,7 +111,7 @@ 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] 断点续传
@@ -124,11 +124,11 @@ Thing/
### 第三阶段:优化与完善 ### 第三阶段:优化与完善
- [x] 性能优化(P1/P2:轮询随窗口可见性暂停、批量测速限并发、渲染 memo 化等,见 MODULE_REVIEW.md - [x] 性能优化(见 MODULE_REVIEW.md
- [x] 错误处理与日志完善(B5 进程级全局日志器、异常兜底) - [x] 错误处理与日志完善(全局日志器、异常兜底)
- [x] 用户体验优化(混合 DPI 定位、rAF 节流、UI 细节) - [x] 用户体验优化(混合 DPI 定位、rAF 节流、UI 细节)
- [ ] 自动更新机制 - [x] 自动更新机制
- [ ] 打包发布 - [x] 打包发布
## 模块管理架构 ## 模块管理架构
+2
View File
@@ -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
View File
@@ -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 推送层广播快照(解耦:调度器不关心有几个订阅者)。
/// ///
/// 调度策略: /// 调度策略:
/// - 快通道 tickUpdateAll(含慢通道硬件,因 UpdateAll 成本主要在 SMART,已通过慢通道分频减少调用频率) /// - 快通道 tickUpdateFastOnly(仅 CPU/GPU/Memory/Network 等轻量硬件),
/// 实际优化:快通道 tick 只 Update 快通道硬件(UpdateFastOnly),慢通道单独按慢节奏 Update /// 避免 SMART 等重查询每秒执行拖慢采样节奏
/// - 慢通道 tickUpdateSlowOnly(仅 Storage/PSU/Motherboard 等) /// - 慢通道 tickUpdateSlowOnly(仅 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);
+1
View File
@@ -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,
+101
View File
@@ -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}";
}
}
}
+5
View File
@@ -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);
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "thing", "name": "thing",
"private": true, "private": true,
"version": "0.1.0", "version": "26.8.5",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
+61
View File
@@ -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 Startrelease.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
+166
View File
@@ -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"
+1390 -24
View File
File diff suppressed because it is too large Load Diff
+34 -1
View File
File diff suppressed because one or more lines are too long
View File
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"
]
}
+4 -2
View File
@@ -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, pin and scroll-control windows",
"windows": ["screenshot-overlay*", "screenshot-editor-*"], "windows": ["screenshot-overlay*", "screenshot-editor*", "screenshot-pin", "screenshot-scroll-*"],
"permissions": [ "permissions": [
"core:default", "core:default",
"core:window:allow-hide", "core:window:allow-hide",
@@ -11,12 +11,14 @@
"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",
"core:window:allow-close", "core:window:allow-close",
"core:event:allow-emit", "core:event:allow-emit",
"core:event:allow-listen", "core:event:allow-listen",
"core:webview:allow-create-webview-window",
"dialog:default", "dialog:default",
"snap-layout:default" "snap-layout:default"
] ]
@@ -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 handleDownloadCreated(downloadItem) { /**
if (!await shouldIntercept(downloadItem)) return * 判断是否为"历史下载"(安装插件之前就已存在、随后被浏览器恢复的旧下载)
* 这类下载一律不接管,交给浏览器原生处理,实现"只接管以后的下载,历史都不管"
*/
async function isHistoricalDownload(item) {
// 1) canResume=true 表示已存在有效的部分文件,说明浏览器在恢复旧下载
if (item.canResume) return true
// 2) 开始时间早于插件首次安装时间(浏览器重启后恢复的旧下载会保留原来的开始时间)
try { try {
await chrome.downloads.cancel(downloadItem.id) const start = item.startTime ? new Date(item.startTime).getTime() : 0
await chrome.downloads.erase({ id: downloadItem.id }) 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 */ } } catch { /* ignore */ }
return false
}
const url = downloadItem.finalUrl || downloadItem.url /**
const filename = downloadItem.filename || '' * 查询引擎是否已有同 URL 的非终态任务(活跃/排队/暂停)
* 用于防止同一下载被重复转发、重复下载
*/
async function hasExistingTask(url) {
try { try {
const id = await addDownload(url, filename, downloadItem.referrer, '') const tasks = await apiRequest('/api/downloads')
await notify('已添加到 Thing', `${filename || url}`) return tasks.some(t => {
} catch (e) { const s = t.status
await notify('Thing 添加失败', `${filename || url}\n${e.message}`) if (s === 'complete' || s === 'error') return false
try { await chrome.downloads.download({ url }) } catch { /* ignore */ } return t.url === url
})
} catch {
return false
} }
} }
// ===== 通知 ===== async function handleDownloadCreated(downloadItem) {
async function notify(title, message) { const url = downloadItem.finalUrl || downloadItem.url
const config = await getConfig()
if (!config.showNotifications) return // 回退下载:我们自己用 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
// 同一 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 {
await chrome.notifications.create({ try {
type: 'basic', await chrome.downloads.cancel(downloadItem.id)
iconUrl: 'icons/icon-128.png', await chrome.downloads.erase({ id: downloadItem.id })
title, } catch { /* ignore */ }
message
}) const filename = downloadItem.filename || ''
} catch { /* ignore */ } try {
await addDownload(url, filename, downloadItem.referrer, '')
} catch (e) {
// 添加失败:回退为浏览器自带下载,并标记该 URL 短时间内跳过,防止再次被拦截形成死循环
fallbackUrls.set(url, Date.now() + 3000)
try { await chrome.downloads.download({ url }) } catch { /* ignore */ }
}
} finally {
processingUrls.delete(url)
}
} }
// ===== 右键菜单 ===== // ===== 右键菜单 & 安装标记 =====
chrome.runtime.onInstalled.addListener(() => { chrome.runtime.onInstalled.addListener(async (details) => {
// 记录首次安装时间:用于区分"安装前的历史下载"(被浏览器恢复的旧下载)与"安装后的新下载"
if (details.reason === 'install') {
await chrome.storage.local.set({ installTime: Date.now() })
}
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
+95 -12
View File
@@ -7,7 +7,7 @@ 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, Type)] #[derive(Serialize, Type)]
@@ -95,6 +95,21 @@ pub async fn clipboard_get_item(
.map_err(|e| format!("查询任务失败: {}", e)) .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] #[specta::specta]
pub async fn clipboard_set_pinned( pub async fn clipboard_set_pinned(
@@ -162,25 +177,44 @@ pub async fn clipboard_save_settings(
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 { // 快捷键改为空字符串(禁用):注销旧快捷键
crate::shortcut::register_shortcut(&app, "剪贴板", &settings.shortcut, |a| { if settings.shortcut.trim().is_empty() && settings.shortcut != prev_shortcut {
super::popup::show_popup(a) crate::shortcut::unregister_shortcut(&app, "剪贴板");
})?;
// 新快捷键非空时确保弹窗窗口已预创建
if !settings.shortcut.trim().is_empty() {
super::popup::ensure_popup_window(&app);
}
} }
Ok(()) Ok(())
} }
@@ -262,3 +296,52 @@ 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(())
}
+9 -6
View File
@@ -12,6 +12,7 @@ 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, Type)] #[derive(Clone, Serialize, Deserialize, Type)]
@@ -55,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,
@@ -73,7 +75,7 @@ impl ClipboardManager {
}; };
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,
@@ -139,13 +141,12 @@ impl ClipboardManager {
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),
@@ -163,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())
} }
} }
+6 -3
View File
@@ -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;
+14 -7
View File
@@ -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,10 +41,13 @@ 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() {
continue; if *s == Some(seq) {
*s = None;
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_or_else(|e| e.into_inner()); let s = settings.lock().unwrap_or_else(|e| e.into_inner());
@@ -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,
+531 -5
View File
@@ -10,12 +10,27 @@
use std::sync::Mutex; use std::sync::Mutex;
use std::sync::atomic::{AtomicBool, Ordering}; 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};
/// 弹窗窗口标签 /// 弹窗窗口标签
pub const POPUP_LABEL: &str = "clipboard-popup"; pub const POPUP_LABEL: &str = "clipboard-popup";
/// 预览窗口标签(悬停/键盘选中条目时在弹窗旁显示内容)
pub const PREVIEW_LABEL: &str = "clipboard-preview";
/// 预览窗口初始逻辑尺寸(后续由前端按内容自适应调整,见 resize_preview
const PREVIEW_W: f64 = 340.0;
const PREVIEW_H: f64 = 300.0;
/// 预览窗口最小逻辑尺寸(防止内容过小时窗口退化)
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 时据此判断是否显示。 /// 标志:show_popup 兜底创建路径设为 true,前端 onMounted 回调 show_window 时据此判断是否显示。
/// 预创建路径不设置,避免应用启动时弹窗自动弹出。 /// 预创建路径不设置,避免应用启动时弹窗自动弹出。
static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false); static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false);
@@ -24,6 +39,50 @@ static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false);
/// 避免窗口重建后仍停留在屏幕外 (-10000, -10000)。 /// 避免窗口重建后仍停留在屏幕外 (-10000, -10000)。
static PENDING_POS: Mutex<Option<(f64, f64)>> = Mutex::new(None); 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 {
LAST_SHOWN
.lock()
.ok()
.and_then(|t| *t)
.map(|t| t.elapsed() < SHOW_GRACE)
.unwrap_or(false)
}
/// 创建弹窗窗口(隐藏状态)并注册失焦监听。 /// 创建弹窗窗口(隐藏状态)并注册失焦监听。
/// 位置默认在屏幕外,show_popup 时会重新定位。 /// 位置默认在屏幕外,show_popup 时会重新定位。
/// 预创建后首次按快捷键走"窗口已存在"分支直接 show,避免首次创建的时序问题。 /// 预创建后首次按快捷键走"窗口已存在"分支直接 show,避免首次创建的时序问题。
@@ -54,13 +113,41 @@ fn create_popup_window(app: &AppHandle) {
} }
}; };
// 监听窗口失焦:自动隐藏 // 监听窗口失焦:自动隐藏(同时隐藏预览窗)
let app_handle = app.clone(); let app_handle = app.clone();
let win_handle = win.clone(); let win_handle = win.clone();
win.on_window_event(move |event| { win.on_window_event(move |event| {
if let tauri::WindowEvent::Focused(false) = event { match event {
let _ = win_handle.hide(); tauri::WindowEvent::Focused(false) => {
let _ = app_handle.emit(crate::constants::events::CLIPBOARD_POPUP_HIDE, ()); // 失焦宽限期:show 后激活期间的焦点弹跳不隐藏弹窗,避免弹窗刚显示就被隐藏
if within_show_grace() {
return;
}
// 交互锁定模式(点击过预览窗):弹窗与预览保持显示,仅由看护线程在
// "点击外部"时关闭;此处的失焦是点击预览窗(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);
}
_ => {}
} }
}); });
@@ -112,6 +199,7 @@ pub fn show_popup(app: &AppHandle) {
y: y 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(crate::constants::events::CLIPBOARD_POPUP_SHOW, ()); let _ = app.emit(crate::constants::events::CLIPBOARD_POPUP_SHOW, ());
@@ -143,17 +231,27 @@ pub fn show_window(app: &AppHandle) {
})); }));
} }
let _ = win.show(); let _ = win.show();
mark_shown();
let _ = win.set_focus(); let _ = win.set_focus();
// 通知前端刷新数据 // 通知前端刷新数据
let _ = app.emit(crate::constants::events::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 粘贴到之前聚焦的窗口。
@@ -207,6 +305,434 @@ fn simulate_paste() {
// 非 Windows 平台暂不支持自动粘贴 // 非 Windows 平台暂不支持自动粘贴
} }
// ===== 独立预览窗口 =====
/// 创建预览窗口(隐藏状态),应用 NoActivate 样式避免抢焦点。
fn create_preview_window(app: &AppHandle) {
let win = match WebviewWindowBuilder::new(
app,
PREVIEW_LABEL,
WebviewUrl::App("index.html#clipboard-preview".into()),
)
.title("预览")
.inner_size(PREVIEW_W, PREVIEW_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) // 不抢占焦点
.effects(EffectsBuilder::new().effects(vec![Effect::Mica]).build())
.build()
{
Ok(w) => w,
Err(e) => {
crate::logger::log_error("clipboard", &format!("创建预览窗失败: {}", e));
return;
}
};
// NoActivate:预览窗可交互但不激活,弹窗保持前台(键盘导航/粘贴不受影响)
// 圆角:NoActivate 悬浮窗系统不自动圆角,显式指定 DWMWCP_ROUND 与弹窗外观统一
#[cfg(windows)]
if let Ok(hwnd) = win.hwnd() {
crate::win32_util::apply_no_activate(hwnd.0 as isize);
crate::win32_util::apply_rounded_corners(hwnd.0 as isize);
}
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);
}
}
// 通知前端加载条目内容(前端完成后自行 resize + reveal
let _ = app.emit(crate::constants::events::CLIPBOARD_PREVIEW_SHOW, id);
}
/// 显示已就绪的预览窗口(前端完成内容加载与 resize 后调用)。
/// 显示前重查弹窗可见性,消除内容加载期间弹窗已隐藏的竞态。
pub fn reveal_preview(app: &AppHandle) {
// 弹窗已隐藏:在途请求作废
if !POPUP_VISIBLE.load(Ordering::SeqCst) {
return;
}
// 已可见则跳过(放大/还原触发的重复 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();
}
}
/// 按内容自适应调整预览窗大小(逻辑像素),位置沿用当前所在侧并重新对齐弹窗。
/// 前端加载/切换内容(文本测高、图片按宽高比)后调用,窗口贴合内容消除留白。
/// allow_flip:初始落位为 true(优先侧放不下可换侧);放大/还原为 false
/// (保持原侧靠工作区 clamp,避免窗口跳侧使鼠标落在窗外误触发隐藏)。
pub fn resize_preview(app: &AppHandle, width: f64, height: f64, allow_flip: bool) {
// 弹窗不可见时忽略(无对齐基准)
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 }));
}
/// 交互锁定模式入口:前端预览窗收到 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(跨模块共享) ===== // ===== 屏幕/光标/DPI 工具已迁移至 crate::win32_util(跨模块共享) =====
use crate::win32_util::{get_cursor_pos, get_work_area_at_point, get_dpi_for_point}; use crate::win32_util::{get_cursor_pos, get_work_area_at_point, get_dpi_for_point};
+26
View File
@@ -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)
}
+39 -2
View File
@@ -2,6 +2,7 @@
//! //!
//! 表结构见 `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 specta::Type;
use std::fs; use std::fs;
@@ -38,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,
@@ -88,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。
@@ -120,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,
@@ -249,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()?;
+28
View File
@@ -10,6 +10,10 @@ pub mod windows {
pub const OSD_OVERLAY: &str = "osd-overlay"; pub const OSD_OVERLAY: &str = "osd-overlay";
#[allow(dead_code)] #[allow(dead_code)]
pub const SCREENSHOT_OVERLAY: &str = "screenshot-overlay"; pub const SCREENSHOT_OVERLAY: &str = "screenshot-overlay";
#[allow(dead_code)]
pub const SCREENSHOT_PIN: &str = "screenshot-pin";
#[allow(dead_code)]
pub const SCREENSHOT_SCROLL: &str = "screenshot-scroll";
} }
/// Tauri 事件名(与前端 constants::EVENTS 对应) /// Tauri 事件名(与前端 constants::EVENTS 对应)
@@ -24,9 +28,14 @@ pub mod events {
pub const CLIPBOARD_CHANGED: &str = "clipboard-changed"; pub const CLIPBOARD_CHANGED: &str = "clipboard-changed";
pub const CLIPBOARD_POPUP_SHOW: &str = "clipboard-popup-show"; pub const CLIPBOARD_POPUP_SHOW: &str = "clipboard-popup-show";
pub const CLIPBOARD_POPUP_HIDE: &str = "clipboard-popup-hide"; 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_SHOW: &str = "quickpanel-show";
pub const QUICKPANEL_HIDE: &str = "quickpanel-hide"; 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_DATA: &str = "monitor-data";
pub const MONITOR_NETWORK: &str = "monitor-network"; pub const MONITOR_NETWORK: &str = "monitor-network";
@@ -37,13 +46,32 @@ pub mod events {
// OSD 窗口 // OSD 窗口
pub const OSD_SYSTEM_UI_ACTIVE: &str = "osd-system-ui-active"; 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_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_START_DRAG: &str = "osd-start-drag";
pub const OSD_END_DRAG: &str = "osd-end-drag"; pub const OSD_END_DRAG: &str = "osd-end-drag";
// 截图 // 截图
pub const SCREENSHOT_SHORTCUT: &str = "screenshot-shortcut"; pub const SCREENSHOT_SHORTCUT: &str = "screenshot-shortcut";
pub const SCREENSHOT_PIN_SHORTCUT: &str = "screenshot-pin-shortcut";
/// 截图结果导出(含覆盖层/编辑器/滚动截图会话)
pub const SCREENSHOT_EXPORTED: &str = "screenshot-exported";
/// 滚动截图会话:实时进度 { width, height, auto }
pub const SCROLL_PROGRESS: &str = "screenshot-scroll-progress";
/// 滚动截图会话:完成并导出(负载与 SCREENSHOT_EXPORTED 相同)
pub const SCROLL_COMPLETE: &str = "screenshot-scroll-complete";
/// 滚动截图会话:已取消(无负载)
pub const SCROLL_CANCELLED: &str = "screenshot-scroll-cancelled";
// 内核安装进度 // 内核安装进度
pub const KERNEL_INSTALL_PROGRESS: &str = "kernel-install-progress"; 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 PROCESS_STATUS_CHANGED: &str = "process-status-changed";
pub const DOWNLOAD_ADDED: &str = "download-added"; 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";
} }
+53 -2
View File
@@ -1,10 +1,11 @@
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]
@@ -13,6 +14,20 @@ pub fn downloader_get_tasks(engine: State<'_, DownloadEngine>) -> Vec<DownloadTa
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] #[specta::specta]
@@ -57,8 +72,9 @@ 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
} }
/// 暂停任务 /// 暂停任务
@@ -75,6 +91,20 @@ pub fn downloader_resume_task(engine: State<'_, DownloadEngine>, id: 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] #[specta::specta]
@@ -141,3 +171,24 @@ pub fn downloader_open_url(app: AppHandle, url: String) -> Result<(), String> {
.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
+137 -11
View File
@@ -1,11 +1,12 @@
use futures_util::StreamExt; use futures_util::StreamExt;
use reqwest::Proxy;
use reqwest::Client; use reqwest::Client;
use std::collections::HashMap; use std::collections::HashMap;
use std::fs::OpenOptions; use std::fs::OpenOptions;
use std::io::SeekFrom; use std::io::SeekFrom;
use std::path::Path; use std::path::Path;
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::sync::Arc; use std::sync::{Arc, Mutex};
use tokio::io::{AsyncSeekExt, AsyncWriteExt}; use tokio::io::{AsyncSeekExt, AsyncWriteExt};
use tokio::task::JoinSet; use tokio::task::JoinSet;
@@ -21,27 +22,110 @@ const READ_STALL_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(3
/// HTTP/HTTPS 下载器 /// HTTP/HTTPS 下载器
#[derive(Clone)] #[derive(Clone)]
pub struct HttpDownloader { pub struct HttpDownloader {
client: Client, /// 直连客户端:强制禁用代理(no_proxy),用于降级重试与控制端探测
direct_client: Client,
/// mihomo 显式代理客户端缓存(与代理地址一一对应):走 http://127.0.0.1:{mixed_port}。
/// 地址未配置(mihomo 未运行)时为 no_proxy 直连。Arc 共享同一状态,任意 clone 统一生效。
mihomo: Arc<Mutex<(Option<String>, Client)>>,
} }
impl HttpDownloader { impl HttpDownloader {
pub fn new() -> Self { pub fn new() -> Self {
let client = Client::builder() let direct_client = Client::builder()
// 强制直连:即使系统代理已开启,下载也不经过系统代理
.no_proxy()
.build() .build()
.unwrap_or_else(|_| Client::new()); .unwrap_or_else(|_| Client::new());
Self { client } Self {
direct_client: direct_client.clone(),
mihomo: Arc::new(Mutex::new((None, direct_client))),
}
}
/// 配置 mihomo 显式代理客户端。
/// - `Some("http://127.0.0.1:{port}")`:走本地 mihomo 的 mixed 端口;
/// - `None`:回退直连(不走系统代理)。
/// 地址未变化时复用缓存,不重复重建,避免丢失连接复用。
pub fn configure_mihomo_proxy(&self, proxy_url: Option<String>) {
let mut guard = self.mihomo.lock().unwrap_or_else(|e| e.into_inner());
if guard.0 == proxy_url {
return;
}
let client = match &proxy_url {
Some(url) => {
let mut cb = Client::builder();
if let Ok(p) = Proxy::all(url.clone()) {
cb = cb.proxy(p);
}
cb.build().unwrap_or_else(|_| Client::new())
}
None => Client::builder()
.no_proxy()
.build()
.unwrap_or_else(|_| Client::new()),
};
*guard = (proxy_url, client);
}
/// 探测 mihomo 外部控制端是否在线(用于判断代理模块是否真正运行)。
/// 走直连客户端,避免探测本身依赖代理。
pub async fn probe_controller(&self, controller: &str) -> bool {
let url = format!("http://{}/version", controller);
match tokio::time::timeout(
std::time::Duration::from_secs(3),
self.direct_client.get(&url).send(),
)
.await
{
Ok(Ok(r)) => r.status().is_success(),
_ => false,
}
}
/// 根据 use_proxy 选择客户端(克隆句柄,Client 内部共享连接池)
fn client(&self, use_proxy: bool) -> Client {
if use_proxy {
self.mihomo
.lock()
.unwrap_or_else(|e| e.into_inner())
.1
.clone()
} else {
self.direct_client.clone()
}
} }
/// 探测下载资源信息(大小、是否支持 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");
@@ -97,7 +181,7 @@ 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);
} }
@@ -132,6 +216,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,
@@ -141,6 +226,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();
@@ -167,7 +283,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(());
} }
@@ -187,7 +303,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(
@@ -241,9 +357,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,
@@ -366,6 +483,15 @@ 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(_) => { Err(_) => {
+3 -2
View File
@@ -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;
+72 -6
View File
@@ -1,5 +1,7 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::sync::{Arc, Mutex};
use std::time::{Duration, Instant};
use axum::{ use axum::{
extract::{Path, State}, extract::{Path, State},
@@ -9,13 +11,25 @@ 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;
/// 最近处理过的下载 URL(短窗口去重):记录对应任务 id 与创建时刻,
/// 用于拦截"探测期间并发 POST"与"任务已结束但扩展重试"造成的重复创建
#[derive(Clone)]
struct RecentEntry {
id: String,
at: Instant,
}
/// 同 URL 去重窗口:窗口内重复 POST 复用既有任务 id
const DEDUP_WINDOW: Duration = Duration::from_secs(30);
#[derive(Serialize)] #[derive(Serialize)]
struct HealthResponse { struct HealthResponse {
ok: bool, ok: bool,
@@ -45,14 +59,19 @@ 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,
recent: Arc::new(Mutex::new(HashMap::new())),
});
let listener = match tokio::net::TcpListener::bind(&addr).await { let listener = match tokio::net::TcpListener::bind(&addr).await {
Ok(l) => l, Ok(l) => l,
@@ -74,6 +93,9 @@ impl ExtensionServer {
struct AppState { struct AppState {
engine: DownloadEngine, engine: DownloadEngine,
secret: String, secret: String,
app_handle: AppHandle,
/// 最近创建的 URL→任务 id(短窗口去重)
recent: Arc<Mutex<HashMap<String, RecentEntry>>>,
} }
/// 鉴权检查:如果配置了 secret,校验 Bearer token /// 鉴权检查:如果配置了 secret,校验 Bearer token
@@ -108,8 +130,48 @@ 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 { // 1. 检查短窗口缓存:同 URL 30s 内已有创建记录,直接返回(拦截浏览器/扩展重试和并发 POST)
Ok(id) => Ok(Json(CreateDownloadResponse { id })), {
let mut recent = state.recent.lock().unwrap_or_else(|e| e.into_inner());
if let Some(entry) = recent.get(&req.url) {
if entry.at.elapsed() < DEDUP_WINDOW {
// 30 秒内重复请求 → 返回已创建任务 id,不重复新建
return Ok(Json(CreateDownloadResponse { id: entry.id.clone() }));
} else {
// 窗口过期 → 删除旧记录继续检查引擎层去重
recent.remove(&req.url);
}
}
}
// 2. 引擎层去重:同 URL 已有非终态任务(活跃/排队/暂停)时直接返回既有任务,
// 避免浏览器重复转发同一下载造成重复下载
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
}) {
// 添加到短窗口缓存以便拦截重试
let mut recent = state.recent.lock().unwrap_or_else(|e| e.into_inner());
recent.insert(req.url.clone(), RecentEntry { id: existing.id.clone(), at: Instant::now() });
return Ok(Json(CreateDownloadResponse { id: existing.id }));
}
// add_task 会 move 掉 req 的字段,先取出 url 供去重缓存使用
let task_url = req.url.clone();
match state.engine.add_task(req.url, req.filename, req.dir, req.headers, true, None).await {
Ok(id) => {
// 记录到短窗口缓存:拦截后续同一 URL 的重复转发/重试
let url = task_url.clone();
let mut recent = state.recent.lock().unwrap_or_else(|e| e.into_inner());
recent.insert(url, RecentEntry { id: id.clone(), at: Instant::now() });
drop(recent);
// 浏览器扩展发起下载:不再置前主窗口,改为带 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 +195,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 }))),
} }
} }
+68 -2
View File
@@ -2,6 +2,17 @@ use serde::{Deserialize, Serialize};
use specta::Type; 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, Type)] #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Type)]
#[serde(rename_all = "lowercase")] #[serde(rename_all = "lowercase")]
@@ -16,6 +27,8 @@ pub enum TaskStatus {
Complete, Complete,
/// 错误 /// 错误
Error, Error,
/// 已取消(用户取消:进度与文件已清除,仅保留记录,只能再次下载)
Cancelled,
} }
/// 下载分段(多线程 Range 下载 / 断点续传用) /// 下载分段(多线程 Range 下载 / 断点续传用)
@@ -37,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, Type)] #[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=未知
@@ -129,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/s0=不限)
#[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 {
@@ -167,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,
} }
} }
} }
+477
View File
@@ -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,
/// infohashhex 小写字符串)
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/s0=不限),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 仍会生效)");
}
/// 会话级公共 trackerHashSet<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()
}
+132 -61
View File
@@ -15,34 +15,37 @@ mod setup;
mod shortcut; mod shortcut;
mod snap_fix; mod snap_fix;
mod tray_menu; mod tray_menu;
mod updater;
mod win32_util; mod win32_util;
use download_engine::{ use download_engine::{
DownloadEngine, 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::{
log_clear, log_info_state, log_list, log_message, 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_repair_pawnio, monitor_set_auto_start, monitor_set_elevate_on_launch,
monitor_stop, MonitorKernel, monitor_set_hardware_config, monitor_start, monitor_start_elevated, monitor_status, monitor_stop,
MonitorKernel,
}; };
use network_monitor::network_status; 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::{
process_all_status, process_start, process_status, process_all_status, process_start, process_status,
@@ -50,32 +53,44 @@ use process_manager::{
}; };
use screenshot::commands::{ use screenshot::commands::{
screenshot_capture_fullscreen, screenshot_capture_window, screenshot_clear_fullscreen, screenshot_capture_fullscreen, screenshot_capture_window, screenshot_clear_fullscreen,
screenshot_compose_copy, screenshot_copy_image, screenshot_crop_copy_stored, screenshot_compose_copy, screenshot_compose_png, screenshot_copy_image,
screenshot_crop_stored, screenshot_cursor_pos, screenshot_delete_cache, screenshot_crop_copy_stored, screenshot_crop_stored, screenshot_cursor_pos,
screenshot_disable_transitions, screenshot_enum_windows, screenshot_fullscreen_png, screenshot_delete_cache, screenshot_disable_transitions, screenshot_enum_windows,
screenshot_get_editor_image, screenshot_get_fullscreen_bmp, screenshot_load_cache, screenshot_fullscreen_png, screenshot_get_fullscreen_bmp, screenshot_load_cache,
screenshot_register_shortcut, screenshot_save_cache, screenshot_save_png, screenshot_load_cache_raw, screenshot_pick_list, screenshot_register_pin_shortcut,
screenshot_set_editor_image, screenshot_unregister_shortcut, screenshot_window_from_point, screenshot_register_shortcut,
screenshot_save_cache, screenshot_save_png, screenshot_scroll_capture,
screenshot_scroll_cancel, screenshot_scroll_finish, screenshot_scroll_start,
screenshot_show_overlay, screenshot_take_editor_image_raw,
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::{ use quickpanel::{
quickpanel_build_file_index, quickpanel_clear_app_icon_cache, quickpanel_delete_file, 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_file_index_stats, quickpanel_get_app_icon, quickpanel_get_settings,
quickpanel_get_special_locations, quickpanel_hide_popup, quickpanel_init_file_index, quickpanel_get_special_locations, quickpanel_hide_popup, quickpanel_init_file_index,
quickpanel_lock_screen, quickpanel_open_file, quickpanel_open_special, quickpanel_list_archives, quickpanel_list_dir, quickpanel_lock_screen, quickpanel_open_file,
quickpanel_register_shortcut, quickpanel_reveal_in_explorer, quickpanel_run_custom_command, quickpanel_open_special, quickpanel_preview_rename, quickpanel_register_shortcut,
quickpanel_run_system_command, quickpanel_save_settings, quickpanel_scan_apps, quickpanel_reveal_in_explorer, quickpanel_run_custom_command, quickpanel_run_system_command,
quickpanel_search_files, quickpanel_show_popup, quickpanel_show_window, quickpanel_save_settings, quickpanel_scan_apps, quickpanel_search_files, quickpanel_show_popup,
quickpanel_unregister_shortcut, 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 quit_app(app: tauri::AppHandle) { fn quit_app(app: tauri::AppHandle) {
@@ -100,13 +115,16 @@ fn export_bindings() {
// 生成命令失败时直接 throw,与原生 invoke 一致,前端无需解包 helper // 生成命令失败时直接 throw,与原生 invoke 一致,前端无需解包 helper
.error_handling(ErrorHandlingMode::Throw) .error_handling(ErrorHandlingMode::Throw)
.commands(collect_commands![ .commands(collect_commands![
// 应用更新(6
app_version, update_check, update_install, update_thinghk_apply,
update_thinghk_confirm, update_thinghk_cancel,
// proxy20 // proxy20
proxy_activate_profile, proxy_check_kernel_update, proxy_clear_system_proxy, proxy_activate_profile, proxy_apply_kernel_update, proxy_cancel_kernel_install, proxy_check_kernel_update, proxy_clear_system_proxy,
proxy_close_connection, proxy_delete_profile, proxy_get_settings, proxy_close_connection, proxy_confirm_install, proxy_delete_profile, proxy_get_settings,
proxy_get_system_proxy, proxy_import_profile, proxy_install_kernel, proxy_get_system_proxy, proxy_import_profile, proxy_kernel_info,
proxy_kernel_info, proxy_restart, proxy_save_settings, 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_test_delay, proxy_update_profile,
// quickpanel22 // quickpanel22
quickpanel_get_settings, quickpanel_save_settings, quickpanel_register_shortcut, quickpanel_get_settings, quickpanel_save_settings, quickpanel_register_shortcut,
quickpanel_unregister_shortcut, quickpanel_show_popup, quickpanel_hide_popup, quickpanel_unregister_shortcut, quickpanel_show_popup, quickpanel_hide_popup,
@@ -115,24 +133,31 @@ fn export_bindings() {
quickpanel_scan_apps, quickpanel_get_app_icon, quickpanel_clear_app_icon_cache, quickpanel_scan_apps, quickpanel_get_app_icon, quickpanel_clear_app_icon_cache,
quickpanel_reveal_in_explorer, quickpanel_open_file, quickpanel_get_special_locations, quickpanel_reveal_in_explorer, quickpanel_open_file, quickpanel_get_special_locations,
quickpanel_open_special, quickpanel_delete_file, quickpanel_run_custom_command, quickpanel_open_special, quickpanel_delete_file, quickpanel_run_custom_command,
quickpanel_run_system_command, quickpanel_run_system_command, quickpanel_list_archives, quickpanel_list_dir,
// clipboard20 quickpanel_batch_extract, quickpanel_preview_rename, quickpanel_apply_rename,
quickpanel_delete_files, quickpanel_focus_main_window,
// clipboard23
clipboard_get_history, clipboard_get_pinned, clipboard_search, clipboard_get_item, clipboard_get_history, clipboard_get_pinned, clipboard_search, clipboard_get_item,
clipboard_set_pinned, clipboard_delete, clipboard_clear, clipboard_copy_back, clipboard_get_thumb, clipboard_set_pinned, clipboard_delete, clipboard_clear,
clipboard_count, clipboard_get_settings, clipboard_save_settings, clipboard_status, clipboard_copy_back, clipboard_count, clipboard_get_settings, clipboard_save_settings,
clipboard_start, clipboard_stop, clipboard_register_shortcut, clipboard_status, clipboard_start, clipboard_stop, clipboard_register_shortcut,
clipboard_unregister_shortcut, clipboard_show_popup, clipboard_hide_popup, clipboard_unregister_shortcut, clipboard_show_popup, clipboard_hide_popup,
clipboard_show_window, clipboard_paste_to_target, clipboard_show_window, clipboard_paste_to_target, clipboard_show_preview,
clipboard_hide_preview, clipboard_resize_preview, clipboard_reveal_preview,
clipboard_preview_interacted,
// download_engine10,豁免 2 // download_engine10,豁免 2
downloader_get_tasks, downloader_check_url, downloader_add_task, downloader_pause_task, downloader_get_tasks, downloader_check_url, downloader_add_task, downloader_pause_task,
downloader_resume_task, downloader_remove_task, downloader_get_settings, downloader_resume_task, downloader_cancel_task, downloader_redownload, downloader_remove_task, downloader_get_settings,
downloader_save_settings, downloader_open_dir, downloader_open_url, downloader_save_settings, downloader_open_dir, downloader_open_url, downloader_focus_window, downloader_inspect, downloader_select_bt_files,
// screenshot19,豁免 2get_fullscreen_bmp 返回 ipc::Response、compose_copy 接收 ipc::Request // screenshot22,豁免 3get_fullscreen_bmp / take_editor_image_raw 返回 ipc::Response、
screenshot_disable_transitions, screenshot_register_shortcut, // compose_copy / compose_png 接收 ipc::Request
screenshot_unregister_shortcut, screenshot_capture_fullscreen, screenshot_fullscreen_png, screenshot_disable_transitions, screenshot_show_overlay, screenshot_register_shortcut,
screenshot_clear_fullscreen, screenshot_crop_stored, screenshot_crop_copy_stored, screenshot_unregister_shortcut, screenshot_register_pin_shortcut,
screenshot_window_from_point, screenshot_cursor_pos, screenshot_enum_windows, screenshot_unregister_pin_shortcut, screenshot_capture_fullscreen,
screenshot_capture_window, screenshot_set_editor_image, screenshot_get_editor_image, 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_scroll_capture,
screenshot_scroll_cancel, screenshot_scroll_finish, screenshot_scroll_start,
screenshot_copy_image, screenshot_save_png, screenshot_copy_image, screenshot_save_png,
screenshot_save_cache, screenshot_load_cache, screenshot_delete_cache, screenshot_save_cache, screenshot_load_cache, screenshot_delete_cache,
]) ])
@@ -159,8 +184,15 @@ pub fn run() {
.build() .build()
) )
.manage(ProcessManager::new()) .manage(ProcessManager::new())
.manage(ThinghkUpdateState::new())
.invoke_handler(tauri::generate_handler![ .invoke_handler(tauri::generate_handler![
quit_app, quit_app,
app_version,
update_check,
update_install,
update_thinghk_apply,
update_thinghk_confirm,
update_thinghk_cancel,
process_start, process_start,
process_stop, process_stop,
process_status, process_status,
@@ -174,11 +206,13 @@ pub fn run() {
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,
@@ -201,24 +235,31 @@ pub fn run() {
monitor_elevate_self, monitor_elevate_self,
monitor_stop, monitor_stop,
monitor_get_status, monitor_get_status,
monitor_repair_pawnio,
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_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,
@@ -226,10 +267,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,
@@ -246,6 +291,11 @@ 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_get_settings,
quickpanel_save_settings, quickpanel_save_settings,
quickpanel_register_shortcut, quickpanel_register_shortcut,
@@ -264,10 +314,17 @@ pub fn run() {
quickpanel_reveal_in_explorer, quickpanel_reveal_in_explorer,
quickpanel_open_file, quickpanel_open_file,
quickpanel_delete_file, quickpanel_delete_file,
quickpanel_delete_files,
quickpanel_run_custom_command, quickpanel_run_custom_command,
quickpanel_run_system_command, quickpanel_run_system_command,
quickpanel_get_special_locations, quickpanel_get_special_locations,
quickpanel_open_special, 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,
@@ -278,27 +335,39 @@ pub fn run() {
screenshot_clear_fullscreen, screenshot_clear_fullscreen,
screenshot_crop_stored, screenshot_crop_stored,
screenshot_crop_copy_stored, screenshot_crop_copy_stored,
screenshot_window_from_point, screenshot_pick_list,
screenshot_show_overlay,
screenshot_cursor_pos, screenshot_cursor_pos,
screenshot_enum_windows, screenshot_enum_windows,
screenshot_capture_window, screenshot_capture_window,
screenshot_set_editor_image, screenshot_scroll_capture,
screenshot_get_editor_image, screenshot_scroll_cancel,
screenshot_scroll_finish,
screenshot_scroll_start,
screenshot_take_editor_image_raw,
screenshot_copy_image, screenshot_copy_image,
screenshot_save_png, screenshot_save_png,
screenshot_save_cache, screenshot_save_cache,
screenshot_load_cache, screenshot_load_cache,
screenshot_load_cache_raw,
screenshot_delete_cache, screenshot_delete_cache,
screenshot_register_shortcut, screenshot_register_shortcut,
screenshot_unregister_shortcut, screenshot_unregister_shortcut,
screenshot_register_pin_shortcut,
screenshot_unregister_pin_shortcut,
screenshot_disable_transitions, screenshot_disable_transitions,
screenshot_compose_copy screenshot_compose_copy,
screenshot_compose_png
]) ])
.setup(setup::init) .setup(setup::init)
.on_window_event(|window, event| { .on_window_event(|window, event| {
if let tauri::WindowEvent::CloseRequested { api, .. } = event { // 仅主窗口拦截关闭(隐藏到托盘)。其他窗口(截图编辑器/OSD 等)
window.hide().ok(); // 调用 close() 是真实销毁语义,全局拦截会导致隐藏窗口累积泄漏。
api.prevent_close(); if window.label() == constants::windows::MAIN {
if let tauri::WindowEvent::CloseRequested { api, .. } = event {
window.hide().ok();
api.prevent_close();
}
} }
}) })
.build(tauri::generate_context!()) .build(tauri::generate_context!())
@@ -313,16 +382,18 @@ pub fn run() {
} }
if let Some(monitor) = app.try_state::<MonitorKernel>() { if let Some(monitor) = app.try_state::<MonitorKernel>() {
// cleanup_on_exit 是 async;在事件循环回调中直接 block_on 有 panic 风险且阻塞退出, // cleanup_on_exit 是 async;在事件循环回调中直接 block_on 有 panic 风险且阻塞退出,
// 放到独立 OS 线程执行并限时等待(与托盘旧实现同模式)。 // 放到独立 OS 线程执行并通过 channel 限时等待 3s,超时放弃等待直接退出
// (进程终止时 OS 回收残留资源),避免清理挂起导致退出卡死。
let app_clone = app.clone(); let app_clone = app.clone();
let monitor_clone = monitor.inner().clone(); let monitor_clone = monitor.inner().clone();
let (tx, rx) = std::sync::mpsc::channel::<()>();
std::thread::spawn(move || { std::thread::spawn(move || {
tauri::async_runtime::block_on(async move { tauri::async_runtime::block_on(async move {
monitor_clone.cleanup_on_exit(&app_clone).await; monitor_clone.cleanup_on_exit(&app_clone).await;
}); });
}) let _ = tx.send(());
.join() });
.ok(); 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();
+192
View File
@@ -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()
}
+109 -16
View File
@@ -4,10 +4,18 @@ use tauri::{AppHandle, State};
use super::system_proxy::{clear_system_proxy_windows, get_system_proxy_windows, set_system_proxy_windows}; use super::system_proxy::{clear_system_proxy_windows, get_system_proxy_windows, set_system_proxy_windows};
use super::{ use super::{
KernelInfo, KernelUpdateInfo, MihomoManager, ProfileMeta, ProxySettings, ProxyStatus, KernelInfo, KernelUpdateInfo, MihomoManager, ProfileMeta, ProxySettings, ProxyStatus, TrafficSnapshot,
}; };
use crate::process_manager::{ProcessInfo, ProcessManager}; 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] #[tauri::command]
#[specta::specta] #[specta::specta]
@@ -41,25 +49,33 @@ pub async fn proxy_check_kernel_update(
state.check_kernel_update().await state.check_kernel_update().await
} }
/// 取消内核下载/安装(设置取消标志,下载循环轮询后中止)
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn proxy_update_kernel( pub fn proxy_cancel_kernel_install(state: State<'_, MihomoManager>) -> Result<(), String> {
state: State<'_, MihomoManager>, state.cancel_kernel_install();
app: AppHandle, Ok(())
mirror_prefix: Option<String>,
) -> Result<KernelInfo, String> {
state.install_kernel(&app, mirror_prefix.unwrap_or_default()).await
} }
/// 首次安装内核(与 update_kernel 共用 install_kernel 实现,语义独立便于前端区分场景) /// 前端确认 mihomo 已停止,唤醒等待中的安装流程继续解压替换。
/// (下载阶段允许 mihomo 运行以便走系统代理,解压替换前必须停止 mihomo,否则 exe 被占用)
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn proxy_install_kernel( 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>, state: State<'_, MihomoManager>,
app: AppHandle, app: AppHandle,
mirror_prefix: Option<String>, zip_path: String,
) -> Result<KernelInfo, String> { ) -> Result<KernelInfo, String> {
state.install_kernel(&app, mirror_prefix.unwrap_or_default()).await let path = std::path::PathBuf::from(zip_path);
state.apply_kernel_update(&app, path).await
} }
#[tauri::command] #[tauri::command]
@@ -87,12 +103,19 @@ pub fn proxy_start(
app: AppHandle, app: AppHandle,
) -> Result<ProcessInfo, String> { ) -> Result<ProcessInfo, String> {
let params = state.prepare_for_start(&app)?; let params = state.prepare_for_start(&app)?;
pm.start(params) let info = pm.start(params)?;
// 手动启动也遵循「启动时自动开启系统代理」设置
state.apply_auto_system_proxy();
Ok(info)
} }
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub fn proxy_stop(pm: State<'_, ProcessManager>) -> Result<(), String> { 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") pm.stop("proxy")
} }
@@ -110,8 +133,65 @@ pub async fn proxy_restart(
}) })
.await .await
.map_err(|e| format!("sleep 失败: {}", e))?; .map_err(|e| format!("sleep 失败: {}", e))?;
let params = state.prepare_for_start(&app)?;
pm.start(params) // 启动并等待 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] #[tauri::command]
@@ -158,6 +238,14 @@ pub async fn proxy_get_connections(
state.get_connections().await 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] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn proxy_close_connection( pub async fn proxy_close_connection(
@@ -220,7 +308,12 @@ pub fn proxy_activate_profile(
#[specta::specta] #[specta::specta]
pub fn proxy_set_system_proxy( pub fn proxy_set_system_proxy(
state: State<'_, MihomoManager>, state: State<'_, MihomoManager>,
pm: State<'_, ProcessManager>,
) -> Result<(), String> { ) -> Result<(), String> {
// 停机时禁止开启系统代理:否则系统代理指向已停止的端口,会导致所有网络请求失败
if !mihomo_running(&pm) {
return Err("mihomo 未运行,无法开启系统代理".into());
}
let settings = state.load_settings(); let settings = state.load_settings();
let addr = format!("127.0.0.1:{}", settings.mixed_port); let addr = format!("127.0.0.1:{}", settings.mixed_port);
set_system_proxy_windows(&addr)?; set_system_proxy_windows(&addr)?;
+55 -108
View File
@@ -1,15 +1,18 @@
//! 内核(mihomo.exe)安装 / 更新 / 版本查询。 //! 内核(mihomo.exe)安装 / 更新 / 版本查询。
//! 子模块通过 `impl super::MihomoManager` 为管理器追加方法,可访问父模块私有字段。 //! 子模块通过 `impl super::MihomoManager` 为管理器追加方法,可访问父模块私有字段。
use futures_util::StreamExt;
use std::fs; use std::fs;
use std::io::{Read, Write}; use std::io::{Read, Write};
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::atomic::Ordering;
use tauri::{AppHandle, Emitter, Manager}; use tauri::{AppHandle, Emitter, Manager};
use crate::constants::events::KERNEL_INSTALL_PROGRESS; use crate::constants::events::KERNEL_INSTALL_PROGRESS;
use super::{InstallProgress, KernelInfo, KernelUpdateInfo, MihomoManager}; use super::{InstallProgress, KernelInfo, KernelUpdateInfo, MihomoManager};
/// 用户主动取消下载的标记错误信息(前端据此静默处理,不弹错误 toast)
const KERNEL_CANCELLED: &str = "下载已取消";
impl MihomoManager { impl MihomoManager {
// ---------- 内核 ---------- // ---------- 内核 ----------
pub fn kernel_info(&self) -> KernelInfo { pub fn kernel_info(&self) -> KernelInfo {
@@ -203,57 +206,15 @@ impl MihomoManager {
} }
} }
/// 下载并安装内核(首次安装与更新共用此方法) /// 应用内核更新:下载阶段已由下载模块完成,本方法仅做 need_stop → 解压 → 替换。
/// - mirror_prefix: 用户选择的镜像源前缀(空串=直连 GitHub) /// zip_path: 下载模块下载完成的 zip 文件路径。
/// - 流式下载:实时推送下载进度到前端 /// 任何阶段失败都会 emit error 事件,避免前端进度卡住。
/// - zip crate 解压:替代 PowerShell,避免执行策略问题 pub async fn apply_kernel_update(&self, app: &AppHandle, zip_path: PathBuf) -> Result<KernelInfo, String> {
/// - 备份旧内核:替换前备份为 .bak self.kernel_cancel.store(false, Ordering::SeqCst);
/// 任何阶段失败都会 emit error 事件,避免前端进度卡在初始状态 let _ = self.kernel_cancel_tx.send(false);
pub async fn install_kernel(&self, app: &AppHandle, mirror_prefix: String) -> Result<KernelInfo, String> { let result = self.apply_kernel_inner(app, zip_path).await;
let result = self.install_kernel_inner(app, mirror_prefix).await;
if let Err(ref e) = result { if let Err(ref e) = result {
let _ = app.emit( if e != KERNEL_CANCELLED {
KERNEL_INSTALL_PROGRESS,
InstallProgress {
stage: "error".into(),
percent: 0,
downloaded_bytes: 0,
total_bytes: None,
message: e.clone(),
},
);
}
result
}
async fn install_kernel_inner(&self, app: &AppHandle, mirror_prefix: String) -> Result<KernelInfo, String> {
let info = self.check_kernel_update().await?;
let zip_path = self.cores_dir().join("mihomo-update.zip");
let extract_dir = self.cores_dir().join("mihomo-update-tmp");
// 拼接用户选择的镜像源 URL
let url = if mirror_prefix.is_empty() {
info.download_url.clone()
} else {
format!("{}{}", mirror_prefix, info.download_url)
};
let label = if mirror_prefix.is_empty() { "GitHub 直连".to_string() } else { mirror_prefix.clone() };
let _ = app.emit(
KERNEL_INSTALL_PROGRESS,
InstallProgress {
stage: "downloading".into(),
percent: 0,
downloaded_bytes: 0,
total_bytes: None,
message: format!("正在下载:{}", label),
},
);
// 单源下载(用户已选择)
match self.download_with_progress(app, &url, &zip_path).await {
Ok(()) => {}
Err(e) => {
let msg = format!("下载失败({}):{}", label, e);
let _ = app.emit( let _ = app.emit(
KERNEL_INSTALL_PROGRESS, KERNEL_INSTALL_PROGRESS,
InstallProgress { InstallProgress {
@@ -261,11 +222,50 @@ impl MihomoManager {
percent: 0, percent: 0,
downloaded_bytes: 0, downloaded_bytes: 0,
total_bytes: None, total_bytes: None,
message: msg.clone(), message: e.clone(),
}, },
); );
let _ = fs::remove_file(&zip_path); }
return Err(msg); }
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() => {}
} }
} }
@@ -299,8 +299,6 @@ impl MihomoManager {
} }
// 在解压目录中递归查找 exe 文件 // 在解压目录中递归查找 exe 文件
// mihomo zip 内的 exe 名字通常与 zip 同名(如 mihomo-windows-amd64-v3-v1.19.13.exe),
// 不是固定的 mihomo.exe,所以查找唯一的 .exe 文件即可
let new_exe = self let new_exe = self
.find_exe_in_dir(&extract_dir) .find_exe_in_dir(&extract_dir)
.ok_or_else(|| "解压后未找到任何 .exe 文件".to_string())?; .ok_or_else(|| "解压后未找到任何 .exe 文件".to_string())?;
@@ -313,7 +311,7 @@ impl MihomoManager {
percent: 96, percent: 96,
downloaded_bytes: 0, downloaded_bytes: 0,
total_bytes: None, total_bytes: None,
message: "正在安装...".into(), message: "正在替换内核...".into(),
}, },
); );
let kernel = self.kernel_path(); let kernel = self.kernel_path();
@@ -345,57 +343,6 @@ impl MihomoManager {
Ok(final_info) Ok(final_info)
} }
/// 流式下载并实时推送进度事件
async fn download_with_progress(
&self,
app: &AppHandle,
url: &str,
dest: &PathBuf,
) -> Result<(), String> {
let resp = self
.client
.get(url)
.header("User-Agent", "thing-app")
.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 total = resp.content_length();
let mut stream = resp.bytes_stream();
let mut file = fs::File::create(dest).map_err(|e| format!("创建文件失败: {}", e))?;
let mut downloaded: u64 = 0;
let mut last_percent: u8 = 0;
while let Some(chunk) = stream.next().await {
let chunk = chunk.map_err(|e| format!("读取流失败: {}", e))?;
file.write_all(&chunk).map_err(|e| format!("写入文件失败: {}", e))?;
downloaded += chunk.len() as u64;
// 下载占总进度的 0-90%
let percent = match total {
Some(t) if t > 0 => ((downloaded as f64 / t as f64) * 90.0) as u8,
_ => 0,
};
// 仅在变化超过 1% 时 emit,避免事件轰炸
if percent >= last_percent + 1 {
last_percent = percent;
let _ = app.emit(
KERNEL_INSTALL_PROGRESS,
InstallProgress {
stage: "downloading".into(),
percent,
downloaded_bytes: downloaded,
total_bytes: total,
message: format!("已下载 {:.2} MB", downloaded as f64 / 1024.0 / 1024.0),
},
);
}
}
file.flush().map_err(|e| format!("flush 失败: {}", e))?;
Ok(())
}
/// 用 zip crate 解压(纯 Rust,避免 PowerShell 执行策略问题) /// 用 zip crate 解压(纯 Rust,避免 PowerShell 执行策略问题)
fn extract_zip(&self, zip_path: &PathBuf, dest: &PathBuf) -> Result<(), String> { 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 file = fs::File::open(zip_path).map_err(|e| format!("打开 zip 失败: {}", e))?;
+116 -14
View File
@@ -6,6 +6,7 @@
//! - [`system_proxy`]Windows 系统代理开关 //! - [`system_proxy`]Windows 系统代理开关
//! - [`commands`]Tauri 命令层 //! - [`commands`]Tauri 命令层
mod autoswitch;
mod commands; mod commands;
mod kernel; mod kernel;
mod profiles; mod profiles;
@@ -13,21 +14,24 @@ mod pseudo;
mod system_proxy; mod system_proxy;
mod types; mod types;
pub use autoswitch::{pick_best, start_auto_switch_loop};
pub use pseudo::is_pseudo_node; pub use pseudo::is_pseudo_node;
pub use types::{InstallProgress, KernelInfo, KernelUpdateInfo, ProfileMeta, ProxySettings, ProxyStatus}; pub use system_proxy::get_system_proxy_windows;
pub use types::{InstallProgress, KernelInfo, KernelUpdateInfo, ProfileMeta, ProxySettings, ProxyStatus, TrafficSnapshot};
pub use commands::{ pub use commands::{
proxy_activate_profile, proxy_check_kernel_update, proxy_clear_system_proxy, proxy_close_connection, proxy_activate_profile, proxy_apply_kernel_update, proxy_cancel_kernel_install, proxy_check_kernel_update, proxy_clear_system_proxy,
proxy_delete_profile, 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_import_profile, proxy_install_kernel, proxy_kernel_info, proxy_patch_configs, proxy_restart, proxy_get_settings, proxy_get_system_proxy, proxy_import_profile, proxy_kernel_info, proxy_traffic,
proxy_save_settings, proxy_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop, proxy_patch_configs, proxy_restart, proxy_save_settings, proxy_select_proxy, proxy_set_system_proxy,
proxy_test_delay, proxy_update_kernel, proxy_update_profile, proxy_version, proxy_start, proxy_status, proxy_stop, proxy_test_delay, proxy_update_profile, proxy_version,
}; };
use reqwest::Client; use reqwest::Client;
use serde_yaml::Value as YamlValue; use serde_yaml::Value as YamlValue;
use std::fs; use std::fs;
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::Mutex; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex};
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use tauri::AppHandle; use tauri::AppHandle;
@@ -41,10 +45,29 @@ struct SettingsCacheEntry {
settings: ProxySettings, settings: ProxySettings,
} }
/// 流量速率差分基线:记录上次采样的会话总量与时刻,用于计算实时速率
struct TrafficBaseline {
download_total: u64,
upload_total: u64,
at: Instant,
}
pub struct MihomoManager { pub struct MihomoManager {
root: PathBuf, root: PathBuf,
client: Client, client: Client,
settings_cache: Mutex<Option<SettingsCacheEntry>>, 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 { impl MihomoManager {
@@ -61,6 +84,24 @@ impl MihomoManager {
.build() .build()
.unwrap_or_else(|_| Client::new()), .unwrap_or_else(|_| Client::new()),
settings_cache: Mutex::new(None), 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(());
} }
} }
@@ -273,6 +314,29 @@ impl MihomoManager {
}) })
} }
/// 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 和系统代理 /// 应用启动时检查是否需要自动启动 mihomo 和系统代理
pub fn auto_start_on_launch(&self, app: &AppHandle, pm: &ProcessManager) { pub fn auto_start_on_launch(&self, app: &AppHandle, pm: &ProcessManager) {
let settings = self.load_settings(); let settings = self.load_settings();
@@ -283,13 +347,9 @@ impl MihomoManager {
Ok(params) => { Ok(params) => {
if let Err(e) = pm.start(params) { if let Err(e) = pm.start(params) {
crate::logger::log_error("mihomo", &format!("自动启动失败: {}", e)); crate::logger::log_error("mihomo", &format!("自动启动失败: {}", e));
} else if settings.auto_system_proxy { } else {
// 启动成功后开启系统代理 // 启动成功后按「启动时自动开启系统代理」设置决定是否开启系统代理
let addr = format!("127.0.0.1:{}", settings.mixed_port); self.apply_auto_system_proxy();
let _ = system_proxy::set_system_proxy_windows(&addr);
let mut s = settings;
s.system_proxy = true;
let _ = self.save_settings(&s);
} }
} }
Err(e) => { Err(e) => {
@@ -407,6 +467,48 @@ impl MihomoManager {
self.api_get("/connections").await 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> { pub async fn close_connection(&self, id: &str) -> Result<(), String> {
self.api_request( self.api_request(
reqwest::Method::DELETE, reqwest::Method::DELETE,
+2 -2
View File
@@ -38,7 +38,7 @@ pub(crate) fn clear_system_proxy_windows() -> Result<(), String> {
} }
#[cfg(windows)] #[cfg(windows)]
pub(crate) fn get_system_proxy_windows() -> bool { pub fn get_system_proxy_windows() -> bool {
use winreg::enums::*; use winreg::enums::*;
use winreg::RegKey; use winreg::RegKey;
let hkcu = RegKey::predef(HKEY_CURRENT_USER); let hkcu = RegKey::predef(HKEY_CURRENT_USER);
@@ -67,7 +67,7 @@ pub(crate) fn clear_system_proxy_windows() -> Result<(), String> {
Err("系统代理仅支持 Windows".into()) Err("系统代理仅支持 Windows".into())
} }
#[cfg(not(windows))] #[cfg(not(windows))]
pub(crate) fn get_system_proxy_windows() -> bool { pub fn get_system_proxy_windows() -> bool {
false false
} }
+16
View File
@@ -124,6 +124,22 @@ pub struct ProxyStatus {
pub restart_count: 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 /// - stage: downloading | extracting | replacing | done | error
/// - percent: 0-100(无 total_bytes 时为 0,前端按 downloadedBytes 显示) /// - percent: 0-100(无 total_bytes 时为 0,前端按 downloadedBytes 显示)
+157 -1
View File
@@ -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
@@ -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,
@@ -295,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")
} }
@@ -309,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) {
@@ -324,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(),
@@ -428,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(
crate::constants::events::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(());
@@ -927,6 +1018,52 @@ pub async fn monitor_get_status(state: tauri::State<'_, MonitorKernel>) -> Resul
state.get_status().await state.get_status().await
} }
/// 检测并修复 PawnIO 驱动:确保安装器随内核部署 → 静默安装 → 重启监控内核
/// (LHM 打开一次后不会重新发现驱动,装完必须重启才能恢复 CPU 温度/功耗读取)。
/// 返回 { installed, needReboot }installed=false 说明未提权或安装失败,交由内核启动自装。
#[tauri::command]
pub async fn monitor_repair_pawnio(
state: tauri::State<'_, MonitorKernel>,
pm: tauri::State<'_, ProcessManager>,
app: AppHandle,
) -> Result<serde_json::Value, String> {
// 1. 确保 PawnIO_setup.exe 随内核部署
state.prepare_kernel(&app)?;
let setup = state.cores_dir().join("PawnIO_setup.exe");
if !setup.exists() {
return Err("未找到 PawnIO_setup.exe 安装器(binaries 资源未随包部署),请重新部署监控内核".into());
}
// 2. 静默安装驱动(继承当前进程权限;Thing 已提权则直接成功)
let mut cmd = std::process::Command::new(&setup);
cmd.args(["-install", "-silent"]);
crate::process_manager::setup_creation_flags(&mut cmd);
let (installed, need_reboot) = match cmd.status() {
Ok(status) => {
let code = status.code().unwrap_or(-1);
match code {
3010 => (true, true), // ERROR_SUCCESS_REBOOT_REQUIRED
0 => (true, false),
_ => (false, false),
}
}
Err(e) => return Err(format!("运行 PawnIO 安装器失败: {}", e)),
};
// 3. 重启监控内核,使 LHM 以 PawnIO 重新打开传感器
state.stop_subscription(&app).await;
if state.is_elevated() && !is_thing_elevated() {
state.shutdown_kernel().await?;
state.elevated.store(false, Ordering::SeqCst);
state.start_elevated(&app).await?;
} else {
pm.stop(PROCESS_ID)?;
state.start_with_subscription(&app).await?;
}
Ok(serde_json::json!({ "installed": installed, "needReboot": need_reboot }))
}
#[tauri::command] #[tauri::command]
pub async fn monitor_get_snapshot(state: tauri::State<'_, MonitorKernel>) -> Result<SensorSnapshot, String> { pub async fn monitor_get_snapshot(state: tauri::State<'_, MonitorKernel>) -> Result<SensorSnapshot, String> {
state.get_snapshot().await state.get_snapshot().await
@@ -950,6 +1087,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]
+196 -6
View File
@@ -15,9 +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 猜测式等待 + 线程泄漏) /// 监视线程句柄(用于停止时 join,避免 sleep 猜测式等待 + 线程泄漏)
static DRAG_HANDLE: Mutex<Option<JoinHandle<()>>> = Mutex::new(None); static DRAG_HANDLE: Mutex<Option<JoinHandle<()>>> = Mutex::new(None);
static TOPMOST_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)))
@@ -27,6 +30,10 @@ 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() { fn stop_drag_thread() {
drag_stop().store(true, Ordering::SeqCst); drag_stop().store(true, Ordering::SeqCst);
@@ -51,18 +58,35 @@ fn stop_topmost_thread() {
} }
} }
/// 停止游戏全屏监视线程并等待其退出
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;
@@ -165,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,
@@ -172,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,
); );
} }
} }
@@ -190,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!(
@@ -203,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
@@ -347,11 +428,98 @@ pub fn osd_start_topmost_watch(app: AppHandle) -> Result<(), String> {
Ok(()) 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(())
}
/// 停止所有 OSD 监视线程 /// 停止所有 OSD 监视线程
#[tauri::command] #[tauri::command]
pub fn osd_stop_watch() { pub fn osd_stop_watch() {
stop_drag_thread(); stop_drag_thread();
stop_topmost_thread(); stop_topmost_thread();
stop_game_thread();
} }
/// 设置点击穿透(Rust 侧原生 WS_EX_TRANSPARENT,比 JS setIgnoreCursorEvents 更可靠) /// 设置点击穿透(Rust 侧原生 WS_EX_TRANSPARENT,比 JS setIgnoreCursorEvents 更可靠)
@@ -378,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),然后在独立线程中调用
+5
View File
@@ -11,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)]
+344
View File
@@ -0,0 +1,344 @@
//! 快速面板:基于 7-Zipbinaries/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)
}
+218 -14
View File
@@ -1,10 +1,20 @@
//! Tauri 命令:快速面板模块 //! Tauri 命令:快速面板模块
use tauri::AppHandle; use tauri::{AppHandle, Emitter, Manager};
use super::popup::{self, QuickPanelSettings}; use super::popup::{self, QuickPanelSettings};
use super::{file_index, app_scanner, icon_extractor}; 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] #[tauri::command]
#[specta::specta] #[specta::specta]
@@ -12,14 +22,17 @@ pub async fn quickpanel_get_settings(app: AppHandle) -> Result<QuickPanelSetting
Ok(popup::load_settings(&app)) Ok(popup::load_settings(&app))
} }
/// 保存快速面板设置;快捷键变化时自动重新注册 + 预创建窗口 /// 保存快速面板设置;快捷键变化时自动重新注册 + 预创建窗口
/// 索引目录变化时闲时自动重建索引。
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn quickpanel_save_settings( pub async fn quickpanel_save_settings(
settings: QuickPanelSettings, settings: QuickPanelSettings,
app: AppHandle, app: AppHandle,
) -> Result<(), String> { ) -> Result<(), String> {
let prev_shortcut = popup::load_settings(&app).shortcut; 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)?; popup::save_settings(&app, &settings)?;
// 快捷键变化时重新注册(共享工具模块,原子化 + 冲突检测) // 快捷键变化时重新注册(共享工具模块,原子化 + 冲突检测)
if settings.shortcut != prev_shortcut { if settings.shortcut != prev_shortcut {
@@ -31,6 +44,10 @@ pub async fn quickpanel_save_settings(
popup::ensure_window(&app); popup::ensure_window(&app);
} }
} }
// 索引目录变更:闲时自动重建(新增/移除路径后无需手动点"构建索引")
if dirs_changed {
schedule_auto_build(app, true);
}
Ok(()) Ok(())
} }
@@ -76,6 +93,26 @@ pub async fn quickpanel_show_window(app: AppHandle) -> Result<(), String> {
Ok(()) 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,LockWorkStationCREATE_NO_WINDOW 避免黑窗) /// 锁定屏幕(Windows: rundll32 user32.dll,LockWorkStationCREATE_NO_WINDOW 避免黑窗)
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
@@ -95,25 +132,100 @@ pub fn quickpanel_lock_screen() -> Result<(), String> {
Ok(()) 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] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn quickpanel_init_file_index(app: AppHandle) -> Result<(), String> { pub async fn quickpanel_init_file_index(app: AppHandle) -> Result<(), String> {
tauri::async_runtime::spawn_blocking(move || file_index::init(&app)) let app_for_build = app.clone();
.await let need_auto_build = tauri::async_runtime::spawn_blocking(move || {
.map_err(|e| format!("索引初始化任务失败: {}", e)) 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 调用) /// 构建文件索引(全量重建,阻塞操作建议在 spawn_blocking 调用)
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn quickpanel_build_file_index(app: AppHandle) -> Result<i64, String> { pub async fn quickpanel_build_file_index(app: AppHandle) -> Result<i64, String> {
let settings = popup::load_settings(&app); let dirs = resolve_index_dirs(&app);
let dirs = if settings.index_dirs.is_empty() { // 懒加载:首次构建时自动初始化 DB 连接
popup::QuickPanelSettings::default().index_dirs file_index::ensure_initialized(&app);
} else {
settings.index_dirs
};
// 阻塞操作放到 spawn_blocking // 阻塞操作放到 spawn_blocking
tauri::async_runtime::spawn_blocking(move || file_index::build_index(&dirs)) tauri::async_runtime::spawn_blocking(move || file_index::build_index(&dirs))
.await .await
@@ -126,7 +238,10 @@ pub async fn quickpanel_build_file_index(app: AppHandle) -> Result<i64, String>
pub async fn quickpanel_search_files( pub async fn quickpanel_search_files(
query: String, query: String,
limit: Option<i64>, limit: Option<i64>,
app: AppHandle,
) -> Result<Vec<file_index::FileRecord>, String> { ) -> 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))) tauri::async_runtime::spawn_blocking(move || file_index::search(&query, limit.unwrap_or(50)))
.await .await
.map_err(|e| format!("搜索任务失败: {}", e)) .map_err(|e| format!("搜索任务失败: {}", e))
@@ -135,7 +250,9 @@ pub async fn quickpanel_search_files(
/// 获取索引状态 /// 获取索引状态
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub fn quickpanel_file_index_stats() -> file_index::IndexStats { pub async fn quickpanel_file_index_stats(app: AppHandle) -> file_index::IndexStats {
// 懒加载:查询状态前确保 DB 已初始化(未初始化时 stats 返回全 0)
file_index::ensure_initialized(&app);
file_index::stats() file_index::stats()
} }
@@ -298,6 +415,69 @@ fn delete_file_impl(path: &str) -> Result<(), String> {
Ok(()) 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 快捷方式不能直接 spawnos error 193),需通过 cmd /C 启动 /// .lnk 快捷方式不能直接 spawnos error 193),需通过 cmd /C 启动
#[tauri::command] #[tauri::command]
@@ -325,11 +505,35 @@ pub fn quickpanel_run_custom_command(command: String, args: Vec<String>) -> Resu
/// 运行系统命令(不设置 CREATE_NO_WINDOW,使 cmd/powershell/regedit 等显示自身窗口) /// 运行系统命令(不设置 CREATE_NO_WINDOW,使 cmd/powershell/regedit 等显示自身窗口)
/// 适用于内置系统工具:regedit、shutdown、cmd、powershell、taskmgr 等。 /// 适用于内置系统工具:regedit、shutdown、cmd、powershell、taskmgr 等。
/// - 控制台类交互程序(cmd/powershell/pwsh)额外设置 CREATE_NEW_CONSOLE
/// 否则从 GUI 宿主启动时无可见控制台窗口(表现为"点击没反应")。
/// - .msc 控制台文件(如 devmgmt.msc)不可被 CreateProcess 直接执行,
/// 改由 mmc 打开(路径解析到 System32,不受当前工作目录影响)。
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub fn quickpanel_run_system_command(command: String, args: Vec<String>) -> Result<(), String> { 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); let mut cmd = std::process::Command::new(&command);
cmd.args(&args); 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))?; cmd.spawn().map_err(|e| format!("运行系统命令失败: {}", e))?;
Ok(()) Ok(())
} }
+139
View File
@@ -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
}
+76 -2
View File
@@ -6,6 +6,7 @@
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::Mutex; use std::sync::Mutex;
use std::sync::atomic::{AtomicBool, Ordering};
use std::time::UNIX_EPOCH; use std::time::UNIX_EPOCH;
use rusqlite::{params, Connection}; use rusqlite::{params, Connection};
@@ -93,6 +94,17 @@ pub fn init(app: &AppHandle) {
crate::logger::log_info("quickpanel", &format!("文件索引 DB 已就绪: {}", path.display())); 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> fn with_conn<F, R>(f: F) -> Option<R>
where where
@@ -107,10 +119,37 @@ where
None 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 中调用。 /// 返回索引条目数。在 spawn_blocking 中调用。
/// 重建完成后自动启动 notify 监听器做增量更新。 /// 重建完成后自动启动 notify 监听器做增量更新。
/// 若已有构建正在进行(手动/自动并发),直接返回 Ok(0),由进行中的构建负责更新索引。
pub fn build_index(dirs: &[String]) -> Result<i64, String> { 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| { let cleared = with_conn(|conn| {
conn.execute("DELETE FROM files", []).ok() conn.execute("DELETE FROM files", []).ok()
@@ -333,16 +372,51 @@ pub fn start_watcher(dirs: &[String]) {
crate::logger::log_info("quickpanel", &format!("notify 监听已启动,监听 {} 个目录", dirs.len())); crate::logger::log_info("quickpanel", &format!("notify 监听已启动,监听 {} 个目录", dirs.len()));
} }
/// 处理文件系统事件:创建/修改 → upsert,删除 → remove,重命名 → remove + upsert /// 处理文件系统事件:
/// - 创建/数据或元数据修改 → upsert
/// - 重命名:旧路径(From) → remove,新路径(To) → upsert
/// - 删除 → remove
fn handle_fs_event(event: &notify::Event) { fn handle_fs_event(event: &notify::Event) {
use notify::event::{ModifyKind, RenameMode};
match event.kind { match event.kind {
EventKind::Create(_) | EventKind::Modify(_) => { // 创建、数据/元数据修改、类型未知 → upsert
EventKind::Create(_)
| EventKind::Modify(ModifyKind::Data(_))
| EventKind::Modify(ModifyKind::Metadata(_))
| EventKind::Modify(ModifyKind::Other)
| EventKind::Modify(ModifyKind::Any) => {
for path in &event.paths { for path in &event.paths {
if path.exists() { if path.exists() {
upsert_path(path); 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(_) => { EventKind::Remove(_) => {
for path in &event.paths { for path in &event.paths {
remove_path(path); remove_path(path);
+13 -7
View File
@@ -4,21 +4,27 @@
//! Phase 2fuzzy + 拼音引擎,command/calc/web/system Provider //! Phase 2fuzzy + 拼音引擎,command/calc/web/system Provider
//! Phase 3:文件索引(walkdir + rusqlite)、应用扫描、剪贴板历史复用 //! Phase 3:文件索引(walkdir + rusqlite)、应用扫描、剪贴板历史复用
pub mod actions;
pub mod app_scanner; pub mod app_scanner;
pub mod commands; pub mod commands;
pub mod explorer;
pub mod file_index; pub mod file_index;
pub mod icon_extractor; pub mod icon_extractor;
pub mod popup; pub mod popup;
pub mod special_locations; 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::{ pub use commands::{
quickpanel_build_file_index, quickpanel_clear_app_icon_cache, quickpanel_delete_file, quickpanel_build_file_index, quickpanel_clear_app_icon_cache, quickpanel_delete_file,
quickpanel_file_index_stats, quickpanel_get_app_icon, quickpanel_get_settings, quickpanel_delete_files, quickpanel_file_index_stats, quickpanel_focus_main_window,
quickpanel_get_special_locations, quickpanel_hide_popup, quickpanel_init_file_index, quickpanel_get_app_icon, quickpanel_get_settings, quickpanel_get_special_locations,
quickpanel_lock_screen, quickpanel_open_file, quickpanel_open_special, quickpanel_hide_popup, quickpanel_init_file_index, quickpanel_lock_screen,
quickpanel_register_shortcut, quickpanel_reveal_in_explorer, quickpanel_run_custom_command, quickpanel_open_file, quickpanel_open_special, quickpanel_register_shortcut,
quickpanel_run_system_command, quickpanel_save_settings, quickpanel_scan_apps, quickpanel_reveal_in_explorer, quickpanel_run_custom_command, quickpanel_run_system_command,
quickpanel_search_files, quickpanel_show_popup, quickpanel_show_window, quickpanel_save_settings, quickpanel_scan_apps, quickpanel_search_files, quickpanel_show_popup,
quickpanel_unregister_shortcut, quickpanel_show_window, quickpanel_unregister_shortcut,
}; };
pub use popup::{ensure_window, load_settings}; pub use popup::{ensure_window, load_settings};
+89 -10
View File
@@ -13,6 +13,7 @@
use std::sync::Mutex; use std::sync::Mutex;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::path::PathBuf; use std::path::PathBuf;
use std::time::{Duration, Instant};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tauri::{AppHandle, Emitter, Manager, WebviewUrl, WebviewWindowBuilder}; use tauri::{AppHandle, Emitter, Manager, WebviewUrl, WebviewWindowBuilder};
@@ -20,6 +21,8 @@ use tauri::window::{Effect, EffectsBuilder};
use crate::win32_util::{get_cursor_pos, get_work_area_at_point, get_dpi_for_point}; use crate::win32_util::{get_cursor_pos, get_work_area_at_point, get_dpi_for_point};
use super::explorer;
use specta::Type; use specta::Type;
/// 弹窗窗口标签 /// 弹窗窗口标签
@@ -29,6 +32,24 @@ pub const POPUP_LABEL: &str = "quick-panel";
const WIN_W: f64 = 600.0; const WIN_W: f64 = 600.0;
const WIN_H: f64 = 420.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 时据此判断是否显示。 /// 标志:show_popup 兜底创建路径设为 true,前端 onMounted 回调 show_window 时据此判断是否显示。
/// 预创建路径不设置,避免应用启动时弹窗自动弹出。 /// 预创建路径不设置,避免应用启动时弹窗自动弹出。
static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false); static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false);
@@ -37,6 +58,48 @@ static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false);
/// 避免窗口重建后仍停留在屏幕外 (-10000, -10000)。 /// 避免窗口重建后仍停留在屏幕外 (-10000, -10000)。
static PENDING_POS: Mutex<Option<(f64, f64)>> = Mutex::new(None); 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)] #[derive(Clone, Serialize, Deserialize, Type)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@@ -164,10 +227,14 @@ fn create_popup_window(app: &AppHandle) {
}; };
// 监听窗口失焦:自动隐藏 // 监听窗口失焦:自动隐藏
// 距上次 show 不足宽限期(激活中焦点弹跳)的失焦事件忽略,避免弹窗刚显示就被隐藏
let app_handle = app.clone(); let app_handle = app.clone();
let win_handle = win.clone(); let win_handle = win.clone();
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 {
if within_show_grace() {
return;
}
let _ = win_handle.hide(); let _ = win_handle.hide();
let _ = app_handle.emit(crate::constants::events::QUICKPANEL_HIDE, ()); let _ = app_handle.emit(crate::constants::events::QUICKPANEL_HIDE, ());
} }
@@ -189,6 +256,7 @@ pub fn ensure_window(app: &AppHandle) {
/// popup_position = "cursor" 时在鼠标位置附近显示,否则在鼠标所在显示器中央显示。 /// popup_position = "cursor" 时在鼠标位置附近显示,否则在鼠标所在显示器中央显示。
/// 窗口不存在则创建(隐藏状态,等前端挂载后调用 show_window 显示)。 /// 窗口不存在则创建(隐藏状态,等前端挂载后调用 show_window 显示)。
pub fn show_popup(app: &AppHandle) { pub fn show_popup(app: &AppHandle) {
crate::logger::log_info("quickpanel", "show_popup triggered");
let settings = load_settings(app); let settings = load_settings(app);
let cursor_mode = settings.popup_position == "cursor"; let cursor_mode = settings.popup_position == "cursor";
@@ -226,14 +294,14 @@ pub fn show_popup(app: &AppHandle) {
// 窗口已存在:移动 + 显示 + 请求焦点 // 窗口已存在:移动 + 显示 + 请求焦点
if let Some(win) = app.get_webview_window(POPUP_LABEL) { 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 { let _ = win.set_position(tauri::Position::Physical(tauri::PhysicalPosition {
x: x as i32, x: x as i32,
y: y as i32, y: y as i32,
})); }));
let _ = win.show(); show_and_focus(&win);
let _ = win.set_focus();
// 通知前端刷新数据
let _ = app.emit(crate::constants::events::QUICKPANEL_SHOW, ());
return; return;
} }
@@ -246,12 +314,24 @@ pub fn show_popup(app: &AppHandle) {
} }
/// 显示已创建的弹窗窗口(由前端 onMounted 后调用)。 /// 显示已创建的弹窗窗口(由前端 onMounted 后调用)。
/// 预创建路径下前端 onMounted 也会调用此函数,但 POPUP_PENDING_SHOW 为 false 时直接跳过, ///
/// 避免应用启动时弹窗自动弹出。仅 show_popup 兜底创建路径才真正显示。 /// 两个路径:
/// 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) { pub fn show_window(app: &AppHandle) {
if !POPUP_PENDING_SHOW.swap(false, Ordering::SeqCst) { 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; return;
} }
// 兜底创建路径:show_popup 兜底重建,窗口尚未显示
if let Some(win) = app.get_webview_window(POPUP_LABEL) { if let Some(win) = app.get_webview_window(POPUP_LABEL) {
// 应用 show_popup 计算的兜底位置(物理坐标),避免停留在屏幕外 // 应用 show_popup 计算的兜底位置(物理坐标),避免停留在屏幕外
let pos = PENDING_POS.lock().ok().and_then(|p| *p); let pos = PENDING_POS.lock().ok().and_then(|p| *p);
@@ -261,10 +341,9 @@ pub fn show_window(app: &AppHandle) {
y: y as i32, y: y as i32,
})); }));
} }
let _ = win.show(); // 同样先检测 Explorer 目录再显示,避免面板抢焦点导致检测失败。
let _ = win.set_focus(); emit_show(app);
// 通知前端刷新数据 show_and_focus(&win);
let _ = app.emit(crate::constants::events::QUICKPANEL_SHOW, ());
} }
} }
+61 -34
View File
@@ -3,7 +3,8 @@
//! 实现: //! 实现:
//! - 全屏(虚拟屏)捕获:BitBlt 从屏幕 DC 拷贝到兼容位图,GetDIBits 取像素 //! - 全屏(虚拟屏)捕获:BitBlt 从屏幕 DC 拷贝到兼容位图,GetDIBits 取像素
//! - 窗口捕获:PrintWindow(PW_RENDERFULLCONTENT) 捕获 DWM 内容(覆盖硬件加速窗口) //! - 窗口捕获:PrintWindow(PW_RENDERFULLCONTENT) 捕获 DWM 内容(覆盖硬件加速窗口)
//! - 窗口拾取:EnumWindows Z 序命中测试(排除本进程窗口,避免命中覆盖层自身) //! - 窗口拾取:pick_windows 枚举 Z 序窗口列表(排除本进程,避免命中覆盖层自身)
//! 前端缓存列表后本地命中测试
//! - 顶层窗口枚举:EnumWindows //! - 顶层窗口枚举:EnumWindows
//! - 像素 → PNG / CF_DIB 转换 //! - 像素 → PNG / CF_DIB 转换
//! //!
@@ -110,7 +111,7 @@ fn bgra_to_bmp(bgra: &[u8], width: i32, height: i32) -> Result<Vec<u8>, String>
/// ///
/// 使用 Fast 压缩 + 无过滤:历史缩略图/自动保存不需要最优压缩比, /// 使用 Fast 压缩 + 无过滤:历史缩略图/自动保存不需要最优压缩比,
/// 大幅降低"点击完成 → 关闭窗口"的编码延迟。 /// 大幅降低"点击完成 → 关闭窗口"的编码延迟。
fn bgra_to_png(bgra: &[u8], width: i32, height: i32) -> Result<Vec<u8>, String> { pub(crate) fn bgra_to_png(bgra: &[u8], width: i32, height: i32) -> Result<Vec<u8>, String> {
use image::codecs::png::{CompressionType, FilterType, PngEncoder}; use image::codecs::png::{CompressionType, FilterType, PngEncoder};
use image::ImageEncoder; use image::ImageEncoder;
if width <= 0 || height <= 0 { if width <= 0 || height <= 0 {
@@ -137,7 +138,7 @@ fn bgra_to_png(bgra: &[u8], width: i32, height: i32) -> Result<Vec<u8>, String>
} }
/// 从 HBITMAP 提取 32bpp BGRA top-down 像素 /// 从 HBITMAP 提取 32bpp BGRA top-down 像素
unsafe fn extract_pixels( pub(crate) unsafe fn extract_pixels(
hdc_mem: isize, hdc_mem: isize,
hbm: isize, hbm: isize,
width: i32, width: i32,
@@ -181,7 +182,16 @@ unsafe fn extract_pixels(
} }
/// 捕获整个虚拟屏(所有显示器拼接为一张图) /// 捕获整个虚拟屏(所有显示器拼接为一张图)
///
/// 优先走 BitBlt(SDR 全屏一次捕获、低延迟);检测到任一显示器为 HDR 时改用 WGC
/// RGBA16F + HDR→sRGB 色调映射,避免 BitBlt 把 scRGB 线性像素当 sRGB 直出导致过曝)。
/// WGC 失败时回退到 BitBlt。
pub fn capture_virtual_screen() -> Result<CapturedImage, String> { pub fn capture_virtual_screen() -> Result<CapturedImage, String> {
if super::wgc_capture::is_hdr_enabled() {
if let Ok(img) = super::wgc_capture::capture_virtual_screen_wgc() {
return Ok(img);
}
}
unsafe { unsafe {
let x = GetSystemMetrics(SM_XVIRTUALSCREEN); let x = GetSystemMetrics(SM_XVIRTUALSCREEN);
let y = GetSystemMetrics(SM_YVIRTUALSCREEN); let y = GetSystemMetrics(SM_YVIRTUALSCREEN);
@@ -231,6 +241,19 @@ pub fn capture_virtual_screen() -> Result<CapturedImage, String> {
/// 捕获指定窗口(PrintWindow + PW_RENDERFULLCONTENT,覆盖硬件加速窗口) /// 捕获指定窗口(PrintWindow + PW_RENDERFULLCONTENT,覆盖硬件加速窗口)
pub fn capture_window(hwnd: isize) -> Result<CapturedImage, String> { pub fn capture_window(hwnd: isize) -> Result<CapturedImage, String> {
let img = capture_window_bgra(hwnd)?;
let png = bgra_to_png(&img.bgra, img.width, img.height)?;
Ok(CapturedImage {
width: img.width,
height: img.height,
png,
bgra: img.bgra,
})
}
/// 捕获指定窗口的原始 BGRA(不做 PNG 编码)。
/// 滚动截图每帧只需像素数据做匹配拼接,跳过编码可显著降低单帧耗时。
pub fn capture_window_bgra(hwnd: isize) -> Result<CapturedImage, String> {
unsafe { unsafe {
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 {
@@ -258,13 +281,11 @@ pub fn capture_window(hwnd: isize) -> Result<CapturedImage, String> {
let result = if ok == 0 { let result = if ok == 0 {
Err("PrintWindow 失败(可能窗口无响应或权限不足)".into()) Err("PrintWindow 失败(可能窗口无响应或权限不足)".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: Vec::new(),
png, bgra,
bgra,
})
}) })
}; };
@@ -276,18 +297,16 @@ pub fn capture_window(hwnd: isize) -> Result<CapturedImage, String> {
} }
} }
/// 获取指定屏幕坐标下的顶层窗口(窗口拾取 /// 枚举可拾取的顶层窗口(Z 序顶→底
/// ///
/// 入参 x/y 为物理屏幕坐标(前端需按显示器 scaleFactor 从逻辑坐标换算) /// 与逐点拾取同语义:排除本进程窗口(覆盖层/主窗口/编辑器)、不可见窗口、工具窗口
/// /// 前端在截图开始时缓存该列表,鼠标移动时在 JS 侧做命中测试(rect 包含点,取 Z 序
/// 不能直接用 WindowFromPoint:覆盖层是 alwaysOnTop 全屏窗口,会命中覆盖层自身。 /// 最顶的第一个命中),消除逐帧 window_from_point 的 IPC 往返;且列表与冻结底图
/// 改为 EnumWindows 按 Z 序(顶→底)枚举顶层窗口做命中测试,并排除本进程 /// 同一时刻生成,命中结果与画面严格一致。
/// (覆盖层/主窗口/编辑器)的窗口,从而取到覆盖层下面的目标窗口。 pub fn pick_windows() -> Vec<WindowInfo> {
pub fn window_from_point(x: i32, y: i32) -> Option<WindowInfo> {
struct PickContext { struct PickContext {
my_pid: u32, my_pid: u32,
pt: POINT, out: Vec<WindowInfo>,
found: Option<WindowInfo>,
} }
extern "system" fn enum_proc(hwnd: HWND, lparam: isize) -> i32 { extern "system" fn enum_proc(hwnd: HWND, lparam: isize) -> i32 {
@@ -311,30 +330,24 @@ pub fn window_from_point(x: i32, y: i32) -> Option<WindowInfo> {
if GetWindowRect(hwnd, &mut rect) == 0 { if GetWindowRect(hwnd, &mut rect) == 0 {
return 1; return 1;
} }
// 命中测试(物理坐标),Z 序最顶层的第一个命中即为目标 ctx.out.push(WindowInfo {
let pt = ctx.pt; hwnd,
if pt.x >= rect.left && pt.x < rect.right && pt.y >= rect.top && pt.y < rect.bottom { title: get_window_title(hwnd),
ctx.found = Some(WindowInfo { rect: ScreenRect::from(rect),
hwnd, visual_rect: extended_frame_bounds(hwnd),
title: get_window_title(hwnd), });
rect: ScreenRect::from(rect),
visual_rect: extended_frame_bounds(hwnd),
});
return 0; // 停止枚举
}
} }
1 1
} }
let mut ctx = PickContext { let mut ctx = PickContext {
my_pid: std::process::id(), my_pid: std::process::id(),
pt: POINT { x, y }, out: Vec::new(),
found: None,
}; };
unsafe { unsafe {
EnumWindows(Some(enum_proc), &mut ctx as *mut _ as isize); EnumWindows(Some(enum_proc), &mut ctx as *mut _ as isize);
} }
ctx.found ctx.out
} }
/// 获取当前鼠标物理屏幕坐标(覆盖层打开时定位初始悬停窗口) /// 获取当前鼠标物理屏幕坐标(覆盖层打开时定位初始悬停窗口)
@@ -530,7 +543,7 @@ fn bgra_to_dib(bgra: &[u8], width: i32, height: i32) -> Vec<u8> {
dib dib
} }
fn crop_bgra( pub(crate) fn crop_bgra(
src: &[u8], src: &[u8],
src_width: usize, src_width: usize,
x: i32, x: i32,
@@ -674,6 +687,20 @@ pub fn compose_copy_rgba(rgba: &[u8], width: i32, height: i32) -> Result<Capture
} }
let dib = rgba_raw_to_dib(rgba, width, height); let dib = rgba_raw_to_dib(rgba, width, height);
write_dib_to_clipboard(&dib)?; write_dib_to_clipboard(&dib)?;
rgba_raw_to_png_checked(rgba, width, height)
}
/// 有标注导出:raw RGBA → PNG base64(仅编码,不写剪贴板;编辑器「保存到文件」用)
pub fn compose_png_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));
}
rgba_raw_to_png_checked(rgba, width, height)
}
/// raw RGBA → PNG base64(带长度校验的封装,供 compose_copy/compose_png 共用)
fn rgba_raw_to_png_checked(rgba: &[u8], width: i32, height: i32) -> Result<CaptureData, String> {
let png = rgba_raw_to_png(rgba, width, height)?; let png = rgba_raw_to_png(rgba, width, height)?;
Ok(CaptureData { Ok(CaptureData {
png_base64: base64_encode(&png), png_base64: base64_encode(&png),
+191 -35
View File
@@ -1,21 +1,23 @@
//! Tauri 命令:截图模块 //! Tauri 命令:截图模块
//! //!
//! 命令清单: //! 命令清单:
//! - screenshot_capture_fullscreen:捕获虚拟屏并存入静态(不做 PNG 编码) //! - screenshot_capture_fullscreen:捕获虚拟屏并存入静态(不做 PNG 编码),返回捕获时刻光标坐标
//! - screenshot_get_fullscreen_bmp:取出全屏捕获的 BMP 原始字节(raw IPC,覆盖层显示用,不移除) //! - screenshot_get_fullscreen_bmp:取出全屏捕获的 BMP 原始字节(raw IPC,覆盖层显示用,不移除)
//! - screenshot_fullscreen_png:全屏捕获编码 PNG base64 并清除(全屏截图进编辑器用) //! - screenshot_fullscreen_png:全屏捕获编码 PNG base64 并清除(全屏截图进编辑器用)
//! - screenshot_clear_fullscreen:清除静态全屏捕获(覆盖层关闭时) //! - 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_take_editor_image_raw:取出编辑器图片(raw IPC,滚动截图会话直接写入)
//! - screenshot_compose_png / screenshot_compose_copyraw RGBA → PNG(仅编码 / 剪贴板+编码)
//! - screenshot_copy_image:写入剪贴板(CF_DIB //! - screenshot_copy_image:写入剪贴板(CF_DIB
//! - screenshot_save_png:写入文件 //! - screenshot_save_png:写入文件
//! - screenshot_disable_transitions:禁用窗口显示/隐藏过渡动画(消除覆盖层缩放动画) //! - screenshot_disable_transitions:禁用窗口显示/隐藏过渡动画(消除覆盖层缩放动画)
use super::{CaptureData, WindowInfo}; use super::{CaptureData, CaptureStart, WindowInfo};
use tauri::{Emitter, Manager}; use tauri::{AppHandle, Emitter, Manager};
/// 禁用指定窗口(按 label 查找)的显示/隐藏过渡动画,消除覆盖层出现/消失时的缩放动画 /// 禁用指定窗口(按 label 查找)的显示/隐藏过渡动画,消除覆盖层出现/消失时的缩放动画
#[tauri::command] #[tauri::command]
@@ -67,16 +69,40 @@ pub async fn screenshot_unregister_shortcut(app: tauri::AppHandle) -> Result<(),
Ok(()) Ok(())
} }
/// 捕获整个虚拟屏(多显示器拼接)存入静态,不做 PNG 编码 /// 注册(或切换)贴图全局快捷键。传入空字符串则禁用快捷键。
/// 按下时 emit 'screenshot-pin-shortcut',由前端切换贴图窗口显示/隐藏。
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn screenshot_capture_fullscreen() -> Result<(), String> { 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 调度
tauri::async_runtime::spawn_blocking(|| { tauri::async_runtime::spawn_blocking(|| {
let img = super::capture::capture_virtual_screen()?; let img = super::capture::capture_virtual_screen()?;
super::capture::store_fullscreen(img) 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))?
@@ -184,29 +210,39 @@ pub async fn screenshot_crop_copy_stored(
} }
} }
/// 拾取指定物理屏幕坐标下的顶层窗口 /// 枚举可拾取的顶层窗口(Z 序顶→底,排除本进程/不可见/工具窗口)。
/// 前端在截图开始时缓存列表,鼠标移动时在 JS 侧本地命中测试,消除逐帧 IPC 往返。
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn screenshot_window_from_point( pub async fn screenshot_pick_list() -> Result<Vec<WindowInfo>, String> {
x: i32,
y: i32,
) -> Result<Option<WindowInfo>, String> {
#[cfg(windows)] #[cfg(windows)]
{ {
tauri::async_runtime::spawn_blocking(move || { tauri::async_runtime::spawn_blocking(super::capture::pick_windows)
Ok(super::capture::window_from_point(x, y)) .await
}) .map_err(|e| format!("枚举失败: {}", e))
.await
.map_err(|e| format!("查询失败: {}", e))?
} }
#[cfg(not(windows))] #[cfg(not(windows))]
{ {
let _ = (x, y); Ok(vec![])
Ok(None)
} }
} }
/// 获取当前鼠标物理屏幕坐标(覆盖层打开时定位初始悬停窗口 /// 一次 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] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn screenshot_cursor_pos() -> Result<(i32, i32), String> { pub async fn screenshot_cursor_pos() -> Result<(i32, i32), String> {
@@ -262,19 +298,90 @@ pub async fn screenshot_capture_window(hwnd: isize) -> Result<CaptureData, Strin
} }
} }
/// 存入编辑器图片(base64 PNG /// 滚动截图:从窗口当前滚动位置向下拼接到底部,返回超长 PNG
/// `region` 为 Some 时仅在框选区域(屏幕物理坐标)内捕捉,宽 = 选区宽;
/// 为 None 时捕捉整个客户区。结束后会把窗口滚回起始位置,不打扰用户。
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn screenshot_set_editor_image(png_base64: String) -> Result<(), String> { pub async fn screenshot_scroll_capture(
super::set_editor_image(png_base64); hwnd: isize,
Ok(()) region: Option<super::ScrollRegion>,
) -> Result<CaptureData, String> {
#[cfg(windows)]
{
tauri::async_runtime::spawn_blocking(move || {
super::scroll_capture::scroll_capture(hwnd, region)
})
.await
.map_err(|e| format!("滚动截图任务失败: {}", e))?
}
#[cfg(not(windows))]
{
let _ = hwnd;
let _ = region;
Err("截图仅支持 Windows".into())
}
} }
/// 取出编辑器图片(编辑器窗口加载时调用,取出即清除) /// 启动滚动截图会话(后台线程持续捕捉拼接,实时推进度事件)。
/// `auto = true` 为自动滚动(线程主动下滚拼到底部);`false` 为手动(等用户滚动窗口)。
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn screenshot_get_editor_image() -> Result<Option<String>, String> { pub fn screenshot_scroll_start(
Ok(super::take_editor_image()) app: AppHandle,
hwnd: isize,
region: Option<super::ScrollRegion>,
auto: bool,
) -> Result<(), String> {
#[cfg(windows)]
{
super::scroll_session::start(app, hwnd, region, auto)
}
#[cfg(not(windows))]
{
let _ = (app, hwnd, region, auto);
Err("截图仅支持 Windows".into())
}
}
/// 结束滚动截图会话并导出结果。
#[tauri::command]
#[specta::specta]
pub fn screenshot_scroll_finish() -> Result<(), String> {
#[cfg(windows)]
{
super::scroll_session::finish()
}
#[cfg(not(windows))]
{
Err("截图仅支持 Windows".into())
}
}
/// 取消滚动截图会话(不导出)。
#[tauri::command]
#[specta::specta]
pub fn screenshot_scroll_cancel() -> Result<(), String> {
#[cfg(windows)]
{
super::scroll_session::cancel_now()
}
#[cfg(not(windows))]
{
Err("截图仅支持 Windows".into())
}
}
/// 取出编辑器图片(原始 PNG 字节,raw IPC → 前端 ArrayBuffer → Blob URL,取出即清除)
///
/// 长图(滚动截图)可达数十 MBraw IPC 相比 base64 JSON 事件传输省 ~33% 体积,
/// 且避免 JSON 序列化/多次广播。注:返回 ipc::Responsespecta 无法生成,豁免标注。
#[tauri::command]
pub async fn screenshot_take_editor_image_raw() -> Result<tauri::ipc::Response, String> {
match super::take_editor_image_raw() {
Some(bytes) => Ok(tauri::ipc::Response::new(bytes)),
None => Err("无待编辑的截图".into()),
}
} }
/// 将 PNG base64 写入系统剪贴板(转 CF_DIB) /// 将 PNG base64 写入系统剪贴板(转 CF_DIB)
@@ -304,6 +411,39 @@ pub async fn screenshot_copy_image(png_base64: String) -> Result<(), String> {
#[tauri::command] #[tauri::command]
pub async fn screenshot_compose_copy( pub async fn screenshot_compose_copy(
request: tauri::ipc::Request<'_>, 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 bodyArrayBuffer".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())
}
}
/// 有标注导出(仅编码):接收 raw RGBA(前端 canvas.getImageData 直传),一次完成 PNG 编码。
/// 与 screenshot_compose_copy 的区别:不写剪贴板(编辑器「保存到文件」用)。
/// body 格式:前 8 字节 = width(i32 LE) + height(i32 LE),之后为 raw RGBA 像素。
/// 注:参数为 tauri::ipc::Request(原始 body),specta 无法生成,豁免标注。
#[tauri::command]
pub async fn screenshot_compose_png(
request: tauri::ipc::Request<'_>,
) -> Result<super::CaptureData, String> { ) -> Result<super::CaptureData, String> {
#[cfg(windows)] #[cfg(windows)]
{ {
@@ -318,10 +458,10 @@ pub async fn screenshot_compose_copy(
let height = i32::from_le_bytes([body[4], body[5], body[6], body[7]]); let height = i32::from_le_bytes([body[4], body[5], body[6], body[7]]);
let rgba = body[8..].to_vec(); let rgba = body[8..].to_vec();
tauri::async_runtime::spawn_blocking(move || { tauri::async_runtime::spawn_blocking(move || {
super::capture::compose_copy_rgba(&rgba, width, height) super::capture::compose_png_rgba(&rgba, width, height)
}) })
.await .await
.map_err(|e| format!("合成复制任务失败: {}", e))? .map_err(|e| format!("合成编码任务失败: {}", e))?
} }
#[cfg(not(windows))] #[cfg(not(windows))]
{ {
@@ -349,17 +489,17 @@ pub async fn screenshot_save_png(png_base64: String, path: String) -> Result<(),
.map_err(|e| format!("保存任务失败: {}", e))? .map_err(|e| format!("保存任务失败: {}", e))?
} }
// ===== 截图历史缓存:完整 PNG 落盘缓存目录,内存只保留缩略图 ===== // ===== 截图历史缓存:完整 PNG 落盘到应用数据目录(持久化,随历史保留数量清理),内存只保留缩略图 =====
/// 历史缓存根目录(app_cache_dir/screenshot/history /// 历史根目录(app_data_dir/screenshot/history
fn history_cache_dir(app: &tauri::AppHandle) -> Result<std::path::PathBuf, String> { fn history_cache_dir(app: &tauri::AppHandle) -> Result<std::path::PathBuf, String> {
let dir = app let dir = app
.path() .path()
.app_cache_dir() .app_data_dir()
.map_err(|e| format!("获取缓存目录失败: {}", e))? .map_err(|e| format!("获取应用数据目录失败: {}", e))?
.join("screenshot") .join("screenshot")
.join("history"); .join("history");
std::fs::create_dir_all(&dir).map_err(|e| format!("创建缓存目录失败: {}", e))?; std::fs::create_dir_all(&dir).map_err(|e| format!("创建历史目录失败: {}", e))?;
Ok(dir) Ok(dir)
} }
@@ -412,6 +552,22 @@ pub async fn screenshot_load_cache(
.map_err(|e| format!("读取缓存任务失败: {}", e))? .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] #[tauri::command]
#[specta::specta] #[specta::specta]
+34 -9
View File
@@ -9,6 +9,12 @@ use specta::Type;
#[cfg(windows)] #[cfg(windows)]
pub mod capture; pub mod capture;
#[cfg(windows)]
pub mod wgc_capture;
#[cfg(windows)]
pub mod scroll_capture;
#[cfg(windows)]
pub mod scroll_session;
pub mod commands; pub mod commands;
/// 前端可见的捕获数据 /// 前端可见的捕获数据
@@ -20,6 +26,14 @@ 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, Type)] #[derive(serde::Serialize, Type)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@@ -40,17 +54,28 @@ pub struct ScreenRect {
pub height: i32, pub height: i32,
} }
/// 编辑器图片静态存储(覆盖层裁剪后存入 → 编辑器窗口加载取出 /// 滚动截图区域(屏幕物理像素坐标,通常为覆盖层框选区平移到屏幕
static EDITOR_IMAGE: Mutex<Option<String>> = Mutex::new(None); #[derive(serde::Serialize, serde::Deserialize, Clone, Copy, Type)]
#[serde(rename_all = "camelCase")]
pub struct ScrollRegion {
pub x: i32,
pub y: i32,
pub width: i32,
pub height: i32,
}
/// 存储编辑器图片base64 PNG /// 编辑器图片静态存储:原始 PNG 字节(滚动截图会话完成后直接写入,
pub fn set_editor_image(png_base64: String) { /// 编辑器窗口通过 raw IPC 取出 → Blob URL 显示,全程不经 base64/JSON 事件传输)
if let Ok(mut g) = EDITOR_IMAGE.lock() { static EDITOR_IMAGE_RAW: Mutex<Option<Vec<u8>>> = Mutex::new(None);
*g = Some(png_base64);
/// 存储编辑器图片(原始 PNG 字节)
pub fn set_editor_image_raw(png: Vec<u8>) {
if let Ok(mut g) = EDITOR_IMAGE_RAW.lock() {
*g = Some(png);
} }
} }
/// 取出并清除编辑器图片 /// 取出并清除编辑器图片(原始 PNG 字节)
pub fn take_editor_image() -> Option<String> { pub fn take_editor_image_raw() -> Option<Vec<u8>> {
EDITOR_IMAGE.lock().ok()?.take() EDITOR_IMAGE_RAW.lock().ok()?.take()
} }
+469
View File
@@ -0,0 +1,469 @@
//! 滚动截图(垂直长图拼接)底层设施(仅 Windows)
//!
//! ## 原理
//! 目标窗口的**客户区**内容往往是可分页垂直滚动的。算法:
//! 1. 用 PrintWindowPW_RENDERFULLCONTENT)抓客户区为 BGRA(不做 PNG 编码);
//! 2. 向窗口发送 `WM_MOUSEWHEEL` 使其向下滚动;
//! 3. 再抓一帧,用**框选带内多列采样行信号**做一维模板匹配,求出两帧间的垂直
//! 滚动像素偏移 `d``cur[y] ≈ prev[y+d]`,故把 `cur` 底部新出现的 `d` 行拼到画布末尾;
//! 4. 重复直到内容不再变化(滚到底部),把各帧拼成一张超高纵轴图像。
//!
//! 固定表头/粘性头部由拼接语义天然处理——只追加 `cur` 底部的 `d` 行,
//! 表头保留在第一帧中,不会重复。
//!
//! ## 滚轮投递
//! `WM_MOUSEWHEEL` 优先发给**框选带中心处的最深子窗口**(如 Chromium 的
//! RenderWidgetHostHWND):很多程序的顶层窗口过程不转发滚轮消息,
//! 直接发顶层会导致"完全不滚动"。坐标一律用屏幕物理坐标(lParam 语义)。
use std::thread::sleep;
use std::time::Duration;
use windows_sys::Win32::Foundation::{HWND, POINT, RECT};
use windows_sys::Win32::Graphics::Gdi::{ClientToScreen, ScreenToClient};
use windows_sys::Win32::UI::WindowsAndMessaging::{
ChildWindowFromPointEx, GetClientRect, GetWindowRect, PostMessageW, SendMessageTimeoutW,
WM_MOUSEWHEEL, WHEEL_DELTA, CWP_SKIPDISABLED, CWP_SKIPINVISIBLE, CWP_SKIPTRANSPARENT,
SMTO_ABORTIFHUNG,
};
use super::{CaptureData, ScrollRegion};
use super::capture::{base64_encode, bgra_to_png, capture_window_bgra, crop_bgra};
/// 窗口客户区上下文:客户区尺寸 + 客户区在窗口位图内的偏移。
pub(crate) struct BandCtx {
pub cw: i32,
pub ch: i32,
pub ox: i32,
pub oy: i32,
}
/// 解析框选带:把可选区域(屏幕物理坐标)换算成客户区内的裁剪带。
/// 区域未命中客户区时返回错误;`None` 表示整客户区。
/// 返回 (ctx, band_x, band_y, band_w, band_h)band_* 为客户区内坐标。
pub(crate) fn resolve_band(
hwnd: isize,
region: Option<ScrollRegion>,
) -> Result<(BandCtx, i32, i32, i32, i32), String> {
let (cw, ch, ox, oy) = client_info(hwnd)
.ok_or_else(|| "无法获取窗口客户区(窗口可能被最小化或已销毁)".to_string())?;
if cw <= 0 || ch <= 0 {
return Err("窗口客户区尺寸无效".into());
}
let (wr_x, wr_y) = window_rect_origin(hwnd).ok_or_else(|| "无法获取窗口矩形".to_string())?;
let band = match region {
Some(r) => {
let wbx = r.x - wr_x;
let wby = r.y - wr_y;
let bx0 = wbx.max(ox);
let by0 = wby.max(oy);
let bx1 = (wbx + r.width).min(ox + cw);
let by1 = (wby + r.height).min(oy + ch);
if bx1 <= bx0 || by1 <= by0 {
return Err("选区未命中窗口客户区".into());
}
(bx0 - ox, by0 - oy, bx1 - bx0, by1 - by0)
}
None => (0, 0, cw, ch),
};
Ok((
BandCtx { cw, ch, ox, oy },
band.0,
band.1,
band.2,
band.3,
))
}
/// 客户区内坐标 → 屏幕物理坐标。
pub(crate) fn client_pt_to_screen(hwnd: isize, cx: i32, cy: i32) -> Option<(i32, i32)> {
unsafe {
let mut pt = POINT { x: cx, y: cy };
if ClientToScreen(hwnd as HWND, &mut pt) == 0 {
return None;
}
Some((pt.x, pt.y))
}
}
/// 递归下钻:找到客户区坐标 (cx, cy) 处最深的子窗口(跳过不可见/禁用/透明子窗口)。
/// WM_MOUSEWHEEL 优先发给真正处理滚轮的子窗口——顶层窗口过程往往不转发滚轮,
/// 这是"自动滚动一开始就不动"的主因之一。
pub(crate) fn deep_child_at_point(top: isize, mut cx: i32, mut cy: i32) -> isize {
let mut cur = top;
for _ in 0..16 {
let child = unsafe {
ChildWindowFromPointEx(
cur as HWND,
POINT { x: cx, y: cy },
CWP_SKIPINVISIBLE | CWP_SKIPDISABLED | CWP_SKIPTRANSPARENT,
)
};
if child == 0 || child == cur as HWND {
break;
}
// 坐标换算到子窗口客户区
let mut pt = POINT { x: cx, y: cy };
unsafe {
if ClientToScreen(cur as HWND, &mut pt) == 0 {
break;
}
if ScreenToClient(child, &mut pt) == 0 {
break;
}
}
cx = pt.x;
cy = pt.y;
cur = child as isize;
}
cur
}
/// 构造 WM_MOUSEWHEEL 的 wParam/lParamlParam 为屏幕坐标)。
fn wheel_params(sx: i32, sy: i32, delta: i32) -> (usize, isize) {
// wParam 高位字 = 有符号 delta,低位字 = 按键 0
let wparam = ((delta as u16) as usize) << 16;
// lParam 低 16 位 = x(屏幕),高 16 位 = y(屏幕)
let lparam = ((((sy as u32) & 0xFFFF) << 16) | ((sx as u32) & 0xFFFF)) as isize;
(wparam, lparam)
}
/// 发送滚轮消息(SendMessageTimeout:目标线程短暂忙/挂起时不至于卡死调用线程)。
/// delta > 0 向上滚,delta < 0 向下滚。
pub(crate) fn send_wheel(hwnd: isize, sx: i32, sy: i32, delta: i32) {
let (wparam, lparam) = wheel_params(sx, sy, delta);
let mut result = 0usize;
unsafe {
let _ = SendMessageTimeoutW(
hwnd as HWND,
WM_MOUSEWHEEL,
wparam,
lparam,
SMTO_ABORTIFHUNG,
80,
&mut result,
);
}
}
/// 异步投递滚轮消息(部分程序只处理经消息泵排队的事件)。
pub(crate) fn post_wheel(hwnd: isize, sx: i32, sy: i32, delta: i32) {
let (wparam, lparam) = wheel_params(sx, sy, delta);
unsafe {
let _ = PostMessageW(hwnd as HWND, WM_MOUSEWHEEL, wparam, lparam);
}
}
// ===== 单次同步滚动截图(一次调用拼到底)=====
/// 每次向下滚动的「格数」(WHEEL_DELTA=120/格)。
const WHEEL_STROKE: i32 = 2;
/// 滚动后等待窗口重绘的时间。
const SETTLE_MS: u64 = 70;
/// 保护上限:最大迭代轮数。
const MAX_ITERS: usize = 140;
/// 保护上限:最大拼接段数。
const MAX_STITCHES: usize = 90;
/// 保护上限:拼接后总高(像素)。
const MAX_TOTAL_H: u32 = 30000;
/// 连续多少次滚动无位移判定为「已到底部」。
const NO_CHANGE_STOP: u32 = 2;
/// 执行滚动截图:把窗口当前滚动位置向下拼接到底部,返回超长 PNG(同步,一次调用)。
///
/// - `region` 为 `Some` 时,只在**框选区域**内捕捉(列带 + 该区域的纵向视口),
/// 输出宽度 = 选区宽度;为 `None` 时捕捉整个客户区。
/// 偏移检测始终优先使用带内信号,保证滚动量在窄带下也能稳健匹配。
/// - 结束时把窗口滚回起始位置,不打扰用户。
pub fn scroll_capture(hwnd: isize, region: Option<ScrollRegion>) -> Result<CaptureData, String> {
let (ctx, band_x, band_y, band_w, band_h) = resolve_band(hwnd, region)?;
let (cw, ch) = (ctx.cw, ctx.ch);
let (client_ox, client_oy) = (ctx.ox, ctx.oy);
// 滚轮目标:带中心的最深子窗口 + 屏幕坐标
let bcx = band_x + band_w / 2;
let bcy = band_y + band_h / 2;
let wheel_hwnd = deep_child_at_point(hwnd, bcx, bcy);
let (sx, sy) = client_pt_to_screen(hwnd, bcx, bcy)
.ok_or_else(|| "无法换算屏幕坐标".to_string())?;
// 第一帧(全客户区)→ 画布(裁剪到框选带)
let first = capture_client_bgra(hwnd, client_ox, client_oy, cw, ch)?;
let mut canvas = crop_bgra(&first, cw as usize, band_x, band_y, band_w, band_h)?;
let mut prev = first;
let mut total_h = band_h as u32;
let mut total_stitches = 0usize;
let mut no_change = 0u32;
let mut moved: u32 = 0;
let mut iters = 0usize;
while iters < MAX_ITERS && total_stitches < MAX_STITCHES && total_h < MAX_TOTAL_H {
iters += 1;
send_wheel(wheel_hwnd, sx, sy, -(WHEEL_DELTA as i32) * WHEEL_STROKE);
sleep(Duration::from_millis(SETTLE_MS));
let cur = match capture_client_bgra(hwnd, client_ox, client_oy, cw, ch) {
Ok(f) => f,
Err(_) => break, // 窗口中途被关闭/失去客户区
};
match detect_vscroll_offset(
&prev,
&cur,
cw as usize,
ch as usize,
band_x as usize,
band_y as usize,
band_w as usize,
band_h as usize,
) {
Some(0) => {
no_change += 1;
if no_change >= NO_CHANGE_STOP {
break; // 已到底部
}
prev = cur;
}
Some(d) => {
no_change = 0;
total_stitches += 1;
moved += 1;
// 追加框选带底部新出现的 d 行(在客户区帧内的带区间 [band_y, band_y+band_h)
let new_rows = (d as i32).min(band_h) as usize;
let new_y = band_y + band_h - new_rows as i32;
let rows = crop_bgra(&cur, cw as usize, band_x, new_y, band_w, new_rows as i32)?;
canvas.extend_from_slice(&rows);
total_h += new_rows as u32;
prev = cur;
}
None => {
// 匹配失败(内容大幅变化/动画等):不拼接、不累计 no_change,下一轮继续
prev = cur;
}
}
}
// 结束回滚:上滚与下滚相同数量的手势
for _ in 0..moved {
send_wheel(wheel_hwnd, sx, sy, WHEEL_DELTA as i32 * WHEEL_STROKE);
sleep(Duration::from_millis(20));
}
if total_h <= band_h as u32 {
return Err("区域内容未能滚动(可能不支持鼠标滚轮或已到底部)".into());
}
let png = bgra_to_png(&canvas, band_w as i32, total_h as i32)?;
Ok(CaptureData {
png_base64: base64_encode(&png),
width: band_w as i32,
height: total_h as i32,
})
}
/// 窗口矩形左上角的屏幕坐标(用于把屏幕区域换算成窗口位图内的裁剪坐标)。
fn window_rect_origin(hwnd: isize) -> Option<(i32, i32)> {
unsafe {
let mut wr: RECT = std::mem::zeroed();
if GetWindowRect(hwnd as HWND, &mut wr) == 0 {
return None;
}
Some((wr.left, wr.top))
}
}
/// 获取窗口客户区尺寸与客户区左上角屏幕坐标。
fn client_info(hwnd: isize) -> Option<(i32, i32, i32, i32)> {
unsafe {
let h = hwnd as HWND;
let mut cr: RECT = std::mem::zeroed();
if GetClientRect(h, &mut cr) == 0 {
return None;
}
let (cw, ch) = (cr.right - cr.left, cr.bottom - cr.top);
let mut pt: POINT = std::mem::zeroed();
if ClientToScreen(h, &mut pt) == 0 {
return None;
}
let mut wr: RECT = std::mem::zeroed();
if GetWindowRect(h, &mut wr) == 0 {
return None;
}
Some((cw, ch, pt.x - wr.left, pt.y - wr.top))
}
}
/// 抓取窗口客户区内容(PrintWindow + 裁剪,不做 PNG 编码)。
pub(crate) fn capture_client_bgra(
hwnd: isize,
client_ox: i32,
client_oy: i32,
cw: i32,
ch: i32,
) -> Result<Vec<u8>, String> {
let img = capture_window_bgra(hwnd)?;
// 客户区在窗口位图内的偏移(PrintWindow 从窗口左上角绘制)
crop_bgra(
&img.bgra,
img.width as usize,
client_ox,
client_oy,
cw.min(img.width),
ch.min(img.height),
)
}
// ===== 帧间垂直偏移检测 =====
/// 行信号采样列数:每行采 16 列亮度(B+G+R),保留横向细节(文字边缘、分隔线)。
/// 相比旧的"整行平均",多列采样大幅降低重复纹理/大面积纯色区的误匹配率。
const SIG_COLS: usize = 16;
/// 单周期可检测的最大偏移(像素)。超过即匹配失败(调用方自适应降速)。
const MAX_OFFSET: usize = 512;
/// 检测两帧之间的垂直滚动像素偏移 `d`,使 `cur[y] ≈ prev[y+d]`。
///
/// 匹配范围优先限定在**框选带**(行=带内行、列=带内列):带外内容(工具栏、
/// 状态栏、不随滚动的区域)不参与匹配,避免污染信号。带太小/带内匹配失败时
/// 逐级回退(全行+带列 → 全行+全列)。
///
/// 返回:
/// - `Some(0)`:两帧实质相同(未滚动 / 已到底部)
/// - `Some(d)` d>0:检测到向下滚动了 d 像素
/// - `None`:无法可靠匹配(内容动画 / 位移超上限等),调用方跳过本轮
pub(crate) fn detect_vscroll_offset(
prev: &[u8],
cur: &[u8],
w: usize,
h: usize,
band_l: usize,
band_t: usize,
band_w: usize,
band_h: usize,
) -> Option<usize> {
if w < 4 || h < 16 {
return None;
}
let band_ok = band_w >= 8 && band_h >= 24 && band_t + band_h <= h && band_l + band_w <= w;
if band_ok {
// 主匹配:行、列都限定在带内(带外内容不随滚动变化,会污染匹配信号)
let ps = row_signals(prev, w, band_t, band_h, band_l, band_w);
let cs = row_signals(cur, w, band_t, band_h, band_l, band_w);
if let Some(r) = match_signals(&ps, &cs) {
return Some(r);
}
// 回退(带内匹配失败:快速滚动位移超上限 / 带内大面积动画):
// 全客户区行只用于**找位移**,不判"无变化"——带外静止内容会把误差拉低,
// 误报 Some(0) 造成假"到底"
if band_l + band_w <= w {
let ps = row_signals(prev, w, 0, h, band_l, band_w);
let cs = row_signals(cur, w, 0, h, band_l, band_w);
if let Some(d) = match_signals(&ps, &cs).filter(|d| *d > 0) {
return Some(d);
}
}
let ps = row_signals(prev, w, 0, h, 0, w);
let cs = row_signals(cur, w, 0, h, 0, w);
return match_signals(&ps, &cs).filter(|d| *d > 0);
}
// 带太小:全客户区回退(此时允许 Some(0),否则永远判不了"到底")
if band_w >= 8 && band_l + band_w <= w {
let ps = row_signals(prev, w, 0, h, band_l, band_w);
let cs = row_signals(cur, w, 0, h, band_l, band_w);
if let Some(r) = match_signals(&ps, &cs) {
return Some(r);
}
}
let ps = row_signals(prev, w, 0, h, 0, w);
let cs = row_signals(cur, w, 0, h, 0, w);
match_signals(&ps, &cs)
}
/// 每行采样 SIG_COLS 列的亮度(B+G+R0..765),返回 rows × SIG_COLS 的信号矩阵。
fn row_signals(bgra: &[u8], w: usize, y0: usize, rows: usize, l: usize, bw: usize) -> Vec<i32> {
// 均匀采样列(含两端)
let mut cols = [0usize; SIG_COLS];
for i in 0..SIG_COLS {
cols[i] = l + (i * (bw - 1)) / (SIG_COLS - 1).max(1);
}
let mut out = Vec::with_capacity(rows * SIG_COLS);
for y in y0..y0 + rows {
let base = y * w * 4;
for &c in &cols {
let i = base + c * 4;
// bgra: B,G,Ralpha 通常为 0,不计入亮度)
out.push(bgra[i] as i32 + bgra[i + 1] as i32 + bgra[i + 2] as i32);
}
}
out
}
/// 信号模板匹配:求 d 使 `cs[y] ≈ ps[y+d]`,取平均绝对误差最小者。
fn match_signals(ps: &[i32], cs: &[i32]) -> Option<usize> {
let n = ps.len() / SIG_COLS;
if n < 16 {
return None;
}
let step = 2; // 隔行采样加速
let max_d = MAX_OFFSET.min(n * 3 / 4);
if max_d < 1 {
return None;
}
// d=0 基准误差:两帧几乎一致 → 未滚动(到底部)
let err0 = {
let (mut e, mut c) = (0i64, 0i64);
let mut y = 0;
while y < n {
for k in 0..SIG_COLS {
e += (cs[y * SIG_COLS + k] - ps[y * SIG_COLS + k]).abs() as i64;
}
c += SIG_COLS as i64;
y += step;
}
if c == 0 {
return None;
}
e as f64 / c as f64
};
if err0 < 4.0 {
return Some(0);
}
// 找最小平均误差的 d
let mut best_d = 0usize;
let mut best_err = f64::MAX;
for d in 1..=max_d {
let (mut e, mut c) = (0i64, 0i64);
let mut y = 0;
while y + d < n {
for k in 0..SIG_COLS {
e += (cs[y * SIG_COLS + k] - ps[(y + d) * SIG_COLS + k]).abs() as i64;
}
c += SIG_COLS as i64;
y += step;
// 早停:明显劣于当前最优则放弃该候选
if c >= 64 && e as f64 / c as f64 > best_err * 1.8 + 24.0 {
break;
}
}
if c >= 64 {
let ae = e as f64 / c as f64;
if ae < best_err {
best_err = ae;
best_d = d;
}
}
}
if best_d == 0 {
return None;
}
// 阈值按 3 通道和(0..765)标定:亚像素滚动会有轻微重采样模糊,阈值不宜过紧
if best_err < 30.0 && best_err * 2.0 < err0 {
Some(best_d)
} else {
None
}
}
+647
View File
@@ -0,0 +1,647 @@
//! 滚动截图会话(仅 Windows):后台线程捕捉拼接 + 独立滚轮线程平滑滚动。
//!
//! 与 [super::scroll_capture::scroll_capture](同步一次调用)不同,本模块把捕获循环
//! 放进后台线程,通过事件把**实时进度**推给前端。
//!
//! ## 自动模式架构
//! - **run_loop(会话线程)**:按节奏捕获客户区帧,与上一帧做带内偏移匹配,拼接新行;
//! - **ticker(滚轮线程)**:以 ~16ms 间隔发送小步长 `WM_MOUSEWHEEL`,由目标程序自身的
//! 平滑滚动动画呈现连续滚动(替代旧版"每 70ms 一整格"的跳变式滚动);
//! - **目标策略升级**:带中心最深子窗口(小步长 Send)→ 子窗口整格 → 顶层整格 Send →
//! 顶层整格 Post。解决"一开始就不滚动"(顶层不转发滚轮 / 程序忽略非整格消息);
//! - **自适应速度**:按每周期实测位移调滚轮步长 / 捕获周期,逼近"带高 1/4"的理想重叠;
//! - **停止补帧(settle)**:用户停止后等目标窗口滚动动画静止再补拼最后一帧,
//! 保证最终图片结尾 = 用户停止时窗口实际停留的位置;
//! - **精准回滚**:先按累计像素粗估上滚,再用帧匹配对初始帧校准回到起始位置。
//!
//! 事件(广播到所有窗口):
//! - `SCROLL_PROGRESS``{ width, height, auto }` 当前已拼接高度
//! - `SCROLL_COMPLETE``{ width, height }` 完成导出(PNG 原始字节已存入编辑器图片槽,
//! 由前端常驻编辑器窗口通过 raw IPC 取出,事件本身不携带图片数据)
//! - `SCROLL_CANCELLED``{}` 取消(丢弃画布)
use std::sync::atomic::{AtomicBool, AtomicI32, AtomicIsize, Ordering};
use std::sync::Mutex;
use std::thread::sleep;
use std::time::{Duration, Instant};
use tauri::{AppHandle, Emitter};
use windows_sys::Win32::UI::WindowsAndMessaging::WHEEL_DELTA;
use crate::constants::events as evts;
use crate::logger::{log_error, log_info};
use super::capture::{bgra_to_png, crop_bgra};
use super::scroll_capture::{
capture_client_bgra, client_pt_to_screen, deep_child_at_point, detect_vscroll_offset,
post_wheel, resolve_band, send_wheel,
};
use super::ScrollRegion;
// ===== 可调参数 =====
/// 滚轮线程发送间隔(毫秒)。小步长 + 高频 → 目标程序的平滑滚动动画连贯不断帧。
const TICK_MS: u64 = 16;
/// 捕获周期基准(毫秒)。与滚轮解耦:滚动不因捕获/匹配而停顿。
const CYCLE_MS: u64 = 130;
/// 捕获周期上限(整格模式下按实测位移自适应放大)。
const CYCLE_MS_MAX: u64 = 360;
/// 每周期理想位移 = clamp(band_h / 4, TARGET_D_MIN, TARGET_D_MAX)。
/// 太小 → 慢;太大 → 带内重叠不足、匹配易失败。
const TARGET_D_MIN: usize = 32;
const TARGET_D_MAX: usize = 180;
/// 小步长模式:起始 / 上下限步长(WHEEL_DELTA=120 为一整格)。
const DELTA_START: i32 = 20;
const DELTA_MIN: i32 = 4;
const DELTA_MAX: i32 = 72;
/// 整格模式步长(部分程序忽略非整格滚轮消息,累不进小步长)。
const DELTA_NOTCH: i32 = 120;
/// 策略未锁定时:连续多少周期无位移 → 升级投递策略。
const ESCALATE_CYCLES: u32 = 3;
/// 策略已锁定时:连续多少周期无位移 → 判定到底。
const NO_CHANGE_STOP: u32 = 3;
/// 上限:拼接后总高(像素),超出即自动结束。
const MAX_TOTAL_H: u32 = 30000;
/// 进度事件节流。
const PROGRESS_THROTTLE_MS: u64 = 120;
/// 停止后等待滚动动画静止的超时(毫秒)。
const SETTLE_TIMEOUT_MS: u64 = 900;
/// 回滚粗估:每整格对应的滚动像素。
const ROLLBACK_PX_PER_NOTCH: f64 = 55.0;
// ===== 会话状态 =====
/// 活动会话(会话线程独占读写;命令只改 STOP/CANCEL 原子标志)
struct Session {
hwnd: isize,
/// 客户区尺寸与客户区在窗口位图内偏移
cw: i32,
ch: i32,
ox: i32,
oy: i32,
band_x: i32,
band_y: i32,
band_w: i32,
band_h: i32,
/// 已拼接像素(带宽 × total_h)
canvas: Vec<u8>,
total_h: u32,
/// 累计检测到的滚动像素
ttl_px: u32,
/// 上一帧(全客户区,匹配基准)
prev: Vec<u8>,
/// 初始帧(回滚校准用)
first: Vec<u8>,
auto_scroll: bool,
active: bool,
}
static SESSION: Mutex<Option<Session>> = Mutex::new(None);
/// 请求线程结束(完成/取消共用)
static STOP: AtomicBool = AtomicBool::new(false);
/// 结束方式:true = 取消(不导出),false = 完成(导出)
static CANCEL: AtomicBool = AtomicBool::new(false);
// ===== 滚轮线程共享控制 =====
static TICKER_STOP: AtomicBool = AtomicBool::new(false);
static WHEEL_TARGET: AtomicIsize = AtomicIsize::new(0);
/// 滚轮步长(有符号 delta,正值;发送时取负 = 向下滚)
static WHEEL_STEP: AtomicI32 = AtomicI32::new(0);
static WHEEL_POST: AtomicBool = AtomicBool::new(false);
static WHEEL_SX: AtomicI32 = AtomicI32::new(0);
static WHEEL_SY: AtomicI32 = AtomicI32::new(0);
/// 会话线程每轮用的只读参数(启动时一次性读出)。
struct Params {
hwnd: isize,
cw: i32,
ch: i32,
ox: i32,
oy: i32,
band_x: i32,
band_y: i32,
band_w: i32,
band_h: i32,
auto_scroll: bool,
}
fn read_params() -> Option<Params> {
let g = SESSION.lock().ok()?;
let s = g.as_ref().filter(|s| s.active)?;
Some(Params {
hwnd: s.hwnd,
cw: s.cw,
ch: s.ch,
ox: s.ox,
oy: s.oy,
band_x: s.band_x,
band_y: s.band_y,
band_w: s.band_w,
band_h: s.band_h,
auto_scroll: s.auto_scroll,
})
}
/// 会话是否仍活动(run_loop 每周期自检,异常路径提前退出)
fn is_active() -> bool {
SESSION
.lock()
.map(|g| g.as_ref().map(|s| s.active).unwrap_or(false))
.unwrap_or(false)
}
/// 启动滚动截图会话。`auto = true` 时线程自动下滚拼到底部;否则等用户手动滚动。
pub fn start(app: AppHandle, hwnd: isize, region: Option<ScrollRegion>, auto: bool) -> Result<(), String> {
{
let g = SESSION.lock().map_err(|e| e.to_string())?;
if g.as_ref().map(|s| s.active).unwrap_or(false) {
return Err("已有滚动截图进行中".into());
}
}
let (ctx, bx, by, bw, bh) = resolve_band(hwnd, region)?;
let first = capture_client_bgra(hwnd, ctx.ox, ctx.oy, ctx.cw, ctx.ch)?;
let canvas = crop_bgra(&first, ctx.cw as usize, bx, by, bw, bh)?;
{
let mut g = SESSION.lock().map_err(|e| e.to_string())?;
*g = Some(Session {
hwnd,
cw: ctx.cw,
ch: ctx.ch,
ox: ctx.ox,
oy: ctx.oy,
band_x: bx,
band_y: by,
band_w: bw,
band_h: bh,
canvas,
total_h: bh as u32,
ttl_px: 0,
first: first.clone(),
prev: first,
auto_scroll: auto,
active: true,
});
}
STOP.store(false, Ordering::Release);
CANCEL.store(false, Ordering::Release);
log_info("scroll-session", &format!(
"启动滚动截图 hwnd={} band={}x{} auto={}",
hwnd, bw, bh, auto
));
std::thread::spawn(move || run_loop(app));
Ok(())
}
/// 请求结束会话并导出(完成)。立即返回,线程在下一轮感知并完成。
pub fn finish() -> Result<(), String> {
if !running() {
return Err("没有进行中的滚动截图".into());
}
STOP.store(true, Ordering::Release);
CANCEL.store(false, Ordering::Release);
Ok(())
}
/// 请求取消会话(不导出)。立即返回,线程在下一轮感知并回滚终止。
pub fn cancel_now() -> Result<(), String> {
if !running() {
return Err("没有进行中的滚动截图".into());
}
STOP.store(true, Ordering::Release);
CANCEL.store(true, Ordering::Release);
Ok(())
}
fn running() -> bool {
SESSION.lock().map(|g| g.as_ref().map(|s| s.active).unwrap_or(false)).unwrap_or(false)
}
/// 滚轮线程:高频小步长发送,滚动手感交给目标程序的平滑滚动动画。
fn ticker_loop() {
loop {
if TICKER_STOP.load(Ordering::Acquire) {
break;
}
let target = WHEEL_TARGET.load(Ordering::Acquire);
let delta = WHEEL_STEP.load(Ordering::Acquire);
let sx = WHEEL_SX.load(Ordering::Acquire);
let sy = WHEEL_SY.load(Ordering::Acquire);
if target != 0 && delta != 0 {
if WHEEL_POST.load(Ordering::Acquire) {
post_wheel(target, sx, sy, -delta);
} else {
send_wheel(target, sx, sy, -delta);
}
}
sleep(Duration::from_millis(TICK_MS));
}
}
/// 应用滚轮投递策略(未检测到位移时逐级升级,直到找到能滚动的通道)。
fn apply_strategy(strategy: u8, p: &Params, bcx: i32, bcy: i32) {
match strategy {
0 => {
// 子窗口 + 小步长(Chromium/WinUI 等会累加小步长并平滑滚动)
WHEEL_TARGET.store(deep_child_at_point(p.hwnd, bcx, bcy), Ordering::Release);
WHEEL_STEP.store(DELTA_START, Ordering::Release);
WHEEL_POST.store(false, Ordering::Release);
}
1 => {
// 子窗口 + 整格(经典 Win32 控件只认整格消息)
WHEEL_TARGET.store(deep_child_at_point(p.hwnd, bcx, bcy), Ordering::Release);
WHEEL_STEP.store(DELTA_NOTCH, Ordering::Release);
WHEEL_POST.store(false, Ordering::Release);
}
2 => {
// 顶层 + 整格 Send(部分程序由顶层统一处理滚轮)
WHEEL_TARGET.store(p.hwnd, Ordering::Release);
WHEEL_STEP.store(DELTA_NOTCH, Ordering::Release);
WHEEL_POST.store(false, Ordering::Release);
}
_ => {
// 顶层 + 整格 Post(只处理消息泵排队事件的程序)
WHEEL_TARGET.store(p.hwnd, Ordering::Release);
WHEEL_STEP.store(DELTA_NOTCH, Ordering::Release);
WHEEL_POST.store(true, Ordering::Release);
}
}
log_info("scroll-session", &format!("滚轮策略升级为 {}", strategy));
}
/// 单周期匹配结果
enum CycleResult {
/// 两帧一致(未滚动)
NoChange,
/// 向下滚了 d 像素(已拼接)
Moved(usize),
/// 匹配失败(动画 / 位移超上限)
MatchFail,
}
/// 一轮捕获-匹配-拼接。返回 (band_w, total_h, CycleResult)。
fn stitch_cycle(p: &Params, cur: &[u8]) -> (i32, u32, CycleResult) {
let mut g = match SESSION.lock() {
Ok(g) => g,
Err(e) => {
log_error("scroll-session", &format!("会话锁异常: {}", e));
return (p.band_w, 0, CycleResult::MatchFail);
}
};
let s = match g.as_mut() {
Some(s) => s,
None => return (p.band_w, 0, CycleResult::MatchFail),
};
let prev = std::mem::take(&mut s.prev);
let (bx, by, bw, bh) = (s.band_x, s.band_y, s.band_w, s.band_h);
let off = detect_vscroll_offset(
&prev,
cur,
p.cw as usize,
p.ch as usize,
bx as usize,
by as usize,
bw as usize,
bh as usize,
);
match off {
Some(0) => {
s.prev = cur.to_vec();
(bw, s.total_h, CycleResult::NoChange)
}
Some(d) => {
// 一次最多拼接带的整高:单步滚动量超过带高时无法恢复中间内容,
// 以整带兜底(自适应速度会把位移压回安全区间)
let new_rows = (d as i32).min(bh) as usize;
let new_y = bh - new_rows as i32; // 带在客户区内的底对齐
match crop_bgra(cur, p.cw as usize, bx, s.band_y + new_y, bw, new_rows as i32) {
Ok(rows) => {
s.canvas.extend_from_slice(&rows);
s.total_h += new_rows as u32;
s.ttl_px += d as u32;
s.prev = cur.to_vec();
(bw, s.total_h, CycleResult::Moved(d))
}
Err(_) => {
s.prev = cur.to_vec();
(bw, s.total_h, CycleResult::MatchFail)
}
}
}
None => {
// 匹配失败:保留旧基准帧(下一帧与更早的稳定帧比对,累积位移仍能对上)
s.prev = prev;
(bw, s.total_h, CycleResult::MatchFail)
}
}
}
fn run_loop(app: AppHandle) {
let p = match read_params() {
Some(p) => p,
None => return,
};
// 滚轮目标初始参数:带中心(客户区坐标)→ 屏幕坐标
let bcx = p.band_x + p.band_w / 2;
let bcy = p.band_y + p.band_h / 2;
let (bsx, bsy) = client_pt_to_screen(p.hwnd, bcx, bcy).unwrap_or((0, 0));
WHEEL_SX.store(bsx, Ordering::Release);
WHEEL_SY.store(bsy, Ordering::Release);
// 自动模式:启动滚轮线程(策略 0 起步)
let mut strategy: u8 = 0;
let mut ticker = None;
if p.auto_scroll {
apply_strategy(0, &p, bcx, bcy);
TICKER_STOP.store(false, Ordering::Release);
ticker = Some(std::thread::spawn(ticker_loop));
}
let mut no_change: u32 = 0; // 锁定后:连续无位移(到底判定)
let mut no_move: u32 = 0; // 未锁定:连续无位移(策略升级判定)
let mut locked = false; // 是否已确认当前策略能滚动
let mut gave_up = false; // 所有策略都滚不动
let mut cycle_ms = CYCLE_MS;
let mut capture_errors: u32 = 0;
let mut last_emit = Instant::now();
loop {
if STOP.load(Ordering::Acquire) || !is_active() {
break;
}
// 周期节拍:捕获+匹配耗时计入周期
let t0 = Instant::now();
let cur = match capture_client_bgra(p.hwnd, p.ox, p.oy, p.cw, p.ch) {
Ok(f) => {
capture_errors = 0;
f
}
Err(e) => {
// 瞬时失败先重试,连续多次失败才视为窗口关闭/失去客户区
capture_errors += 1;
log_error("scroll-session", &format!("捕获失败({}/3): {}", capture_errors, e));
if capture_errors >= 3 {
break;
}
sleep(Duration::from_millis(100));
continue;
}
};
let (band_w, total_h, result) = stitch_cycle(&p, &cur);
// 目标位移:带高 1/4,夹在安全区间
let target_d = (p.band_h as usize / 4).clamp(TARGET_D_MIN, TARGET_D_MAX);
match result {
CycleResult::Moved(d) => {
if !locked {
locked = true;
log_info("scroll-session", &format!("策略 {} 生效,锁定", strategy));
}
no_change = 0;
no_move = 0;
if p.auto_scroll {
if strategy == 0 {
// 小步长模式:按实测位移调步长(sqrt 阻尼防过冲)
let delta = WHEEL_STEP.load(Ordering::Acquire) as f64;
let factor = target_d as f64 / d.max(6) as f64;
let nd = (delta * factor.sqrt()).clamp(DELTA_MIN as f64, DELTA_MAX as f64);
WHEEL_STEP.store(nd as i32, Ordering::Release);
} else {
// 整格模式:步长固定,按实测位移调捕获周期
if d as f64 > p.band_h as f64 * 0.55 {
cycle_ms = ((cycle_ms as f64) * 1.25).min(CYCLE_MS_MAX as f64) as u64;
} else if d < target_d / 2 && cycle_ms > CYCLE_MS {
cycle_ms = ((cycle_ms as f64) * 0.8).max(CYCLE_MS as f64) as u64;
}
}
}
}
CycleResult::NoChange => {
if locked {
no_change += 1;
if no_change >= NO_CHANGE_STOP && p.auto_scroll {
break; // 已到底部
}
// 手动模式由用户控制,不自动结束
} else if p.auto_scroll {
no_move += 1;
if no_move >= ESCALATE_CYCLES {
no_move = 0;
strategy += 1;
if strategy > 3 {
gave_up = true; // 所有通道都滚不动 → 结束(前端提示)
break;
}
apply_strategy(strategy, &p, bcx, bcy);
}
}
}
CycleResult::MatchFail => {
// 内容大幅变化/动画/位移超上限:若持续失败则降速,
// 避免越滚越快导致匹配一直失败(表现即"滚动中断")
if p.auto_scroll {
if locked && strategy == 0 {
let delta = WHEEL_STEP.load(Ordering::Acquire) as f64;
let nd = (delta * 0.75).max(DELTA_MIN as f64);
WHEEL_STEP.store(nd as i32, Ordering::Release);
} else if !locked {
// 未锁定:匹配失败也算"无位移"参与策略升级,
// 防止动画页面导致升级判定永不触发
no_move += 1;
if no_move >= ESCALATE_CYCLES {
no_move = 0;
strategy += 1;
if strategy > 3 {
gave_up = true;
break;
}
apply_strategy(strategy, &p, bcx, bcy);
}
}
}
}
}
// 进度事件(节流)
if matches!(result, CycleResult::Moved(_))
&& last_emit.elapsed().as_millis() as u64 >= PROGRESS_THROTTLE_MS
{
last_emit = Instant::now();
emit_progress(&app, band_w, total_h, p.auto_scroll);
}
if total_h >= MAX_TOTAL_H {
break;
}
// 补足周期剩余时间
let el = t0.elapsed().as_millis() as u64;
if el < cycle_ms {
sleep(Duration::from_millis(cycle_ms - el));
}
}
// 停滚轮线程(join 等它退出,最多再发一拍)
if let Some(t) = ticker.take() {
TICKER_STOP.store(true, Ordering::Release);
let _ = t.join();
}
let cancel = CANCEL.load(Ordering::Acquire);
// 完成(非取消、非放弃)时:等滚动动画静止后补拼最后一帧,
// 保证图片结尾 = 用户停止时窗口实际停留的位置
if !cancel && !gave_up {
settle_and_stitch(&p);
}
// 取出会话数据
let mut s = match SESSION.lock().ok().and_then(|mut g| g.take()) {
Some(s) => s,
None => {
log_info("scroll-session", "会话已不存在(未导出)");
let _ = app.emit(evts::SCROLL_CANCELLED, serde_json::json!({}));
return;
}
};
// 编码与回滚并行:PNG 编码只依赖画布(已定格),回滚不依赖画布,
// 两者无数据依赖,并行可显著缩短「停止 → 打开编辑器」的等待
let (band_w, total_h) = (s.band_w, s.total_h);
let encode = if cancel {
None
} else {
let canvas = std::mem::take(&mut s.canvas);
Some(std::thread::spawn(move || {
bgra_to_png(&canvas, band_w, total_h as i32)
}))
};
// 回滚到起始位置(与编码并行):先按累计像素粗估上滚,再帧匹配校准
if s.ttl_px > 0 {
rollback(&s);
}
STOP.store(false, Ordering::Release);
CANCEL.store(false, Ordering::Release);
// 等编码完成:PNG 原始字节直接存入编辑器图片槽(不经 base64 / JSON 事件传输)
let png = encode.and_then(|h| h.join().ok()).and_then(|r| r.ok());
match png {
Some(png) => {
log_info("scroll-session", &format!(
"完成导出 width={} height={}",
band_w, total_h
));
super::set_editor_image_raw(png);
let _ = app.emit(
evts::SCROLL_COMPLETE,
serde_json::json!({ "width": band_w, "height": total_h }),
);
}
None => {
log_info("scroll-session", "会话已取消(未导出)");
let _ = app.emit(evts::SCROLL_CANCELLED, serde_json::json!({}));
}
}
}
/// 停止后等待目标窗口滚动动画静止,并把静止帧补拼进画布(结尾对齐停止位置)。
fn settle_and_stitch(p: &Params) {
let deadline = Instant::now() + Duration::from_millis(SETTLE_TIMEOUT_MS);
loop {
sleep(Duration::from_millis(70));
if Instant::now() >= deadline || !is_active() {
return;
}
let cur = match capture_client_bgra(p.hwnd, p.ox, p.oy, p.cw, p.ch) {
Ok(f) => f,
Err(_) => return,
};
match stitch_cycle(p, &cur).2 {
CycleResult::NoChange => return, // 已静止且无新内容
CycleResult::Moved(_) | CycleResult::MatchFail => {
// 动画仍在进行(Moved 已拼接;MatchFail 继续等)
if Instant::now() >= deadline {
return;
}
}
}
}
}
/// 回滚:粗估整格数上滚 → 与初始帧逐次比对校准,直到回到起始位置。
/// 帧匹配校准消除"每格滚动像素因程序而异"带来的累计误差。
fn rollback(s: &Session) {
let target = {
let t = WHEEL_TARGET.load(Ordering::Acquire);
if t != 0 { t } else { s.hwnd }
};
let mut sx = WHEEL_SX.load(Ordering::Acquire);
let mut sy = WHEEL_SY.load(Ordering::Acquire);
if sx == 0 && sy == 0 {
if let Some((x, y)) = client_pt_to_screen(
s.hwnd,
s.band_x + s.band_w / 2,
s.band_y + s.band_h / 2,
) {
sx = x;
sy = y;
}
}
// 粗估上滚(宁可略少,剩余交给校准补齐)。
// 上限按累计像素推算:长图捕获(累计数万 px)也要能回滚到位,
// 固定小上限会导致超长捕获结束后窗口停在半途。
let notches = (((s.ttl_px as f64) / ROLLBACK_PX_PER_NOTCH).floor() as i32).clamp(1, 800);
for _ in 0..notches {
send_wheel(target, sx, sy, WHEEL_DELTA as i32);
sleep(Duration::from_millis(3));
}
sleep(Duration::from_millis(80));
// 帧匹配校准:d = 当前仍相对起始位置向下滚动的像素
let mut last_d = usize::MAX;
for _ in 0..12 {
let cur = match capture_client_bgra(s.hwnd, s.ox, s.oy, s.cw, s.ch) {
Ok(f) => f,
Err(_) => return,
};
let d = detect_vscroll_offset(
&s.first,
&cur,
s.cw as usize,
s.ch as usize,
s.band_x as usize,
s.band_y as usize,
s.band_w as usize,
s.band_h as usize,
);
match d {
Some(0) | None => return, // 已回到起始位置 / 无法匹配(视为完成)
Some(d) if d < 10 => return, // 误差 10px 内视为到位
Some(d) => {
if d >= last_d {
return; // 不再下降:窗口可能不支持向上滚(虚拟化列表),放弃
}
last_d = d;
let more = (((d as f64) / ROLLBACK_PX_PER_NOTCH).ceil() as i32).clamp(1, 60);
for _ in 0..more {
send_wheel(target, sx, sy, WHEEL_DELTA as i32);
sleep(Duration::from_millis(3));
}
sleep(Duration::from_millis(60));
}
}
}
}
fn emit_progress(app: &AppHandle, width: i32, height: u32, auto: bool) {
let _ = app.emit(
evts::SCROLL_PROGRESS,
serde_json::json!({ "width": width, "height": height, "auto": auto }),
);
}
+363
View File
@@ -0,0 +1,363 @@
//! HDR 全屏捕获实现(Windows Graphics Capture + HDR→sRGB 色调映射)
//!
//! ## 为什么需要它
//! Windows 高级色彩(HDR)开启时,桌面由 DWM 用**线性 scRGBRGBA16F**合成。
//! [crate::screenshot::capture] 的 `BitBlt` 从屏幕 DC 直接取出 8bit 像素,
//! 把这些线性/scRGB 高亮值当 sRGB 编码,会导致亮部越界被裁、局部过曝失真。
//!
//! ## 方案
//! 检测到任意显示器为 HDR 输出时,改用 WGC:
//! 1. 以 `RGBA16F`scRGB 线性)捕获每个显示器;
//! 2. 按 SDR 参考白缩放(`÷ (sdr_white_nits / 80)`)后钳制到 [0,1]
//! 3. 做 sRGB 伽马编码,得到与屏幕观感一致的 BGRA8;
//! 4. 按各显示器在虚拟屏上的偏移拼接到一整张虚拟屏图像(与 BitBlt 输出同构)。
//!
//! 仅当 HDR 时才走此路径;SDR 显示器仍用快速的 BitBlt。
use std::ffi::c_void;
use std::sync::mpsc;
use std::time::Duration;
use windows_capture::capture::{Context, GraphicsCaptureApiHandler};
use windows_capture::frame::Frame;
use windows_capture::graphics_capture_api::InternalCaptureControl;
use windows_capture::monitor::Monitor;
use windows_capture::settings::{
ColorFormat, CursorCaptureSettings, DirtyRegionSettings, DrawBorderSettings,
MinimumUpdateIntervalSettings, SecondaryWindowSettings, Settings,
};
use super::capture::CapturedImage;
// ===== 虚拟屏尺寸(与 capture.rs 一致)=====
const SM_XVIRTUALSCREEN: i32 = 76;
const SM_YVIRTUALSCREEN: i32 = 77;
const SM_CXVIRTUALSCREEN: i32 = 78;
const SM_CYVIRTUALSCREEN: i32 = 79;
/// Windows「SDR 内容亮度」的默认参考白(nits)。未自定义时为 203。
/// 严格值可用 DISPLAYCONFIG_SDR_WHITE_LEVEL 查询;此处取系统默认,覆盖绝大多数情况。
const DEFAULT_SDR_WHITE_NITS: f32 = 203.0;
/// 单帧捕获参数(作为 WGC handler 的 Flags 传入,把抓到的帧回传给调用线程)
#[derive(Clone)]
struct CaptureFlags {
tx: mpsc::SyncSender<Result<FramePixels, String>>,
}
/// 一帧 Rgba16F 像素(已去掉行尾 paddingtop-down
struct FramePixels {
width: u32,
height: u32,
raw: Vec<u8>,
}
/// 一次性截图 handler:拿到第一帧即回传并停止捕获
struct OneShot {
flags: CaptureFlags,
}
impl GraphicsCaptureApiHandler for OneShot {
type Flags = CaptureFlags;
type Error = String;
fn new(ctx: Context<Self::Flags>) -> Result<Self, Self::Error> {
Ok(Self { flags: ctx.flags })
}
fn on_frame_arrived(
&mut self,
frame: &mut Frame,
capture_control: InternalCaptureControl,
) -> Result<(), Self::Error> {
let mut buffer = frame.buffer().map_err(|e| e.to_string())?;
let width = buffer.width();
let height = buffer.height();
let row_pitch = buffer.row_pitch() as usize;
let raw = buffer.as_raw_buffer();
// 拷贝并去掉行 paddingRgba16F = 每像素 8 字节)
let row_bytes = (width as usize) * 8;
let mut packed = vec![0u8; row_bytes * (height as usize)];
for y in 0..(height as usize) {
let src = y * row_pitch;
let dst = y * row_bytes;
packed[dst..dst + row_bytes].copy_from_slice(&raw[src..src + row_bytes]);
}
let _ = self.flags.tx.send(Ok(FramePixels {
width,
height,
raw: packed,
}));
// 单帧足够,立即结束捕获(internal stop → 捕获线程退出)
capture_control.stop();
Ok(())
}
}
/// 捕获单个显示器(按 hmonitor),返回 tonemap 后的 BGRA8top-down
fn capture_monitor_bgra(
hmonitor: *mut c_void,
sdr_white: f32,
) -> Result<(Vec<u8>, u32, u32), String> {
let monitor = Monitor::from_raw_hmonitor(hmonitor);
let (tx, rx) = mpsc::sync_channel::<Result<FramePixels, String>>(1);
let flags = CaptureFlags { tx };
let settings = Settings::new(
monitor,
CursorCaptureSettings::WithCursor,
DrawBorderSettings::WithoutBorder,
SecondaryWindowSettings::Default,
MinimumUpdateIntervalSettings::Custom(Duration::from_millis(32)),
DirtyRegionSettings::Default,
ColorFormat::Rgba16F,
flags,
);
let control = OneShot::start_free_threaded(settings)
.map_err(|e| format!("WGC 捕获启动失败: {}", e))?;
let frame = match rx.recv_timeout(Duration::from_secs(10)) {
Ok(Ok(f)) => f,
Ok(Err(e)) => {
let _ = control.stop();
return Err(e);
}
Err(e) => {
let _ = control.stop();
return Err(format!("等待 WGC 帧超时: {}", e));
}
};
let _ = control.stop();
let bgra = tonemap_rgba16f_to_bgra(&frame.raw, frame.width, frame.height, sdr_white);
Ok((bgra, frame.width, frame.height))
}
/// 捕获整个虚拟屏(多显示器拼接),返回与 BitBlt 同构的 `CapturedImage`BGRA top-down)。
/// 仅当检测到 HDR 时由 [capture] 调用。
pub fn capture_virtual_screen_wgc() -> Result<CapturedImage, String> {
// 用 QueryDisplayConfig 读系统实际 SDR 白电平(nits),取不到才回退系统默认 203
let sdr_white = query_sdr_white_level().unwrap_or(DEFAULT_SDR_WHITE_NITS);
let monitors = enum_monitors();
if monitors.is_empty() {
return Err("未检测到显示器".into());
}
use windows_sys::Win32::UI::WindowsAndMessaging::GetSystemMetrics as gsm;
let vx = unsafe { gsm(SM_XVIRTUALSCREEN) };
let vy = unsafe { gsm(SM_YVIRTUALSCREEN) };
let vw = unsafe { gsm(SM_CXVIRTUALSCREEN) };
let vh = unsafe { gsm(SM_CYVIRTUALSCREEN) };
if vw <= 0 || vh <= 0 {
return Err("无法获取虚拟屏尺寸".into());
}
let mut canvas = vec![0u8; (vw as usize) * (vh as usize) * 4]; // 透明区以黑填充
for m in &monitors {
let (bgra, mw, mh) = capture_monitor_bgra(m.handle as *mut c_void, sdr_white)?;
let ow = m.x - vx;
let oh = m.y - vy;
if mw as i32 != m.w || mh as i32 != m.h {
// 尺寸失配(极少见,如缩放中途)— 中止避免错位拼接
return Err(format!(
"显示器捕获尺寸不符: 枚举 {}x{} vs WGC {}x{}",
m.w, m.h, mw, mh
));
}
let mw = mw as usize;
for row in 0..mh {
let src = (row as usize) * mw * 4;
let dst = ((oh + row as i32) as usize) * (vw as usize) * 4 + (ow as usize) * 4;
let len = mw * 4;
canvas[dst..dst + len].copy_from_slice(&bgra[src..src + len]);
}
}
Ok(CapturedImage {
width: vw,
height: vh,
png: Vec::new(),
bgra: canvas,
})
}
// ===== 显示器枚举与 HDR 检测 =====
struct MonInfo {
handle: usize,
x: i32,
y: i32,
w: i32,
h: i32,
}
fn enum_monitors() -> Vec<MonInfo> {
let mut out: Vec<MonInfo> = Vec::new();
unsafe extern "system" fn cb(
hmon: isize,
_hdc: isize,
rect: *mut windows_sys::Win32::Foundation::RECT,
lparam: isize,
) -> windows_sys::Win32::Foundation::BOOL {
let v = &mut *(lparam as *mut Vec<MonInfo>);
let r = *rect;
v.push(MonInfo {
handle: hmon as usize,
x: r.left,
y: r.top,
w: r.right - r.left,
h: r.bottom - r.top,
});
1
}
unsafe {
windows_sys::Win32::Graphics::Gdi::EnumDisplayMonitors(
0,
std::ptr::null(),
Some(cb),
&mut out as *mut _ as isize,
);
}
out
}
/// 枚举 DXGI 输出,任一显示器为 HDRadvanced color / PQ / HLG)输出则返回 true。
/// 任何错误一律视为非 HDR(回退 BitBlt),保证普通 SDR 环境不受影响。
pub fn is_hdr_enabled() -> bool {
#[allow(unused_imports)]
use windows::Win32::Graphics::Dxgi::Common::{
DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709, DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020,
DXGI_COLOR_SPACE_TYPE,
};
fn is_hdr_space(space: DXGI_COLOR_SPACE_TYPE) -> bool {
// HDR10PQBT.2020 主色)与 scRGB 高级色彩工作空间即视为 HDR
matches!(
space,
DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020 | DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709
)
}
use windows::Win32::Graphics::Dxgi::IDXGIFactory1;
let Ok(factory) = (unsafe {
windows::Win32::Graphics::Dxgi::CreateDXGIFactory1::<IDXGIFactory1>()
}) else {
return false;
};
use windows::core::ComInterface;
unsafe {
let mut ai = 0u32;
while let Ok(adapter) = factory.EnumAdapters1(ai) {
ai += 1;
let mut oi = 0u32;
while let Ok(output) = adapter.EnumOutputs(oi) {
oi += 1;
if let Ok(out6) =
output.cast::<windows::Win32::Graphics::Dxgi::IDXGIOutput6>()
{
let mut desc: windows::Win32::Graphics::Dxgi::DXGI_OUTPUT_DESC1 =
std::mem::zeroed();
if out6.GetDesc1(&mut desc).is_ok() && is_hdr_space(desc.ColorSpace) {
return true;
}
}
}
}
}
false
}
/// 通过 QueryDisplayConfig 读取 Windows 实际的 SDR 参考白电平(nits)。
///
/// SDR 白电平并非 union 的声明成员,而是系统/驱动写入在 DISPLAYCONFIG_MODE_INFO
/// 的 union 尾部(desktopImageInfo 之后)的 4 字节(DISPLAYCONFIG_SDR_WHITE_LEVEL)。
/// 取不到(非 HDR / 查询失败)时返回 None,由调用方回退系统默认 203。
fn query_sdr_white_level() -> Option<f32> {
use windows_sys::Win32::Devices::Display::{
GetDisplayConfigBufferSizes, QueryDisplayConfig, DISPLAYCONFIG_MODE_INFO,
DISPLAYCONFIG_MODE_INFO_TYPE_DESKTOP_IMAGE, DISPLAYCONFIG_PATH_INFO,
DISPLAYCONFIG_SDR_WHITE_LEVEL, QDC_ONLY_ACTIVE_PATHS,
};
unsafe {
let mut num_paths = 0u32;
let mut num_modes = 0u32;
if GetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &mut num_paths, &mut num_modes) != 0
{
return None;
}
let mut paths = vec![std::mem::zeroed::<DISPLAYCONFIG_PATH_INFO>(); num_paths as usize];
let mut modes = vec![std::mem::zeroed::<DISPLAYCONFIG_MODE_INFO>(); num_modes as usize];
if QueryDisplayConfig(
QDC_ONLY_ACTIVE_PATHS,
&mut num_paths,
paths.as_mut_ptr(),
&mut num_modes,
modes.as_mut_ptr(),
std::ptr::null_mut(),
) != 0
{
return None;
}
for mode in modes.iter().take(num_modes as usize) {
if mode.infoType == DISPLAYCONFIG_MODE_INFO_TYPE_DESKTOP_IMAGE {
let base = mode as *const DISPLAYCONFIG_MODE_INFO as *const u8;
let off = std::mem::size_of::<DISPLAYCONFIG_MODE_INFO>()
- std::mem::size_of::<DISPLAYCONFIG_SDR_WHITE_LEVEL>();
let white = std::ptr::read_unaligned::<u32>(base.add(off) as *const u32);
if white > 0 {
return Some(white as f32);
}
}
}
}
None
}
// ===== HDR→sRGB 色调映射 =====
/// IEEE754 半精度 float → f32
fn half_to_f32(h: u16) -> f32 {
let sign = (h & 0x8000) != 0;
let exp = (h >> 10) & 0x1f;
let man = (h & 0x3ff) as f32;
let v = match exp {
0 => man / 1024.0 * 2.0f32.powi(-14), // 次正规
0x1f => f32::NAN, // Inf/NaN,按 NaN 处理(后续 clamp 为 0~255 安全)
_ => (1.0 + man / 1024.0) * 2.0f32.powi(exp as i32 - 15),
};
if sign {
-v
} else {
v
}
}
/// 线性 scRGB 值 → sRGB 8bit(标准 sRGB OETF
fn srgb_encode(linear: f32) -> u8 {
let l = linear.clamp(0.0, 1.0);
let e = if l <= 0.003_130_8 {
12.92 * l
} else {
1.055 * l.powf(1.0 / 2.4) - 0.055
};
(e * 255.0 + 0.5) as u8
}
/// Rgba16FscRGB 线性,top-down)→ BGRA8sRGB),按 SDR 参考白缩放。
fn tonemap_rgba16f_to_bgra(raw: &[u8], width: u32, height: u32, sdr_white: f32) -> Vec<u8> {
let inv_scale = 80.0 / sdr_white.max(1.0);
let n = (width as usize) * (height as usize);
let mut out = vec![0u8; n * 4];
for i in 0..n {
let pi = i * 8;
let r16 = u16::from_le_bytes([raw[pi], raw[pi + 1]]);
let g16 = u16::from_le_bytes([raw[pi + 2], raw[pi + 3]]);
let b16 = u16::from_le_bytes([raw[pi + 4], raw[pi + 5]]);
let b = srgb_encode(half_to_f32(b16) * inv_scale);
let g = srgb_encode(half_to_f32(g16) * inv_scale);
let r = srgb_encode(half_to_f32(r16) * inv_scale);
let oi = i * 4;
out[oi] = b;
out[oi + 1] = g;
out[oi + 2] = r;
out[oi + 3] = 255; // 强制不透明(与 BitBlt 路径一致)
}
out
}
+12 -13
View File
@@ -66,8 +66,9 @@ pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
let server_engine = engine.clone(); let server_engine = engine.clone();
let server_port = settings.extension_port; let server_port = settings.extension_port;
let server_secret = settings.extension_secret.clone(); let server_secret = settings.extension_secret.clone();
let server_app = app.handle().clone();
tauri::async_runtime::spawn(async move { tauri::async_runtime::spawn(async move {
ExtensionServer::start(server_engine, server_port, server_secret).await; ExtensionServer::start(server_engine, server_port, server_secret, server_app).await;
}); });
// ===== 剪贴板模块:监听 + 快捷键 + 预创建弹窗 ===== // ===== 剪贴板模块:监听 + 快捷键 + 预创建弹窗 =====
@@ -87,11 +88,15 @@ pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
} }
// 预创建弹窗窗口(隐藏),首次按快捷键时直接 show,避免首次创建时序问题 // 预创建弹窗窗口(隐藏),首次按快捷键时直接 show,避免首次创建时序问题
crate::clipboard::popup::ensure_popup_window(&app_handle); crate::clipboard::popup::ensure_popup_window(&app_handle);
// 同时预创建独立预览窗口(隐藏),弹窗悬停条目时直接显示
crate::clipboard::popup::ensure_preview_window(&app_handle);
} }
app.manage(clipboard); app.manage(clipboard);
// ===== 快速面板:快捷键 + 预创建弹窗 + 文件索引 ===== // ===== 快速面板:快捷键 + 预创建弹窗 =====
// defaultEnabled:true 假设启用;用户在设置页禁用模块时由前端 onDisable 钩子注销快捷键。 // defaultEnabled:true 假设启用;用户在设置页禁用模块时由前端 onDisable 钩子注销快捷键。
// 文件索引 DB 连接改为懒加载(首次搜索/构建时由 commands 中的 ensure_initialized 触发),
// 避免应用启动时即打开 SQLite 连接,降低启动 IO 开销。
let qp_settings = crate::quickpanel::load_settings(&app.handle()); let qp_settings = crate::quickpanel::load_settings(&app.handle());
if !qp_settings.shortcut.trim().is_empty() { if !qp_settings.shortcut.trim().is_empty() {
let app_handle = app.handle().clone(); let app_handle = app.handle().clone();
@@ -106,8 +111,6 @@ pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
// 预创建弹窗窗口(隐藏),首次按快捷键时直接 show,避免首次创建时序问题 // 预创建弹窗窗口(隐藏),首次按快捷键时直接 show,避免首次创建时序问题
crate::quickpanel::ensure_window(&app_handle); crate::quickpanel::ensure_window(&app_handle);
} }
// 初始化文件索引数据库(不立即构建,由前端设置页或首次唤起时触发)
crate::quickpanel::file_index::init(&app.handle());
// ===== 托盘菜单 ===== // ===== 托盘菜单 =====
crate::tray_menu::create_tray_menu(app.handle())?; crate::tray_menu::create_tray_menu(app.handle())?;
@@ -115,6 +118,9 @@ pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
// ===== 进程监控线程 ===== // ===== 进程监控线程 =====
start_monitoring_thread(app.handle().clone()); start_monitoring_thread(app.handle().clone());
// ===== 代理:自动切换节点后台调度(独立于模块激活状态) =====
crate::mihomo_manager::start_auto_switch_loop(app.handle().clone());
// ===== 自动启动(随应用启动,不依赖模块启用) ===== // ===== 自动启动(随应用启动,不依赖模块启用) =====
// mihomo:用户在设置中开启"自动启动"时随应用启动 // mihomo:用户在设置中开启"自动启动"时随应用启动
if let Some(mihomo) = app.try_state::<MihomoManager>() { if let Some(mihomo) = app.try_state::<MihomoManager>() {
@@ -123,16 +129,9 @@ pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
} }
} }
// monitor Kernel硬件监控默认启用,被动读取无副作用 // monitor Kernel用户在设置中开启"自动启动"时随应用启动
if let Some(monitor) = app.try_state::<MonitorKernel>() { if let Some(monitor) = app.try_state::<MonitorKernel>() {
let monitor = monitor.inner().clone(); monitor.auto_start_on_launch(app.handle());
let app_handle = app.handle().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)),
}
});
} }
// 截图快捷键由前端 screenshotStore 启动时调用 screenshot_register_shortcut 注册 // 截图快捷键由前端 screenshotStore 启动时调用 screenshot_register_shortcut 注册
+166 -104
View File
@@ -21,10 +21,10 @@ 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, wa_top, wa_bottom, 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::win32_util::{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::mihomo_manager::{MihomoManager, is_pseudo_node}; use crate::mihomo_manager::{MihomoManager, is_pseudo_node};
use crate::monitor_kernel::MonitorKernel; use crate::monitor_kernel::MonitorKernel;
use crate::process_manager::{ProcessManager, ProcessStatus}; use crate::process_manager::{ProcessManager, ProcessStatus};
@@ -46,6 +46,7 @@ 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>,
@@ -147,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 {
@@ -172,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,
@@ -179,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
}
// ===== 显示/隐藏托盘菜单窗口 ===== // ===== 显示/隐藏托盘菜单窗口 =====
/// 托盘菜单窗口尺寸(逻辑像素) /// 托盘菜单窗口尺寸(逻辑像素)
@@ -245,29 +271,30 @@ pub fn precreate_tray_menu_window(app: &AppHandle) {
} }
/// 右键托盘时调用:计算定位参数、发送状态给前端,但不立即显示窗口。 /// 右键托盘时调用:计算定位参数、发送状态给前端,但不立即显示窗口。
/// 窗口等待前端测量内容高度后调用 `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:菜单宽度按物理像素换算 // 光标所在显示器的 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 menu_w_px = MENU_W * scale;
// 水平:菜单左边缘对齐鼠标 X(向右延伸),超出右边界则左移(物理坐标) // 水平:菜单左边缘对齐鼠标 X(向右延伸),超出屏幕右边界则左移(物理坐标)
let x = mx.max(wa_left as f64).min(wa_right as f64 - menu_w_px); let x = mx.max(scr_left as f64).min(scr_right as f64 - menu_w_px);
// 保存布局参数(全部物理坐标 + scale,供 tray_menu_ready 换算前端上报的逻辑高度) // 保存布局参数(全部物理坐标 + scale,供 tray_menu_ready 换算前端上报的逻辑高度)
{ {
let mut layout = LAST_MENU_LAYOUT.lock().unwrap_or_else(|e| e.into_inner()); let mut layout = LAST_MENU_LAYOUT.lock().unwrap_or_else(|e| e.into_inner());
*layout = Some((x, tray_top, wa_top as f64, wa_bottom as f64, scale)); *layout = Some((x, my, scr_top as f64, scr_bottom as f64, scale));
} }
// 记录显示时间,用于失焦防抖 // 记录显示时间,用于失焦防抖
@@ -281,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(crate::constants::events::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);
}); });
} }
@@ -302,6 +344,22 @@ async fn refresh_and_emit_state(app: &AppHandle) {
let _ = app.emit(crate::constants::events::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 命令 =====
/// 执行菜单项动作(统一入口) /// 执行菜单项动作(统一入口)
@@ -338,6 +396,21 @@ 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(crate::constants::events::TRAY_TOGGLE_OSD, ()); let _ = app.emit(crate::constants::events::TRAY_TOGGLE_OSD, ());
} }
@@ -348,18 +421,12 @@ pub async fn tray_menu_action(
} }
} }
"download_new" => { "download_new" => {
if let Some(window) = app.get_webview_window(crate::constants::windows::MAIN) { focus_main_window(&app);
window.show().ok();
window.set_focus().ok();
}
let _ = app.emit(crate::constants::events::TRAY_NEW_DOWNLOAD, ()); let _ = app.emit(crate::constants::events::TRAY_NEW_DOWNLOAD, ());
hide_tray_menu(&app); hide_tray_menu(&app);
} }
"settings" => { "settings" => {
if let Some(window) = app.get_webview_window(crate::constants::windows::MAIN) { focus_main_window(&app);
window.show().ok();
window.set_focus().ok();
}
let _ = app.emit(crate::constants::events::TRAY_OPEN_SETTINGS, ()); let _ = app.emit(crate::constants::events::TRAY_OPEN_SETTINGS, ());
hide_tray_menu(&app); hide_tray_menu(&app);
} }
@@ -370,9 +437,20 @@ pub async fn tray_menu_action(
_ => {} _ => {}
} }
// 刷新状态并发送给前端(quit 除外,quit 后进程已退出) // 按动作类型选择性刷新,避免无关动作(OSD 开关/跳转设置)也全量请求 mihomo API:
if action != "quit" { // - 代理相关动作:全量刷新(节点列表/延迟可能已变化)
refresh_and_emit_state(&app).await; // - 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;
}
"kernel_restart" | "osd_toggle" => {
let state = get_base_tray_state(&app);
let _ = app.emit(crate::constants::events::TRAY_MENU_STATE_UPDATED, state);
}
_ => {}
} }
Ok(()) Ok(())
@@ -392,9 +470,9 @@ 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, wa_top, wa_bottom, scale) = { let (x, cursor_y, scr_top, scr_bottom, scale) = {
let layout = LAST_MENU_LAYOUT.lock().unwrap_or_else(|e| e.into_inner()); 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))
}; };
// 将内容高度限制在合理范围内(前端上报为逻辑像素) // 将内容高度限制在合理范围内(前端上报为逻辑像素)
@@ -408,14 +486,22 @@ pub async fn tray_menu_ready(content_height: f64, app: AppHandle) -> Result<(),
height: win_h_px as u32, height: win_h_px as u32,
})); }));
// 垂直:菜单下边缘紧贴托盘图标顶部(向上弹出,物理坐标) // 垂直:菜单底部对齐鼠标点击位置(向上弹出,物理坐标)
let y = (tray_top - win_h_px).max(wa_top).min(wa_bottom - win_h_px); // 用屏幕边界而非工作区 clamp,使菜单贴近/覆盖任务栏上的鼠标位置,
// 而不是被工作区底部(任务栏顶部)截断后整体出现在任务栏上方。
let y = (cursor_y - win_h_px).max(scr_top).min(scr_bottom - win_h_px);
let pos = tauri::Position::Physical(tauri::PhysicalPosition { let pos = tauri::Position::Physical(tauri::PhysicalPosition {
x: x as i32, x: x as i32,
y: y 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();
@@ -446,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, "代理已开启", &format!("当前节点: {} ({}ms)", name, delay));
send_notification(app, "代理已开启", "所有节点均超时,未自动选择"); }
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 {
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, "代理已开启", "无可用节点");
} else {
send_notification(app, "代理已开启", "所有候选节点均超时,未自动选择");
} }
} }
} else {
send_notification(app, "代理已开启", "无可用节点");
} }
// 5. 开启系统代理 // 3. 开启系统代理
mihomo.enable_system_proxy()?; mihomo.enable_system_proxy()?;
Ok(()) Ok(())
@@ -495,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>();
@@ -647,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(crate::constants::windows::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);
} }
_ => {} _ => {}
} }
+506
View File
@@ -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.exeMSI 通常安装到 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, &current_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
}
+154
View File
@@ -60,6 +60,30 @@ pub fn get_work_area_at_point(x: i32, y: i32) -> Option<(i32, i32, i32, i32)> {
} }
} }
/// 获取指定点所在显示器的完整边界(含任务栏),返回 (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。 /// 获取指定点所在显示器的有效 DPI。
/// scale factor = dpi / 96。 /// scale factor = dpi / 96。
#[cfg(windows)] #[cfg(windows)]
@@ -81,6 +105,115 @@ pub fn get_dpi_for_point(x: i32, y: i32) -> Option<u32> {
} }
} }
/// 强制将窗口置为前台(绕过 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_ROUNDWin11 约 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 平台空实现 ===== // ===== 非 Windows 平台空实现 =====
#[cfg(not(windows))] #[cfg(not(windows))]
@@ -94,3 +227,24 @@ pub fn get_work_area_at_point(_x: i32, _y: i32) -> Option<(i32, i32, i32, i32)>
#[cfg(not(windows))] #[cfg(not(windows))]
pub fn get_dpi_for_point(_x: i32, _y: i32) -> Option<u32> { None } 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 }
+9 -4
View File
@@ -1,11 +1,11 @@
{ {
"$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.5",
"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"
}, },
@@ -19,7 +19,7 @@
"transparent": true, "transparent": true,
"visible": false, "visible": false,
"windowEffects": { "windowEffects": {
"effects": ["acrylic", "mica"] "effects": ["mica", "acrylic"]
} }
} }
], ],
@@ -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"
}
}
} }
} }
+96 -13
View File
@@ -10,16 +10,19 @@ import { useAppStore } from '@/stores/appStore'
import { useScreenshotStore } from '@/stores/screenshotStore' import { useScreenshotStore } from '@/stores/screenshotStore'
import { useQuickPanelStore } from '@/stores/quickpanelStore' import { useQuickPanelStore } from '@/stores/quickpanelStore'
import { useMonitorStore } from '@/stores/monitorStore' 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 } from '@/lib/trayEvents' import { pendingNewDownload } from '@/lib/trayEvents'
import { EVENTS, STORAGE_KEYS } from '@/lib/constants' 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 quickpanelStore = useQuickPanelStore()
const monitorStore = useMonitorStore() const monitorStore = useMonitorStore()
const processStore = useProcessStore()
/** 侧边栏 / 标题栏需要的模块信息(id + name + icon */ /** 侧边栏 / 标题栏需要的模块信息(id + name + icon */
interface NavModule { interface NavModule {
@@ -41,6 +44,9 @@ const activeModule = ref('')
const activeComponent = shallowRef<Component | null>(null) const activeComponent = shallowRef<Component | null>(null)
/** 模块组件加载中(异步 import 未完成)标志,避免切换期间仍显示上一个模块内容 */
const moduleLoading = ref(false)
/** 当前可显示的模块(内置模块 + 已启用的用户模块),按用户排序显示 */ /** 当前可显示的模块(内置模块 + 已启用的用户模块),按用户排序显示 */
const availableModules = computed<NavModule[]>(() => { const availableModules = computed<NavModule[]>(() => {
const enabledIds = appStore.enabledModules.map(m => m.id) const enabledIds = appStore.enabledModules.map(m => m.id)
@@ -65,10 +71,15 @@ const availableModules = computed<NavModule[]>(() => {
let moduleLoadSeq = 0 let moduleLoadSeq = 0
const loadModule = async (moduleId: string) => { const loadModule = async (moduleId: string) => {
const seq = ++moduleLoadSeq 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 // activeComponent
if (seq !== moduleLoadSeq) return 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)
@@ -76,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?.()
@@ -85,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 = () => {
@@ -99,14 +162,14 @@ 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() quickpanelStore.syncCommands()
@@ -149,16 +212,24 @@ onMounted(async () => {
// localStorage // localStorage
quickpanelStore.syncCommands() quickpanelStore.syncCommands()
quickpanelStore.syncSettings() quickpanelStore.syncSettings()
// DB
commands.quickpanelInitFileIndex().catch(e => console.error('文件索引初始化失败:', e))
// + // +
trayUnlisteners.push( trayUnlisteners.push(
await listen<{ moduleId: string }>('quickpanel-execute-command', async (e) => { await listen<{ moduleId: string }>('quickpanel-execute-command', async (e) => {
const win = getCurrentWindow() // Rust Windows
try { try {
await win.show() await commands.quickpanelFocusMainWindow()
await win.unminimize()
await win.setFocus()
} catch { } catch {
/* 忽略窗口操作失败 */ // 退 show + setFocus
const win = getCurrentWindow()
try {
await win.show()
await win.unminimize()
await win.setFocus()
} catch {
/* 忽略窗口操作失败 */
}
} }
handleSearch(e.payload.moduleId) handleSearch(e.payload.moduleId)
}) })
@@ -177,6 +248,14 @@ onMounted(async () => {
} }
}) })
) )
//
// /
trayUnlisteners.push(
await listen<{ id: string }>(EVENTS.downloadExtensionAdded, (e) => {
if (!e.payload?.id) return
void openDownloadWindow(e.payload.id)
})
)
trayUnlisteners.push( trayUnlisteners.push(
await listen(EVENTS.trayOpenSettings, () => { await listen(EVENTS.trayOpenSettings, () => {
handleModuleChange('settings') handleModuleChange('settings')
@@ -184,6 +263,8 @@ onMounted(async () => {
) )
// //
screenshotStore.initExportListener().catch(e => console.error('[screenshot] 导出监听初始化失败:', e)) screenshotStore.initExportListener().catch(e => console.error('[screenshot] 导出监听初始化失败:', e))
//
screenshotStore.initScrollEditorListener().catch(e => console.error('[screenshot] 滚动进编辑器监听初始化失败:', e))
}) })
const trayUnlisteners: UnlistenFn[] = [] const trayUnlisteners: UnlistenFn[] = []
@@ -193,6 +274,8 @@ onUnmounted(() => {
screenshotStore.destroyExportListener() screenshotStore.destroyExportListener()
// OSD watcher // OSD watcher
monitorStore.disposeOsd() monitorStore.disposeOsd()
//
processStore.destroyListener()
}) })
</script> </script>
@@ -206,7 +289,7 @@ 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 }" />
+43 -2
View File
@@ -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"
+6 -6
View File
@@ -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">
+108 -18
View File
@@ -1,5 +1,5 @@
<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, Check, Loader2 } 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'
@@ -42,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 = ''
@@ -50,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()
} }
@@ -57,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()
@@ -187,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(() => {
isMaximized.value = await tauriWindow!.isMaximized() if (resizeDebounce) return
resizeDebounce = setTimeout(async () => {
resizeDebounce = null
try {
isMaximized.value = await tauriWindow!.isMaximized()
} catch {
/* 窗口已销毁等异常忽略 */
}
}, 150)
}) })
} catch { } catch {
// Tauri // Tauri
@@ -209,6 +288,7 @@ 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 (unlistenFocus) unlistenFocus()
if (scrollViewport) scrollViewport.removeEventListener('scroll', handleMainScroll) if (scrollViewport) scrollViewport.removeEventListener('scroll', handleMainScroll)
@@ -259,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
> >
@@ -276,7 +355,6 @@ const handleBlur = () => {
v-if="tabsStore.saveVisible" 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" 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" :disabled="tabsStore.saving"
title="保存当前模块设置"
@click="tabsStore.runSave" @click="tabsStore.runSave"
@mousedown.stop @mousedown.stop
> >
@@ -287,7 +365,7 @@ const handleBlur = () => {
</Transition> </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"
@@ -295,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">
@@ -305,34 +384,45 @@ 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>
</template> </template>
<template v-if="searchResults.length > 0"> <template v-if="searchResults.length > 0">
<div v-if="filteredModules.length > 0" class="border-t border-border"></div> <div v-if="filteredModules.length > 0" class="border-t border-border"></div>
<div class="px-2 py-1 text-xs font-semibold text-muted-foreground uppercase tracking-wider"> <div class="px-2 py-1 text-xs font-semibold text-muted-foreground uppercase tracking-wider">
设置项 设置项
</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">
<span class="truncate">{{ item.title }}</span> <div class="flex items-center gap-1.5">
<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>
@@ -347,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
> >
@@ -358,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
> >
@@ -375,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
> >
+20
View File
@@ -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>
+20
View File
@@ -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>
+20
View File
@@ -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>
+21
View File
@@ -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>
+17
View File
@@ -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>
+26
View File
@@ -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>
+10
View File
@@ -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(
+15
View File
@@ -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>
+1
View File
@@ -0,0 +1 @@
export { default as Skeleton } from "./Skeleton.vue"
+1 -1
View File
@@ -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,
)" )"
> >
+1 -1
View File
@@ -24,7 +24,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
<TooltipContent <TooltipContent
data-slot="tooltip-content" data-slot="tooltip-content"
v-bind="{ ...forwarded, ...$attrs }" v-bind="{ ...forwarded, ...$attrs }"
:class="cn('bg-foreground text-background animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit rounded-md px-3 py-1.5 text-xs text-balance', props.class)" :class="cn('bg-foreground text-background animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit max-w-[calc(100vw-2rem)] rounded-md px-3 py-1.5 text-xs', props.class)"
> >
<slot /> <slot />
+305 -24
View File
@@ -4,16 +4,45 @@ import { invoke as __TAURI_INVOKE } from "@tauri-apps/api/core";
/** Commands */ /** Commands */
export const commands = { export const commands = {
/** 获取当前应用版本 */
appVersion: () => __TAURI_INVOKE<string>("app_version"),
/** 检查 Gitea 最新 release,返回版本对比与可用资产 */
updateCheck: () => __TAURI_INVOKE<UpdateCheckResult>("update_check"),
/**
*
* 便 thing_{v}_x64.exe / thing_{v}_x64-setup.exe
* 便copy update.bat
* copy /S
* 退
*/
updateInstall: (downloadedPath: string) => __TAURI_INVOKE<null>("update_install", { downloadedPath }),
/**
* ThingHK
* need_stop
* UPDATE_PROGRESS need_stop
*/
updateThinghkApply: (zipPath: string) => __TAURI_INVOKE<null>("update_thinghk_apply", { zipPath }),
/** 前端已停止监控内核,确认继续解压替换(唤醒 need_stop 等待) */
updateThinghkConfirm: () => __TAURI_INVOKE<null>("update_thinghk_confirm"),
/** 取消 ThingHK 内核更新(need_stop 等待阶段有效:唤醒 apply 以「已取消」返回,zip 保留便于重试) */
updateThinghkCancel: () => __TAURI_INVOKE<null>("update_thinghk_cancel"),
proxyActivateProfile: (id: string) => __TAURI_INVOKE<null>("proxy_activate_profile", { id }), proxyActivateProfile: (id: string) => __TAURI_INVOKE<null>("proxy_activate_profile", { id }),
/** 应用内核更新:下载阶段已由下载模块完成,本方法仅做 need_stop → 解压 → 替换。 */
proxyApplyKernelUpdate: (zipPath: string) => __TAURI_INVOKE<KernelInfo>("proxy_apply_kernel_update", { zipPath }),
/** 取消内核下载/安装(设置取消标志,下载循环轮询后中止) */
proxyCancelKernelInstall: () => __TAURI_INVOKE<null>("proxy_cancel_kernel_install"),
proxyCheckKernelUpdate: () => __TAURI_INVOKE<KernelUpdateInfo>("proxy_check_kernel_update"), proxyCheckKernelUpdate: () => __TAURI_INVOKE<KernelUpdateInfo>("proxy_check_kernel_update"),
proxyClearSystemProxy: () => __TAURI_INVOKE<null>("proxy_clear_system_proxy"), proxyClearSystemProxy: () => __TAURI_INVOKE<null>("proxy_clear_system_proxy"),
proxyCloseConnection: (id: string) => __TAURI_INVOKE<null>("proxy_close_connection", { id }), proxyCloseConnection: (id: string) => __TAURI_INVOKE<null>("proxy_close_connection", { id }),
/**
* mihomo
* mihomo 便 mihomo exe
*/
proxyConfirmInstall: () => __TAURI_INVOKE<null>("proxy_confirm_install"),
proxyDeleteProfile: (id: string) => __TAURI_INVOKE<null>("proxy_delete_profile", { id }), proxyDeleteProfile: (id: string) => __TAURI_INVOKE<null>("proxy_delete_profile", { id }),
proxyGetSettings: () => __TAURI_INVOKE<ProxySettings>("proxy_get_settings"), proxyGetSettings: () => __TAURI_INVOKE<ProxySettings>("proxy_get_settings"),
proxyGetSystemProxy: () => __TAURI_INVOKE<boolean>("proxy_get_system_proxy"), proxyGetSystemProxy: () => __TAURI_INVOKE<boolean>("proxy_get_system_proxy"),
proxyImportProfile: (url: string, name: string) => __TAURI_INVOKE<ProfileMeta>("proxy_import_profile", { url, name }), proxyImportProfile: (url: string, name: string) => __TAURI_INVOKE<ProfileMeta>("proxy_import_profile", { url, name }),
/** 首次安装内核(与 update_kernel 共用 install_kernel 实现,语义独立便于前端区分场景) */
proxyInstallKernel: (mirrorPrefix: string | null) => __TAURI_INVOKE<KernelInfo>("proxy_install_kernel", { mirrorPrefix }),
proxyKernelInfo: () => __TAURI_INVOKE<KernelInfo>("proxy_kernel_info"), proxyKernelInfo: () => __TAURI_INVOKE<KernelInfo>("proxy_kernel_info"),
proxyRestart: () => __TAURI_INVOKE<ProcessInfo>("proxy_restart"), proxyRestart: () => __TAURI_INVOKE<ProcessInfo>("proxy_restart"),
proxySaveSettings: (settings: ProxySettings) => __TAURI_INVOKE<null>("proxy_save_settings", { settings }), proxySaveSettings: (settings: ProxySettings) => __TAURI_INVOKE<null>("proxy_save_settings", { settings }),
@@ -22,12 +51,15 @@ export const commands = {
proxyStart: () => __TAURI_INVOKE<ProcessInfo>("proxy_start"), proxyStart: () => __TAURI_INVOKE<ProcessInfo>("proxy_start"),
proxyStatus: () => __TAURI_INVOKE<ProxyStatus>("proxy_status"), proxyStatus: () => __TAURI_INVOKE<ProxyStatus>("proxy_status"),
proxyStop: () => __TAURI_INVOKE<null>("proxy_stop"), proxyStop: () => __TAURI_INVOKE<null>("proxy_stop"),
proxyTraffic: () => __TAURI_INVOKE<TrafficSnapshot>("proxy_traffic"),
proxyTestDelay: (name: string, url: string | null, timeout: number | null) => __TAURI_INVOKE<number>("proxy_test_delay", { name, url, timeout }), proxyTestDelay: (name: string, url: string | null, timeout: number | null) => __TAURI_INVOKE<number>("proxy_test_delay", { name, url, timeout }),
proxyUpdateKernel: (mirrorPrefix: string | null) => __TAURI_INVOKE<KernelInfo>("proxy_update_kernel", { mirrorPrefix }),
proxyUpdateProfile: (id: string) => __TAURI_INVOKE<ProfileMeta>("proxy_update_profile", { id }), proxyUpdateProfile: (id: string) => __TAURI_INVOKE<ProfileMeta>("proxy_update_profile", { id }),
/** 读取快速面板设置(快捷键等) */ /** 读取快速面板设置(快捷键等) */
quickpanelGetSettings: () => __TAURI_INVOKE<QuickPanelSettings>("quickpanel_get_settings"), quickpanelGetSettings: () => __TAURI_INVOKE<QuickPanelSettings>("quickpanel_get_settings"),
/** 保存快速面板设置;快捷键变化时自动重新注册 + 预创建窗口 */ /**
* +
*
*/
quickpanelSaveSettings: (settings: QuickPanelSettings) => __TAURI_INVOKE<null>("quickpanel_save_settings", { settings }), quickpanelSaveSettings: (settings: QuickPanelSettings) => __TAURI_INVOKE<null>("quickpanel_save_settings", { settings }),
/** 注册(或切换)快速面板全局快捷键 */ /** 注册(或切换)快速面板全局快捷键 */
quickpanelRegisterShortcut: (shortcut: string) => __TAURI_INVOKE<null>("quickpanel_register_shortcut", { shortcut }), quickpanelRegisterShortcut: (shortcut: string) => __TAURI_INVOKE<null>("quickpanel_register_shortcut", { shortcut }),
@@ -41,7 +73,12 @@ export const commands = {
quickpanelShowWindow: () => __TAURI_INVOKE<null>("quickpanel_show_window"), quickpanelShowWindow: () => __TAURI_INVOKE<null>("quickpanel_show_window"),
/** 锁定屏幕(Windows: rundll32 user32.dll,LockWorkStationCREATE_NO_WINDOW 避免黑窗) */ /** 锁定屏幕(Windows: rundll32 user32.dll,LockWorkStationCREATE_NO_WINDOW 避免黑窗) */
quickpanelLockScreen: () => __TAURI_INVOKE<null>("quickpanel_lock_screen"), quickpanelLockScreen: () => __TAURI_INVOKE<null>("quickpanel_lock_screen"),
/** 初始化文件索引数据库(应用启动时调用) */ /**
*
* last_built_dirs notify
*
* "构建索引"
*/
quickpanelInitFileIndex: () => __TAURI_INVOKE<null>("quickpanel_init_file_index"), quickpanelInitFileIndex: () => __TAURI_INVOKE<null>("quickpanel_init_file_index"),
/** 构建文件索引(全量重建,阻塞操作建议在 spawn_blocking 调用) */ /** 构建文件索引(全量重建,阻塞操作建议在 spawn_blocking 调用) */
quickpanelBuildFileIndex: () => __TAURI_INVOKE<number>("quickpanel_build_file_index"), quickpanelBuildFileIndex: () => __TAURI_INVOKE<number>("quickpanel_build_file_index"),
@@ -81,8 +118,41 @@ export const commands = {
/** /**
* CREATE_NO_WINDOW使 cmd/powershell/regedit * CREATE_NO_WINDOW使 cmd/powershell/regedit
* regeditshutdowncmdpowershelltaskmgr * regeditshutdowncmdpowershelltaskmgr
* - cmd/powershell/pwsh CREATE_NEW_CONSOLE
* GUI 宿"点击没反应"
* - .msc devmgmt.msc CreateProcess
* mmc System32
*/ */
quickpanelRunSystemCommand: (command: string, args: string[]) => __TAURI_INVOKE<null>("quickpanel_run_system_command", { command, args }), quickpanelRunSystemCommand: (command: string, args: string[]) => __TAURI_INVOKE<null>("quickpanel_run_system_command", { command, args }),
/** 列出目录下的压缩包文件(供批量解压面板使用)。 */
quickpanelListArchives: (dir: string) => __TAURI_INVOKE<ArchiveInfo[]>("quickpanel_list_archives", { dir }),
/** 列出目录下的全部条目(供批量重命名/删除面板使用,不含子目录递归)。 */
quickpanelListDir: (dir: string) => __TAURI_INVOKE<FileEntry[]>("quickpanel_list_dir", { dir }),
/**
* `files` `dest_dir`
* `password` `into_subfolder`
* `quickpanel-extract-progress`
*/
quickpanelBatchExtract: (files: string[], destDir: string, password: string | null, intoSubfolder: boolean) => __TAURI_INVOKE<ExtractResult[]>("quickpanel_batch_extract", { files, destDir, password, intoSubfolder }),
/**
* `pattern → replacement`
* `newName`
*/
quickpanelPreviewRename: (files: string[], pattern: string, replacement: string) => __TAURI_INVOKE<RenamePreview[]>("quickpanel_preview_rename", { files, pattern, replacement }),
/** 执行重命名。同一目录下若目标已存在则跳过该项。 */
quickpanelApplyRename: (items: RenameItem[]) => __TAURI_INVOKE<RenameResult[]>("quickpanel_apply_rename", { items }),
/**
* /`force=false` `force=true`
* /
*
*/
quickpanelDeleteFiles: (paths: string[], force: boolean) => __TAURI_INVOKE<DeleteResult[]>("quickpanel_delete_files", { paths, force }),
/**
*
* Tauri set_focus Windows
* SetForegroundWindow + BringWindowToTop Alt
*/
quickpanelFocusMainWindow: () => __TAURI_INVOKE<null>("quickpanel_focus_main_window"),
clipboardGetHistory: (limit: number | null, offset: number | null, kind: string | null) => __TAURI_INVOKE<HistoryPage>("clipboard_get_history", { limit, offset, kind }), clipboardGetHistory: (limit: number | null, offset: number | null, kind: string | null) => __TAURI_INVOKE<HistoryPage>("clipboard_get_history", { limit, offset, kind }),
clipboardGetPinned: () => __TAURI_INVOKE<ClipboardItem[]>("clipboard_get_pinned"), clipboardGetPinned: () => __TAURI_INVOKE<ClipboardItem[]>("clipboard_get_pinned"),
clipboardSearch: (query: string, limit: number | null, offset: number | null) => __TAURI_INVOKE<HistoryPage>("clipboard_search", { query, limit, offset }), clipboardSearch: (query: string, limit: number | null, offset: number | null) => __TAURI_INVOKE<HistoryPage>("clipboard_search", { query, limit, offset }),
@@ -92,6 +162,8 @@ export const commands = {
/** 图片 PNG base64(仅 image 类型) */ /** 图片 PNG base64(仅 image 类型) */
imageBase64: string | null, imageBase64: string | null,
}) & (ClipboardItem) | null>("clipboard_get_item", { id }), }) & (ClipboardItem) | null>("clipboard_get_item", { id }),
/** 获取图片缩略图 PNG base64(弹窗悬停预览用,避免加载全尺寸图片) */
clipboardGetThumb: (id: number) => __TAURI_INVOKE<string | null>("clipboard_get_thumb", { id }),
clipboardSetPinned: (id: number, pinned: boolean) => __TAURI_INVOKE<boolean>("clipboard_set_pinned", { id, pinned }), clipboardSetPinned: (id: number, pinned: boolean) => __TAURI_INVOKE<boolean>("clipboard_set_pinned", { id, pinned }),
clipboardDelete: (id: number) => __TAURI_INVOKE<boolean>("clipboard_delete", { id }), clipboardDelete: (id: number) => __TAURI_INVOKE<boolean>("clipboard_delete", { id }),
clipboardClear: () => __TAURI_INVOKE<boolean>("clipboard_clear"), clipboardClear: () => __TAURI_INVOKE<boolean>("clipboard_clear"),
@@ -114,16 +186,40 @@ export const commands = {
clipboardShowWindow: () => __TAURI_INVOKE<null>("clipboard_show_window"), clipboardShowWindow: () => __TAURI_INVOKE<null>("clipboard_show_window"),
/** 隐藏弹窗并模拟 Ctrl+V 粘贴到原窗口 */ /** 隐藏弹窗并模拟 Ctrl+V 粘贴到原窗口 */
clipboardPasteToTarget: () => __TAURI_INVOKE<null>("clipboard_paste_to_target"), clipboardPasteToTarget: () => __TAURI_INVOKE<null>("clipboard_paste_to_target"),
/** 在弹窗旁显示独立预览窗口(悬停/键盘选中时调用) */
clipboardShowPreview: (id: number) => __TAURI_INVOKE<null>("clipboard_show_preview", { id }),
/** 隐藏独立预览窗口 */
clipboardHidePreview: () => __TAURI_INVOKE<null>("clipboard_hide_preview"),
/**
*
*
* allow_flip true/ false
*/
clipboardResizePreview: (width: number | null, height: number | null, allowFlip: boolean) => __TAURI_INVOKE<null>("clipboard_resize_preview", { width, height, allowFlip }),
/**
* resize
* "先以上次尺寸(可能是放大态大窗)显示再缩回"
*/
clipboardRevealPreview: () => __TAURI_INVOKE<null>("clipboard_reveal_preview"),
/**
* mousedown/
* +/退
*/
clipboardPreviewInteracted: () => __TAURI_INVOKE<null>("clipboard_preview_interacted"),
/** 获取所有任务 */ /** 获取所有任务 */
downloaderGetTasks: () => __TAURI_INVOKE<DownloadTask[]>("downloader_get_tasks"), downloaderGetTasks: () => __TAURI_INVOKE<DownloadTask[]>("downloader_get_tasks"),
/** 检查 URL 重复性并探测文件信息(添加下载前调用) */ /** 检查 URL 重复性并探测文件信息(添加下载前调用) */
downloaderCheckUrl: (url: string, dir: string | null, headers: { [key in string]: string } | null) => __TAURI_INVOKE<CheckUrlResult>("downloader_check_url", { url, dir, headers }), downloaderCheckUrl: (url: string, dir: string | null, headers: { [key in string]: string } | null) => __TAURI_INVOKE<CheckUrlResult>("downloader_check_url", { url, dir, headers }),
/** 添加下载任务 */ /** 添加下载任务 */
downloaderAddTask: (url: string, filename: string | null, dir: string | null, headers: { [key in string]: string } | null, autoRename: boolean | null) => __TAURI_INVOKE<string>("downloader_add_task", { url, filename, dir, headers, autoRename }), downloaderAddTask: (url: string, filename: string | null, dir: string | null, headers: { [key in string]: string } | null, autoRename: boolean | null, onlyFiles: number[] | null) => __TAURI_INVOKE<string>("downloader_add_task", { url, filename, dir, headers, autoRename, onlyFiles }),
/** 暂停任务 */ /** 暂停任务 */
downloaderPauseTask: (id: string) => __TAURI_INVOKE<null>("downloader_pause_task", { id }), downloaderPauseTask: (id: string) => __TAURI_INVOKE<null>("downloader_pause_task", { id }),
/** 恢复任务 */ /** 恢复任务 */
downloaderResumeTask: (id: string) => __TAURI_INVOKE<null>("downloader_resume_task", { id }), downloaderResumeTask: (id: string) => __TAURI_INVOKE<null>("downloader_resume_task", { id }),
/** 取消任务(置为已取消,清空进度并删除下载文件,但保留记录) */
downloaderCancelTask: (id: string) => __TAURI_INVOKE<null>("downloader_cancel_task", { id }),
/** 重新下载已取消/出错的任务 */
downloaderRedownload: (id: string) => __TAURI_INVOKE<null>("downloader_redownload", { id }),
/** 移除任务 */ /** 移除任务 */
downloaderRemoveTask: (id: string, deleteFiles: boolean | null) => __TAURI_INVOKE<null>("downloader_remove_task", { id, deleteFiles }), downloaderRemoveTask: (id: string, deleteFiles: boolean | null) => __TAURI_INVOKE<null>("downloader_remove_task", { id, deleteFiles }),
/** 获取设置 */ /** 获取设置 */
@@ -134,14 +230,37 @@ export const commands = {
downloaderOpenDir: (path: string) => __TAURI_INVOKE<null>("downloader_open_dir", { path }), downloaderOpenDir: (path: string) => __TAURI_INVOKE<null>("downloader_open_dir", { path }),
/** 用系统默认浏览器打开 URL */ /** 用系统默认浏览器打开 URL */
downloaderOpenUrl: (url: string) => __TAURI_INVOKE<null>("downloader_open_url", { url }), downloaderOpenUrl: (url: string) => __TAURI_INVOKE<null>("downloader_open_url", { url }),
/**
* label
* Tauri set_focus Windows
* SetForegroundWindow + BringWindowToTop
* Alt /
*/
downloaderFocusWindow: (label: string) => __TAURI_INVOKE<null>("downloader_focus_window", { label }),
/** 解析磁力链 / .torrent 文件,返回种子信息(名称 / infohash / 文件列表),供前端做文件勾选 */
downloaderInspect: (input: string) => __TAURI_INVOKE<TorrentInfo>("downloader_inspect", { input }),
/** 磁力任务:元数据解析成功后,用户勾选文件并确认开始下载 */
downloaderSelectBtFiles: (id: string, onlyFiles: number[]) => __TAURI_INVOKE<null>("downloader_select_bt_files", { id, onlyFiles }),
/** 禁用指定窗口(按 label 查找)的显示/隐藏过渡动画,消除覆盖层出现/消失时的缩放动画 */ /** 禁用指定窗口(按 label 查找)的显示/隐藏过渡动画,消除覆盖层出现/消失时的缩放动画 */
screenshotDisableTransitions: (label: string) => __TAURI_INVOKE<null>("screenshot_disable_transitions", { label }), screenshotDisableTransitions: (label: string) => __TAURI_INVOKE<null>("screenshot_disable_transitions", { label }),
/** 一次 IPC 完成指定窗口的显示与聚焦(截图覆盖层显示关键路径,减少串行往返) */
screenshotShowOverlay: (label: string) => __TAURI_INVOKE<null>("screenshot_show_overlay", { label }),
/** 注册(或切换)截图全局快捷键。传入空字符串则禁用快捷键。 */ /** 注册(或切换)截图全局快捷键。传入空字符串则禁用快捷键。 */
screenshotRegisterShortcut: (shortcut: string) => __TAURI_INVOKE<null>("screenshot_register_shortcut", { shortcut }), screenshotRegisterShortcut: (shortcut: string) => __TAURI_INVOKE<null>("screenshot_register_shortcut", { shortcut }),
/** 注销截图全局快捷键 */ /** 注销截图全局快捷键 */
screenshotUnregisterShortcut: () => __TAURI_INVOKE<null>("screenshot_unregister_shortcut"), screenshotUnregisterShortcut: () => __TAURI_INVOKE<null>("screenshot_unregister_shortcut"),
/** 捕获整个虚拟屏(多显示器拼接)存入静态,不做 PNG 编码 */ /**
screenshotCaptureFullscreen: () => __TAURI_INVOKE<null>("screenshot_capture_fullscreen"), *
* emit 'screenshot-pin-shortcut'/
*/
screenshotRegisterPinShortcut: (shortcut: string) => __TAURI_INVOKE<null>("screenshot_register_pin_shortcut", { shortcut }),
/** 注销贴图全局快捷键 */
screenshotUnregisterPinShortcut: () => __TAURI_INVOKE<null>("screenshot_unregister_pin_shortcut"),
/**
* PNG
* IPC
*/
screenshotCaptureFullscreen: () => __TAURI_INVOKE<CaptureStart>("screenshot_capture_fullscreen"),
/** 全屏捕获编码为 PNG base64 并清除(全屏截图直接进编辑器) */ /** 全屏捕获编码为 PNG base64 并清除(全屏截图直接进编辑器) */
screenshotFullscreenPng: () => __TAURI_INVOKE<CaptureData>("screenshot_fullscreen_png"), screenshotFullscreenPng: () => __TAURI_INVOKE<CaptureData>("screenshot_fullscreen_png"),
/** 清除静态全屏捕获(覆盖层关闭/取消时释放内存) */ /** 清除静态全屏捕获(覆盖层关闭/取消时释放内存) */
@@ -150,24 +269,42 @@ export const commands = {
screenshotCropStored: (x: number, y: number, w: number, h: number) => __TAURI_INVOKE<CaptureData>("screenshot_crop_stored", { x, y, w, h }), screenshotCropStored: (x: number, y: number, w: number, h: number) => __TAURI_INVOKE<CaptureData>("screenshot_crop_stored", { x, y, w, h }),
/** 裁剪已存储的全屏捕获并直接写入剪贴板(一次 IPC 完成"裁剪+复制" */ /** 裁剪已存储的全屏捕获并直接写入剪贴板(一次 IPC 完成"裁剪+复制" */
screenshotCropCopyStored: (x: number, y: number, w: number, h: number) => __TAURI_INVOKE<CaptureData>("screenshot_crop_copy_stored", { x, y, w, h }), screenshotCropCopyStored: (x: number, y: number, w: number, h: number) => __TAURI_INVOKE<CaptureData>("screenshot_crop_copy_stored", { x, y, w, h }),
/** 拾取指定物理屏幕坐标下的顶层窗口 */ /**
screenshotWindowFromPoint: (x: number, y: number) => __TAURI_INVOKE<{ * Z //
hwnd: number, * JS IPC
title: string, */
rect: ScreenRect, screenshotPickList: () => __TAURI_INVOKE<WindowInfo[]>("screenshot_pick_list"),
/** DWM 扩展边框矩形(视觉边界,去掉最大化窗口的隐形缩放边框),命中测试用 rect,高亮用 visual_rect */ /** 获取当前鼠标物理屏幕坐标(贴图窗口拖动跟随等场景使用) */
visualRect: ScreenRect | null,
} | null>("screenshot_window_from_point", { x, y }),
/** 获取当前鼠标物理屏幕坐标(覆盖层打开时定位初始悬停窗口) */
screenshotCursorPos: () => __TAURI_INVOKE<[number, number]>("screenshot_cursor_pos"), screenshotCursorPos: () => __TAURI_INVOKE<[number, number]>("screenshot_cursor_pos"),
/** 枚举所有可见顶层窗口 */ /** 枚举所有可见顶层窗口 */
screenshotEnumWindows: () => __TAURI_INVOKE<WindowInfo[]>("screenshot_enum_windows"), screenshotEnumWindows: () => __TAURI_INVOKE<WindowInfo[]>("screenshot_enum_windows"),
/** 按 hwnd 捕获指定窗口 */ /** 按 hwnd 捕获指定窗口 */
screenshotCaptureWindow: (hwnd: number) => __TAURI_INVOKE<CaptureData>("screenshot_capture_window", { hwnd }), screenshotCaptureWindow: (hwnd: number) => __TAURI_INVOKE<CaptureData>("screenshot_capture_window", { hwnd }),
/** 存入编辑器图片(base64 PNG */ /**
screenshotSetEditorImage: (pngBase64: string) => __TAURI_INVOKE<null>("screenshot_set_editor_image", { pngBase64 }), * PNG
/** 取出编辑器图片(编辑器窗口加载时调用,取出即清除) */ * `region` Some =
screenshotGetEditorImage: () => __TAURI_INVOKE<string | null>("screenshot_get_editor_image"), * None
*/
screenshotScrollCapture: (hwnd: number, region: {
x: number,
y: number,
width: number,
height: number,
} | null) => __TAURI_INVOKE<CaptureData>("screenshot_scroll_capture", { hwnd, region }),
/** 取消滚动截图会话(不导出)。 */
screenshotScrollCancel: () => __TAURI_INVOKE<null>("screenshot_scroll_cancel"),
/** 结束滚动截图会话并导出结果。 */
screenshotScrollFinish: () => __TAURI_INVOKE<null>("screenshot_scroll_finish"),
/**
* 线
* `auto = true` 线`false`
*/
screenshotScrollStart: (hwnd: number, region: {
x: number,
y: number,
width: number,
height: number,
} | null, auto: boolean) => __TAURI_INVOKE<null>("screenshot_scroll_start", { hwnd, region, auto }),
/** 将 PNG base64 写入系统剪贴板(转 CF_DIB */ /** 将 PNG base64 写入系统剪贴板(转 CF_DIB */
screenshotCopyImage: (pngBase64: string) => __TAURI_INVOKE<null>("screenshot_copy_image", { pngBase64 }), screenshotCopyImage: (pngBase64: string) => __TAURI_INVOKE<null>("screenshot_copy_image", { pngBase64 }),
/** 将 PNG base64 写入文件 */ /** 将 PNG base64 写入文件 */
@@ -186,6 +323,22 @@ export type AppRecord = {
path: string, path: string,
}; };
export type ArchiveInfo = {
name: string,
path: string,
size: number,
};
/** BT 种子内文件条目(多文件任务用;阶段1下载全部文件,但保留列表供 UI 展示) */
export type BtFileInfo = {
/** 文件在种子内的索引 */
index: number,
/** 相对种子根目录的路径(如 "sub/file.mkv" */
path: string,
/** 文件大小(字节) */
size: number,
};
/** 前端可见的捕获数据 */ /** 前端可见的捕获数据 */
export type CaptureData = { export type CaptureData = {
pngBase64: string, pngBase64: string,
@@ -193,6 +346,12 @@ export type CaptureData = {
height: number, height: number,
}; };
/** 截图启动信息:捕获时刻的光标物理坐标(覆盖层据此做初始窗口拾取,省一次 IPC 往返) */
export type CaptureStart = {
cursorX: number,
cursorY: number,
};
/** check_url 命令返回的结果 */ /** check_url 命令返回的结果 */
export type CheckUrlResult = { export type CheckUrlResult = {
/** 探测是否成功 */ /** 探测是否成功 */
@@ -260,16 +419,32 @@ export type CustomCommand = {
args?: string[], args?: string[],
}; };
/** 批量删除单个条目的结果。 */
export type DeleteResult = {
name: string,
path: string,
ok: boolean,
error: string,
};
/** 下载任务 */ /** 下载任务 */
export type DownloadTask = { export type DownloadTask = {
/** 任务 ID(自增 hex 字符串) */ /** 任务 ID(自增 hex 字符串) */
id: string, id: string,
/** 下载地址 */ /** 下载地址HTTP URL 或磁力链接) */
url: string, url: string,
/** 文件名 */ /** 文件名(HTTP:目标文件名;BT:种子名称) */
filename: string, filename: string,
/** 保存目录(绝对路径) */ /** 保存目录(绝对路径) */
dir: string, dir: string,
/** 协议类型 */
protocol?: TaskProtocol,
/** BT 种子 infohash(协议=BitTorrent 时存在) */
infoHash?: string | null,
/** BT 种子内文件列表(协议=BitTorrent 时存在) */
btFiles?: BtFileInfo[],
/** BT 元数据是否已解析就绪(异步添加时:后台解析完成前为 false,调度器跳过) */
btMetadataReady?: boolean,
/** 状态 */ /** 状态 */
status: TaskStatus, status: TaskStatus,
/** 文件总大小(字节),0=未知 */ /** 文件总大小(字节),0=未知 */
@@ -310,6 +485,16 @@ export type DownloaderSettings = {
deleteFilesOnRemove?: boolean, deleteFilesOnRemove?: boolean,
/** 添加下载前检查重复(URL 或文件名重复时询问) */ /** 添加下载前检查重复(URL 或文件名重复时询问) */
checkDuplicate?: boolean, checkDuplicate?: boolean,
/** 下载是否使用代理:true=尊重系统代理(mihomo 开启系统代理时经其转发),false=强制直连 */
useProxy?: boolean,
/** BitTorrent 上传限速 KB/s0=不限) */
btUploadLimitKb?: number,
/** BitTorrent 下载完成后是否继续做种上传(false=下载完即停止上传) */
btSeedAfterDownload?: boolean,
/** BitTorrent 监听端口(0=自动选择) */
btListenPort?: number,
/** BitTorrent 使用代理下载:开启后自动使用代理模块(mihomo)的 SOCKS5 端口;代理不可用时降级直连 */
btUseProxy?: boolean,
}; };
/** 重复类型 */ /** 重复类型 */
@@ -330,6 +515,20 @@ export type ExistingTaskInfo = {
status: TaskStatus, status: TaskStatus,
}; };
export type ExtractResult = {
name: string,
path: string,
ok: boolean,
error: string,
};
export type FileEntry = {
name: string,
path: string,
isDir: boolean,
size: number,
};
/** 单个文件记录(返回给前端) */ /** 单个文件记录(返回给前端) */
export type FileRecord = { export type FileRecord = {
path: string, path: string,
@@ -429,6 +628,26 @@ export type QuickPanelSettings = {
customCommands?: CustomCommand[], customCommands?: CustomCommand[],
}; };
export type RenameItem = {
path: string,
oldName: string,
newName: string,
};
export type RenamePreview = {
path: string,
oldName: string,
newName: string,
error: string,
};
export type RenameResult = {
oldName: string,
newName: string,
ok: boolean,
error: string,
};
export type ScreenRect = { export type ScreenRect = {
x: number, x: number,
y: number, y: number,
@@ -436,6 +655,14 @@ export type ScreenRect = {
height: number, height: number,
}; };
/** 滚动截图区域(屏幕物理像素坐标,通常为覆盖层框选区平移到屏幕) */
export type ScrollRegion = {
x: number,
y: number,
width: number,
height: number,
};
/** 下载分段(多线程 Range 下载 / 断点续传用) */ /** 下载分段(多线程 Range 下载 / 断点续传用) */
export type Segment = { export type Segment = {
/** 分段索引 */ /** 分段索引 */
@@ -460,6 +687,13 @@ export type SpecialLocation = {
args: string[], args: string[],
}; };
/** 任务下载协议类型 */
export type TaskProtocol =
/** HTTP/HTTPS 直链 */
"http" |
/** BitTorrent(磁力链 / .torrent 文件) */
"bittorrent";
/** 任务状态 */ /** 任务状态 */
export type TaskStatus = export type TaskStatus =
/** 排队等待(并发数已满) */ /** 排队等待(并发数已满) */
@@ -471,7 +705,54 @@ export type TaskStatus =
/** 已完成 */ /** 已完成 */
"complete" | "complete" |
/** 错误 */ /** 错误 */
"error"; "error" |
/** 已取消(用户取消:进度与文件已清除,仅保留记录,只能再次下载) */
"cancelled";
/** 种子信息(inspect 解析结果,供命令返回给前端做文件勾选) */
export type TorrentInfo = {
/** 种子名称 */
name: string,
/** infohashhex 小写字符串) */
infoHash: string,
/** 种子内全部文件总大小(字节) */
totalSize: number,
/** 种子内文件列表 */
files: BtFileInfo[],
};
/** 实时流量快照(由 /connections 的会话总量差分得出实时速率) */
export type TrafficSnapshot = {
/** 本次会话累计下载字节数 */
downloadTotal: number,
/** 本次会话累计上传字节数 */
uploadTotal: number,
/** 实时下载速率(字节/秒) */
downloadSpeed: number,
/** 实时上传速率(字节/秒) */
uploadSpeed: number,
/** 当前活跃连接数 */
activeConnections: number,
};
/** release 中的一个资产 */
export type UpdateAsset = {
name: string,
size: number,
browserDownloadUrl: string,
};
/** 检查更新的结果 */
export type UpdateCheckResult = {
currentVersion: string,
latestVersion: string,
hasUpdate: boolean,
/** portable | installed */
installType: string,
releaseName: string,
releaseBody: string,
assets: UpdateAsset[],
};
/** 窗口信息(窗口拾取 / 枚举) */ /** 窗口信息(窗口拾取 / 枚举) */
export type WindowInfo = { export type WindowInfo = {
+59
View File
@@ -9,6 +9,13 @@ export const WINDOWS = {
main: 'main', main: 'main',
osdOverlay: 'osd-overlay', osdOverlay: 'osd-overlay',
screenshotOverlay: 'screenshot-overlay', screenshotOverlay: 'screenshot-overlay',
screenshotPin: 'screenshot-pin',
/** 常驻截图编辑器窗口(隐藏复用,打开只 show 不重建 WebView */
screenshotEditor: 'screenshot-editor',
/** 滚动截图控制窗 */
screenshotScroll: 'screenshot-scroll',
/** 单文件一次性下载窗口前缀,实际 label = `${downloadWindow}-<taskId>` */
downloadWindow: 'download-window',
} as const } as const
/** Tauri 事件名(前端 emit / listen 与 Rust constants::events 对应) */ /** Tauri 事件名(前端 emit / listen 与 Rust constants::events 对应) */
@@ -23,22 +30,57 @@ export const EVENTS = {
clipboardChanged: 'clipboard-changed', clipboardChanged: 'clipboard-changed',
clipboardPopupShow: 'clipboard-popup-show', clipboardPopupShow: 'clipboard-popup-show',
clipboardPopupHide: 'clipboard-popup-hide', clipboardPopupHide: 'clipboard-popup-hide',
clipboardPreviewShow: 'clipboard-preview-show',
clipboardPreviewHide: 'clipboard-preview-hide',
// 鼠标进入/离开独立预览窗(弹窗据此决定是否延迟隐藏预览,便于点击复制/放大)
clipboardPreviewEnter: 'clipboard-preview-enter',
clipboardPreviewLeave: 'clipboard-preview-leave',
// 快速面板 // 快速面板
quickpanelShow: 'quickpanel-show', quickpanelShow: 'quickpanel-show',
quickpanelHide: 'quickpanel-hide', quickpanelHide: 'quickpanel-hide',
quickpanelExecuteCommand: 'quickpanel-execute-command', quickpanelExecuteCommand: 'quickpanel-execute-command',
quickpanelExtractProgress: 'quickpanel-extract-progress',
// 文件索引构建完成(闲时自动建立/重建、手动构建)
quickpanelIndexUpdated: 'quickpanel-index-updated',
// 截图 // 截图
screenshotBegin: 'screenshot-begin', screenshotBegin: 'screenshot-begin',
screenshotOverlayReady: 'screenshot-overlay-ready', screenshotOverlayReady: 'screenshot-overlay-ready',
screenshotShortcut: 'screenshot-shortcut', screenshotShortcut: 'screenshot-shortcut',
screenshotPinShortcut: 'screenshot-pin-shortcut',
screenshotPinReady: 'screenshot-pin-ready',
screenshotPinShow: 'screenshot-pin-show',
screenshotExported: 'screenshot-exported', screenshotExported: 'screenshot-exported',
/** 滚动截图会话:实时进度 { width, height, auto } */
scrollProgress: 'screenshot-scroll-progress',
/** 滚动截图会话:完成并导出(Rust 已把 PNG 原始字节写入编辑器图片槽,事件只带 { width, height } */
scrollComplete: 'screenshot-scroll-complete',
/** 滚动截图会话:已取消 */
scrollCancelled: 'screenshot-scroll-cancelled',
/** 滚动截图完成:打开截图编辑器(编辑/裁剪后保存才进历史) */
scrollToEditor: 'screenshot-scroll-to-editor',
/** 常驻编辑器窗口挂载完成(store 等待后下发加载事件) */
screenshotEditorReady: 'screenshot-editor-ready',
/** 通知常驻编辑器窗口加载编辑器图片槽中的新图(raw IPC 取出) */
screenshotEditorLoad: 'screenshot-editor-load',
// 内核安装进度 // 内核安装进度
kernelInstallProgress: 'kernel-install-progress', kernelInstallProgress: 'kernel-install-progress',
// 后端自动切换节点完成(后台执行,刷新节点列表并提示)
proxyAutoSwitch: 'proxy-auto-switch',
// 应用更新进度
updateProgress: 'update-progress',
// 监控 OSD // 监控 OSD
osdStateUpdate: 'osd-state-update', osdStateUpdate: 'osd-state-update',
/** OSD 数据通道:仅推送显示项 key→value 映射 + 网速(高频,每秒) */
osdDataUpdate: 'osd-data-update',
/** OSD 窗口挂载后请求主窗口补发配置+数据(防止错过创建时的首推) */
osdConfigRequest: 'osd-config-request',
osdContentSize: 'osd-content-size', osdContentSize: 'osd-content-size',
osdSystemUiActive: 'osd-system-ui-active', osdSystemUiActive: 'osd-system-ui-active',
osdSystemUiInactive: 'osd-system-ui-inactive', osdSystemUiInactive: 'osd-system-ui-inactive',
/** 前台出现全屏应用(游戏):OSD 应隐藏以避免游戏掉帧 */
osdGameActive: 'osd-game-active',
/** 全屏应用退出前台:OSD 可恢复显示 */
osdGameInactive: 'osd-game-inactive',
osdStartDrag: 'osd-start-drag', osdStartDrag: 'osd-start-drag',
osdEndDrag: 'osd-end-drag', osdEndDrag: 'osd-end-drag',
monitorReady: 'monitor-ready', monitorReady: 'monitor-ready',
@@ -50,6 +92,10 @@ export const EVENTS = {
// 其他 // 其他
processStatusChanged: 'process-status-changed', processStatusChanged: 'process-status-changed',
downloadAdded: 'download-added', downloadAdded: 'download-added',
/** 任务被删除(浏览器扩展通过 HTTP API 删除任务时发出,前端据此刷新任务列表) */
downloadRemoved: 'download-removed',
/** 浏览器扩展通过 HTTP API 新增下载(负载 { id },前端据以为该任务创建专属下载窗口) */
downloadExtensionAdded: 'download-extension-added',
} as const } as const
/** localStorage 存储键 */ /** localStorage 存储键 */
@@ -60,6 +106,19 @@ export const STORAGE_KEYS = {
quickpanelSettings: 'thing_quickpanel_settings', quickpanelSettings: 'thing_quickpanel_settings',
quickpanelHistory: 'thing_quickpanel_history', quickpanelHistory: 'thing_quickpanel_history',
quickpanelHistoryItems: 'thing_quickpanel_history_items', quickpanelHistoryItems: 'thing_quickpanel_history_items',
quickpanelPwdHistory: 'thing_quickpanel_pwd_history',
quickpanelPwdFavs: 'thing_quickpanel_pwd_favs',
quickpanelRenameMatchHistory: 'thing_quickpanel_rename_match_history',
quickpanelRenameMatchFavs: 'thing_quickpanel_rename_match_favs',
quickpanelRenameReplaceHistory: 'thing_quickpanel_rename_replace_history',
quickpanelRenameReplaceFavs: 'thing_quickpanel_rename_replace_favs',
quickpanelDeleteFilterHistory: 'thing_quickpanel_delete_filter_history',
quickpanelDeleteFilterFavs: 'thing_quickpanel_delete_filter_favs',
currencyRates: 'thing_quickpanel_currency_rates', currencyRates: 'thing_quickpanel_currency_rates',
monitorOsdConfig: 'thing_monitor_osd_config', monitorOsdConfig: 'thing_monitor_osd_config',
/** 关闭"自动启动监控内核"时暂存的 OSD 开关状态(开启自动启动时据此恢复) */
monitorOsdPending: 'thing_monitor_osd_pending',
monitorOverviewCards: 'thing_monitor_overview_cards',
screenshotHistory: 'thing_screenshot_history',
screenshotPinIndex: 'thing_screenshot_pin_index',
} as const } as const
+3
View File
@@ -10,3 +10,6 @@ import { ref } from 'vue'
/** 待打开新建下载对话框(由托盘"新建下载"触发) */ /** 待打开新建下载对话框(由托盘"新建下载"触发) */
export const pendingNewDownload = ref(false) export const pendingNewDownload = ref(false)
/** 待切换到下载任务列表页(由浏览器扩展新增下载触发,不弹对话框直接看任务) */
export const pendingShowDownloadTasks = ref(false)
+25 -2
View File
@@ -12,12 +12,15 @@ import { useModuleTabsStore, type ModuleTab } from '@/stores/moduleTabsStore'
* ```ts * ```ts
* // 模块 <script setup> 顶部 * // 模块 <script setup> 顶部
* const activeTab = ref('overview') * const activeTab = ref('overview')
* const tabsListRef = useModuleTabs(activeTab, [ * const tabsListRef = useModuleTabs('proxy', activeTab, [
* { value: 'overview', label: '概览' }, * { value: 'overview', label: '概览' },
* { value: 'settings', label: '设置' } * { value: 'settings', label: '设置' }
* ]) * ])
* ``` * ```
* *
* id
* moduleTabsStore tabpendingTab
*
* ```vue * ```vue
* <!-- 模板中给 TabsList 包一层带 ref 的 div --> * <!-- 模板中给 TabsList 包一层带 ref 的 div -->
* <div ref="tabsListRef"> * <div ref="tabsListRef">
@@ -29,7 +32,8 @@ import { useModuleTabsStore, type ModuleTab } from '@/stores/moduleTabsStore'
* 1. onMounted moduleTabsStoreTitleBar * 1. onMounted moduleTabsStoreTitleBar
* 2. IntersectionObserver TabsList rootMargin TitleBar * 2. IntersectionObserver TabsList rootMargin TitleBar
* 3. watch activeTab store.activeTab * 3. watch activeTab store.activeTab
* 4. onUnmounted observer * 4. tab
* 5. onUnmounted observer
* *
* ## * ##
* - TitleBar 40px (h-10)composable 44px * - TitleBar 40px (h-10)composable 44px
@@ -37,6 +41,7 @@ import { useModuleTabsStore, type ModuleTab } from '@/stores/moduleTabsStore'
* - composable onUnmounted * - composable onUnmounted
*/ */
export function useModuleTabs( export function useModuleTabs(
moduleId: string,
activeTab: Ref<string>, activeTab: Ref<string>,
tabs: ModuleTab[] tabs: ModuleTab[]
): Ref<HTMLElement | null> { ): Ref<HTMLElement | null> {
@@ -45,6 +50,15 @@ export function useModuleTabs(
let observer: IntersectionObserver | null = null let observer: IntersectionObserver | null = null
/** 应用待跳转 tab(若属于当前模块的 tab 列表) */
const applyPendingTab = () => {
const pending = tabsStore.consumePendingTab(moduleId)
if (pending && tabs.some(t => t.value === pending)) {
activeTab.value = pending
tabsStore.setActiveTab(pending)
}
}
const setupObserver = () => { const setupObserver = () => {
const el = tabsListRef.value const el = tabsListRef.value
if (!el || observer) return if (!el || observer) return
@@ -75,10 +89,19 @@ export function useModuleTabs(
} }
}) })
// 模块已挂载时(搜索结果选中同一模块),pendingTab 变化 → 直接切换 tab
watch(() => tabsStore.pendingTab, (p) => {
if (p?.moduleId === moduleId) {
applyPendingTab()
}
})
onMounted(async () => { onMounted(async () => {
tabsStore.registerTabs(tabs, activeTab.value) tabsStore.registerTabs(tabs, activeTab.value)
await nextTick() await nextTick()
setupObserver() setupObserver()
// 搜索导航跳转:模块刚挂载,消费待跳转 tab
applyPendingTab()
}) })
onUnmounted(() => { onUnmounted(() => {
+27 -5
View File
@@ -6,8 +6,17 @@ import 'vue-sonner/style.css'
import { createLogger } from './lib/logger' import { createLogger } from './lib/logger'
const logger = createLogger('main') const logger = createLogger('main')
// 禁用 WebView 默认右键菜单(桌面应用体验,主窗口与独立窗口共用)
document.addEventListener('contextmenu', (e) => e.preventDefault())
// 良性通知过滤:ResizeObserver 回调引发的布局变化在同一帧内级联时,
// 浏览器会派发此 ErrorEvent(规范定义为"通知"而非异常,无可操作信息)。
// 监控数据每秒刷新、reka-ui 组件挂载时高发,直接忽略避免污染日志。
const BENIGN_RESIZE_OBSERVER_RE = /^ResizeObserver loop (completed with undelivered notifications|limit exceeded)/i
// 全局未捕获异常日志 // 全局未捕获异常日志
window.addEventListener('error', (event) => { window.addEventListener('error', (event) => {
if (event.message && BENIGN_RESIZE_OBSERVER_RE.test(event.message)) return
logger.error(`全局JS错误: ${event.message} @ ${event.filename}:${event.lineno}`) logger.error(`全局JS错误: ${event.message} @ ${event.filename}:${event.lineno}`)
}) })
@@ -22,18 +31,28 @@ window.addEventListener('unhandledrejection', (event) => {
const standaloneWindowApps: Array<[hash: string, label: string, loader: () => Promise<{ default: Component }>]> = [ const standaloneWindowApps: Array<[hash: string, label: string, loader: () => Promise<{ default: Component }>]> = [
['#osd-overlay', 'OSD', () => import('./modules/monitor/OsdWindow.vue')], ['#osd-overlay', 'OSD', () => import('./modules/monitor/OsdWindow.vue')],
['#clipboard-popup', '剪贴板弹窗', () => import('./modules/clipboard/ClipboardPopup.vue')], ['#clipboard-popup', '剪贴板弹窗', () => import('./modules/clipboard/ClipboardPopup.vue')],
['#clipboard-preview', '剪贴板预览', () => import('./modules/clipboard/ClipboardPreview.vue')],
['#quick-panel', '快速面板弹窗', () => import('./modules/quickpanel/QuickPanel.vue')], ['#quick-panel', '快速面板弹窗', () => import('./modules/quickpanel/QuickPanel.vue')],
['#tray-menu', '托盘菜单', () => import('./modules/tray/TrayMenu.vue')], ['#tray-menu', '托盘菜单', () => import('./modules/tray/TrayMenu.vue')],
['#screenshot-overlay', '截图覆盖层', () => import('./modules/screenshot/ScreenshotOverlay.vue')], ['#screenshot-overlay', '截图覆盖层', () => import('./modules/screenshot/ScreenshotOverlay.vue')],
['#screenshot-editor', '截图编辑器', () => import('./modules/screenshot/ScreenshotEditor.vue')], ['#screenshot-editor', '截图编辑器', () => import('./modules/screenshot/ScreenshotEditor.vue')],
['#screenshot-pin', '贴图窗口', () => import('./modules/screenshot/ScreenshotPin.vue')],
['#screenshot-scroll', '滚动截图', () => import('./modules/screenshot/ScrollControl.vue')],
['#download-window', '下载窗口', () => import('./modules/downloader/DownloadWindow.vue')],
] ]
const winHash = window.location.hash const winHash = window.location.hash
// #screenshot-overlay 带窗口号参数(多屏),按前缀匹配;其余精确匹配 // #screenshot-overlay 带窗口号参数(多屏)、#download-window 带 ?task= 参数,按前缀匹配;其余精确匹配
const matched = standaloneWindowApps.find(([hash]) => const matched = standaloneWindowApps.find(([hash]) => {
hash === '#screenshot-overlay' ? winHash.startsWith(hash) : winHash === hash if (
) hash === '#screenshot-overlay' ||
hash === '#screenshot-scroll' ||
hash === '#download-window'
)
return winHash.startsWith(hash)
return winHash === hash
})
if (matched) { if (matched) {
const [, label, loader] = matched const [, label, loader] = matched
@@ -77,14 +96,17 @@ if (matched) {
useProcessStore().initListener().catch(e => console.error('Process listener init error:', e)) useProcessStore().initListener().catch(e => console.error('Process listener init error:', e))
}) })
// 截图模块:加载设置 + 预创建常驻覆盖层窗口 + 监听导出事件(历史/自动保存)+ 注册并监听全局快捷键 // 截图模块:加载设置 + 恢复持久化历史 + 预创建常驻覆盖层窗口 + 监听导出事件(历史/自动保存)+ 注册并监听全局快捷键(截图/贴图)
void import('./stores/screenshotStore').then(({ useScreenshotStore }) => { void import('./stores/screenshotStore').then(({ useScreenshotStore }) => {
const screenshotStore = useScreenshotStore() const screenshotStore = useScreenshotStore()
screenshotStore.loadSettings() screenshotStore.loadSettings()
screenshotStore.loadHistory()
screenshotStore.initOverlay().catch(e => console.error('Screenshot overlay init error:', e)) screenshotStore.initOverlay().catch(e => console.error('Screenshot overlay init error:', e))
screenshotStore.initExportListener().catch(e => console.error('Screenshot export listener init error:', e)) screenshotStore.initExportListener().catch(e => console.error('Screenshot export listener init error:', e))
screenshotStore.initShortcutListener().catch(e => console.error('Screenshot shortcut listener init error:', e)) screenshotStore.initShortcutListener().catch(e => console.error('Screenshot shortcut listener init error:', e))
screenshotStore.initShortcutRegistration().catch(e => console.error('Screenshot shortcut registration init error:', e)) screenshotStore.initShortcutRegistration().catch(e => console.error('Screenshot shortcut registration init error:', e))
screenshotStore.initPinShortcutListener().catch(e => console.error('Screenshot pin shortcut listener init error:', e))
screenshotStore.initPinShortcutRegistration().catch(e => console.error('Screenshot pin shortcut registration init error:', e))
}) })
}) })
} }
+93 -44
View File
@@ -7,7 +7,6 @@ import {
import { toast } from 'vue-sonner' import { toast } from 'vue-sonner'
import { useClipboardStore, type ClipboardItem, type ClipboardKind, type ClipboardItemDetail } from '@/stores/clipboardStore' import { useClipboardStore, type ClipboardItem, type ClipboardKind, type ClipboardItemDetail } from '@/stores/clipboardStore'
import { useModuleTabs } from '@/lib/use-module-tabs' import { useModuleTabs } from '@/lib/use-module-tabs'
import { useModuleTabsStore } from '@/stores/moduleTabsStore'
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs' import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
import { ScrollArea } from '@/components/ui/scroll-area' import { ScrollArea } from '@/components/ui/scroll-area'
import { Card, CardContent } from '@/components/ui/card' import { Card, CardContent } from '@/components/ui/card'
@@ -26,12 +25,15 @@ import {
import { import {
Pagination, PaginationContent, PaginationItem, PaginationEllipsis, Pagination, PaginationContent, PaginationItem, PaginationEllipsis,
} from '@/components/ui/pagination' } from '@/components/ui/pagination'
import { Skeleton } from '@/components/ui/skeleton'
import {
Empty, EmptyContent, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle,
} from '@/components/ui/empty'
const store = useClipboardStore() const store = useClipboardStore()
const activeTab = ref('history') const activeTab = ref('history')
const tabsStore = useModuleTabsStore() const tabsListRef = useModuleTabs('clipboard', activeTab, [
const tabsListRef = useModuleTabs(activeTab, [
{ value: 'history', label: '历史' }, { value: 'history', label: '历史' },
{ value: 'pinned', label: '固定' }, { value: 'pinned', label: '固定' },
{ value: 'settings', label: '设置' }, { value: 'settings', label: '设置' },
@@ -72,11 +74,21 @@ const gotoPage = async (p: number) => {
const detailOpen = ref(false) const detailOpen = ref(false)
const detailLoading = ref(false) const detailLoading = ref(false)
const detail = ref<ClipboardItemDetail | null>(null) const detail = ref<ClipboardItemDetail | null>(null)
/** 详情加载序号:快速点击多个条目时丢弃过期请求结果,避免旧请求覆盖新详情 */
let detailSeq = 0
const openDetail = async (item: ClipboardItem) => { const openDetail = async (item: ClipboardItem) => {
// reka-ui Dialog triggerElement preventScroll focus
// ScrollAreaViewport(tabindex=0) blur
const active = document.activeElement
if (active instanceof HTMLElement) {
active.blur()
}
detailOpen.value = true detailOpen.value = true
detailLoading.value = true detailLoading.value = true
detail.value = null detail.value = null
const seq = ++detailSeq
const d = await store.getItem(item.id) const d = await store.getItem(item.id)
if (seq !== detailSeq) return //
detail.value = d detail.value = d
detailLoading.value = false detailLoading.value = false
} }
@@ -101,29 +113,35 @@ const handleEnabledToggle = async (val: boolean) => {
form.value.enabled = val form.value.enabled = val
try { try {
await store.saveSettings({ ...form.value }) await store.saveSettings({ ...form.value })
toast.success(val ? '已开启剪贴板监听' : '已停止剪贴板监听')
} catch { } catch {
toast.error('切换监听失败') toast.error('切换监听失败')
} }
} }
const handleSaveSettings = async () => { //
// store round-trip watch
let saveFormTimer = 0
const persistSettingsForm = async () => {
if (JSON.stringify(form.value) === JSON.stringify(store.settings)) return
try { try {
await store.saveSettings({ ...form.value }) await store.saveSettings({ ...form.value })
toast.success('设置已保存')
} catch { } catch {
toast.error('保存设置失败') toast.error('保存设置失败')
} }
} }
watch(
// storeTitleBar form,
tabsStore.registerSave(handleSaveSettings) () => {
window.clearTimeout(saveFormTimer)
saveFormTimer = window.setTimeout(persistSettingsForm, 400)
},
{ deep: true }
)
const handleShortcutChange = async () => { const handleShortcutChange = async () => {
// "" //
try { try {
await store.saveSettings({ ...form.value }) await store.saveSettings({ ...form.value })
toast.success(`快捷键已更新为 ${form.value.shortcut || '(已禁用)'}`)
} catch { } catch {
toast.error('快捷键注册失败,可能被其他程序占用') toast.error('快捷键注册失败,可能被其他程序占用')
} }
@@ -282,9 +300,17 @@ const historyList = computed(() => store.history)
const pinnedList = computed(() => store.pinned) const pinnedList = computed(() => store.pinned)
onMounted(async () => { onMounted(async () => {
await store.init() // store //
await Promise.all([loadPage(), store.refreshPinned()]) // /
form.value = { ...store.settings } const isFirst = !store.initialized
if (isFirst) store.loading = true
try {
await Promise.all([store.init(), loadPage(), store.refreshPinned()])
store.initialized = true
form.value = { ...store.settings }
} finally {
store.loading = false
}
}) })
onUnmounted(() => { onUnmounted(() => {
@@ -308,7 +334,7 @@ onUnmounted(() => {
<TabsContent value="history" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate"> <TabsContent value="history" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate">
<div class="flex items-center gap-2 mb-3 shrink-0"> <div class="flex items-center gap-2 mb-3 shrink-0">
<div class="relative flex-1 max-w-sm"> <div class="relative flex-1 max-w-sm">
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" /> <Search class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
<Input v-model="searchQuery" placeholder="搜索历史..." class="pl-8" /> <Input v-model="searchQuery" placeholder="搜索历史..." class="pl-8" />
</div> </div>
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
@@ -327,7 +353,7 @@ onUnmounted(() => {
{{ store.historyTotal }} {{ store.historyTotal }}
</Badge> </Badge>
<Button variant="outline" size="sm" @click="clearOpen = true" :disabled="!historyList.length"> <Button variant="outline" size="sm" @click="clearOpen = true" :disabled="!historyList.length">
<Eraser class="h-4 w-4 mr-1" />清空 <Eraser class="size-4 mr-1" />清空
</Button> </Button>
</div> </div>
@@ -368,22 +394,42 @@ onUnmounted(() => {
<ScrollArea class="flex-1 min-h-0"> <ScrollArea class="flex-1 min-h-0">
<div class="space-y-1.5 pr-2"> <div class="space-y-1.5 pr-2">
<div <!-- 加载骨架数据异步返回前撑起画面避免误显示"暂无历史" -->
v-if="!historyList.length" <div v-if="store.loading" class="space-y-1.5">
class="flex flex-col items-center justify-center text-muted-foreground py-12" <div
> v-for="n in 8" :key="n"
<ClipboardList class="h-12 w-12 mb-3 opacity-40" /> class="flex items-center gap-3 rounded-lg border p-3"
<p class="text-sm">暂无历史记录复制内容后将自动收录</p> >
<Skeleton class="size-4 shrink-0" />
<div class="flex-1 space-y-2">
<Skeleton class="h-3.5 w-3/4" />
<Skeleton class="h-2.5 w-1/4" />
</div>
</div>
</div> </div>
<Empty
v-else-if="!historyList.length"
class="py-12"
>
<EmptyHeader>
<EmptyMedia variant="icon">
<ClipboardList class="size-6" />
</EmptyMedia>
<EmptyTitle>暂无历史记录</EmptyTitle>
</EmptyHeader>
<EmptyContent>
<EmptyDescription>复制内容后将自动收录图片与文件也会被记录</EmptyDescription>
</EmptyContent>
</Empty>
<Card <Card
v-for="item in historyList" v-for="item in historyList"
:key="item.id" :key="item.id"
class="group hover:shadow-md transition-shadow py-0" class="group hover:shadow-md transition-shadow py-0"
> >
<CardContent class="flex items-center gap-3 px-3 py-2"> <CardContent class="flex items-center gap-3 px-3 py-2">
<component :is="kindIcon(item.kind)" class="h-4 w-4 text-muted-foreground shrink-0" /> <component :is="kindIcon(item.kind)" class="size-4 text-muted-foreground shrink-0" />
<div class="flex-1 min-w-0 cursor-pointer" @click="openDetail(item)"> <div class="flex-1 min-w-0 cursor-pointer" @click="openDetail(item)">
<p class="text-sm break-all line-clamp-1" :title="item.preview">{{ item.preview }}</p> <p class="text-sm break-all line-clamp-1">{{ item.preview }}</p>
<div class="flex items-center gap-2 mt-0.5 text-xs text-muted-foreground flex-wrap"> <div class="flex items-center gap-2 mt-0.5 text-xs text-muted-foreground flex-wrap">
<Badge variant="outline" :class="['px-1.5 py-0 text-[10px] border', kindBadgeClass(item.kind)]">{{ kindLabel(item.kind) }}</Badge> <Badge variant="outline" :class="['px-1.5 py-0 text-[10px] border', kindBadgeClass(item.kind)]">{{ kindLabel(item.kind) }}</Badge>
<span>{{ formatTime(item.createdAt) }}</span> <span>{{ formatTime(item.createdAt) }}</span>
@@ -391,13 +437,13 @@ onUnmounted(() => {
</div> </div>
</div> </div>
<div class="flex items-center gap-0.5 shrink-0 opacity-0 group-hover:opacity-100 transition"> <div class="flex items-center gap-0.5 shrink-0 opacity-0 group-hover:opacity-100 transition">
<Button variant="ghost" size="icon" class="h-7 w-7" title="复制" @click.stop="handleCopy(item)"> <Button variant="ghost" size="icon" class="size-7" title="复制" @click.stop="handleCopy(item)">
<Copy class="h-3.5 w-3.5" /> <Copy class="h-3.5 w-3.5" />
</Button> </Button>
<Button variant="ghost" size="icon" class="h-7 w-7" :title="item.pinned ? '取消固定' : '固定'" @click.stop="handlePin(item)"> <Button variant="ghost" size="icon" class="size-7" :title="item.pinned ? '取消固定' : '固定'" @click.stop="handlePin(item)">
<component :is="item.pinned ? PinOff : Pin" class="h-3.5 w-3.5" /> <component :is="item.pinned ? PinOff : Pin" class="h-3.5 w-3.5" />
</Button> </Button>
<Button variant="ghost" size="icon" class="h-7 w-7 hover:text-destructive" title="删除" @click.stop="handleDelete(item)"> <Button variant="ghost" size="icon" class="size-7 hover:text-destructive" title="删除" @click.stop="handleDelete(item)">
<Trash2 class="h-3.5 w-3.5" /> <Trash2 class="h-3.5 w-3.5" />
</Button> </Button>
</div> </div>
@@ -410,19 +456,22 @@ onUnmounted(() => {
<!-- 固定 --> <!-- 固定 -->
<TabsContent value="pinned" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate"> <TabsContent value="pinned" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate">
<div class="flex-1 min-h-0 overflow-y-auto space-y-1.5 pr-1"> <div class="flex-1 min-h-0 overflow-y-auto space-y-1.5 pr-1">
<div <Empty v-if="!pinnedList.length" class="h-full py-8">
v-if="!pinnedList.length" <EmptyHeader>
class="flex flex-col items-center justify-center h-full text-muted-foreground" <EmptyMedia variant="icon">
> <Pin class="size-6" />
<Pin class="h-12 w-12 mb-3 opacity-40" /> </EmptyMedia>
<p class="text-sm">暂无固定条目</p> <EmptyTitle>暂无固定条目</EmptyTitle>
<p class="text-xs mt-1">鼠标悬停历史条目点击图钉按钮即可固定</p> </EmptyHeader>
</div> <EmptyContent>
<EmptyDescription>鼠标悬停历史条目点击图钉按钮即可固定</EmptyDescription>
</EmptyContent>
</Empty>
<Card v-for="item in pinnedList" :key="item.id" class="group hover:shadow-md transition-shadow py-0"> <Card v-for="item in pinnedList" :key="item.id" class="group hover:shadow-md transition-shadow py-0">
<CardContent class="flex items-center gap-3 px-3 py-2"> <CardContent class="flex items-center gap-3 px-3 py-2">
<component :is="kindIcon(item.kind)" class="h-4 w-4 text-primary shrink-0" /> <component :is="kindIcon(item.kind)" class="size-4 text-primary shrink-0" />
<div class="flex-1 min-w-0 cursor-pointer" @click="openDetail(item)"> <div class="flex-1 min-w-0 cursor-pointer" @click="openDetail(item)">
<p class="text-sm break-all line-clamp-1" :title="item.preview">{{ item.preview }}</p> <p class="text-sm break-all line-clamp-1">{{ item.preview }}</p>
<div class="flex items-center gap-2 mt-0.5 text-xs text-muted-foreground flex-wrap"> <div class="flex items-center gap-2 mt-0.5 text-xs text-muted-foreground flex-wrap">
<Badge variant="outline" :class="['px-1.5 py-0 text-[10px] border', kindBadgeClass(item.kind)]">{{ kindLabel(item.kind) }}</Badge> <Badge variant="outline" :class="['px-1.5 py-0 text-[10px] border', kindBadgeClass(item.kind)]">{{ kindLabel(item.kind) }}</Badge>
<span>{{ formatTime(item.createdAt) }}</span> <span>{{ formatTime(item.createdAt) }}</span>
@@ -430,13 +479,13 @@ onUnmounted(() => {
</div> </div>
</div> </div>
<div class="flex items-center gap-0.5 shrink-0 opacity-0 group-hover:opacity-100 transition"> <div class="flex items-center gap-0.5 shrink-0 opacity-0 group-hover:opacity-100 transition">
<Button variant="ghost" size="icon" class="h-7 w-7" title="复制" @click.stop="handleCopy(item)"> <Button variant="ghost" size="icon" class="size-7" title="复制" @click.stop="handleCopy(item)">
<Copy class="h-3.5 w-3.5" /> <Copy class="h-3.5 w-3.5" />
</Button> </Button>
<Button variant="ghost" size="icon" class="h-7 w-7" title="取消固定" @click.stop="handlePin(item)"> <Button variant="ghost" size="icon" class="size-7" title="取消固定" @click.stop="handlePin(item)">
<PinOff class="h-3.5 w-3.5" /> <PinOff class="h-3.5 w-3.5" />
</Button> </Button>
<Button variant="ghost" size="icon" class="h-7 w-7 hover:text-destructive" title="删除" @click.stop="handleDelete(item)"> <Button variant="ghost" size="icon" class="size-7 hover:text-destructive" title="删除" @click.stop="handleDelete(item)">
<Trash2 class="h-3.5 w-3.5" /> <Trash2 class="h-3.5 w-3.5" />
</Button> </Button>
</div> </div>
@@ -450,7 +499,7 @@ onUnmounted(() => {
<div class="max-w-xl space-y-4"> <div class="max-w-xl space-y-4">
<div class="flex items-center"> <div class="flex items-center">
<h3 class="text-base font-medium flex items-center gap-2"> <h3 class="text-base font-medium flex items-center gap-2">
<SettingsIcon class="h-4 w-4" />基本设置 <SettingsIcon class="size-4" />基本设置
</h3> </h3>
</div> </div>
@@ -519,7 +568,7 @@ onUnmounted(() => {
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<div> <div>
<Label class="flex items-center gap-2"> <Label class="flex items-center gap-2">
<Keyboard class="h-4 w-4" />快捷弹窗快捷键 <Keyboard class="size-4" />快捷弹窗快捷键
</Label> </Label>
<p class="text-xs text-muted-foreground mt-1">全局快捷键触发鼠标位置历史弹窗留空禁用</p> <p class="text-xs text-muted-foreground mt-1">全局快捷键触发鼠标位置历史弹窗留空禁用</p>
</div> </div>
@@ -563,7 +612,7 @@ onUnmounted(() => {
</DialogHeader> </DialogHeader>
<div class="flex-1 min-h-0 overflow-auto"> <div class="flex-1 min-h-0 overflow-auto">
<div v-if="detailLoading" class="flex items-center justify-center py-12"> <div v-if="detailLoading" class="flex items-center justify-center py-12">
<Loader2 class="h-6 w-6 animate-spin text-muted-foreground" /> <Loader2 class="size-6 animate-spin text-muted-foreground" />
</div> </div>
<template v-else-if="detail"> <template v-else-if="detail">
<img <img
@@ -575,7 +624,7 @@ onUnmounted(() => {
<p v-else-if="detail.kind === 'image'" class="text-sm text-muted-foreground text-center py-8"> <p v-else-if="detail.kind === 'image'" class="text-sm text-muted-foreground text-center py-8">
图片预览不可用 图片预览不可用
</p> </p>
<pre v-else-if="detail.kind === 'text'" class="text-sm whitespace-pre-wrap break-all font-mono bg-muted/50 p-3 rounded">{{ detail.content }}</pre> <pre v-else-if="detail.kind === 'text'" class="text-sm whitespace-pre-wrap break-all font-mono bg-muted/50 p-3 rounded select-text cursor-text">{{ detail.content }}</pre>
<ul v-else-if="detail.kind === 'files'" class="space-y-1 text-sm"> <ul v-else-if="detail.kind === 'files'" class="space-y-1 text-sm">
<li <li
v-for="(p, i) in (parseFiles(detail.content))" v-for="(p, i) in (parseFiles(detail.content))"
+250 -153
View File
@@ -8,13 +8,18 @@ import { Effect, EffectState } from '@tauri-apps/api/window'
import { commands } from '@/lib/bindings' import { commands } from '@/lib/bindings'
import { import {
ClipboardList, Pin, PinOff, Trash2, Search, Image as ImageIcon, ClipboardList, Pin, PinOff, Trash2, Search, Image as ImageIcon,
FileText, Files, Loader2, FileText, Files,
} from '@lucide/vue' } from '@lucide/vue'
import { ScrollArea } from '@/components/ui/scroll-area' import { ScrollArea } from '@/components/ui/scroll-area'
import { Input } from '@/components/ui/input' import { Input } from '@/components/ui/input'
import { Button } from '@/components/ui/button'
import {
Select, SelectContent, SelectItem, SelectTrigger, SelectValue,
} from '@/components/ui/select'
import { import {
Pagination, PaginationContent, PaginationItem, PaginationEllipsis, Pagination, PaginationContent, PaginationItem, PaginationEllipsis,
} from '@/components/ui/pagination' } from '@/components/ui/pagination'
import { Skeleton } from '@/components/ui/skeleton'
// ===== Rust bindings camelCase ===== // ===== Rust bindings camelCase =====
// kind bindings string // kind bindings string
@@ -26,6 +31,8 @@ const total = ref(0)
const currentPage = ref(1) const currentPage = ref(1)
const PAGE_SIZE = 50 const PAGE_SIZE = 50
const searchQuery = ref('') const searchQuery = ref('')
/** 类型筛选:全部/文本/图片/文件 */
const kindFilter = ref<'all' | 'text' | 'image' | 'files'>('all')
const selectedIndex = ref(0) const selectedIndex = ref(0)
const loading = ref(false) const loading = ref(false)
const searchInputRef = ref<HTMLInputElement | null>(null) const searchInputRef = ref<HTMLInputElement | null>(null)
@@ -37,21 +44,37 @@ const totalPages = computed(() => Math.max(1, Math.ceil(total.value / PAGE_SIZE)
// ===== ===== // ===== =====
/** 加载请求序号:翻页/搜索快速操作时丢弃过期请求结果,避免旧请求覆盖新结果 */ /** 加载请求序号:翻页/搜索快速操作时丢弃过期请求结果,避免旧请求覆盖新结果 */
let loadSeq = 0 let loadSeq = 0
/** 列表视图:history = 全部历史(后端分页);pinned = 仅钉住条目(前端筛选+分页) */
const viewMode = ref<'history' | 'pinned'>('history')
async function loadData() { async function loadData() {
const seq = ++loadSeq const seq = ++loadSeq
loading.value = true loading.value = true
try { try {
const q = searchQuery.value.trim() if (viewMode.value === 'pinned') {
const offset = (currentPage.value - 1) * PAGE_SIZE // /
let res: HistoryPage const all = await commands.clipboardGetPinned()
if (q) { if (seq !== loadSeq) return
res = await commands.clipboardSearch(q, PAGE_SIZE, offset) const q = searchQuery.value.trim().toLowerCase()
const kind = kindFilter.value
let filtered = all
if (kind !== 'all') filtered = filtered.filter(i => i.kind === kind)
if (q) filtered = filtered.filter(i => i.preview.toLowerCase().includes(q))
total.value = filtered.length
const start = (currentPage.value - 1) * PAGE_SIZE
items.value = filtered.slice(start, start + PAGE_SIZE)
} else { } else {
res = await commands.clipboardGetHistory(PAGE_SIZE, offset, 'all') const q = searchQuery.value.trim()
const offset = (currentPage.value - 1) * PAGE_SIZE
let res: HistoryPage
if (q) {
res = await commands.clipboardSearch(q, PAGE_SIZE, offset)
} else {
res = await commands.clipboardGetHistory(PAGE_SIZE, offset, kindFilter.value)
}
if (seq !== loadSeq) return //
items.value = res.items
total.value = res.total
} }
if (seq !== loadSeq) return //
items.value = res.items
total.value = res.total
selectedIndex.value = 0 selectedIndex.value = 0
} catch (e) { } catch (e) {
if (seq !== loadSeq) return if (seq !== loadSeq) return
@@ -66,13 +89,20 @@ async function loadData() {
} }
} }
/** 切换历史/钉住视图 */
async function toggleViewMode() {
viewMode.value = viewMode.value === 'history' ? 'pinned' : 'history'
currentPage.value = 1
await loadData()
}
async function gotoPage(p: number) { async function gotoPage(p: number) {
currentPage.value = Math.min(Math.max(1, p), totalPages.value) currentPage.value = Math.min(Math.max(1, p), totalPages.value)
await loadData() await loadData()
} }
// // /
watch(searchQuery, () => { watch([searchQuery, kindFilter], () => {
currentPage.value = 1 currentPage.value = 1
if (searchTimer) clearTimeout(searchTimer) if (searchTimer) clearTimeout(searchTimer)
searchTimer = setTimeout(loadData, 200) searchTimer = setTimeout(loadData, 200)
@@ -106,7 +136,14 @@ async function deleteItem(item: ClipboardItem, ev: Event) {
ev.stopPropagation() ev.stopPropagation()
try { try {
await commands.clipboardDelete(item.id) await commands.clipboardDelete(item.id)
// total/
//
items.value = items.value.filter((i) => i.id !== item.id) items.value = items.value.filter((i) => i.id !== item.id)
// 退
if (items.value.length === 0 && currentPage.value > 1) {
currentPage.value -= 1
}
await loadData()
} catch (e) { } catch (e) {
console.error('[clipboard-popup] 删除失败:', e) console.error('[clipboard-popup] 删除失败:', e)
} }
@@ -120,19 +157,109 @@ async function hideWindow() {
} }
} }
// ===== =====
async function showPreview(item: ClipboardItem) {
try {
await commands.clipboardShowPreview(item.id)
} catch {
/* 忽略 */
}
}
async function hidePreview() {
try {
await commands.clipboardHidePreview()
} catch {
/* 忽略 */
}
}
/** 存储条目预览文本元素,用于检测是否被截断(仅截断的文本才显示预览) */
const previewEls = new Map<number, HTMLElement>()
function setPreviewEl(id: number, el: unknown) {
if (el instanceof HTMLElement) previewEls.set(id, el)
else previewEls.delete(id)
}
/** line-clamp-1 截断检测:内容高度超过单行即视为截断 */
function isTextTruncated(id: number): boolean {
const el = previewEls.get(id)
if (!el) return true //
return el.scrollHeight > el.clientHeight
}
/** 当前条目是否需要预览:图片始终预览;文本仅被截断时预览 */
function needsPreview(item: ClipboardItem): boolean {
if (item.kind === 'image') return true
if (item.kind === 'text') return isTextTruncated(item.id)
return false
}
let hoverTimer: ReturnType<typeof setTimeout> | null = null
/** 鼠标是否位于独立预览窗内:为 true 时离开条目不隐藏预览,便于点击复制/放大 */
const mouseInPreview = ref(false)
/** 键盘选中:立即显示/隐藏预览(不等待悬停延迟) */
function showSelectedPreview() {
cancelHoverTimer()
mouseInPreview.value = false
const item = items.value[selectedIndex.value]
if (item && needsPreview(item)) {
void showPreview(item)
} else {
void hidePreview()
}
}
function onItemHover(idx: number, item: ClipboardItem) {
selectedIndex.value = idx
//
cancelHoverTimer()
mouseInPreview.value = false
//
if (!needsPreview(item)) {
void hidePreview()
return
}
// 100ms
hoverTimer = setTimeout(() => {
void showPreview(item)
}, 100)
}
function onItemLeave() {
//
// / preview-enter
cancelHoverTimer()
if (mouseInPreview.value) return
hoverTimer = setTimeout(() => {
void hidePreview()
}, 250)
}
function cancelHoverTimer() {
if (hoverTimer) {
clearTimeout(hoverTimer)
hoverTimer = null
}
}
// ===== ===== // ===== =====
// Select /Enter/Esc Select
// //
const selectOpen = ref(false)
function onKeydown(e: KeyboardEvent) { function onKeydown(e: KeyboardEvent) {
if (selectOpen.value) return
if (e.key === 'ArrowDown') { if (e.key === 'ArrowDown') {
e.preventDefault() e.preventDefault()
selectedIndex.value = Math.min(selectedIndex.value + 1, items.value.length - 1) selectedIndex.value = Math.min(selectedIndex.value + 1, items.value.length - 1)
cancelHoverTimer() showSelectedPreview()
previewVisible.value = false
scrollSelectedIntoView() scrollSelectedIntoView()
} else if (e.key === 'ArrowUp') { } else if (e.key === 'ArrowUp') {
e.preventDefault() e.preventDefault()
selectedIndex.value = Math.max(selectedIndex.value - 1, 0) selectedIndex.value = Math.max(selectedIndex.value - 1, 0)
cancelHoverTimer() showSelectedPreview()
previewVisible.value = false
scrollSelectedIntoView() scrollSelectedIntoView()
} else if (e.key === 'Enter') { } else if (e.key === 'Enter') {
e.preventDefault() e.preventDefault()
@@ -140,6 +267,8 @@ function onKeydown(e: KeyboardEvent) {
if (item) selectAndPaste(item) if (item) selectAndPaste(item)
} else if (e.key === 'Escape') { } else if (e.key === 'Escape') {
e.preventDefault() e.preventDefault()
cancelHoverTimer()
void hidePreview()
hideWindow() hideWindow()
} }
} }
@@ -175,62 +304,6 @@ const formatTime = (ms: number) => {
const hasItems = computed(() => items.value.length > 0) const hasItems = computed(() => items.value.length > 0)
// ===== 100ms =====
const previewSrc = ref('')
const previewVisible = ref(false)
let hoverTimer: ReturnType<typeof setTimeout> | null = null
// id dataUrl
const imageCache = new Map<number, string>()
/** 根据 base64 前缀判断 MIME 类型 */
function buildImageDataUrl(b64: string): string {
const mime = b64.startsWith('/9j/') ? 'image/jpeg' : 'image/png'
return `data:${mime};base64,${b64}`
}
async function onItemHover(idx: number, item: ClipboardItem) {
selectedIndex.value = idx
//
if (item.kind !== 'image') {
cancelHoverTimer()
previewVisible.value = false
return
}
//
cancelHoverTimer()
// 100ms
hoverTimer = setTimeout(async () => {
try {
let src = imageCache.get(item.id)
if (!src) {
const detail = await commands.clipboardGetItem(item.id)
if (detail?.imageBase64) {
src = buildImageDataUrl(detail.imageBase64)
imageCache.set(item.id, src)
}
}
if (src) {
previewSrc.value = src
previewVisible.value = true
}
} catch {
/* 忽略加载失败 */
}
}, 100)
}
function cancelHoverTimer() {
if (hoverTimer) {
clearTimeout(hoverTimer)
hoverTimer = null
}
}
function onItemLeave() {
cancelHoverTimer()
previewVisible.value = false
}
// ===== ===== // ===== =====
/** 从 localStorage 读取主应用的主题设置 */ /** 从 localStorage 读取主应用的主题设置 */
function readMainTheme(): { theme: string; effect: string } { function readMainTheme(): { theme: string; effect: string } {
@@ -333,15 +406,37 @@ onMounted(async () => {
await applyTheme() await applyTheme()
searchQuery.value = '' searchQuery.value = ''
currentPage.value = 1 currentPage.value = 1
// //
cancelHoverTimer() cancelHoverTimer()
previewVisible.value = false mouseInPreview.value = false
imageCache.clear() void hidePreview()
await loadData() await loadData()
await nextTick() await nextTick()
searchInputRef.value?.focus() searchInputRef.value?.focus()
})) }))
//
unlistenFns.push(await listen(EVENTS.clipboardPopupHide, () => {
cancelHoverTimer()
mouseInPreview.value = false
void hidePreview()
}))
// /
unlistenFns.push(await listen(EVENTS.clipboardPreviewEnter, () => {
mouseInPreview.value = true
cancelHoverTimer()
}))
// onItemHover
unlistenFns.push(await listen(EVENTS.clipboardPreviewLeave, () => {
mouseInPreview.value = false
cancelHoverTimer()
hoverTimer = setTimeout(() => {
void hidePreview()
}, 250)
}))
// //
await loadData() await loadData()
await nextTick() await nextTick()
@@ -363,10 +458,10 @@ onUnmounted(() => {
<template> <template>
<div class="popup-root flex flex-col h-screen w-screen" @keydown="onKeydown"> <div class="popup-root flex flex-col h-screen w-screen" @keydown="onKeydown">
<!-- 搜索栏与剪切板主页统一样式 --> <!-- 搜索栏与剪切板主页统一样式+ 类型筛选 -->
<div class="flex items-center gap-2 px-3 py-2 border-b border-border shrink-0"> <div class="flex items-center gap-2 px-3 py-2 border-b border-border shrink-0">
<div class="relative flex-1 max-w-sm"> <div class="relative flex-1 min-w-0">
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" /> <Search class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
<Input <Input
ref="searchInputRef" ref="searchInputRef"
v-model="searchQuery" v-model="searchQuery"
@@ -375,24 +470,38 @@ onUnmounted(() => {
spellcheck="false" spellcheck="false"
/> />
</div> </div>
<span class="text-xs text-muted-foreground whitespace-nowrap">{{ total }} </span> <Select v-model="kindFilter" :open="selectOpen" @update:open="selectOpen = $event">
<SelectTrigger size="sm" class="w-[76px] shrink-0 text-xs" title="按类型筛选">
<SelectValue />
</SelectTrigger>
<!-- 内容宽度与 trigger 等宽覆盖默认 min-w-[8rem]128px紧凑弹窗内不显过宽 -->
<SelectContent class="w-(--reka-select-trigger-width) min-w-0">
<SelectItem value="all">全部</SelectItem>
<SelectItem value="text">文本</SelectItem>
<SelectItem value="image">图片</SelectItem>
<SelectItem value="files">文件</SelectItem>
</SelectContent>
</Select>
</div> </div>
<!-- 图片悬停预览浮层 -->
<Transition name="popup-preview">
<div v-if="previewVisible && previewSrc" class="popup-preview">
<img :src="previewSrc" alt="预览" />
</div>
</Transition>
<!-- 列表 --> <!-- 列表 -->
<ScrollArea class="popup-list flex-1 min-h-0"> <ScrollArea class="popup-list flex-1 min-h-0">
<div class="space-y-1.5 p-2"> <div class="space-y-1.5 p-2">
<div v-if="loading && !hasItems" class="flex flex-col items-center justify-center py-12 text-muted-foreground"> <div v-if="loading && !hasItems" class="space-y-1.5">
<Loader2 class="h-6 w-6 animate-spin" /> <div
v-for="n in 8"
:key="n"
class="flex items-start gap-3 rounded-lg border px-3 py-2"
>
<Skeleton class="size-4 shrink-0 mt-0.5" />
<div class="flex-1 space-y-1.5">
<Skeleton class="h-3.5 w-3/4" />
<Skeleton class="h-2.5 w-1/4" />
</div>
</div>
</div> </div>
<div v-else-if="!hasItems" class="flex flex-col items-center justify-center py-12 text-muted-foreground"> <div v-else-if="!hasItems" class="flex flex-col items-center justify-center py-12 text-muted-foreground">
<ClipboardList class="h-10 w-10 mb-2 opacity-40" /> <ClipboardList class="size-10 mb-2 opacity-40" />
<p class="text-sm"> <p class="text-sm">
{{ searchQuery ? '无匹配结果' : '暂无历史记录' }} {{ searchQuery ? '无匹配结果' : '暂无历史记录' }}
</p> </p>
@@ -406,19 +515,22 @@ onUnmounted(() => {
@mouseenter="onItemHover(idx, item)" @mouseenter="onItemHover(idx, item)"
@mouseleave="onItemLeave" @mouseleave="onItemLeave"
> >
<component :is="kindIcon(item.kind)" class="h-4 w-4 text-muted-foreground shrink-0 mt-0.5" /> <component :is="kindIcon(item.kind)" class="size-4 text-muted-foreground shrink-0 mt-0.5" />
<div class="flex-1 min-w-0"> <div class="flex-1 min-w-0">
<p class="text-sm break-all line-clamp-1" :title="item.preview">{{ item.preview }}</p> <p
class="text-sm break-all line-clamp-1"
:ref="el => setPreviewEl(item.id, el)"
>{{ item.preview }}</p>
<div class="flex items-center gap-2 mt-0.5 text-xs text-muted-foreground flex-wrap"> <div class="flex items-center gap-2 mt-0.5 text-xs text-muted-foreground flex-wrap">
<span class="popup-item-kind px-1.5 py-0 text-[10px] border rounded-sm" :class="kindBadgeClass(item.kind)">{{ kindLabel(item.kind) }}</span> <span class="popup-item-kind px-1.5 py-0 text-[10px] border rounded-sm" :class="kindBadgeClass(item.kind)">{{ kindLabel(item.kind) }}</span>
<span>{{ formatTime(item.createdAt) }}</span> <span>{{ formatTime(item.createdAt) }}</span>
</div> </div>
</div> </div>
<div class="popup-item-actions shrink-0"> <div class="popup-item-actions shrink-0">
<button class="popup-action-btn h-7 w-7" title="固定" @click="togglePin(item, $event)"> <button class="popup-action-btn size-7" :title="item.pinned ? '取消固定' : '固定'" @click="togglePin(item, $event)">
<component :is="item.pinned ? PinOff : Pin" class="h-3.5 w-3.5" /> <component :is="item.pinned ? PinOff : Pin" class="h-3.5 w-3.5" />
</button> </button>
<button class="popup-action-btn h-7 w-7 hover:text-destructive" title="删除" @click="deleteItem(item, $event)"> <button class="popup-action-btn size-7 hover:text-destructive" title="删除" @click="deleteItem(item, $event)">
<Trash2 class="h-3.5 w-3.5" /> <Trash2 class="h-3.5 w-3.5" />
</button> </button>
</div> </div>
@@ -426,38 +538,56 @@ onUnmounted(() => {
</div> </div>
</ScrollArea> </ScrollArea>
<!-- 分页与剪切板历史统一样式 --> <!-- 底部总数 + 分页 + 视图切换grid 两侧 1fr 等宽分页严格居中 -->
<div v-if="totalPages > 1" class="flex items-center justify-center gap-1 px-2 py-1 border-t border-border"> <div class="grid grid-cols-[1fr_auto_1fr] items-center gap-2 px-3 py-1 border-t border-border shrink-0">
<Pagination <span class="text-xs text-muted-foreground whitespace-nowrap justify-self-start">{{ total }} </span>
v-slot="{ page }" <div v-if="totalPages > 1" class="justify-self-center">
:page="currentPage" <Pagination
:total="total" v-slot="{ page }"
:items-per-page="PAGE_SIZE" :page="currentPage"
:sibling-count="1" :total="total"
show-edges :items-per-page="PAGE_SIZE"
@update:page="gotoPage" :sibling-count="1"
> show-edges
<PaginationContent v-slot="{ items: pageItems }" class="gap-1"> @update:page="gotoPage"
<template v-for="(item, index) in pageItems" :key="index"> >
<PaginationItem <PaginationContent v-slot="{ items: pageItems }" class="gap-1">
v-if="item.type === 'page'" <template v-for="(item, index) in pageItems" :key="index">
:value="item.value" <PaginationItem
:is-active="item.value === page" v-if="item.type === 'page'"
size="icon" :value="item.value"
class="size-7 text-xs" :is-active="item.value === page"
> size="icon"
{{ item.value }} class="size-7 text-xs"
</PaginationItem> >
<PaginationEllipsis v-else class="size-7" /> {{ item.value }}
</template> </PaginationItem>
</PaginationContent> <PaginationEllipsis v-else class="size-7" />
</Pagination> </template>
</PaginationContent>
</Pagination>
</div>
<!-- col-start-3无分页时中间轨道宽为 0若不固定列位置按钮会被自动放置
到第 2 轨道视觉居中显式固定第 3 轨道保证始终贴右 -->
<div class="justify-self-end col-start-3">
<Button
:variant="viewMode === 'pinned' ? 'default' : 'outline'"
size="sm"
class="h-7 px-2 text-xs gap-1"
:title="viewMode === 'pinned' ? '当前:仅钉住条目,点击查看全部历史' : '当前:全部历史,点击仅查看钉住条目'"
@click="toggleViewMode"
>
<!-- 图标与文字同义Pin=钉住视图 / ClipboardList=历史视图高亮表示当前视图 -->
<component :is="viewMode === 'pinned' ? Pin : ClipboardList" class="size-3.5" />
{{ viewMode === 'pinned' ? '钉住' : '历史' }}
</Button>
</div>
</div> </div>
<!-- 底部提示 --> <!-- 底部提示 -->
<div class="popup-footer shrink-0"> <div class="popup-footer shrink-0">
<span><kbd></kbd><kbd></kbd> 导航</span> <span><kbd></kbd><kbd></kbd> 导航</span>
<span><kbd>Enter</kbd> 粘贴</span> <span><kbd>Enter</kbd>/<kbd>左键</kbd> 粘贴</span>
<span><kbd>Esc</kbd> 关闭</span> <span><kbd>Esc</kbd> 关闭</span>
</div> </div>
</div> </div>
@@ -577,39 +707,6 @@ onUnmounted(() => {
color: var(--muted-foreground); color: var(--muted-foreground);
} }
/* 图片悬停预览浮层:固定在弹窗右上角,不遮挡列表操作 */
.popup-preview {
position: absolute;
top: 50px;
right: 10px;
z-index: 100;
max-width: 180px;
max-height: 180px;
border-radius: 6px;
overflow: hidden;
border: 1px solid var(--border);
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25);
background: var(--popover, var(--background));
pointer-events: none;
}
.popup-preview img {
display: block;
max-width: 100%;
max-height: 180px;
object-fit: contain;
}
/* 预览浮层淡入淡出 */
.popup-preview-enter-active,
.popup-preview-leave-active {
transition: opacity 0.15s ease;
}
.popup-preview-enter-from,
.popup-preview-leave-to {
opacity: 0;
}
.popup-footer kbd { .popup-footer kbd {
background: var(--muted); background: var(--muted);
color: var(--foreground); color: var(--foreground);
+369
View File
@@ -0,0 +1,369 @@
<script setup lang="ts">
import { ref, onMounted, onUnmounted } from 'vue'
import { listen, emit, type UnlistenFn } from '@tauri-apps/api/event'
import { getCurrentWindow, Effect, EffectState } from '@tauri-apps/api/window'
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
import { commands } from '@/lib/bindings'
import { ZoomIn, ZoomOut, FileText, Image as ImageIcon } from '@lucide/vue'
import { ScrollArea } from '@/components/ui/scroll-area'
// ===== =====
const kind = ref<'text' | 'image' | ''>('')
const textContent = ref('')
const thumbSrc = ref('')
const fullSrc = ref('')
const enlarged = ref(false)
const loading = ref(false)
let unlistenFns: UnlistenFn[] = []
//
let loadSeq = 0
/** 根据 base64 前缀判断 MIME 类型 */
function buildImageDataUrl(b64: string): string {
const mime = b64.startsWith('/9j/') ? 'image/jpeg' : 'image/png'
return `data:${mime};base64,${b64}`
}
// ===== =====
//
const PAD = 12 // p-3
const HEADER_H = 30 // py-1.5*2 + +
const TEXT_W = 360 //
const THUMB_MAX_W = 440 //
const THUMB_MAX_H = 340 //
const DEF_W = 340 // /
const DEF_H = 300 // /
/** 离屏测量文本在指定内容宽下的自然高度(样式与模板 pre 一致,保证测量准确) */
function measureTextHeight(text: string, width: number): number {
const el = document.createElement('pre')
el.className = 'text-xs whitespace-pre-wrap break-all font-mono leading-relaxed'
el.style.cssText = `position:fixed;left:-9999px;top:0;width:${width}px;margin:0;visibility:hidden`
el.textContent = text
document.body.appendChild(el)
const h = el.getBoundingClientRect().height
el.remove()
return h
}
/** 读取图片原始尺寸 */
function loadImageSize(src: string): Promise<{ w: number; h: number }> {
return new Promise((resolve) => {
const img = new Image()
img.onload = () => resolve({ w: img.naturalWidth || 0, h: img.naturalHeight || 0 })
img.onerror = () => resolve({ w: 0, h: 0 })
img.src = src
})
}
/**
* 后端按工作区钳制并重新对齐弹窗完成后 reveal 显示窗口出现即最终尺寸
* "先大后小"闪烁seq 用于丢弃快速切换时的过期请求
* allowFlip初始落位为 true放不下可换侧放大/还原为 false保持原侧 */
async function fitWindow(seq: number, allowFlip: boolean) {
let w = DEF_W
let h = DEF_H
if (kind.value === 'text') {
const th = measureTextHeight(textContent.value, TEXT_W - PAD * 2)
w = TEXT_W
h = HEADER_H + PAD * 2 + th
} else if (kind.value === 'image') {
const src = enlarged.value ? fullSrc.value : thumbSrc.value
if (src) {
const { w: iw, h: ih } = await loadImageSize(src)
if (seq !== loadSeq) return
if (iw && ih) {
let dw = iw
let dh = ih
if (!enlarged.value) {
//
const scale = Math.min(THUMB_MAX_W / iw, THUMB_MAX_H / ih, 1)
dw = Math.round(iw * scale)
dh = Math.round(ih * scale)
}
w = dw + PAD * 2
h = dh + HEADER_H + PAD * 2
}
}
}
if (seq !== loadSeq) return
try {
// resize reveal
await commands.clipboardResizePreview(w, h, allowFlip)
await commands.clipboardRevealPreview()
} catch {
/* 忽略 */
}
}
/** 根据条目 id 加载预览内容(文本取全文,图片先取缩略图) */
async function loadItem(id: number) {
const seq = ++loadSeq
loading.value = true
enlarged.value = false
kind.value = ''
textContent.value = ''
thumbSrc.value = ''
fullSrc.value = ''
try {
const detail = await commands.clipboardGetItem(id)
if (seq !== loadSeq) return
if (detail?.kind === 'text') {
kind.value = 'text'
textContent.value = detail.content ?? ''
} else if (detail?.kind === 'image') {
kind.value = 'image'
if (detail.imageBase64) fullSrc.value = buildImageDataUrl(detail.imageBase64)
const thumb = await commands.clipboardGetThumb(id).catch(() => null)
if (seq !== loadSeq) return
thumbSrc.value = thumb ? buildImageDataUrl(thumb) : fullSrc.value
}
} catch {
/* 加载失败保持空态 */
} finally {
if (seq === loadSeq) {
loading.value = false
//
void fitWindow(seq, true)
}
}
}
/** 图片点击:缩略图 ↔ 原图放大切换(窗口随内容自适应:放大态按原图尺寸) */
function toggleEnlarge() {
if (kind.value !== 'image' || !fullSrc.value) return
enlarged.value = !enlarged.value
// 使 clamp
void fitWindow(loadSeq, false)
}
// ===== / =====
// onItemLeave
// "/"
// mousedown WebView2 mouseleave
// "/"
// /
// +/退
// leave线
const interacted = ref(false)
function onRootEnter() {
void emit(EVENTS.clipboardPreviewEnter)
}
function onRootMouseDown() {
onRootEnter()
interacted.value = true
void commands.clipboardPreviewInteracted().catch(() => {})
}
function onRootLeave() {
//
if (interacted.value) return
void emit(EVENTS.clipboardPreviewLeave)
}
/** Ctrl+C:有选区交给浏览器默认复制;无选区则复制整段文本,支持预览窗内自由复制 */
function onKeydown(e: KeyboardEvent) {
if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'c') {
if (window.getSelection()?.toString().trim()) return
if (textContent.value) {
e.preventDefault()
navigator.clipboard?.writeText(textContent.value).catch(() => {})
}
}
}
// ===== =====
function readMainTheme(): { theme: string; effect: string } {
try {
const raw = localStorage.getItem(STORAGE_KEYS.appSettings)
if (raw) {
const s = JSON.parse(raw)
return { theme: s.theme ?? 'system', effect: s.effect ?? 'mica' }
}
} catch {
/* 忽略 */
}
return { theme: 'system', effect: 'mica' }
}
function resolveIsDark(theme: string): boolean {
if (theme === 'dark') return true
if (theme === 'light') return false
return window.matchMedia('(prefers-color-scheme: dark)').matches
}
async function applyTheme() {
const root = document.documentElement
const { theme, effect } = readMainTheme()
try {
const tauriWin = getCurrentWindow()
if (theme === 'system') await tauriWin.setTheme(null)
else await tauriWin.setTheme(theme as 'dark' | 'light')
} catch {
/* 非 Tauri 环境忽略 */
}
const isDark = resolveIsDark(theme)
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
root.classList.add(`effect-${effect}`)
if (isDark) root.classList.add('dark')
try {
const tauriWin = getCurrentWindow()
await tauriWin.clearEffects()
if (effect === 'mica') {
await tauriWin.setEffects({
effects: [Effect.Mica],
// NoActivate
// FollowsWindowActiveState
// Active
state: EffectState.Active,
color: isDark ? [30, 41, 59, 0] : [248, 250, 252, 0],
})
await tauriWin.setBackgroundColor('#00000000')
root.style.setProperty('--popup-bg', 'transparent')
} else if (effect === 'acrylic') {
await tauriWin.setEffects({
effects: [Effect.Acrylic],
state: EffectState.Active,
color: isDark ? [30, 41, 59, 0] : [248, 250, 252, 0],
})
await tauriWin.setBackgroundColor('#00000000')
root.style.setProperty('--popup-bg', 'transparent')
} else {
await tauriWin.setBackgroundColor(isDark ? '#0f172a' : '#ffffff')
root.style.setProperty('--popup-bg', isDark ? '#0f172a' : '#ffffff')
}
} catch {
/* 非 Tauri 环境忽略 */
}
}
onMounted(async () => {
await applyTheme()
const mq = window.matchMedia('(prefers-color-scheme: dark)')
const onThemeChange = () => applyTheme()
mq.addEventListener('change', onThemeChange)
unlistenFns.push(() => mq.removeEventListener('change', onThemeChange))
// /
unlistenFns.push(await listen<number>(EVENTS.clipboardPreviewShow, async (e) => {
await applyTheme()
void loadItem(e.payload)
}))
// /
unlistenFns.push(await listen(EVENTS.clipboardPreviewHide, () => {
loadSeq++ //
kind.value = ''
textContent.value = ''
thumbSrc.value = ''
fullSrc.value = ''
enlarged.value = false
loading.value = false
interacted.value = false
}))
})
onUnmounted(() => {
unlistenFns.forEach((fn) => fn())
})
</script>
<template>
<div
class="preview-root h-screen w-screen outline-none"
tabindex="0"
@mouseenter="onRootEnter"
@mousedown="onRootMouseDown"
@mouseleave="onRootLeave"
@keydown="onKeydown"
>
<!-- 加载中 -->
<div v-if="loading" class="h-full flex items-center justify-center text-xs text-muted-foreground">
加载中
</div>
<!-- 文本预览 -->
<div v-else-if="kind === 'text'" class="h-full flex flex-col">
<div class="flex items-center px-3 py-1.5 border-b border-border shrink-0">
<span class="text-xs text-muted-foreground flex items-center gap-1.5">
<FileText class="size-3.5" />文本预览/自由复制
</span>
</div>
<ScrollArea class="flex-1 min-h-0">
<pre class="text-xs whitespace-pre-wrap break-all font-mono select-text cursor-text leading-relaxed p-3">{{ textContent }}</pre>
</ScrollArea>
</div>
<!-- 图片预览 -->
<div v-else-if="kind === 'image'" class="h-full flex flex-col">
<div class="flex items-center justify-between px-3 py-1.5 border-b border-border shrink-0">
<span class="text-xs text-muted-foreground flex items-center gap-1.5">
<ImageIcon class="size-3.5" />图片预览
</span>
<button v-if="fullSrc" class="preview-btn" :title="enlarged ? '还原' : '点击查看原图'" @click="toggleEnlarge">
<component :is="enlarged ? ZoomOut : ZoomIn" class="h-3.5 w-3.5" />{{ enlarged ? '还原' : '放大' }}
</button>
</div>
<!-- 放大态ScrollArea 滚动查看原图缩略态内容居中不滚动 -->
<ScrollArea v-if="enlarged" class="flex-1 min-h-0">
<div class="p-3">
<img
:src="fullSrc"
alt="剪贴板图片预览"
class="rounded block cursor-default"
@click="toggleEnlarge"
/>
</div>
</ScrollArea>
<div v-else class="flex-1 min-h-0 p-3 preview-img-thumb">
<img
:src="thumbSrc"
alt="剪贴板图片预览"
class="rounded block max-w-full max-h-full mx-auto cursor-zoom-in"
@click="toggleEnlarge"
/>
</div>
</div>
<!-- 空态 -->
<div v-else class="h-full flex items-center justify-center text-xs text-muted-foreground">
将鼠标悬停条目查看预览
</div>
</div>
</template>
<style scoped>
.preview-root {
font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Microsoft YaHei', 'PingFang SC', sans-serif;
background: var(--popup-bg, transparent);
color: var(--foreground);
border-radius: 8px;
overflow: hidden;
}
.preview-btn {
display: inline-flex;
align-items: center;
gap: 4px;
font-size: 11px;
padding: 2px 8px;
border-radius: 5px;
border: 1px solid var(--border);
background: var(--muted);
color: var(--foreground);
cursor: pointer;
transition: background-color 0.1s;
}
.preview-btn:hover {
background: var(--accent);
}
/* 缩略图态:内容居中,图片不放大 */
.preview-img-thumb {
display: flex;
align-items: center;
justify-content: center;
}
</style>
+38 -1
View File
@@ -5,7 +5,44 @@ const searchItems: SearchIndexItem[] = [
{ {
title: '剪贴板历史', title: '剪贴板历史',
description: '查看和管理剪贴板记录', description: '查看和管理剪贴板记录',
keywords: ['剪贴板', '复制', '粘贴', 'clipboard', 'copy', 'paste'] keywords: ['剪贴板', '复制', '粘贴', 'clipboard', 'copy', 'paste'],
tab: 'history'
},
{
title: '固定记录',
description: '查看固定的剪贴板条目',
keywords: ['固定', '收藏', 'pin', '置顶'],
tab: 'pinned'
},
{
title: '剪贴板设置',
description: '历史数量、图片收录与快捷弹窗快捷键',
keywords: ['设置', 'setting', '选项', '配置'],
tab: 'settings'
},
{
title: '快捷弹窗快捷键',
description: '配置全局快捷键唤起剪贴板弹窗',
keywords: ['快捷键', '热键', 'shortcut', 'hotkey', '弹窗', 'popup'],
tab: 'settings'
},
{
title: '最大历史条数',
description: '设置剪贴板历史记录数量上限',
keywords: ['历史', '数量', '上限', '条数', 'max', 'limit'],
tab: 'settings'
},
{
title: '图片大小上限',
description: '设置收录图片的大小上限 (KB)',
keywords: ['图片', '大小', '上限', 'image', 'kb', '体积'],
tab: 'settings'
},
{
title: '记录图片',
description: '是否收录复制/截图的图片',
keywords: ['图片', '截图', '收录', 'image', 'capture'],
tab: 'settings'
} }
] ]
+495
View File
@@ -0,0 +1,495 @@
<script setup lang="ts">
import { ref, computed, onMounted, onUnmounted } from 'vue'
import { getCurrentWindow, Effect, EffectState } from '@tauri-apps/api/window'
import { LogicalSize } from '@tauri-apps/api/dpi'
import { listen, type UnlistenFn } from '@tauri-apps/api/event'
import { Pause, Play, X, Minus, FolderOpen, AlertCircle, Loader2, XCircle } from '@lucide/vue'
import { commands, type DownloadTask, type Segment, type TaskStatus } from '@/lib/bindings'
import { STORAGE_KEYS } from '@/lib/constants'
import { createLogger } from '@/lib/logger'
const logger = createLogger('download-window')
// ===== URL hash id#download-window?task=<id> =====
const hash = window.location.hash
const taskId = new URLSearchParams(hash.split('?')[1] ?? '').get('task') ?? ''
if (!taskId) logger.warn('下载窗口缺少 task 参数')
const win = getCurrentWindow()
const task = ref<DownloadTask | null>(null)
const loading = ref(true)
const actionError = ref('')
// ===== Rust ProgressPayload =====
interface ProgressPayload {
id: string
completedSize: number
totalSize: number
speed: number
status: TaskStatus
segments: number[]
}
const loadTask = async () => {
try {
const all = await commands.downloaderGetTasks()
task.value = all.find(t => t.id === taskId) ?? null
} catch (e) {
logger.error('获取任务失败: ' + e)
} finally {
loading.value = false
}
// /
if (!task.value) {
await win.close()
return
}
//
try { await win.setTitle(task.value.filename) } catch { /* 忽略 */ }
}
// ===== =====
const totalSize = computed(() => task.value?.totalSize ?? 0)
const completedSize = computed(() => task.value?.completedSize ?? 0)
const speed = computed(() => task.value?.speed ?? 0)
const status = computed<TaskStatus>(() => task.value?.status ?? 'active')
const progress = computed(() => {
if (!totalSize.value || totalSize.value === 0) return 0
return Math.min(100, Math.round((completedSize.value / totalSize.value) * 100))
})
const segments = computed(() => task.value?.segments ?? [])
const showSegments = computed(() => segments.value.length > 1)
const statusText = computed(() => {
switch (status.value) {
case 'active': return '下载中'
case 'queued': return '等待中'
case 'paused': return '已暂停'
case 'complete': return '已完成'
case 'error': return '出错'
case 'cancelled': return '已取消'
}
})
const statusTone = computed(() => {
if (status.value === 'complete') return 'success'
if (status.value === 'error') return 'destructive'
if (status.value === 'paused' || status.value === 'cancelled') return 'muted'
return 'active'
})
// ===== =====
const formatByte = (b: number) => {
if (!b || isNaN(b)) return '0 B'
if (b < 1024) return `${b} B`
if (b < 1024 * 1024) return `${(b / 1024).toFixed(1)} KB`
if (b < 1024 * 1024 * 1024) return `${(b / 1024 / 1024).toFixed(2)} MB`
return `${(b / 1024 / 1024 / 1024).toFixed(2)} GB`
}
const formatTotal = (b: number) => (!b || b === 0 ? '未知' : formatByte(b))
// ===== =====
const segLen = (s: Segment) => s.end - s.start + 1
const totalSpan = computed(() => segments.value.reduce((a, s) => a + segLen(s), 0))
const segPercent = (s: Segment) => {
if (segLen(s) <= 0) return 0
return Math.min(100, Math.round((s.completed / segLen(s)) * 100))
}
// ===== =====
const errorTip = (e: unknown) => {
actionError.value = typeof e === 'string' ? e : '操作失败'
}
const doPause = async () => {
try { await commands.downloaderPauseTask(taskId) } catch (e) { return errorTip(e) }
await loadTask().catch(() => {})
}
const doResume = async () => {
try { await commands.downloaderResumeTask(taskId) } catch (e) { return errorTip(e) }
await loadTask().catch(() => {})
}
// 3
const armedCancel = ref(false)
let cancelArmTimer = 0
const doCancel = async () => {
if (!armedCancel.value) {
armedCancel.value = true
window.clearTimeout(cancelArmTimer)
cancelArmTimer = window.setTimeout(() => (armedCancel.value = false), 3000)
return
}
window.clearTimeout(cancelArmTimer)
armedCancel.value = false
try { await commands.downloaderCancelTask(taskId) } catch (e) { return errorTip(e) }
await win.close()
}
const doOpenFolder = async () => {
if (!task.value?.dir) return
try { await commands.downloaderOpenDir(task.value.dir) } catch (e) { errorTip(e) }
}
const doMinimize = () => win.minimize()
const doClose = () => win.close()
// data-tauri-drag-region
// pointer startDragging
const startDrag = () => {
win.startDragging().catch(() => {})
}
// 3
const clearErrorSoon = () => {
if (!actionError.value) return
window.setTimeout(() => { if (!actionError.value) return; actionError.value = '' }, 3000)
}
// ===== + mica/acrylic =====
function readMainTheme(): { theme: string; effect: string } {
try {
const raw = localStorage.getItem(STORAGE_KEYS.appSettings)
if (raw) {
const s = JSON.parse(raw)
return { theme: s.theme ?? 'system', effect: s.effect ?? 'mica' }
}
} catch { /* 忽略 */ }
return { theme: 'system', effect: 'mica' }
}
/** 判断当前是否应为深色主题(弹窗独立窗口,system 模式用 matchMedia 可靠) */
function resolveIsDark(theme: string): boolean {
if (theme === 'dark') return true
if (theme === 'light') return false
return window.matchMedia('(prefers-color-scheme: dark)').matches
}
async function applyTheme() {
const root = document.documentElement
const { theme, effect } = readMainTheme()
// 1. system null
try {
if (theme === 'system') await win.setTheme(null)
else await win.setTheme(theme as 'dark' | 'light')
} catch { /* 忽略 */ }
// 2. matchMedia
const isDark = resolveIsDark(theme)
// 3. DOM classeffect style.css
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
root.classList.add(`effect-${effect}`)
if (isDark) root.classList.add('dark')
// 4. mica/acrylic
try {
await win.clearEffects()
if (effect === 'mica') {
await win.setEffects({
effects: [Effect.Mica],
state: EffectState.FollowsWindowActiveState,
color: isDark ? [30, 41, 59, 0] : [248, 250, 252, 0],
})
await win.setBackgroundColor('#00000000')
root.style.setProperty('--popup-bg', 'transparent')
} else if (effect === 'acrylic') {
await win.setEffects({
effects: [Effect.Acrylic],
state: EffectState.FollowsWindowActiveState,
color: isDark ? [30, 41, 59, 0] : [248, 250, 252, 0],
})
await win.setBackgroundColor('#00000000')
root.style.setProperty('--popup-bg', 'transparent')
} else {
await win.setBackgroundColor(isDark ? '#0f172a' : '#ffffff')
root.style.setProperty('--popup-bg', isDark ? '#0f172a' : '#ffffff')
}
} catch { /* 忽略 */ }
}
// ===== =====
const rootRef = ref<HTMLElement | null>(null)
let lastHeight = 0
let autoResizeObserver: ResizeObserver | null = null
//
// titlebar/loading getBoundingClientRect().height
const MIN_H = 52
const WINDOW_W = 420
const applyAutoHeight = async () => {
if (!rootRef.value) return
try {
if (await win.isMinimized()) return
} catch { /* 忽略 */ }
const h = Math.max(MIN_H, Math.ceil(rootRef.value.getBoundingClientRect().height))
if (Math.abs(h - lastHeight) > 4) {
lastHeight = h
win.setSize(new LogicalSize(WINDOW_W, h)).catch(() => {})
}
}
// ===== =====
let progressUnlisten: UnlistenFn | null = null
let completeUnlisten: UnlistenFn | null = null
let onThemeChange: (() => void) | null = null
// + + /
// Rust downloaderFocusWindow Windows setFocus
const handleComplete = async () => {
await loadTask().catch(() => {})
if (status.value === 'complete') {
try { await commands.downloaderFocusWindow(win.label) } catch { /* 忽略 */ }
}
}
onMounted(async () => {
await applyTheme()
await loadTask()
progressUnlisten = await listen<ProgressPayload>('download-progress', (e) => {
if (e.payload.id !== taskId || !task.value) return
const t = task.value
t.completedSize = e.payload.completedSize
t.totalSize = e.payload.totalSize
t.speed = e.payload.speed
t.status = e.payload.status
if (Array.isArray(e.payload.segments) && t.segments) {
t.segments.forEach((seg, i) => {
const v = e.payload.segments[i]
if (v !== undefined) seg.completed = v
})
}
})
completeUnlisten = await listen<{ id: string }>('download-complete', (e) => {
if (e.payload?.id !== taskId) return
handleComplete()
})
const mq = window.matchMedia('(prefers-color-scheme: dark)')
onThemeChange = () => applyTheme()
mq.addEventListener('change', onThemeChange)
//
lastHeight = 0
autoResizeObserver = new ResizeObserver(applyAutoHeight)
if (rootRef.value) autoResizeObserver.observe(rootRef.value)
// App.vue
// setSize show +
// " resize"
void applyAutoHeight()
window.setTimeout(async () => {
//
await applyAutoHeight()
try { await win.show() } catch { /* 忽略 */ }
try { await win.unminimize() } catch { /* 忽略 */ }
void commands.downloaderFocusWindow(win.label).catch(() => {})
}, 120)
})
onUnmounted(() => {
progressUnlisten?.()
completeUnlisten?.()
autoResizeObserver?.disconnect()
if (onThemeChange) window.matchMedia('(prefers-color-scheme: dark)').removeEventListener('change', onThemeChange)
window.clearTimeout(cancelArmTimer)
})
</script>
<template>
<div ref="rootRef" class="dlw-root">
<!-- 顶部标题栏可拖动文件名作为标题右侧放操作按钮 + 最小化 + 关闭 -->
<div class="dlw-titlebar" data-tauri-drag-region>
<div class="dlw-title-left" data-tauri-drag-region>
<Loader2 v-if="status === 'active'" class="size-3 shrink-0 animate-spin text-primary" />
<XCircle v-else-if="status === 'error'" class="size-3 shrink-0 text-red-500" />
<Pause v-else class="size-3 shrink-0 text-muted-foreground" />
<span v-if="loading" class="text-xs font-medium text-muted-foreground">下载</span>
<span v-else-if="task" class="dlw-title-name" :title="task.filename"
@mousedown.left.prevent="startDrag">{{ task.filename }}</span>
</div>
<div class="dlw-title-right">
<button v-if="status === 'active'" class="dlw-btn" @click="doPause">
<Pause class="size-3" /> 暂停
</button>
<button v-else-if="status === 'paused'" class="dlw-btn" @click="doResume">
<Play class="size-3" /> 继续
</button>
<button v-if="status !== 'complete' && status !== 'error'" class="dlw-btn dlw-btn-danger" @click="doCancel">
{{ armedCancel ? '再点一次取消' : '取消' }}
</button>
<button v-if="status === 'complete'" class="dlw-btn dlw-btn-primary" @click="doOpenFolder">
<FolderOpen class="size-3" /> 打开文件夹
</button>
<button v-else-if="status === 'error' && task?.dir" class="dlw-btn" @click="doOpenFolder">
<FolderOpen class="size-3" /> 打开目录
</button>
<button class="dlw-icon-btn" title="最小化" @click="doMinimize">
<Minus class="size-3.5" />
</button>
<button class="dlw-icon-btn" title="关闭(下载在后台继续)" @click="doClose">
<X class="size-3.5" />
</button>
</div>
</div>
<!-- 主体状态 + 总进度 + 分段条 -->
<div class="dlw-body">
<div v-if="loading" class="dlw-loading">
<Loader2 class="size-5 animate-spin text-muted-foreground" />
</div>
<template v-else-if="task">
<div class="flex items-center justify-between gap-2 text-xs">
<span class="dlw-status-badge" :class="`tone-${statusTone}`">{{ statusText }}</span>
<span class="truncate text-muted-foreground">
{{ formatByte(completedSize) }} / {{ formatTotal(totalSize) }} · {{ progress }}%
<template v-if="status === 'active' && speed > 0"> · {{ formatByte(speed) }}/s</template>
</span>
</div>
<div class="dlw-bar mt-1.5">
<div class="dlw-bar-fill" :style="{ width: progress + '%' }" />
</div>
<!-- 分段进度横向分段条 -->
<div v-if="showSegments" class="mt-2">
<span class="text-[10px] text-muted-foreground">分段 ({{ segments.length }} 线程)</span>
<div class="dlw-seg-strip mt-1">
<div
v-for="(seg, i) in segments"
:key="i"
class="dlw-seg"
:style="{ width: ((segLen(seg) / totalSpan) * 100).toFixed(2) + '%' }"
:title="`#${i + 1} ${segPercent(seg)}%`"
>
<div class="dlw-seg-fill" :style="{ width: segPercent(seg) + '%' }" />
</div>
</div>
</div>
<div v-if="actionError" class="mt-1.5 truncate text-right text-[10px] text-red-500" @click="clearErrorSoon">
{{ actionError }}
</div>
</template>
<div v-else class="dlw-loading">
<span class="flex items-center text-xs text-muted-foreground">
<AlertCircle class="size-4 mr-1.5" /> 任务已不存在
</span>
</div>
</div>
</div>
</template>
<style scoped>
.dlw-root {
display: flex;
flex-direction: column;
gap: 4px;
padding: 4px 6px 6px;
overflow: hidden;
}
/* 标题栏 */
.dlw-titlebar {
display: flex;
align-items: center;
justify-content: space-between;
height: 34px;
padding: 0 2px 0 8px;
gap: 6px;
user-select: none;
flex-shrink: 0;
}
.dlw-title-left {
display: flex;
align-items: center;
gap: 6px;
min-width: 0;
}
.dlw-title-name {
font-size: 12px;
font-weight: 600;
line-height: 1.3;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.dlw-title-right {
display: flex;
align-items: center;
gap: 4px;
flex-shrink: 0;
min-width: 0;
}
/* 图标按钮(最小化/关闭) */
.dlw-icon-btn {
display: inline-flex;
align-items: center;
justify-content: center;
width: 24px;
height: 24px;
border-radius: 5px;
color: var(--muted-foreground);
}
.dlw-icon-btn:hover { background: var(--accent); color: var(--accent-foreground); }
/* --popup-bg mica/acrylic
flex:1 撑满 titlebar 下方的剩余高度避免内容尤其无分段时比窗口矮导致底部露出
白色/透明的窗口背景区空白 */
.dlw-body {
display: flex;
flex-direction: column;
flex: 1 1 auto;
min-height: 0;
border: 1px solid var(--border);
border-radius: 9px;
background: var(--popup-bg, transparent);
padding: 9px 11px 9px;
box-shadow: 0 8px 30px rgb(0 0 0 / 0.18);
}
/* 加载/任务缺失等仅有一行的场景,内容垂直居中于撑满的卡片内 */
.dlw-body > .dlw-loading { flex: 1 1 auto; margin: auto; }
.dlw-loading {
display: flex;
align-items: center;
justify-content: center;
min-height: 56px;
}
.dlw-status-badge {
flex-shrink: 0;
font-size: 10px;
line-height: 1.6;
padding: 0 8px;
border-radius: 999px;
white-space: nowrap;
}
.dlw-status-badge.tone-active { background: var(--primary); color: var(--primary-foreground); }
.dlw-status-badge.tone-success { background: #10b981; color: #fff; }
.dlw-status-badge.tone-destructive { background: #ef4444; color: #fff; }
.dlw-status-badge.tone-muted { background: var(--muted); color: var(--muted-foreground); }
.dlw-bar { height: 7px; border-radius: 999px; background: var(--muted); overflow: hidden; }
.dlw-bar-fill { height: 100%; border-radius: 999px; background: var(--primary); transition: width 0.2s linear; }
.dlw-seg-strip { display: flex; gap: 2px; height: 7px; }
.dlw-seg { height: 100%; border-radius: 3px; background: var(--muted); overflow: hidden; }
.dlw-seg-fill { height: 100%; background: var(--primary); opacity: 0.75; transition: width 0.2s linear; }
/* 操作按钮(紧凑) */
.dlw-btn {
display: inline-flex;
align-items: center;
gap: 4px;
height: 24px;
padding: 0 8px;
font-size: 11px;
border-radius: 6px;
border: 1px solid var(--border);
background: transparent;
color: var(--foreground);
cursor: pointer;
white-space: nowrap;
}
.dlw-btn:hover { background: var(--accent); color: var(--accent-foreground); }
.dlw-btn-danger { color: #ef4444; }
.dlw-btn-danger:hover { background: rgb(239 68 68 / 0.12); color: #dc2626; }
.dlw-btn-primary { background: var(--primary); color: var(--primary-foreground); border-color: transparent; }
/* hover 时显式保持前景色,避免被上面的 .dlw-btn:hover 覆盖成深色导致黑字黑底不可见 */
.dlw-btn-primary:hover { background: var(--primary); color: var(--primary-foreground); filter: brightness(1.05); }
</style>
File diff suppressed because it is too large Load Diff
+26 -4
View File
@@ -5,22 +5,44 @@ const searchItems: SearchIndexItem[] = [
{ {
title: '下载任务', title: '下载任务',
description: '查看与管理下载任务', description: '查看与管理下载任务',
keywords: ['下载', 'download', '任务', 'task'] keywords: ['下载', 'download', '任务', 'task'],
tab: 'tasks'
}, },
{ {
title: '添加下载', title: '添加下载',
description: '添加 HTTP/HTTPS 直链下载', description: '添加 HTTP/HTTPS 直链下载',
keywords: ['添加', '链接', 'url', 'add', '新建'] keywords: ['添加', '链接', 'url', 'add', '新建'],
tab: 'tasks'
}, },
{ {
title: '下载设置', title: '下载设置',
description: '配置下载目录、并发数与速度限制', description: '配置下载目录、并发数与速度限制',
keywords: ['设置', 'setting', '速度', '目录', '并发'] keywords: ['设置', 'setting', '速度', '目录', '并发'],
tab: 'settings'
},
{
title: '下载目录',
description: '设置任务默认保存目录',
keywords: ['目录', '保存', '路径', 'dir', 'folder', '下载位置'],
tab: 'settings'
},
{
title: '并发下载数',
description: '设置同时下载的任务数量上限',
keywords: ['并发', '数量', 'concurrent', '线程'],
tab: 'settings'
},
{
title: '速度限制',
description: '设置全局下载/上传限速',
keywords: ['限速', '速度', '速率', 'rate', 'limit', '带宽'],
tab: 'settings'
}, },
{ {
title: '浏览器扩展', title: '浏览器扩展',
description: '安装 Thing Extension 接管浏览器下载', description: '安装 Thing Extension 接管浏览器下载',
keywords: ['扩展', 'extension', '浏览器', 'chrome', 'edge'] keywords: ['扩展', 'extension', '浏览器', 'chrome', 'edge'],
tab: 'extension'
} }
] ]
+441 -216
View File
@@ -5,13 +5,16 @@ import {
ShieldCheck, ShieldOff, Zap, Thermometer, Clock, ChevronDown, ShieldCheck, ShieldOff, Zap, Thermometer, Clock, ChevronDown,
ArrowDown, ArrowUp, Wifi, FolderOpen, Copy, ListChecks, ArrowDown, ArrowUp, Wifi, FolderOpen, Copy, ListChecks,
Monitor as MonitorIcon, GripVertical, SlidersHorizontal, Monitor as MonitorIcon, GripVertical, SlidersHorizontal,
Eye, EyeOff, MousePointerClick, Eye, EyeOff, MousePointerClick, Plus, PencilLine,
CircuitBoard, BatteryFull, Gamepad2,
} from '@lucide/vue' } from '@lucide/vue'
import type { LucideIcon } from '@lucide/vue'
import { computed, onMounted, onUnmounted, ref, watch } from 'vue' import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
import { toast } from 'vue-sonner' import { toast } from 'vue-sonner'
import { VueDraggable } from 'vue-draggable-plus' import { VueDraggable } from 'vue-draggable-plus'
import { appDataDir } from '@tauri-apps/api/path' import { appDataDir } from '@tauri-apps/api/path'
import { revealItemInDir } from '@tauri-apps/plugin-opener' import { revealItemInDir } from '@tauri-apps/plugin-opener'
import { invoke } from '@tauri-apps/api/core'
import { import {
useMonitorStore, useMonitorStore,
type SensorEntry, type SensorEntry,
@@ -23,8 +26,10 @@ import {
type AlertConfig, type AlertConfig,
DEFAULT_COLOR_THEME, DEFAULT_COLOR_THEME,
} from '@/stores/monitorStore' } from '@/stores/monitorStore'
import { STORAGE_KEYS } from '@/lib/constants'
import { useModuleTabs } from '@/lib/use-module-tabs' import { useModuleTabs } from '@/lib/use-module-tabs'
import { fmt, tempColor, loadColor, fmtSpeed, typeLabel, groupDisplayName, groupIcon } from './format' import { fmt, tempColor, fmtSpeed, typeLabel, groupDisplayName, groupIcon } from './format'
import OverviewCard, { type OverviewCardView } from './OverviewCard.vue'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card' import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import { Badge } from '@/components/ui/badge' import { Badge } from '@/components/ui/badge'
@@ -45,7 +50,7 @@ const store = useMonitorStore()
// ===== Tab TitleBar ===== // ===== Tab TitleBar =====
const activeTab = ref('overview') const activeTab = ref('overview')
const tabsListRef = useModuleTabs(activeTab, [ const tabsListRef = useModuleTabs('monitor', activeTab, [
{ value: 'overview', label: '概览' }, { value: 'overview', label: '概览' },
{ value: 'details', label: '详细' }, { value: 'details', label: '详细' },
{ value: 'osd', label: 'OSD 显示' }, { value: 'osd', label: 'OSD 显示' },
@@ -193,6 +198,183 @@ const storageDrives = computed<StorageDrive[]>(() => {
const downSpeed = computed(() => fmtSpeed(store.networkSpeed?.downloadBps ?? null)) const downSpeed = computed(() => fmtSpeed(store.networkSpeed?.downloadBps ?? null))
const upSpeed = computed(() => fmtSpeed(store.networkSpeed?.uploadBps ?? null)) const upSpeed = computed(() => fmtSpeed(store.networkSpeed?.uploadBps ?? null))
// ===== + / =====
/** 概览卡片类型 id */
type OverviewCardId = 'cpu' | 'gpu' | 'memory' | 'network' | 'storage' | 'motherboard' | 'battery' | 'psu'
/** 卡片目录:可添加的全部硬件卡片 */
const OVERVIEW_CARD_CATALOG: { id: OverviewCardId; name: string; desc: string; icon: LucideIcon }[] = [
{ id: 'cpu', name: 'CPU', desc: '温度 / 功耗 / 负载', icon: Cpu },
{ id: 'gpu', name: 'GPU', desc: '温度 / 功耗 / 负载', icon: Gauge },
{ id: 'memory', name: '内存', desc: '用量 / 负载', icon: MemoryStick },
{ id: 'network', name: '网络', desc: '下载 / 上传速率', icon: Wifi },
{ id: 'storage', name: '存储', desc: '各硬盘温度 / 容量 / 使用率', icon: HardDrive },
{ id: 'motherboard', name: '主板', desc: '温度 / 风扇', icon: CircuitBoard },
{ id: 'battery', name: '电池', desc: '电量 / 充放电功率', icon: BatteryFull },
{ id: 'psu', name: '电源', desc: '输出功率', icon: Zap },
]
const OVERVIEW_CARDS_VERSION = 1
/** 默认显示的卡片(用户需求:cpu/gpu/内存/网络) */
const DEFAULT_OVERVIEW_CARDS: OverviewCardId[] = ['cpu', 'gpu', 'memory', 'network']
/** 加载持久化的卡片列表(过滤未知 id,空则回退默认) */
function loadOverviewCards(): OverviewCardId[] {
try {
const saved = localStorage.getItem(STORAGE_KEYS.monitorOverviewCards)
if (!saved) return [...DEFAULT_OVERVIEW_CARDS]
const parsed = JSON.parse(saved)
if (parsed?.version !== OVERVIEW_CARDS_VERSION) return [...DEFAULT_OVERVIEW_CARDS]
const ids: string[] = Array.isArray(parsed.cards) ? parsed.cards : []
const valid = ids.filter(id => OVERVIEW_CARD_CATALOG.some(c => c.id === id)) as OverviewCardId[]
return valid.length ? valid : [...DEFAULT_OVERVIEW_CARDS]
} catch {
return [...DEFAULT_OVERVIEW_CARDS]
}
}
/** 当前显示的卡片列表(顺序即显示顺序) */
const overviewCards = ref<OverviewCardId[]>(loadOverviewCards())
function saveOverviewCards() {
try {
localStorage.setItem(STORAGE_KEYS.monitorOverviewCards, JSON.stringify({
version: OVERVIEW_CARDS_VERSION,
cards: overviewCards.value,
}))
} catch { /* 忽略 localStorage 写入失败 */ }
}
/** 编辑模式:显示拖拽把手/移除按钮,启用拖拽排序 */
const overviewEditing = ref(false)
/** 添加卡片 Popover 开关 */
const overviewAddOpen = ref(false)
/** 尚未添加的卡片(添加菜单内容) */
const addableOverviewCards = computed(() =>
OVERVIEW_CARD_CATALOG.filter(c => !overviewCards.value.includes(c.id))
)
function addOverviewCard(id: OverviewCardId) {
if (overviewCards.value.includes(id)) return
overviewCards.value.push(id)
saveOverviewCards()
overviewAddOpen.value = false
}
function removeOverviewCard(id: string) {
overviewCards.value = overviewCards.value.filter(c => c !== id)
saveOverviewCards()
}
/** 拖拽排序结束:持久化新顺序 */
function onOverviewDragEnd() {
saveOverviewCards()
}
// --- // ---
/** 主板分组(motherboard 为空时回退 superio / embeddedcontroller */
const boardGroup = computed(() =>
store.groupById['motherboard'] ?? store.groupById['superio'] ?? store.groupById['embeddedcontroller'] ?? null
)
const boardName = computed(() => boardGroup.value?.sensors[0]?.hardwareName ?? null)
const boardTemp = computed(() =>
boardGroup.value?.sensors.find(s => s.type === 'temperature' && s.value != null)?.value ?? null
)
const boardFan = computed(() =>
boardGroup.value?.sensors.find(s => s.type === 'fan' && s.value != null)?.value ?? null
)
const batteryLevel = computed(() => {
const g = store.groupById['battery']
if (!g) return null
return g.sensors.find(s => s.name === 'Battery Level' && s.type === 'level')?.value
?? g.sensors.find(s => s.type === 'level')?.value
?? null
})
const batteryCharge = computed(() => store.findSensorValue('battery', { name: 'Battery Charge', type: 'power' }))
const batteryDischarge = computed(() => store.findSensorValue('battery', { name: 'Battery Discharge', type: 'power' }))
const batteryName = computed(() => store.groupById['battery']?.sensors[0]?.hardwareName ?? null)
const psuPower = computed(() => store.findSensorValue('psu', { type: 'power' }))
const psuName = computed(() => store.groupById['psu']?.sensors[0]?.hardwareName ?? null)
/** 构建各卡片视图数据(从上面的 computed 提取值并格式化) */
function buildOverviewCardView(id: OverviewCardId): OverviewCardView {
switch (id) {
case 'cpu':
return {
id, title: 'CPU', icon: Cpu, subtitle: cpuModel.value,
main: { label: '封装温度', labelIcon: Thermometer, text: fmt(cpuTemp.value, 0), unit: '°C', colorClass: tempColor(cpuTemp.value) },
subs: [{ label: '功耗', labelIcon: Zap, text: fmt(cpuPower.value, 1), unit: 'W' }],
load: { label: '总负载', value: cpuLoad.value },
}
case 'gpu':
return {
id, title: 'GPU', icon: Gauge, subtitle: gpuModel.value,
main: { label: '核心温度', labelIcon: Thermometer, text: fmt(gpuTemp.value, 0), unit: '°C', colorClass: tempColor(gpuTemp.value) },
subs: [{ label: '功耗', labelIcon: Zap, text: fmt(gpuPower.value, 1), unit: 'W' }],
load: { label: '3D 负载', value: gpuLoad.value },
}
case 'memory':
return {
id, title: '内存', icon: MemoryStick,
subtitle: memTotalGB.value != null ? `${fmt(memTotalGB.value, 0)} GB` : null,
subtitleFull: memModuleModels.value.join(', ') || null,
main: { label: '已使用', labelIcon: MemoryStick, text: fmt(memUsedGB.value, 1), unit: ` / ${fmt(memTotalGB.value, 1)} GB` },
subs: [],
load: { label: '负载', value: memLoad.value },
}
case 'network':
return {
id, title: '网络', icon: Wifi,
main: { label: '下载', labelIcon: ArrowDown, text: downSpeed.value.value, unit: downSpeed.value.unit, colorClass: 'text-sky-500' },
subs: [{ label: '上传', labelIcon: ArrowUp, text: upSpeed.value.value, unit: upSpeed.value.unit, colorClass: 'text-violet-500' }],
load: null,
}
case 'storage':
return {
id, title: '存储', icon: HardDrive,
subtitle: storageDrives.value.length ? `${storageDrives.value.length} 个设备` : null,
main: { label: '', text: '' },
subs: [],
load: null,
wide: true,
}
case 'motherboard':
return {
id, title: '主板', icon: CircuitBoard, subtitle: boardName.value,
main: { label: '温度', labelIcon: Thermometer, text: fmt(boardTemp.value, 0), unit: '°C', colorClass: tempColor(boardTemp.value) },
subs: [{ label: '风扇', text: fmt(boardFan.value, 0), unit: 'RPM' }],
load: null,
}
case 'battery':
return {
id, title: '电池', icon: BatteryFull, subtitle: batteryName.value,
main: { label: '电量', labelIcon: BatteryFull, text: fmt(batteryLevel.value, 0), unit: '%' },
subs: [
{ label: '充电', labelIcon: Zap, text: fmt(batteryCharge.value, 1), unit: 'W' },
{ label: '放电', labelIcon: Zap, text: fmt(batteryDischarge.value, 1), unit: 'W' },
],
load: null,
}
case 'psu':
return {
id, title: '电源', icon: Zap, subtitle: psuName.value,
main: { label: '输出功率', labelIcon: Zap, text: fmt(psuPower.value, 1), unit: 'W' },
subs: [],
load: null,
}
}
}
/** 当前卡片视图列表(与 overviewCards 顺序一一对应) */
const overviewCardViews = computed<OverviewCardView[]>(() =>
overviewCards.value.map(buildOverviewCardView)
)
// ===== ===== // ===== =====
const stateMeta: Record<ConnectionState, { text: string; class: string }> = { const stateMeta: Record<ConnectionState, { text: string; class: string }> = {
idle: { text: '未启动', class: 'bg-muted text-muted-foreground' }, idle: { text: '未启动', class: 'bg-muted text-muted-foreground' },
@@ -255,6 +437,31 @@ async function handleRefresh() {
} }
} }
/** 检测并修复 PawnIO 驱动:安装缺失驱动并重启监控内核 */
const repairingPawnio = ref(false)
async function handleRepairPawnio() {
repairingPawnio.value = true
try {
const r = await invoke<{ installed: boolean; needReboot: boolean }>('monitor_repair_pawnio')
if (r.needReboot) {
toast.info('PawnIO 驱动已安装,需重启电脑后生效')
} else if (r.installed) {
toast.success('PawnIO 驱动已修复,监控内核已重启')
} else {
toast.error('PawnIO 驱动安装未完成', {
description: '请以管理员/提权方式运行 Thing 后重试',
})
}
store.pawnIoMissing = false
await store.refreshStatus()
await store.fetchSnapshot()
} catch (e) {
toast.error('修复 PawnIO 失败', { description: String(e) })
} finally {
repairingPawnio.value = false
}
}
/** Thing 使 /** Thing 使
* Thing 以管理员权限运行时ThingHK 子进程继承权限ProcessManager 可直接管控 * Thing 以管理员权限运行时ThingHK 子进程继承权限ProcessManager 可直接管控
* ThingHK 崩溃会自动重启避免数据停止后 Thing 不感知 * ThingHK 崩溃会自动重启避免数据停止后 Thing 不感知
@@ -354,8 +561,6 @@ async function handleSaveConfig() {
description: '主板/存储等硬件需提权才能读取完整数据,建议提权', description: '主板/存储等硬件需提权才能读取完整数据,建议提权',
duration: 6000, duration: 6000,
}) })
} else {
toast.success('配置已保存', { description: '正在重启 Kernel...' })
} }
// Kernel // Kernel
@@ -373,7 +578,6 @@ async function handleSaveConfig() {
} }
} }
} else { } else {
toast.success('配置已保存', { description: '传感器类型过滤已热生效' })
configDialogOpen.value = false configDialogOpen.value = false
// //
await store.fetchSnapshot() await store.fetchSnapshot()
@@ -910,7 +1114,6 @@ function confirmOsdPick() {
osdConfig.value.overlayItems = newItems osdConfig.value.overlayItems = newItems
saveOsdConfig(osdConfig.value) saveOsdConfig(osdConfig.value)
osdPickDialogOpen.value = false osdPickDialogOpen.value = false
toast.success('悬浮窗显示项已更新')
} }
/** 拖动排序结束回调 */ /** 拖动排序结束回调 */
@@ -928,8 +1131,29 @@ function removeOsdItem(key: string) {
} }
} }
/** 开启 OSD 但监控内核未运行时的提示对话框开关 */
const osdNeedsKernelOpen = ref(false)
/** 从对话框启动内核:先直接开启 OSD(立即显示),内核在后台自行启动 */
async function startKernelForOsd() {
osdNeedsKernelOpen.value = false
// OSDstore overlayEnabled watch /
osdConfig.value.overlayEnabled = true
saveOsdConfigDebounced(osdConfig.value)
// await OSD OSD
store.start().catch(() => {})
}
/** OSD 配置项变更时自动保存(防抖:滑块拖动期间不逐帧写盘) */ /** OSD 配置项变更时自动保存(防抖:滑块拖动期间不逐帧写盘) */
function updateOsdConfig(field: keyof OsdConfig, value: unknown) { function updateOsdConfig(field: keyof OsdConfig, value: unknown) {
// OSD OSD
if (field === 'overlayEnabled' && value === true) {
const kernelRunning = store.status?.running === true
if (!kernelRunning) {
osdNeedsKernelOpen.value = true
return
}
}
;(osdConfig.value as unknown as Record<string, unknown>)[field] = value ;(osdConfig.value as unknown as Record<string, unknown>)[field] = value
saveOsdConfigDebounced(osdConfig.value) saveOsdConfigDebounced(osdConfig.value)
} }
@@ -1028,7 +1252,6 @@ function saveColorTheme() {
osdConfig.value.colorTheme = editingColorTheme.value osdConfig.value.colorTheme = editingColorTheme.value
saveOsdConfig(osdConfig.value) saveOsdConfig(osdConfig.value)
colorThemeDialogOpen.value = false colorThemeDialogOpen.value = false
toast.success('颜色主题已保存')
} }
function resetColorTheme() { function resetColorTheme() {
@@ -1102,8 +1325,9 @@ onUnmounted(() => {
// dispose storeSSE OSD // dispose storeSSE OSD
// store.subscribe() if unlistenFns.length return init // store.subscribe() if unlistenFns.length return init
// OSD OSD 退 // OSD OSD 退
// OSD App // store.disposeOsd()tray:toggle-osd OSD watcher App.vue
store.disposeOsd() // initOsd()
// OSD OSD App 退
}) })
// Kernel UI // Kernel UI
@@ -1138,219 +1362,168 @@ watch(() => store.status?.ready, (ready, prev) => {
<p class="text-sm">正在加载...</p> <p class="text-sm">正在加载...</p>
</div> </div>
<!-- 始终显示卡片网格未启动时数据以占位符显示保持画面完整 --> <template v-else>
<div v-else key="content" class="grid grid-cols-1 md:grid-cols-3 gap-2.5"> <!-- ===== Kernel 状态栏置顶紧凑横条 ===== -->
<!-- CPU温度 + 功耗 + 频率未读数据以 -- 占位 --> <Card class="py-0 gap-0 mb-2.5">
<Card class="py-0 gap-0"> <CardContent class="px-3.5 py-2 flex flex-wrap items-center gap-x-3 gap-y-1.5 text-xs">
<CardHeader class="pb-1.5 px-3.5 pt-2.5"> <span class="flex items-center gap-1.5 font-medium text-sm">
<CardTitle class="flex items-center justify-between text-sm"> <Activity class="size-4 text-primary" />Kernel
<span class="flex items-center gap-1.5"><Cpu class="size-4 text-primary" />CPU</span> </span>
<span class="text-xs text-muted-foreground font-normal truncate ml-2" :title="cpuModel ?? ''">{{ cpuModel ?? '--' }}</span> <span :class="['px-2 py-0.5 rounded-full', stateMeta[store.connState].class]">
</CardTitle> {{ stateMeta[store.connState].text }}
</CardHeader> </span>
<CardContent class="px-3.5 pb-2.5 space-y-1.5"> <Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-emerald-500 hover:bg-emerald-500' : ''">
<!-- 温度 + 功耗 --> {{ store.snapshot?.isAdmin ? '管理员' : '普通' }}
<div class="flex items-end justify-between gap-2"> </Badge>
<div> <Badge v-if="store.status?.thingElevated" variant="outline" class="border-emerald-500/50 text-emerald-600 dark:text-emerald-400">
<div class="text-xs text-muted-foreground flex items-center gap-1"><Thermometer class="size-3" />封装温度</div> <ShieldCheck class="size-2.5 mr-0.5" />提权
<div :class="['text-2xl font-bold tabular-nums leading-tight', tempColor(cpuTemp)]"> </Badge>
{{ fmt(cpuTemp, 0) }}<span class="text-sm font-normal">°C</span> <span class="text-muted-foreground">PID: <span class="font-mono text-foreground">{{ store.status?.pid ?? '--' }}</span></span>
</div> <span class="text-muted-foreground">传感器: <span class="font-mono text-foreground">{{ store.status?.sensorCount ?? '--' }}</span></span>
</div> <span class="text-muted-foreground">重启: <span class="font-mono text-foreground">{{ store.status?.restartCount ?? 0 }}</span></span>
<div class="text-right"> <span class="text-muted-foreground">事件: <span class="font-mono text-foreground">{{ store.eventCount }}</span></span>
<div class="text-xs text-muted-foreground flex items-center gap-1 justify-end"><Zap class="size-3" />功耗</div> <div class="flex items-center gap-1.5 ml-auto">
<div class="text-base font-medium tabular-nums">{{ fmt(cpuPower, 1) }}<span class="text-xs text-muted-foreground ml-0.5">W</span></div> <!-- 启动中 loadingstarting=true 但状态还没变为 loading 时显示 -->
</div> <Button v-if="store.starting && store.connState === 'idle'" size="xs" variant="outline" disabled>
</div> <Loader2 class="size-3 animate-spin" />启动中
<!-- 负载 --> </Button>
<div> <!-- 启动按钮未运行且非启动中时显示 -->
<div class="flex items-center justify-between text-xs mb-0.5"> <Button v-if="store.connState === 'idle' && !store.starting" size="xs" :disabled="store.starting" @click="handleStart">
<span class="text-muted-foreground flex items-center gap-1"><Gauge class="size-3" />总负载</span> <Play class="size-3" />启动
<span :class="['font-medium tabular-nums', loadColor(cpuLoad)]">{{ fmt(cpuLoad, 0) }}%</span> </Button>
</div> <!-- 提权按钮标志未启用时显示设置标志 + 以管理员权限重启 Thing -->
<Progress :model-value="cpuLoad ?? 0" class="h-1.5" /> <Tooltip v-if="!store.elevateOnLaunch">
<TooltipTrigger as-child>
<Button size="xs" variant="outline" class="gap-1 text-emerald-600 dark:text-emerald-400 border-emerald-500/40 hover:bg-emerald-500/10" :disabled="store.starting" @click="handleElevateSelf">
<Loader2 v-if="store.starting" class="size-3 animate-spin" />
<ShieldCheck v-else class="size-3" />提权
</Button>
</TooltipTrigger>
<TooltipContent class="max-w-[480px] break-words">以管理员权限重启 Thing UACThingHK 子进程继承权限后续启动自动提权崩溃自动重启</TooltipContent>
</Tooltip>
<!-- 取消提权按钮标志已启用时显示清除标志下次启动不触发 UAC -->
<Tooltip v-else>
<TooltipTrigger as-child>
<Button size="xs" variant="outline" class="gap-1 text-muted-foreground hover:text-foreground" @click="handleCancelElevation">
<ShieldOff class="size-3" />取消提权
</Button>
</TooltipTrigger>
<TooltipContent class="max-w-[480px] break-words">取消提权下次启动将以普通权限运行不影响当前会话</TooltipContent>
</Tooltip>
<Button size="xs" variant="outline" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleRefresh">
<RefreshCw class="size-3" />刷新
</Button>
<Button size="xs" variant="outline" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleStop">
<Square class="size-3" />停止
</Button>
<Separator orientation="vertical" class="h-4 mx-0.5" />
<!-- 编辑布局开关拖拽排序 / 删除卡片 -->
<Button
size="xs"
:variant="overviewEditing ? 'default' : 'outline'"
:title="overviewEditing ? '完成编辑' : '编辑卡片布局(拖拽排序 / 删除)'"
@click="overviewEditing = !overviewEditing"
>
<PencilLine class="size-3" />{{ overviewEditing ? '完成' : '编辑布局' }}
</Button>
<!-- 添加卡片 -->
<Popover v-model:open="overviewAddOpen">
<PopoverTrigger as-child>
<Button size="xs" variant="outline" :disabled="!addableOverviewCards.length" title="添加硬件卡片">
<Plus class="size-3" />添加卡片
</Button>
</PopoverTrigger>
<PopoverContent class="w-64 p-1.5" align="end">
<button
v-for="c in addableOverviewCards"
:key="c.id"
class="w-full flex items-center gap-2.5 rounded-md px-2.5 py-2 text-sm hover:bg-accent transition-colors text-left"
@click="addOverviewCard(c.id)"
>
<component :is="c.icon" class="size-4 text-primary shrink-0" />
<span class="min-w-0">
<span class="block truncate">{{ c.name }}</span>
<span class="block text-xs text-muted-foreground truncate">{{ c.desc }}</span>
</span>
</button>
<div v-if="!addableOverviewCards.length" class="px-2.5 py-2 text-xs text-muted-foreground text-center">所有卡片均已添加</div>
</PopoverContent>
</Popover>
</div> </div>
</CardContent> </CardContent>
</Card> </Card>
<!-- GPU结构与 CPU 一致温度 + 功耗未读数据以 -- 占位 --> <!-- PawnIO 驱动缺失提示提权但驱动未装 CPU 温度/功耗无法读取 -->
<Card class="py-0 gap-0"> <Card v-if="store.pawnIoMissing" class="py-0 gap-0 mb-2.5 !border-amber-500/40 bg-amber-500/10">
<CardHeader class="pb-1.5 px-3.5 pt-2.5"> <CardContent class="px-3.5 py-2 flex flex-wrap items-center gap-2 text-xs text-amber-600 dark:text-amber-400">
<CardTitle class="flex items-center justify-between text-sm"> <AlertTriangle class="size-4 shrink-0" />
<span class="flex items-center gap-1.5"><Gauge class="size-4 text-primary" />GPU</span> <span class="flex-1 min-w-[200px]">检测到 PawnIO 驱动未安装CPU 温度/功耗可能无法读取误卸载过 PawnIO 等情况会触发点击下方按钮自动安装并重启监控内核</span>
<span class="text-xs text-muted-foreground font-normal truncate ml-2" :title="gpuModel ?? ''">{{ gpuModel ?? '--' }}</span> <Button size="xs" variant="outline" class="shrink-0 text-amber-600 dark:text-amber-400 border-amber-500/40 hover:bg-amber-500/10" :disabled="store.starting || store.stopping || repairingPawnio" @click="handleRepairPawnio">
</CardTitle> <Loader2 v-if="repairingPawnio" class="size-3 mr-1 animate-spin" />
</CardHeader> <RefreshCw v-else class="size-3 mr-1" />
<CardContent class="px-3.5 pb-2.5 space-y-1.5"> {{ repairingPawnio ? '修复中...' : '检测并修复' }}
<!-- 温度 + 功耗 CPU 卡片结构一致 --> </Button>
<div class="flex items-end justify-between gap-2">
<div>
<div class="text-xs text-muted-foreground flex items-center gap-1"><Thermometer class="size-3" />核心温度</div>
<div :class="['text-2xl font-bold tabular-nums leading-tight', tempColor(gpuTemp)]">
{{ fmt(gpuTemp, 0) }}<span class="text-sm font-normal">°C</span>
</div>
</div>
<div class="text-right">
<div class="text-xs text-muted-foreground flex items-center gap-1 justify-end"><Zap class="size-3" />功耗</div>
<div class="text-base font-medium tabular-nums">{{ fmt(gpuPower, 1) }}<span class="text-xs text-muted-foreground ml-0.5">W</span></div>
</div>
</div>
<!-- 负载 -->
<div>
<div class="flex items-center justify-between text-xs mb-0.5">
<span class="text-muted-foreground flex items-center gap-1"><Gauge class="size-3" />3D 负载</span>
<span :class="['font-medium tabular-nums', loadColor(gpuLoad)]">{{ fmt(gpuLoad, 0) }}%</span>
</div>
<Progress :model-value="gpuLoad ?? 0" class="h-1.5" />
</div>
</CardContent> </CardContent>
</Card> </Card>
<!-- 内存主指标大字 + 进度条未读数据以 -- 占位 --> <!-- ===== 硬件信息卡片网格模板化可编辑拖拽排序 / 删除 / 添加 ===== -->
<Card class="py-0 gap-0"> <VueDraggable
<CardHeader class="pb-1.5 px-3.5 pt-2.5"> v-model="overviewCards"
<CardTitle class="flex items-center justify-between text-sm"> :animation="200"
<span class="flex items-center gap-1.5"><MemoryStick class="size-4 text-primary" />内存</span> :force-fallback="true"
<span class="text-xs text-muted-foreground font-normal truncate ml-2" :title="memModuleModels.join(', ')"> handle=".overview-drag-handle"
{{ memTotalGB != null ? fmt(memTotalGB, 0) + ' GB' : '--' }} ghost-class="opacity-40"
</span> chosen-class="drag-chosen"
</CardTitle> :disabled="!overviewEditing"
</CardHeader> class="grid grid-cols-1 md:grid-cols-4 gap-2.5"
<CardContent class="px-3.5 pb-2.5 space-y-1.5"> @end="onOverviewDragEnd()"
<!-- 已使用 / 总容量主指标 CPU 温度对齐 --> >
<div class="flex items-end justify-between gap-2"> <OverviewCard
<div> v-for="view in overviewCardViews"
<div class="text-xs text-muted-foreground flex items-center gap-1"><MemoryStick class="size-3" />已使用</div> :key="view.id"
<div class="text-2xl font-bold tabular-nums leading-tight"> :view="view"
{{ fmt(memUsedGB, 1) }}<span class="text-sm font-normal text-muted-foreground"> / {{ fmt(memTotalGB, 1) }} GB</span> :editing="overviewEditing"
</div> @remove="removeOverviewCard(view.id)"
</div> >
</div> <!-- 存储卡多盘列表 -->
<!-- 负载进度条 CPU 负载对齐 --> <template v-if="view.id === 'storage'" #body>
<div> <div v-if="storageDrives.length" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-2">
<div class="flex items-center justify-between text-xs mb-0.5"> <div v-for="drive in storageDrives" :key="drive.name" class="border rounded-md p-2 space-y-1">
<span class="text-muted-foreground flex items-center gap-1"><Gauge class="size-3" />负载</span> <div class="flex items-center justify-between gap-2">
<span :class="['font-medium tabular-nums', loadColor(memLoad)]">{{ fmt(memLoad, 0) }}%</span> <Tooltip>
</div> <TooltipTrigger as-child>
<Progress :model-value="memLoad ?? 0" class="h-1.5" /> <span class="text-xs font-medium truncate">{{ drive.name }}</span>
</div> </TooltipTrigger>
</CardContent> <TooltipContent>{{ drive.name }}</TooltipContent>
</Card> </Tooltip>
<span :class="['text-xs font-mono tabular-nums shrink-0', tempColor(drive.temp)]">{{ fmt(drive.temp, 0) }}°C</span>
<!-- 网络跨3列下载/上传速率独立于 Kernel Tauri 后台推送 --> </div>
<Card class="md:col-span-3 py-0 gap-0"> <div>
<CardHeader class="pb-1.5 px-3.5 pt-2.5"> <div class="flex items-center justify-between text-xs mb-0.5">
<CardTitle class="flex items-center gap-1.5 text-sm"> <span class="text-muted-foreground">使用率</span>
<Wifi class="size-4 text-primary" />网络 <span class="font-mono tabular-nums">{{ fmt(drive.usedPct, 0) }}%</span>
</CardTitle> </div>
</CardHeader> <Progress :model-value="drive.usedPct ?? 0" class="h-1" />
<CardContent class="px-3.5 pb-2.5"> </div>
<div class="grid grid-cols-2 gap-4"> <div class="flex items-center justify-between text-xs text-muted-foreground">
<!-- 下载 --> <span>容量</span>
<div> <span class="font-mono tabular-nums">{{ fmt(drive.usedGB, 1) }} / {{ fmt(drive.totalGB, 1) }} GB</span>
<div class="text-xs text-muted-foreground flex items-center gap-1 mb-0.5"><ArrowDown class="size-3 text-sky-500" />下载</div>
<div class="text-2xl font-bold tabular-nums leading-tight text-sky-500">
{{ downSpeed.value }}<span class="text-sm font-normal text-muted-foreground ml-0.5">{{ downSpeed.unit }}</span>
</div>
</div>
<!-- 上传 -->
<div>
<div class="text-xs text-muted-foreground flex items-center gap-1 mb-0.5"><ArrowUp class="size-3 text-violet-500" />上传</div>
<div class="text-2xl font-bold tabular-nums leading-tight text-violet-500">
{{ upSpeed.value }}<span class="text-sm font-normal text-muted-foreground ml-0.5">{{ upSpeed.unit }}</span>
</div>
</div>
</div>
</CardContent>
</Card>
<!-- 存储跨3列列出各硬盘温度/容量/使用率未读到以占位符显示 -->
<Card class="md:col-span-3 py-0 gap-0">
<CardHeader class="pb-1.5 px-3.5 pt-2.5">
<CardTitle class="flex items-center gap-1.5 text-sm">
<HardDrive class="size-4 text-primary" />存储
</CardTitle>
</CardHeader>
<CardContent class="px-3.5 pb-2.5">
<div v-if="storageDrives.length" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-2">
<div v-for="drive in storageDrives" :key="drive.name" class="border rounded-md p-2 space-y-1">
<div class="flex items-center justify-between gap-2">
<span class="text-xs font-medium truncate" :title="drive.name">{{ drive.name }}</span>
<span :class="['text-xs font-mono tabular-nums shrink-0', tempColor(drive.temp)]">{{ fmt(drive.temp, 0) }}°C</span>
</div>
<div>
<div class="flex items-center justify-between text-xs mb-0.5">
<span class="text-muted-foreground">使用率</span>
<span class="font-mono tabular-nums">{{ fmt(drive.usedPct, 0) }}%</span>
</div> </div>
<Progress :model-value="drive.usedPct ?? 0" class="h-1" />
</div>
<div class="flex items-center justify-between text-xs text-muted-foreground">
<span>容量</span>
<span class="font-mono tabular-nums">{{ fmt(drive.usedGB, 1) }} / {{ fmt(drive.totalGB, 1) }} GB</span>
</div> </div>
</div> </div>
</div> <div v-else class="text-xs text-muted-foreground py-2 text-center">暂无存储数据</div>
<!-- 无数据占位保持卡片结构完整 --> </template>
<div v-else class="text-xs text-muted-foreground py-2 text-center">暂无存储数据</div> </OverviewCard>
</CardContent> <!-- 空占位全部卡片移除后显示 -->
</Card> <Card v-if="!overviewCards.length" class="col-span-full py-0 gap-0 no-drag">
<CardContent class="py-8 text-center text-sm text-muted-foreground">
<!-- Kernel 状态卡片跨3列含启动/停止/刷新/提权按钮 --> 暂无卡片点击上方"添加卡片"添加硬件
<Card class="md:col-span-3 py-0 gap-0"> </CardContent>
<CardHeader class="pb-1.5 px-3.5 pt-2.5"> </Card>
<CardTitle class="flex items-center justify-between text-sm"> </VueDraggable>
<span class="flex items-center gap-1.5"><Activity class="size-4 text-primary" />Kernel 状态</span>
<div class="flex items-center gap-1.5">
<span :class="['text-xs px-2 py-0.5 rounded-full', stateMeta[store.connState].class]">
{{ stateMeta[store.connState].text }}
</span>
<Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-emerald-500 hover:bg-emerald-500' : ''">
{{ store.snapshot?.isAdmin ? '管理员' : '普通' }}
</Badge>
<Badge v-if="store.status?.thingElevated" variant="outline" class="text-xs border-emerald-500/50 text-emerald-600 dark:text-emerald-400">
<ShieldCheck class="size-2.5 mr-0.5" />提权
</Badge>
</div>
</CardTitle>
</CardHeader>
<CardContent class="px-3.5 pb-2.5">
<div class="flex flex-wrap items-center gap-x-4 gap-y-1.5 text-xs">
<span class="text-muted-foreground">PID: <span class="font-mono text-foreground">{{ store.status?.pid ?? '--' }}</span></span>
<span class="text-muted-foreground">传感器: <span class="font-mono text-foreground">{{ store.status?.sensorCount ?? '--' }}</span></span>
<span class="text-muted-foreground">重启: <span class="font-mono text-foreground">{{ store.status?.restartCount ?? 0 }}</span></span>
<span class="text-muted-foreground">事件: <span class="font-mono text-foreground">{{ store.eventCount }}</span></span>
<div class="flex items-center gap-1.5 ml-auto">
<!-- 启动中 loadingstarting=true 但状态还没变为 loading 时显示 -->
<Button v-if="store.starting && store.connState === 'idle'" size="xs" variant="outline" disabled>
<Loader2 class="size-3 animate-spin" />启动中
</Button>
<!-- 启动按钮未运行且非启动中时显示 -->
<Button v-if="store.connState === 'idle' && !store.starting" size="xs" :disabled="store.starting" @click="handleStart">
<Play class="size-3" />启动
</Button>
<!-- 提权按钮标志未启用时显示设置标志 + 以管理员权限重启 Thing -->
<Button v-if="!store.elevateOnLaunch" size="xs" variant="outline" class="gap-1 text-emerald-600 dark:text-emerald-400 border-emerald-500/40 hover:bg-emerald-500/10" :disabled="store.starting" title="以管理员权限重启 Thing(弹 UAC,ThingHK 子进程继承权限,后续启动自动提权,崩溃自动重启)" @click="handleElevateSelf">
<Loader2 v-if="store.starting" class="size-3 animate-spin" />
<ShieldCheck v-else class="size-3" />提权
</Button>
<!-- 取消提权按钮标志已启用时显示清除标志下次启动不触发 UAC -->
<Button v-else size="xs" variant="outline" class="gap-1 text-muted-foreground hover:text-foreground" title="取消提权,下次启动将以普通权限运行(不影响当前会话)" @click="handleCancelElevation">
<ShieldOff class="size-3" />取消提权
</Button>
<Button size="xs" variant="outline" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleRefresh">
<RefreshCw class="size-3" />刷新
</Button>
<Button size="xs" variant="outline" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleStop">
<Square class="size-3" />停止
</Button>
</div>
</div>
</CardContent>
</Card>
<!-- 断线提示 --> <!-- 断线提示 -->
<Card v-if="store.connState === 'disconnected'" class="md:col-span-3 border-orange-500/40 py-0 gap-0"> <Card v-if="store.connState === 'disconnected'" class="mt-2.5 border-orange-500/40 py-0 gap-0">
<CardContent class="pt-3 flex items-start gap-2 text-sm"> <CardContent class="pt-3 flex items-start gap-2 text-sm">
<AlertTriangle class="size-4 text-orange-500 mt-0.5 shrink-0" /> <AlertTriangle class="size-4 text-orange-500 mt-0.5 shrink-0" />
<div> <div>
@@ -1361,7 +1534,7 @@ watch(() => store.status?.ready, (ready, prev) => {
</Card> </Card>
<!-- 错误提示 --> <!-- 错误提示 -->
<Card v-if="store.errorMsg" class="md:col-span-3 border-red-500/40 py-0 gap-0"> <Card v-if="store.errorMsg" class="mt-2.5 border-red-500/40 py-0 gap-0">
<CardContent class="pt-3 flex items-start gap-2 text-sm"> <CardContent class="pt-3 flex items-start gap-2 text-sm">
<AlertTriangle class="size-4 text-red-500 mt-0.5 shrink-0" /> <AlertTriangle class="size-4 text-red-500 mt-0.5 shrink-0" />
<div> <div>
@@ -1370,7 +1543,7 @@ watch(() => store.status?.ready, (ready, prev) => {
</div> </div>
</CardContent> </CardContent>
</Card> </Card>
</div> </template>
</ScrollArea> </ScrollArea>
</TabsContent> </TabsContent>
@@ -1420,7 +1593,12 @@ watch(() => store.status?.ready, (ready, prev) => {
<div class="text-[11px] uppercase tracking-wide text-muted-foreground/70 mb-1">{{ typeLabel(typeGroup.type) }}</div> <div class="text-[11px] uppercase tracking-wide text-muted-foreground/70 mb-1">{{ typeLabel(typeGroup.type) }}</div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-0.5 text-xs"> <div class="grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-0.5 text-xs">
<div v-for="s in typeGroup.items" :key="s.id" class="flex justify-between items-center py-0.5"> <div v-for="s in typeGroup.items" :key="s.id" class="flex justify-between items-center py-0.5">
<span class="text-muted-foreground truncate pr-2" :title="s.name">{{ s.name }}</span> <Tooltip>
<TooltipTrigger as-child>
<span class="text-muted-foreground truncate pr-2">{{ s.name }}</span>
</TooltipTrigger>
<TooltipContent>{{ s.name }}</TooltipContent>
</Tooltip>
<span class="font-mono tabular-nums shrink-0" :class="{ 'text-muted-foreground/50': s.value == null }"> <span class="font-mono tabular-nums shrink-0" :class="{ 'text-muted-foreground/50': s.value == null }">
{{ s.value == null ? 'N/A' : s.value.toFixed(s.type === 'voltage' || s.type === 'power' ? 2 : 1) }} {{ s.value == null ? 'N/A' : s.value.toFixed(s.type === 'voltage' || s.type === 'power' ? 2 : 1) }}
<span class="text-muted-foreground ml-0.5">{{ s.unit }}</span> <span class="text-muted-foreground ml-0.5">{{ s.unit }}</span>
@@ -2012,6 +2190,20 @@ watch(() => store.status?.ready, (ready, prev) => {
@update:model-value="updateOsdConfig('clickThrough', Boolean($event))" @update:model-value="updateOsdConfig('clickThrough', Boolean($event))"
/> />
</div> </div>
<!-- 游戏全屏自动隐藏 -->
<div class="flex items-center justify-between">
<div class="flex flex-col gap-0.5">
<Label class="text-sm flex items-center gap-1.5 cursor-pointer">
<Gamepad2 class="size-3.5 text-muted-foreground" />
游戏全屏时自动隐藏
</Label>
<span class="text-[11px] text-muted-foreground">检测到全屏应用游戏前台时隐藏悬浮窗退出后自动恢复避免游戏掉帧</span>
</div>
<Switch
:model-value="osdConfig.gameAutoHide"
@update:model-value="updateOsdConfig('gameAutoHide', Boolean($event))"
/>
</div>
</div> </div>
<Separator /> <Separator />
@@ -2074,7 +2266,18 @@ watch(() => store.status?.ready, (ready, prev) => {
</Button> </Button>
</div> </div>
<div class="text-xs text-muted-foreground"> <div class="text-xs text-muted-foreground">
Kernel ProcessManager 统一管理应用启动时自动拉起崩溃自动重启 Kernel ProcessManager 统一管理崩溃自动重启
</div>
<!-- 应用启动时自动启动 toggle参照代理模块 -->
<div class="flex items-center justify-between rounded-md border p-3">
<div>
<p class="text-sm">应用启动时自动启动监控内核</p>
<p class="text-xs text-muted-foreground">软件启动时自动运行 ThingHK 内核</p>
</div>
<Switch
:model-value="store.autoStart"
@update:model-value="(v: boolean) => store.setAutoStart(v)"
/>
</div> </div>
</CardContent> </CardContent>
</Card> </Card>
@@ -2108,7 +2311,7 @@ watch(() => store.status?.ready, (ready, prev) => {
>{{ pathDisplay || pathShort }}</span> >{{ pathDisplay || pathShort }}</span>
<span v-else class="font-mono text-xs text-right cursor-default">{{ pathShort }}</span> <span v-else class="font-mono text-xs text-right cursor-default">{{ pathShort }}</span>
</TooltipTrigger> </TooltipTrigger>
<TooltipContent class="max-w-[400px] break-all">{{ store.kernelInfo.path ?? '' }}</TooltipContent> <TooltipContent class="max-w-[480px] break-words">{{ store.kernelInfo.path ?? '' }}</TooltipContent>
</Tooltip> </Tooltip>
<template v-if="store.kernelInfo.exists"> <template v-if="store.kernelInfo.exists">
<Tooltip> <Tooltip>
@@ -2270,6 +2473,28 @@ watch(() => store.status?.ready, (ready, prev) => {
</DialogContent> </DialogContent>
</Dialog> </Dialog>
<!-- 开启 OSD 但监控内核未运行提示 -->
<Dialog v-model:open="osdNeedsKernelOpen">
<DialogContent class="max-w-md">
<DialogHeader>
<DialogTitle class="flex items-center gap-2">
<TriangleAlert class="size-4 text-amber-500" />
需先启动监控内核
</DialogTitle>
<DialogDescription>
OSD 悬浮窗依赖监控内核提供数据当前内核未运行请先启动内核后再开启 OSD 显示
</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button variant="outline" @click="osdNeedsKernelOpen = false">取消</Button>
<Button @click="startKernelForOsd">
<Play class="size-3.5" />
启动内核
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
<!-- OSD 显示项选择 Dialog --> <!-- OSD 显示项选择 Dialog -->
<Dialog v-model:open="osdPickDialogOpen"> <Dialog v-model:open="osdPickDialogOpen">
<DialogContent class="max-w-lg"> <DialogContent class="max-w-lg">
+56 -33
View File
@@ -77,31 +77,19 @@ interface OsdConfig {
overlayY?: number | null overlayY?: number | null
} }
interface SensorEntry {
name: string
type: string
hardwareName: string
value: number | null
unit: string
}
interface SensorGroup {
id: string
sensors: SensorEntry[]
}
interface SensorSnapshot {
groups: SensorGroup[]
}
interface NetworkSpeed { interface NetworkSpeed {
downloadBps: number downloadBps: number
uploadBps: number uploadBps: number
} }
/** 配置通道载荷(低频:配置变化时推送) */
interface OsdStatePayload { interface OsdStatePayload {
config: OsdConfig config: OsdConfig
snapshot: SensorSnapshot | null }
/** 数据通道载荷(高频:仅显示项 key→value 映射 + 网速) */
interface OsdDataPayload {
data: Record<string, number | null>
networkSpeed: NetworkSpeed | null networkSpeed: NetworkSpeed | null
} }
@@ -333,7 +321,8 @@ function fmtFixedUnit(item: OsdItem): string {
// ===== ===== // ===== =====
const config = ref<OsdConfig | null>(null) const config = ref<OsdConfig | null>(null)
const snapshot = ref<SensorSnapshot | null>(null) /** 数据通道:显示项 key→value 映射(由主窗口每秒推送,替代全量快照) */
const dataMap = ref<Record<string, number | null>>({})
const networkSpeed = ref<NetworkSpeed | null>(null) const networkSpeed = ref<NetworkSpeed | null>(null)
let unlistenFns: UnlistenFn[] = [] let unlistenFns: UnlistenFn[] = []
@@ -341,15 +330,7 @@ let unlistenFns: UnlistenFn[] = []
function getOsdItemValue(item: OsdItem): number | null { function getOsdItemValue(item: OsdItem): number | null {
if (item.special === 'net-up') return networkSpeed.value?.uploadBps ?? null if (item.special === 'net-up') return networkSpeed.value?.uploadBps ?? null
if (item.special === 'net-down') return networkSpeed.value?.downloadBps ?? null if (item.special === 'net-down') return networkSpeed.value?.downloadBps ?? null
if (!snapshot.value) return null return dataMap.value[item.key] ?? null
for (const g of snapshot.value.groups) {
if (g.id !== item.groupId) continue
const s = g.sensors.find(s =>
s.hardwareName === item.hardwareName && s.name === item.sensorName && s.type === item.type
)
if (s) return s.value ?? null
}
return null
} }
// ===== ===== // ===== =====
@@ -463,6 +444,23 @@ function scheduleMeasure() {
}, 50) }, 50)
} }
/** '--'
* 导致 osd-bar 变宽仅靠配置变化触发测量不够需监听 osd-bar 尺寸变化
* 任何内容变宽/变高数据加载配置变更都自动重测上报驱动主窗口放大 */
let resizeObserver: ResizeObserver | null = null
function observeBarSize() {
resizeObserver?.disconnect()
resizeObserver = null
const root = osdRootEl.value
const bar = root?.querySelector<HTMLElement>('.osd-bar')
if (!bar) return
resizeObserver = new ResizeObserver(() => scheduleMeasure())
resizeObserver.observe(bar)
}
// config v-if osd-bar
watch(osdRootEl, () => { void nextTick(observeBarSize) })
// ===== 穿 ===== // ===== 穿 =====
// Tauri setIgnoreCursorEvents webview2 Rust WS_EX_TRANSPARENT // Tauri setIgnoreCursorEvents webview2 Rust WS_EX_TRANSPARENT
// WS_EX_TRANSPARENT Tauri webview2 穿 // WS_EX_TRANSPARENT Tauri webview2 穿
@@ -514,15 +512,26 @@ onMounted(async () => {
console.error('[OSD] 启动置顶监视失败:', e) console.error('[OSD] 启动置顶监视失败:', e)
} }
// OSD // OSD
unlistenFns.push(await listen<OsdStatePayload>('osd-state-update', (e) => { try {
await invoke('osd_start_game_watch')
} catch (e) {
console.error('[OSD] 启动游戏全屏监视失败:', e)
}
// OSD
unlistenFns.push(await listen<OsdStatePayload>(EVENTS.osdStateUpdate, (e) => {
config.value = e.payload.config config.value = e.payload.config
snapshot.value = e.payload.snapshot // //
networkSpeed.value = e.payload.networkSpeed
// /
scheduleMeasure() scheduleMeasure()
})) }))
// OSD keyvalue +
unlistenFns.push(await listen<OsdDataPayload>(EVENTS.osdDataUpdate, (e) => {
dataMap.value = e.payload.data
networkSpeed.value = e.payload.networkSpeed
}))
// UI // UI
unlistenFns.push(await listen(EVENTS.osdSystemUiActive, async () => { unlistenFns.push(await listen(EVENTS.osdSystemUiActive, async () => {
await applyTopmost(false) await applyTopmost(false)
@@ -531,6 +540,10 @@ onMounted(async () => {
unlistenFns.push(await listen(EVENTS.osdSystemUiInactive, async () => { unlistenFns.push(await listen(EVENTS.osdSystemUiInactive, async () => {
await applyTopmost(true) await applyTopmost(true)
})) }))
// +
//
await emit(EVENTS.osdConfigRequest)
}) })
/** 鼠标按下:仅在关闭穿透时响应左键拖动 */ /** 鼠标按下:仅在关闭穿透时响应左键拖动 */
@@ -548,6 +561,9 @@ onUnmounted(() => {
unlistenFns.forEach(fn => fn()) unlistenFns.forEach(fn => fn())
// 线 // 线
invoke('osd_stop_watch').catch(() => {}) invoke('osd_stop_watch').catch(() => {})
//
resizeObserver?.disconnect()
resizeObserver = null
}) })
</script> </script>
@@ -652,6 +668,13 @@ onUnmounted(() => {
display: inline-flex; display: inline-flex;
flex-wrap: nowrap; flex-wrap: nowrap;
align-items: stretch; align-items: stretch;
/* resize
若允许换行中文标签内存/网络会在旧窗口宽度内竖排禁止后仅临时溢出
随内容测量上报触发 setSize 立即恢复 */
white-space: nowrap;
/* osd-root100vw getBoundingClientRect
被旧窗口钳制的宽度而非真实内容宽度上报后 setSize 不变窗口永远无法变宽 */
flex-shrink: 0;
backdrop-filter: blur(8px); backdrop-filter: blur(8px);
padding: 3px 4px; padding: 3px 4px;
gap: 0; gap: 0;
+179
View File
@@ -0,0 +1,179 @@
<script setup lang="ts">
/**
* 概览页信息卡片模板统一 CPU/GPU/内存/网络/主板/电池/电源等硬件卡片的结构
* - 标题行图标 + 标题 + 右侧次要信息截断 + tooltip
* - 主体主指标大字+ 次指标右侧小字+ 负载进度条
* - #body 插槽可整体替换主体如存储卡的多盘列表
* - 编辑模式显示拖拽把手.overview-drag-handle与移除按钮
*/
import type { LucideIcon } from '@lucide/vue'
import { GripVertical } from '@lucide/vue'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { Button } from '@/components/ui/button'
import { Progress } from '@/components/ui/progress'
import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip'
import { computed, ref } from 'vue'
import { useElementSize } from '@vueuse/core'
import { fmt, loadColor } from './format'
export interface CardMetric {
/** 指标名(如 封装温度/功耗) */
label: string
/** 已格式化的值文本(null 数据传 '--',由 fmt 处理) */
text: string
/** 值后缀单位(小号弱化显示,可为 ' / 32.0 GB' 这类复合后缀) */
unit?: string
/** 值颜色 class(温度/负载等着色) */
colorClass?: string
/** 标签前小图标 */
labelIcon?: LucideIcon
}
export interface CardLoad {
label: string
value: number | null
}
export interface OverviewCardView {
/** 卡片类型 id(同目录卡片持久化标识) */
id: string
title: string
icon: LucideIcon
/** 右上角次要信息(型号等,截断 + tooltip 完整内容) */
subtitle?: string | null
/** tooltip 完整内容(默认同 subtitle */
subtitleFull?: string | null
/** 主指标(大字) */
main: CardMetric
/** 次指标(右侧小字) */
subs: CardMetric[]
/** 负载进度条(null 不显示) */
load?: CardLoad | null
/** 是否占满整行(如存储多盘列表) */
wide?: boolean
}
const props = withDefaults(defineProps<{
view: OverviewCardView
/** 编辑模式:显示拖拽把手与移除按钮 */
editing?: boolean
}>(), { editing: false })
defineEmits<{ remove: [] }>()
/**
* 型号显示文本超长时截断头部保留尾部 (TM) i5-10400
* 后缀型号核心部分通常最具辨识度完整内容见 tooltip
* 型号 span 自身为 flex-1宽度由布局决定不随内容变化直接测量它
* canvas 按该元素实际计算字体测量 + 二分查找保留最长尾部
* 编辑模式把手/删除按钮占位时 span 自动变窄截断随之收紧
*/
const subtitleRef = ref<HTMLElement | null>(null)
const { width: subtitleAvailWidth } = useElementSize(subtitleRef)
let measureCtx: CanvasRenderingContext2D | null = null
/** 按型号 span 的实际计算字体测量文本宽度;canvas 不可用时按字符数估算 */
function textWidth(text: string): number {
const el = subtitleRef.value
if (!measureCtx) measureCtx = document.createElement('canvas').getContext('2d')
if (!measureCtx || !el) return text.length * 7
const cs = getComputedStyle(el)
measureCtx.font = `${cs.fontWeight} ${cs.fontSize} ${cs.fontFamily}`
return measureCtx.measureText(text).width
}
const displaySubtitle = computed(() => {
const s = props.view.subtitle
if (!s) return s
const avail = subtitleAvailWidth.value - 2 // /
if (avail <= 0) return s // CSS truncate
if (textWidth(s) <= avail) return s
// n'' + n
let lo = 1
let hi = s.length
while (lo < hi) {
const mid = Math.ceil((lo + hi) / 2)
if (textWidth(`${s.slice(-mid)}`) <= avail) lo = mid
else hi = mid - 1
}
return `${s.slice(-lo)}`
})
</script>
<template>
<Card
:class="[
'py-0 gap-0 overflow-hidden',
view.wide ? 'col-span-full' : '',
]"
>
<CardHeader class="pb-1.5 px-3.5 pt-2.5">
<CardTitle class="flex items-center gap-1.5 text-sm">
<!-- 扁平单行 flex把手/图标/标题 + 型号flex-1 占满剩余+ 删除按钮 -->
<span
v-if="editing"
class="overview-drag-handle cursor-grab active:cursor-grabbing text-muted-foreground/40 hover:text-muted-foreground transition-colors no-native-drag shrink-0"
title="拖动排序"
>
<GripVertical class="size-3.5" />
</span>
<component :is="view.icon" class="size-4 text-primary shrink-0" />
<span class="truncate">{{ view.title }}</span>
<!-- 型号直接 flex 子项自动块化truncate 生效flex-1 宽度由布局决定 -->
<Tooltip v-if="view.subtitle">
<TooltipTrigger as-child>
<span ref="subtitleRef" class="min-w-0 flex-1 truncate text-right text-xs text-muted-foreground font-normal">{{ displaySubtitle }}</span>
</TooltipTrigger>
<!-- align=end触发 span flex-1 撑满标题行默认居中对齐会让 tooltip 落在卡片中央
对齐右缘使其出现在右对齐的型号文字正上方 -->
<TooltipContent align="end">{{ view.subtitleFull ?? view.subtitle }}</TooltipContent>
</Tooltip>
<span v-else class="flex-1" aria-hidden="true" />
<Button
v-if="editing"
size="icon-xs"
variant="ghost"
class="text-muted-foreground hover:text-destructive shrink-0"
title="移除卡片"
@click="$emit('remove')"
>
<span class="text-lg leading-none">×</span>
</Button>
</CardTitle>
</CardHeader>
<CardContent class="px-3.5 pb-2.5 space-y-1.5">
<!-- 自定义主体如存储多盘列表 -->
<slot name="body">
<!-- 主指标 + 次指标 -->
<div class="flex items-end justify-between gap-2">
<div class="min-w-0">
<div class="text-xs text-muted-foreground flex items-center gap-1">
<component :is="view.main.labelIcon" v-if="view.main.labelIcon" class="size-3 shrink-0" />
<span class="truncate">{{ view.main.label }}</span>
</div>
<div :class="['text-2xl font-bold tabular-nums leading-tight', view.main.colorClass]">
{{ view.main.text }}<span v-if="view.main.unit" class="text-sm font-normal text-muted-foreground">{{ view.main.unit }}</span>
</div>
</div>
<div v-for="sub in view.subs" :key="sub.label" class="text-right shrink-0">
<div class="text-xs text-muted-foreground flex items-center gap-1 justify-end">
<component :is="sub.labelIcon" v-if="sub.labelIcon" class="size-3 shrink-0" />
<span>{{ sub.label }}</span>
</div>
<div :class="['text-base font-medium tabular-nums', sub.colorClass]">
{{ sub.text }}<span v-if="sub.unit" class="text-xs text-muted-foreground ml-0.5 font-normal">{{ sub.unit }}</span>
</div>
</div>
</div>
<!-- 负载进度条 -->
<div v-if="view.load">
<div class="flex items-center justify-between text-xs mb-0.5">
<span class="text-muted-foreground">{{ view.load.label }}</span>
<span :class="['font-medium tabular-nums', loadColor(view.load.value)]">{{ fmt(view.load.value, 0) }}%</span>
</div>
<Progress :model-value="view.load.value ?? 0" class="h-1.5" />
</div>
</slot>
</CardContent>
</Card>
</template>

Some files were not shown because too many files have changed in this diff Show More