Compare commits
27
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e65825d3e | ||
|
|
ff1d5cd517 | ||
|
|
9e6d73e191 | ||
|
|
79bded1cd2 | ||
|
|
bccd21fde5 | ||
|
|
b018abd922 | ||
|
|
f6c1cc250e | ||
|
|
79c43d5340 | ||
|
|
8f853f7ef3 | ||
|
|
4f574cb5fa | ||
|
|
10a95ddeea | ||
|
|
069aa58c9f | ||
|
|
8e940f164b | ||
|
|
272246fb61 | ||
|
|
78d272859c | ||
|
|
70d2d4e1d0 | ||
|
|
706b32e1f2 | ||
|
|
3664120808 | ||
|
|
ffa410b399 | ||
|
|
d702ed0d31 | ||
|
|
27ad5d89a5 | ||
|
|
6b9f71da08 | ||
|
|
28e0c4664a | ||
|
|
d21649c60e | ||
|
|
4dd60f42a1 | ||
|
|
0a19b4b38a | ||
|
|
7d49a7395f |
No files matched your search
+7
-1
@@ -7,8 +7,14 @@ yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
# 发布暂存目录
|
||||
.trae
|
||||
.workbuddy
|
||||
.npm-cache
|
||||
.bun-tmp
|
||||
.uploads
|
||||
temp/
|
||||
release_stage/
|
||||
musicdl_outputs/
|
||||
|
||||
node_modules
|
||||
dist
|
||||
|
||||
@@ -1,618 +0,0 @@
|
||||
# 模块开发指南
|
||||
|
||||
本文档详细说明 Thing 应用的模块系统架构,帮助开发者快速理解并创建新模块。
|
||||
|
||||
## 架构概述
|
||||
|
||||
Thing 采用**统一模块注册机制**,每个模块通过 `index.ts` 自描述其全部配置(名称、图标、组件、搜索项、进程配置、生命周期钩子等),由中央注册表 `moduleRegistry` 统一管理。
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────┐
|
||||
│ main.ts │
|
||||
│ import './modules' (触发注册) │
|
||||
└──────────────────────┬──────────────────────────────┘
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────┐
|
||||
│ src/modules/index.ts │
|
||||
│ 聚合入口:导入所有模块配置并注册 │
|
||||
└──────────────────────┬──────────────────────────────┘
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────┐
|
||||
│ src/modules/registry.ts │
|
||||
│ ModuleRegistry 单例:注册 / 查询 / 组件懒加载 │
|
||||
└──────┬───────────────┬───────────────┬──────────────┘
|
||||
│ │ │
|
||||
▼ ▼ ▼
|
||||
App.vue Sidebar.vue GeneralSettings
|
||||
(组件加载) (侧边栏导航) (模块开关管理)
|
||||
```
|
||||
|
||||
## 核心文件说明
|
||||
|
||||
| 文件 | 职责 |
|
||||
|------|------|
|
||||
| `src/types/module.ts` | 模块配置类型定义 |
|
||||
| `src/modules/registry.ts` | 注册表单例:注册、查询、组件懒加载缓存 |
|
||||
| `src/modules/index.ts` | 聚合入口:导入并注册所有模块 |
|
||||
| `src/modules/icons.ts` | 模块图标映射表 |
|
||||
| `src/modules/<name>/index.ts` | 各模块的配置声明 |
|
||||
| `src/modules/<name>/*.vue` | 模块前端组件 |
|
||||
|
||||
## 模块配置类型
|
||||
|
||||
```typescript
|
||||
// src/types/module.ts
|
||||
|
||||
interface ModuleConfig {
|
||||
/** 模块唯一标识(如 'proxy'、'clipboard') */
|
||||
id: string
|
||||
/** 显示名称 */
|
||||
name: string
|
||||
/** 图标标识(对应 icons.ts 中的 key) */
|
||||
icon: string
|
||||
/** 模块描述(显示在设置界面的模块管理中) */
|
||||
description: string
|
||||
/** 模块分类 */
|
||||
category: 'network' | 'tool' | 'system' | 'media'
|
||||
/** 默认是否启用(默认 true) */
|
||||
defaultEnabled?: boolean
|
||||
/** 是否为内置模块(不可禁用,如设置模块) */
|
||||
builtin?: boolean
|
||||
/** 懒加载组件的 loader 函数(推荐) */
|
||||
loader?: () => Promise<{ default: Component }>
|
||||
/** 直接组件引用(内置模块可用,无需懒加载) */
|
||||
component?: Component
|
||||
/** 全局搜索项 */
|
||||
searchItems?: SearchIndexItem[]
|
||||
/** 进程配置(需要管理子进程的模块填写) */
|
||||
process?: ModuleProcessConfig
|
||||
/** 生命周期钩子 */
|
||||
lifecycle?: ModuleLifecycle
|
||||
/** 排序权重(数值越小越靠前,默认 100) */
|
||||
order?: number
|
||||
}
|
||||
```
|
||||
|
||||
## 创建新模块
|
||||
|
||||
### 第 1 步:创建模块目录
|
||||
|
||||
```
|
||||
src/modules/my-module/
|
||||
├── index.ts # 模块配置
|
||||
└── MyModule.vue # 前端组件
|
||||
```
|
||||
|
||||
### 第 2 步:编写模块配置
|
||||
|
||||
```typescript
|
||||
// src/modules/my-module/index.ts
|
||||
import type { ModuleConfig } from '@/types/module'
|
||||
|
||||
export const moduleConfig: ModuleConfig = {
|
||||
id: 'my-module',
|
||||
name: '我的模块',
|
||||
icon: 'my-module', // 需在 icons.ts 中添加映射
|
||||
description: '模块功能描述',
|
||||
category: 'tool',
|
||||
defaultEnabled: true,
|
||||
loader: () => import('./MyModule.vue'),
|
||||
searchItems: [
|
||||
{
|
||||
title: '功能名称',
|
||||
description: '功能描述',
|
||||
keywords: ['关键词1', '关键词2', 'keyword']
|
||||
}
|
||||
],
|
||||
order: 70
|
||||
}
|
||||
```
|
||||
|
||||
### 第 3 步:注册模块
|
||||
|
||||
在 `src/modules/index.ts` 中添加导入:
|
||||
|
||||
```typescript
|
||||
import { moduleConfig as myModule } from './my-module'
|
||||
|
||||
const allModules: ModuleConfig[] = [
|
||||
// ... 已有模块
|
||||
myModule
|
||||
]
|
||||
|
||||
moduleRegistry.registerAll(allModules)
|
||||
```
|
||||
|
||||
### 第 4 步:添加图标映射
|
||||
|
||||
在 `src/modules/icons.ts` 中添加:
|
||||
|
||||
```typescript
|
||||
import { Wrench } from '@lucide/vue' // 选择合适的图标
|
||||
|
||||
export const moduleIconMap: Record<string, Component> = {
|
||||
// ... 已有映射
|
||||
'my-module': Wrench
|
||||
}
|
||||
```
|
||||
|
||||
### 第 5 步(可选):添加 Rust 后端命令
|
||||
|
||||
如果模块需要 Rust 后端支持,在 `src-tauri/src/` 中创建命令模块,并在 `lib.rs` 的 `invoke_handler` 中注册。
|
||||
|
||||
## 进程管理
|
||||
|
||||
需要管理外部子进程的模块(如 mihomo)通过 `ModuleProcessConfig` 声明进程配置。下载器模块使用进程内自建下载引擎,不涉及外部子进程管理。
|
||||
|
||||
### 配置示例
|
||||
|
||||
```typescript
|
||||
// src/modules/proxy/index.ts
|
||||
export const moduleConfig: ModuleConfig = {
|
||||
// ...
|
||||
process: {
|
||||
name: 'mihomo', // 进程标识
|
||||
executable: '', // 可执行文件路径(运行时确定)
|
||||
args: ['-f', 'config.yaml'], // 启动参数
|
||||
autoStart: false, // 模块启用时是否自动启动
|
||||
restartOnCrash: true, // 崩溃后自动重启
|
||||
maxRestarts: 3 // 最大重启次数(0 = 不限制)
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 前端 API
|
||||
|
||||
```typescript
|
||||
import { useProcessStore } from '@/stores/processStore'
|
||||
|
||||
const processStore = useProcessStore()
|
||||
|
||||
// 通过模块 ID 启动进程(自动读取模块配置)
|
||||
await processStore.startByModule('proxy')
|
||||
|
||||
// 停止进程
|
||||
await processStore.stopByModule('proxy')
|
||||
|
||||
// 获取进程状态(从缓存读取)
|
||||
const status = processStore.getProcessStatus('proxy')
|
||||
// status.status: 'running' | 'stopped' | 'crashed' | 'starting'
|
||||
|
||||
// 刷新所有进程状态
|
||||
await processStore.refreshAll()
|
||||
```
|
||||
|
||||
### 自动化行为
|
||||
|
||||
模块启用/禁用时,`appStore.toggleModule` 会自动处理:
|
||||
|
||||
| 操作 | 禁用模块 | 启用模块 |
|
||||
|------|----------|----------|
|
||||
| 进程 | 停止运行中的进程 | 若 `autoStart` 为 true,启动进程 |
|
||||
| 搜索项 | 移除该模块的搜索项 | 恢复该模块的搜索项 |
|
||||
| 组件缓存 | 清除组件缓存,释放内存 | 下次访问时重新懒加载 |
|
||||
| 生命周期 | 调用 `onDisable` 钩子 | 调用 `onEnable` 钩子 |
|
||||
| 侧边栏 | 从侧边栏隐藏 | 在侧边栏显示 |
|
||||
| Toast 通知 | 显示"已禁用 {模块名}" | 显示"已启用 {模块名}" |
|
||||
|
||||
## 生命周期钩子
|
||||
|
||||
```typescript
|
||||
interface ModuleLifecycle {
|
||||
/** 模块首次加载时调用 */
|
||||
onInit?: () => void | Promise<void>
|
||||
/** 模块组件挂载时调用(切换到该模块) */
|
||||
onActivate?: () => void | Promise<void>
|
||||
/** 模块组件卸载时调用(切换离开该模块) */
|
||||
onDeactivate?: () => void | Promise<void>
|
||||
/** 模块被禁用时调用 */
|
||||
onDisable?: () => void | Promise<void>
|
||||
/** 模块被启用时调用 */
|
||||
onEnable?: () => void | Promise<void>
|
||||
}
|
||||
```
|
||||
|
||||
使用示例:
|
||||
|
||||
```typescript
|
||||
export const moduleConfig: ModuleConfig = {
|
||||
// ...
|
||||
lifecycle: {
|
||||
onEnable: async () => {
|
||||
console.log('模块已启用')
|
||||
// 初始化资源、建立连接等
|
||||
},
|
||||
onDisable: async () => {
|
||||
console.log('模块已禁用')
|
||||
// 释放资源、关闭连接等
|
||||
},
|
||||
onActivate: () => {
|
||||
console.log('用户切换到本模块')
|
||||
// 开始实时数据更新等
|
||||
},
|
||||
onDeactivate: () => {
|
||||
console.log('用户离开本模块')
|
||||
// 暂停实时更新以节省资源
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## 全局搜索
|
||||
|
||||
模块通过 `searchItems` 声明可被全局搜索的功能项。用户在标题栏搜索框输入关键词时,匹配的搜索项会显示在结果列表中。
|
||||
|
||||
```typescript
|
||||
searchItems: [
|
||||
{
|
||||
title: '代理设置', // 显示标题
|
||||
description: '配置网络代理', // 显示描述
|
||||
keywords: ['代理', 'proxy', '网络'] // 匹配关键词
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
如果搜索项需要执行特定操作(如跳转到子页面、触发命令),在模块组件挂载时通过 `searchStore.registerAction` 注册:
|
||||
|
||||
```typescript
|
||||
import { useSearchStore } from '@/stores/searchStore'
|
||||
|
||||
const searchStore = useSearchStore()
|
||||
|
||||
onMounted(() => {
|
||||
// 注册第 0 个搜索项的 action
|
||||
searchStore.registerAction('my-module', 0, () => {
|
||||
// 跳转到特定子页面或执行操作
|
||||
activeTab.value = 'settings'
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
## 模块分类
|
||||
|
||||
| 分类 | 说明 | 适用场景 |
|
||||
|------|------|----------|
|
||||
| `network` | 网络相关 | 代理、下载器、网络工具 |
|
||||
| `tool` | 实用工具 | 剪贴板、文件搜索、文本处理 |
|
||||
| `system` | 系统相关 | 硬件监控、系统设置 |
|
||||
| `media` | 媒体相关 | 截图、录屏、图片处理 |
|
||||
|
||||
分类目前用于元信息标记,未来可用于设置界面的分组展示。
|
||||
|
||||
## 模块禁用机制详解
|
||||
|
||||
当用户在设置页面切换模块开关时:
|
||||
|
||||
```
|
||||
用户点击开关
|
||||
│
|
||||
▼
|
||||
appStore.toggleModule(moduleId, enabled)
|
||||
│
|
||||
├─ 禁用时:
|
||||
│ ├─ searchStore.unregisterModule(moduleId) // 移除搜索项
|
||||
│ ├─ processStore.stopByModule(moduleId) // 停止进程
|
||||
│ ├─ config.lifecycle?.onDisable?.() // 生命周期钩子
|
||||
│ ├─ moduleRegistry.clearComponentCache(id) // 清除组件缓存
|
||||
│ ├─ modules[id].enabled = false // 更新状态
|
||||
│ └─ toast.success('已禁用 {模块名}') // 通知用户
|
||||
│
|
||||
└─ 启用时:
|
||||
├─ modules[id].enabled = true // 更新状态
|
||||
├─ config.lifecycle?.onEnable?.() // 生命周期钩子
|
||||
├─ searchStore.registerItem(...) // 恢复搜索项
|
||||
├─ processStore.startByModule(moduleId) // 启动进程(若 autoStart)
|
||||
└─ toast.success('已启用 {模块名}') // 通知用户
|
||||
```
|
||||
|
||||
禁用后的效果:
|
||||
- 模块从侧边栏导航中隐藏
|
||||
- 模块的搜索项从全局搜索中移除
|
||||
- 模块的后台进程被停止
|
||||
- 模块的组件缓存被清除,释放内存
|
||||
- 如果当前正在查看被禁用的模块,自动切换到第一个可用模块
|
||||
|
||||
## 注意事项
|
||||
|
||||
1. **模块 ID 必须唯一**:重复注册会被忽略并输出警告
|
||||
2. **图标必须映射**:模块配置中的 `icon` 字符串必须在 `icons.ts` 中有对应映射,否则回退到 Settings 图标
|
||||
3. **懒加载优先**:使用 `loader` 而非 `component`,避免首屏加载所有模块代码
|
||||
4. **避免循环依赖**:模块的 `index.ts` 只导出配置,不导入其他模块的 store
|
||||
5. **进程配置的 executable**:通常留空,由模块组件在运行时根据用户设置确定实际路径
|
||||
6. **内置模块**:设置 `builtin: true` 的模块不可被用户禁用,开关处于禁用状态
|
||||
|
||||
## 跨模块开发经验(代理模块沉淀)
|
||||
|
||||
以下要点来自代理模块开发,对后续涉及子进程管理、外部 API 交互、shadcn-vue 组件使用的模块同样适用。
|
||||
|
||||
### Tauri 命令与主线程
|
||||
|
||||
- **同步命令(`pub fn`)会阻塞主线程**:Tauri 的同步命令在主线程执行,其内部的 `std::thread::sleep`、磁盘 I/O、网络请求会阻塞所有 async 命令的调度。涉及等待/阻塞操作的命令必须声明为 `pub async fn`,并用 `tauri::async_runtime::spawn_blocking(|| { std::thread::sleep(...) }).await` 将阻塞操作放到线程池。
|
||||
- **Windows 端口释放有延迟**:`child.kill()` + `child.wait()` 后 TCP 端口不会立即可用,需等待约 800ms 再重新绑定。重启类命令应预留此延迟。
|
||||
- **`Mutex` 持锁期间禁止 sleep**:`ProcessManager::check_and_cleanup` 等持锁函数中不要执行长时间 sleep,否则会阻塞所有需要该锁的命令(如状态查询)。应先释放锁再 sleep,或移出临界区。
|
||||
- **进程监控线程**:`start_monitoring_thread` 每 3 秒检查一次进程状态,崩溃时自动重启(可配置 `maxRestarts`)。前端通过监听 `process-status-changed` 事件更新 UI。
|
||||
|
||||
### 外部 API 交互
|
||||
|
||||
- **API 就绪轮询**:子进程 spawn 后 API 不会立即可用(需初始化配置、加载 geo 文件等)。前端应在请求前轮询健康检查接口(如 `/version`),500ms 间隔、10s 超时。
|
||||
- **缓存配置避免频繁读盘**:后端 Manager 每次方法调用都从磁盘读 settings 会拖慢批量操作。建议在 Manager 内维护内存缓存,`save_settings` 时同步更新。
|
||||
- **并发请求限流**:批量测速等场景不要一次性 `Promise.all` 全部请求,应分批(如每批 20 个),避免压垮子进程。
|
||||
|
||||
### shadcn-vue / reka-ui 注意事项
|
||||
|
||||
- **Select 禁止空字符串 value**:`<SelectItem value="">` 会触发警告并失效。使用哨兵值(如 `__default__`、`__all__`)替代空字符串,在 `@update:model-value` 回调中转回空值。
|
||||
- **Select 双击问题**:reka-ui Select 的 DismissableLayer + closeAutoFocus 会导致连续点击两个 Select 时第一次点击仅关闭上一个、需第二次点击才打开下一个。当前未完美解决,建议同一界面避免放置过多相邻 Select。
|
||||
- **Switch 使用 `model-value` / `update:model-value`**:reka-ui v2+ 的 Switch 不再使用 `checked` / `update:checked`。
|
||||
- **Sonner toast 不可见**:通常是缺少 `vue-sonner/lib/index.css` 导入,而非 z-index 问题。确保在入口处导入该 CSS。
|
||||
- **AlertDialog 替代 confirm()**:原生 `confirm()` 在 Tauri WebView 中样式不一致,使用 shadcn-vue AlertDialog 封装 Promise 化的 `showConfirm()` 函数,支持 destructive 样式。
|
||||
|
||||
### 数据一致性与自愈
|
||||
|
||||
- **配置文件与磁盘 reconcile**:settings.json 中的列表(如订阅 profiles)可能与磁盘文件不同步(用户手动删除、反序列化失败被 default 覆盖)。每次 `load_settings` 时应扫描磁盘补全缺失条目,并在 `currentProfile` 为 null 时自动指向第一个。
|
||||
- **操作顺序防重复**:导入文件后写入 settings 时,若先写文件再 load_settings(含 reconcile 扫盘),reconcile 会扫到新文件添加一次,随后 push 又添加一次。应先 load_settings → 写文件 → push(加去重保护)。
|
||||
- **子进程崩溃循环防护**:子进程因依赖文件损坏(如 geo 数据库)崩溃时,`restart_on_crash` 会反复重启。需配置备用下载源(如 jsdelivr 镜像)避免无代理时 GitHub 超时。
|
||||
|
||||
### UI 细节
|
||||
|
||||
- **瀑布流布局避免卡片等高撑开**:使用 `columns-1 md:columns-2 gap-4 [&>*]:mb-4 [&>*]:break-inside-avoid` 替代 `grid`,让卡片按内容高度自然排列。
|
||||
- **模块禁用清理系统状态**:模块 `onDisable` 钩子应清理系统级副作用(如系统代理注册表项),避免模块停用后遗留导致系统异常。
|
||||
- **应用退出清理**:在 `lib.rs` 的 `quit_app` 命令和托盘退出事件中都要调用 `cleanup_on_exit` + `stop_all`,确保任何退出路径都清理干净。
|
||||
|
||||
## 近期重要变更(影响其他模块开发)
|
||||
|
||||
以下是最近几次改动中确立的约定和模式,开发新模块时需遵循。
|
||||
|
||||
### 后端:子进程启动必须隐藏控制台窗口
|
||||
|
||||
`process_manager.rs` 暴露了公共函数 `setup_creation_flags(cmd: &mut Command)`,Windows 上会设置 `CREATE_NO_WINDOW` 标志。
|
||||
|
||||
**所有用 `std::process::Command` 启动外部程序的地方都必须调用它**,否则会弹出黑色控制台窗口(即使程序是后台运行)。包括:
|
||||
|
||||
- `ProcessManager::start()` 启动 mihomo 等内核
|
||||
- `ProcessManager::check_and_cleanup()` 崩溃重启
|
||||
- 任何调用 `mihomo.exe -v` 等查询版本的场景
|
||||
|
||||
跨平台:非 Windows 平台该函数为空实现,无需条件编译。
|
||||
|
||||
```rust
|
||||
use crate::process_manager::setup_creation_flags;
|
||||
|
||||
let mut cmd = std::process::Command::new(&path);
|
||||
cmd.arg("-v");
|
||||
setup_creation_flags(&mut cmd); // 必须调用
|
||||
cmd.stdout(Stdio::piped()).stderr(Stdio::null()).stdin(Stdio::null());
|
||||
```
|
||||
|
||||
### 后端:长时间 wait() 不要阻塞主线程
|
||||
|
||||
`ProcessManager::stop()` 中 `child.kill()` 是快速的,但 `child.wait()` 可能阻塞几十到几百毫秒。**wait() 已移到后台线程**:
|
||||
|
||||
```rust
|
||||
thread::spawn(move || {
|
||||
let _ = entry.child.wait();
|
||||
});
|
||||
```
|
||||
|
||||
新模块若有类似的"终止外部进程"逻辑,也应遵循此模式,避免 Tauri 命令阻塞导致前端卡顿。
|
||||
|
||||
### 后端:内核/二进制下载用流式 + 事件推送
|
||||
|
||||
`mihomo_manager/` 目录(`kernel.rs`)的 `install_kernel` 确立了"下载二进制资源"的标准模式,未来若有其他模块需要下载外部内核时应复用:
|
||||
|
||||
- **流式下载**:`reqwest::Response::bytes_stream()` + `futures_util::StreamExt`,避免大文件一次性读入内存
|
||||
- **进度事件**:通过 `app.emit("xxx-install-progress", progress)` 推送,事件载荷结构参考 `InstallProgress`
|
||||
- **事件节流**:仅在百分比变化 ≥1% 时 emit,避免事件轰炸
|
||||
- **zip 解压**:用 `zip` crate(纯 Rust),不要用 PowerShell `Expand-Archive`(有执行策略问题)
|
||||
- **文件名匹配**:解压后用 `find_exe_in_dir` 查找 `.exe`(zip 内文件名可能含版本号,不是固定名字),找到后重命名为标准名
|
||||
|
||||
### 后端:GitHub API rate limit 规避
|
||||
|
||||
`check_kernel_update` 采用 **API 优先 + 重定向回退** 策略:
|
||||
|
||||
1. 先调 `api.github.com/.../releases/latest`(能拿完整资产列表,命名变化时更健壮)
|
||||
2. 失败(403 rate limit / 网络错误)时回退到访问 `github.com/.../releases/latest`,从 302 重定向的最终 URL 提取版本号,按稳定命名规则构造下载 URL
|
||||
|
||||
**新模块若需要查 GitHub 最新版本,应复用此模式**,不要直接调 API(未认证 60次/小时/IP 极易超限)。
|
||||
|
||||
### 后端:资产命名规则适配
|
||||
|
||||
mihomo v1.19+ 改了 Windows 资产命名,按 CPU 微架构分级:
|
||||
|
||||
- 旧:`mihomo-windows-amd64-vX.X.X.zip`(已废弃)
|
||||
- 新:`mihomo-windows-amd64-v3-vX.X.X.zip`(v1/v2/v3 对应 CPU level)
|
||||
|
||||
`fetch_latest_via_api` 中的匹配优先级:v3 标准 > v3-go124 > v3-go123 > v3 其他 > v2 > v1 > 旧命名。若未来其他内核也有类似分级,参考此优先级策略。
|
||||
|
||||
### 前端:Transition 内的 v-if/v-else 必须加 key
|
||||
|
||||
**这是 dev 模式的坑**。`<Transition mode="out-in">` 内的 `v-if`/`v-else` 分支如果缺 `:key`,Vue 3.5.x dev 模式下会触发 `__vnode` 写入竞态,导致:
|
||||
|
||||
- 控制台报错 `Cannot set properties of null (setting '__vnode')`
|
||||
- vnode 树损坏,所有事件派发失效(按钮点击没反应)
|
||||
- **build 模式不报错**(生产构建剥除了 `__vnode` instrumentation),容易漏掉
|
||||
|
||||
**约定**:`<Transition>` 内所有分支(v-if/v-else-if/v-else)都必须加 `:key`,即使是原生 div 也要加。
|
||||
|
||||
```vue
|
||||
<Transition name="fade" mode="out-in">
|
||||
<ComponentA v-if="cond" key="a" />
|
||||
<div v-else key="empty">占位</div>
|
||||
</Transition>
|
||||
```
|
||||
|
||||
`ModuleContainer.vue` 和 `ProxyModule.vue` 的 Progress 区块已修复,新模块开发时注意。
|
||||
|
||||
### 前端:模块内 Tabs 顶部固定模式
|
||||
|
||||
模块根容器用 `h-full overflow-hidden flex flex-col`,Tabs 用 `flex-1 min-h-0 flex flex-col`,TabsList 加 `shrink-0`,TabsContent 加 `flex-1 min-h-0 overflow-y-auto`:
|
||||
|
||||
```vue
|
||||
<div class="h-full p-6 overflow-hidden flex flex-col">
|
||||
<Tabs v-model="tab" class="flex-1 min-h-0 flex flex-col">
|
||||
<TabsList class="shrink-0">...</TabsList>
|
||||
<TabsContent value="x" class="flex-1 min-h-0 overflow-y-auto">...</TabsContent>
|
||||
</Tabs>
|
||||
</div>
|
||||
```
|
||||
|
||||
这样 TabsList 固定在顶部,只有 TabsContent 滚动。`min-h-0` 是 flex 子元素 overflow 生效的关键,不能省。
|
||||
|
||||
### 前端:Tauri 事件监听需在 store 中管理生命周期
|
||||
|
||||
`proxyStore.ts` 的 `installKernel` 确立了模式:
|
||||
|
||||
- 监听在方法调用时注册,`finally` 块中取消
|
||||
- 用模块级变量保存 `UnlistenFn`,避免重复注册
|
||||
- 错误事件由后端保证 emit(前端不重复弹 toast,统一由 watch 处理)
|
||||
|
||||
```typescript
|
||||
let progressUnlisten: UnlistenFn | null = null
|
||||
const installKernel = async () => {
|
||||
if (!progressUnlisten) {
|
||||
progressUnlisten = await listen<Progress>('xxx-progress', (e) => {
|
||||
progress.value = e.payload
|
||||
})
|
||||
}
|
||||
try {
|
||||
await invoke('xxx_command')
|
||||
} finally {
|
||||
if (progressUnlisten) {
|
||||
progressUnlisten()
|
||||
progressUnlisten = null
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 前端:窗口隐藏前 blur 焦点
|
||||
|
||||
TitleBar 的关闭按钮实际是 `hide()` 到托盘。webview 快速隐藏时浏览器 `mouseleave` 可能不触发,导致从托盘恢复后按钮仍显示 hover 高亮。
|
||||
|
||||
**修复**:`hide()` 前调用 `document.activeElement.blur()`,并监听 `onFocusChanged` 在窗口重新获得焦点时再 blur 一次。新模块若有类似的"隐藏窗口"操作(如全局快捷键隐藏),同样需要 blur。
|
||||
|
||||
### 前端:浮动标签切换器(TabsList 滚动遮挡时在 TitleBar 显示)
|
||||
|
||||
模块详情页内容滚动时,顶部 `TabsList` 会被 `TitleBar` 遮挡,导致用户必须滚回顶部才能切换 Tab。已抽取通用 composable `src/lib/use-module-tabs.ts` 自动处理。
|
||||
|
||||
**接入方式**(任何使用 Tabs 的模块都可用,代理/下载器模块已接入):
|
||||
|
||||
```ts
|
||||
// 模块 <script setup> 顶部
|
||||
import { useModuleTabs } from '@/lib/use-module-tabs'
|
||||
|
||||
const activeTab = ref('overview')
|
||||
const tabsListRef = useModuleTabs(activeTab, [
|
||||
{ value: 'overview', label: '概览' },
|
||||
{ value: 'settings', label: '设置' }
|
||||
])
|
||||
```
|
||||
|
||||
```vue
|
||||
<!-- 模板中给 TabsList 包一层带 ref 的 div -->
|
||||
<Tabs v-model="activeTab">
|
||||
<div ref="tabsListRef">
|
||||
<TabsList>...</TabsList>
|
||||
</div>
|
||||
<TabsContent .../>
|
||||
</Tabs>
|
||||
```
|
||||
|
||||
**工作原理**:
|
||||
- composable 内部在 `onMounted` 时注册标签到 `moduleTabsStore`,`onUnmounted` 时注销
|
||||
- 用 `IntersectionObserver`(`rootMargin: '-44px 0px 0px 0px'` 裁剪 TitleBar 高度)监听 TabsList 可见性
|
||||
- 滚动遮挡时 `TitleBar` 中"Thing"标题右侧自动显示浮动切换按钮(带淡入+左滑动画)
|
||||
- 双向 watch 同步本地 `activeTab` 与 store,用户点击 TitleBar 浮动按钮也能切换模块内 Tab
|
||||
|
||||
**约束**:TitleBar 高度固定 40px(h-10),composable 已用 44px 裁剪(含 4px 缓冲);store 是单例,一个模块同一时间只能注册一组标签。
|
||||
|
||||
### 前端:内核路径用 %APPDATA% 简化显示
|
||||
|
||||
内核路径较长(如 `C:\Users\xxx\AppData\Roaming\thing.lfeng.me\proxy\cores\mihomo.exe`),展示时用 `%APPDATA%` 替换前缀,并提供复制完整路径 / 在文件夹中显示两个按钮。代理和下载器模块的内核管理区块已采用此模式。
|
||||
|
||||
```ts
|
||||
import { appDataDir } from '@tauri-apps/api/path'
|
||||
|
||||
const appDataPath = ref('')
|
||||
onMounted(async () => {
|
||||
try { appDataPath.value = await appDataDir() } catch {}
|
||||
})
|
||||
|
||||
const pathDisplay = computed(() => {
|
||||
const p = store.kernel?.path
|
||||
if (!p) return ''
|
||||
if (appDataPath.value && p.toLowerCase().startsWith(appDataPath.value.toLowerCase())) {
|
||||
return '%APPDATA%' + p.slice(appDataPath.value.length)
|
||||
}
|
||||
return p
|
||||
})
|
||||
```
|
||||
|
||||
`<title>` 放完整路径,显示文本用 `pathDisplay`,复制时复制完整路径。
|
||||
|
||||
### 前端:任务历史持久化(下载器模块模式)
|
||||
|
||||
下载引擎在进程内运行,状态通过 `engine_state.json` 持久化到磁盘。前端 store 的做法:
|
||||
|
||||
- `onMounted` 时调用 `store.init()`,一次性加载 status/settings/extensionInfo/tasks
|
||||
- 通过 Tauri 事件 `download-progress`、`download-complete`、`download-added` 实时更新任务状态
|
||||
- 引擎在 `Storage::new` 时自动创建数据目录,`save` 时兜底重建父目录,避免路径不存在错误
|
||||
|
||||
此模式适用于任何"引擎在进程内运行、状态需持久化"的场景。
|
||||
|
||||
### 前端:轻量设置 Dialog(替代独立 Tab)
|
||||
|
||||
模块设置项较多时,传统做法是单独开一个"设置"Tab。但任务页工具栏需要快速调整少量核心设置(如下载目录、并发数),切到设置 Tab 再切回来体验割裂。
|
||||
|
||||
**模式**:在任务工具栏放一个"下载设置"按钮,点击弹出 Dialog,包含核心设置项(与设置页共用 `store.settings`),保存时调用 `handleSaveSettings`(引擎立即应用新配置,无需重启)并自动关闭弹窗。完整设置仍保留在"设置"Tab。
|
||||
|
||||
适用场景:需要在任务页快速调整的少量高频设置;若设置项不多,可完全用 Dialog 替代设置 Tab。
|
||||
|
||||
### 后端:opener 插件 scope 限制与绕过
|
||||
|
||||
`tauri-plugin-opener` 的 `opener:allow-open-path` 权限默认 **无 scope**,IPC `open_path` 命令会拒绝任何路径并报错 `Not allowed to open path`。
|
||||
|
||||
**解决方案**:在 Rust 端写一个自定义命令,用 `OpenerExt::opener().open_path()` 直接调用(绕过 IPC scope 检查):
|
||||
|
||||
```rust
|
||||
use tauri_plugin_opener::OpenerExt;
|
||||
|
||||
#[tauri::command]
|
||||
pub fn my_open_dir(app: AppHandle, path: String) -> Result<(), String> {
|
||||
let p = std::path::Path::new(&path);
|
||||
if !p.exists() {
|
||||
return Err(format!("路径不存在: {}", path));
|
||||
}
|
||||
app.opener().open_path(path, None::<&str>).map_err(|e| e.to_string())
|
||||
}
|
||||
```
|
||||
|
||||
在 `lib.rs` 的 `invoke_handler` 中注册,前端通过 `invoke('my_open_dir', { path })` 调用。下载器模块的"打开下载目录"已采用此方案。
|
||||
|
||||
### 前端:剩余时间(ETA)可读化
|
||||
|
||||
下载卡片直接显示 `(total-completed)/speed` 会得到 `17.217666215634114 B` 这种难懂的字节数。应格式化为时间:
|
||||
|
||||
```ts
|
||||
const formatEta = (seconds: number): string => {
|
||||
if (!isFinite(seconds) || seconds <= 0) return ''
|
||||
if (seconds < 60) return `剩余 ${Math.ceil(seconds)} 秒`
|
||||
if (seconds < 3600) {
|
||||
const m = Math.floor(seconds / 60)
|
||||
const s = Math.ceil(seconds % 60)
|
||||
return `剩余 ${m} 分 ${s} 秒`
|
||||
}
|
||||
const h = Math.floor(seconds / 3600)
|
||||
const m = Math.ceil((seconds % 3600) / 60)
|
||||
return `剩余 ${h} 小时 ${m} 分`
|
||||
}
|
||||
```
|
||||
|
||||
`getEta(task) = (totalLength - completedLength) / downloadSpeed`,speed≤0 时返回 0(不显示)。
|
||||
|
||||
### 前端:状态统计用 Badge 替代纯文本
|
||||
|
||||
下载任务工具栏的速度/活跃/等待/已完成数量,以及代理概览页的内核状态/版本,从纯文本改为 `Badge variant="secondary"` 或带颜色的 `Badge`(绿色已安装/红色未安装),视觉更醒目。新模块的状态展示建议统一用 Badge。
|
||||
|
||||
### 后端:应用退出清理(单一出口)
|
||||
|
||||
退出清理已收敛到 `lib.rs` 的 `RunEvent::ExitRequested` 分支(P0-1/V7):`quit_app` 命令与托盘退出项都只触发 `app.exit(0)`,清理逻辑(`cleanup_on_exit` + `stop_all`)只在该分支执行一次。新增管理子进程的模块时,在 `ExitRequested` 分支注册自己的 `cleanup_on_exit` 即可,不要在命令或托盘路径重复清理。
|
||||
@@ -0,0 +1,667 @@
|
||||
# 音乐模块 · 本地音乐解密规划(Music Decrypt Plan)
|
||||
|
||||
> 状态:**P0 + P1a + P1c 已实施并完成真机端到端验证**(2026-09-27:网易云解密 + QQ音乐离线解密 + 文件夹批量 + musicex 在线取密钥,用真实 192kHz/24bit `.mflac` 样本跑通全链路;Rust 单测 204 项全库通过)
|
||||
> 定位:音乐模块的「本地解密」子能力,不是独立模块——挂靠 `music` 模块新增「解密」页签,Rust 侧新增 `music/decrypt/` 子模块;`ncm` 与 `qmc` 均为纯 Rust 离线引擎,QQ 按「内嵌 ekey 离线 → musicex 在线取密钥」分层(Frida 降为 P2 兜底)
|
||||
> 日期:2026-09-27(同日修订:QQ 分层重排、ncm 算法细节补全)
|
||||
> 关联文档:`AI_DEV_GUIDE.md`(模块注册 / IPC 范式——注意 specta 绑定见 `lib.rs` 的 `export_bindings()`)、`MUSIC_REMOTE_PLAN.md`(规划文档范式)
|
||||
> 参考项目与**许可分档**:
|
||||
> - `taurusxin/ncmdump`(<https://github.com/taurusxin/ncmdump>,**MIT**)——§3.1 全部算法细节的对照物,**可逐行对照**。
|
||||
> - `QQKWKG-TriMusicDecrypt`(QKKDecrypt,<https://github.com/Acooldog/QQKWKG-TriMusicDecrypt>,**GPLv3**)——只取平台矩阵与坑清单。
|
||||
> - `ownlight6/qmc-decoder`(<https://github.com/ownlight6/qmc-decoder>,**GPLv3**)——只取 QMC/musicex/ekey 的**格式与协议知识**(<https://github.com/ownlight6/qmc-decoder/blob/main/MGG_DECRYPTION_FLOW.md>)。
|
||||
> - GPLv3 两仓:**只读文档与行为,严禁抄代码**。
|
||||
|
||||
---
|
||||
|
||||
## 0. 结论先行
|
||||
|
||||
1. **范围收敛到两平台**(本轮显式指定):网易云 `.ncm` + QQ音乐 QMC 系列。酷狗/酷我明确出栈,不进任何分期。
|
||||
2. **两条技术路线,全部纯 Rust,零新增运行时依赖**:
|
||||
- ncm → **Rust 原生**(`aes 0.8` / `cbc 0.1` / `base64 0.22` 已在依赖;`ecb` crate 不在依赖树,ECB 手写 16 字节块循环,零新增 crate)。
|
||||
- QQ → **Rust 原生三层路由**(详见 §3.2):① 尾部内嵌 ekey 的文件纯离线可解;② musicex 文件读本机凭据调 `GetEVkey` API;③ 前两层都不成立才用 Frida 注入兜底。
|
||||
- **本节原有的「Frida 主链」判断已作废**:它把「需要客户端在跑」与「需要 Frida 注入」绑成了一件事。实际只有第③层需要注入,而前两层覆盖绝大多数真实文件。改分层后**不再需要便携 Python、不再需要 `pip install frida`、不再受杀软与 mangled 符号版本漂移影响**。
|
||||
3. **UI 是音乐模块第 4 个页签「解密」**:`useModuleTabs` 加一项 + `DecryptPanel.vue` + 独立轻量 store,命令与事件挂进现有 music 命令族,完全照抄下载任务的「先回 taskId、进度走事件」范式。
|
||||
4. **许可边界分三档**:`ncmdump` 是 MIT,**可逐行对照**;QKKDecrypt 与 `qmc-decoder` 是 GPLv3 + FFmpeg GPL,**只沉淀格式/协议知识与坑清单,实现逐行重写**。
|
||||
5. **工作量**:P0(网易云 + 页签全链路)约 **2 个工作日**;P1a(QQ 离线 + API,纯 Rust)约 **2~3 个工作日**;P1b(Frida 兜底,按需)另计。
|
||||
|
||||
```mermaid
|
||||
flowchart LR
|
||||
subgraph FE["前端 · 解密页签"]
|
||||
A["DecryptPanel.vue<br/>文件选择 / 任务列表 / 状态卡"]
|
||||
S["decryptStore.ts<br/>任务状态 + 事件监听"]
|
||||
end
|
||||
subgraph R["Rust · music/decrypt/"]
|
||||
C["commands.rs<br/>run / cancel"]
|
||||
N["ncm.rs<br/>网易云离线引擎"]
|
||||
Q["qq.rs<br/>QMC 三层路由(P1)"]
|
||||
end
|
||||
subgraph QQS["QQ 三层(P1)"]
|
||||
L1["① 尾部内嵌 ekey<br/>纯离线"]
|
||||
L2["② musicex → 本机凭据<br/>GetEVkey API"]
|
||||
L3["③ Frida 兜底<br/>(P1b,按需)"]
|
||||
end
|
||||
O["savedir/decrypted/"]
|
||||
A --> S --> C
|
||||
C --> N --> O
|
||||
C --> Q --> L1 --> O
|
||||
Q --> L2 --> O
|
||||
Q -.-> L3 -.-> O
|
||||
Q -.->|"music-decrypt-event"| S
|
||||
N -.-> S
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 1. 需求解构
|
||||
|
||||
| 用户原话 | 解构 | 落点 |
|
||||
|---|---|---|
|
||||
| 在音乐模块添加解密 Tabs | 音乐模块第 4 个页签 | §5.2 |
|
||||
| 解密各平台的加密格式 | 收敛为 QQ音乐 + 网易云(本轮显式指定) | §3 |
|
||||
| 最小路径实现 | 砍掉:转码、元数据回填、封面提取、拖拽、酷狗酷我、并发调优、历史持久化 | §7 P2 清单 |
|
||||
| 可参考 QKKDecrypt | 对齐思路与坑,不搬 GPLv3 代码 | §3.3 |
|
||||
|
||||
---
|
||||
|
||||
## 2. 现状勘察(2026-09-27 从仓库实际读取)
|
||||
|
||||
### 2.1 已具备的基建(直接复用)
|
||||
|
||||
| 能力 | 现有实现 | 复用方式 |
|
||||
|---|---|---|
|
||||
| Tab 体系 | `useModuleTabs`(`MusicModule.vue:78`,alwaysVisible 模式,标题栏浮动切换器自动接管) | 加 `{ value: 'decrypt', label: '解密' }` 一项 |
|
||||
| 任务 + 事件范式 | `music_download` / `music-download-event`(`commands.rs:187`、`constants.rs:107`) | 解密照抄:先回 taskId,进度推事件 |
|
||||
| 便携 Python + pip 镜像 | `runtime.rs`(清华源 `PIP_INDEX_URL`,`mod.rs:77`) | QQ sidecar 的 frida 安装、Python 就绪检查 |
|
||||
| 加密依赖 | `Cargo.toml` 已有 `aes = "0.8"`、`cbc = "0.1"`、`base64 = "0.22"` | ncm 的 AES-128-ECB 手写循环,零新增依赖 |
|
||||
| specta 绑定 | `lib.rs export_bindings()` 两处 `collect_commands!` | 新命令两处同步登记(`lib.rs:300` 注释明确要求) |
|
||||
| 文件选择对话框 | `@tauri-apps/plugin-dialog`(`MusicModule.vue:4` 已 import) | 页签内直接用,不加 Rust 命令 |
|
||||
| 输出目录 | 默认 `savedir`(设置页「本地下载目录」) | 解密默认输出 `savedir/decrypted/` |
|
||||
| 播放引擎 | symphonia(`Cargo.toml:115`) | 解出的 flac/mp3/ogg 可直接进曲库试听 |
|
||||
|
||||
### 2.2 关键缺口(需新增)
|
||||
|
||||
| 缺口 | 说明 |
|
||||
|---|---|
|
||||
| ncm 解密实现 | 纯算法,约 200 行 + 单测 |
|
||||
| QQ 运行期 sidecar | Frida 注入 + `EncAndDesMediaFile` 调用序列,按参考思路重写 |
|
||||
| 解密任务 store | 下载任务在 `musicStore`;解密需独立轻量 store(页签切换会卸载组件,监听器必须挂 store) |
|
||||
| frida 依赖安装 | `pip install frida`(wheel 带原生扩展,走现有镜像),需一条安装命令 + 进度事件 |
|
||||
|
||||
---
|
||||
|
||||
## 3. 技术选型
|
||||
|
||||
### 3.1 网易云 `.ncm`:Rust 原生离线
|
||||
|
||||
**为什么不进 Python**:
|
||||
|
||||
- ncm 是纯文件级算法,不需要任何进程配合;塞进 Python 等于把 200 行算法绑上「必须先装运行时」的前置。
|
||||
- 便携 Python 是按需安装(musicdl 才触发),解密不应被它卡住——Rust 路线开箱即用。
|
||||
- Rust 侧可直接 `cargo test`,对照样本文件做回归。
|
||||
|
||||
**算法要点**(对照 MIT 协议的 `ncmdump`(`src/ncmcrypt.cpp`)逐条独立重写。下面每一条都是**会写错的地方**,不是梗概):
|
||||
|
||||
**① 容器结构**
|
||||
|
||||
```
|
||||
0x00 magic 8B "CTENFDAM"(即 43 54 45 4E 46 44 41 4D)
|
||||
0x08 2B 0x02 0x00 → 跳过
|
||||
0x0A key_len 4B LE
|
||||
0x0E key_data key_len B (XOR 0x64 → AES-128-ECB → 得 RC4 密钥盒种子)
|
||||
... meta_len 4B LE
|
||||
... meta_data meta_len B (XOR 0x63 → 去 22B 前缀 → base64 → AES-128-ECB → 去 6B 前缀 → JSON)
|
||||
... 5B 跳过(CRC32 4B + 图片版本 1B)
|
||||
... cover_len 4B LE
|
||||
... img_len 4B LE
|
||||
... img_data img_len B (内嵌封面:PNG 或 JPEG)
|
||||
... 跳 cover_len - img_len
|
||||
... audio 剩余全部 (改性 RC4)
|
||||
```
|
||||
|
||||
**② 两个 XOR 常量不同**(原文档误合并成一个 `0x64`)
|
||||
|
||||
| 段 | XOR 常量 | 加密方式 | 解密后处理 |
|
||||
|---|---|---|---|
|
||||
| key 段 | `0x64` | AES-128-ECB | **跳过前 17 字节**(`neteasecloudmusic`),其余即 RC4 密钥盒种子 |
|
||||
| meta 段 | `0x63` | AES-128-ECB(先 base64 解码) | 跳过前 6 字节(`music:`),其余为 JSON |
|
||||
|
||||
**③ AES-128-ECB 解密**:**key 段与 meta 段用两个不同的 16 字节密钥**——`sCoreKey` = ASCII `neteasecloudmusi`(即 17 字节前缀 `neteasecloudmusic\0` 的前 16 字节)、`sModifyKey` = ASCII `#14ljk_!\]&0U<'(`。**收尾不是"去前缀",而是 PKCS#7 风格 padding**:逐 16 字节块解密,最后一字节即 padding 长度(`> 16` 时视作 0),去掉 padding 后再手动跳前缀。
|
||||
|
||||
> 易错点:**「AES 密钥」与「要剥掉的前缀」是两个东西**。`neteasecloudmusic` 既是被剥的 17 字节前缀(含结尾 NUL),其前 16 字节又是 key 段的 AES 密钥;meta 段则两者都不同。混用不报错、只会全解错(实现里分别命名为 `CORE_KEY` / `CORE_AES_KEY` / `MODIFY_KEY`)。
|
||||
|
||||
**④ meta 段的两层前缀**:原始数据前 22 字节是字面量 `163 key(Don't modify):`,**先剥掉它**,再对余下部分 base64 解码,才喂给 AES。
|
||||
|
||||
**⑤ 音频段是「改性 RC4」**
|
||||
|
||||
- 密钥盒用参考实现的 KSA:`swap = keybox[i]`;`c = (swap + last_byte + key[key_offset]) & 0xff`,`key_offset` 触 keyLen 归零循环取 key,`keybox[i] = keybox[c]`、`keybox[c] = swap`、`last_byte = c`。**照抄即可,但注意 `last_byte` 在模 256 下是恒等变形(结果与标准 RC4 逐字节相同),它既不是"关键差异",也不能作为验证手段**——见 §6.25。
|
||||
- 明文按 `0x8000` 字节一块循环,块内 `j = (i + 1) & 0xff`,`plain[i] = cipher[i] ^ keybox[(keybox[(keybox[j] + j) & 0xff] + keybox[j]) & 0xff]`。块之间不重置密钥盒、也不额外跳字节——`i` 是块内下标。
|
||||
- **块边界必须由"读满一块"确定**(`read_full`),不能用 `Read::read` 的短读结果,否则相位错位、中途变噪声(§6.24)。
|
||||
- **不存在"每 0x8000 字节后跳过 5 字节间隔"**(原文档此条有误)。`0x8000` 是块大小,`5` 是 §① 里跳过的 CRC32 + 图片版本。
|
||||
|
||||
**⑥ 输出扩展名由音频首帧魔数决定,不是 meta 的 `format` 字段**(原文档此条说反了):首个解密块以 `ID3`(`0x49 0x44 0x33`)开头 → `.mp3`,否则 → `.flac`。meta 的 `format` 只用于另一件事——**判断该不该回填标签/封面时的格式分支**。
|
||||
|
||||
**⑦ 顺手可得的元数据**:meta JSON 含 `musicName` / `artist`(二维数组,取每项第 0 个元素并用 `/` 连接)/ `album` / `bitrate` / `duration`,且封面字节已在上面的 `img_data` 里读出。**P0 已实现封面单独落盘**(`<歌名>.cover.png|jpg`,按魔数定扩展名);**写进音频标签**仍留 P2——那需要 `lofty` 且要按 mp3/flac/m4a 分派容器,属于「增强」而非「能播」。
|
||||
|
||||
**⑧ 失败处理**:魔数不符 / `key_len <= 0` / 块不足 16 字节 → 返回可读错误(`Err(String)`),**per-file 失败不 panic、不中断整批**。
|
||||
|
||||
### 3.2 QQ音乐:Rust 原生三层路由(**本节已重写**)
|
||||
|
||||
**原判断作废的理由**:原文把「需要 QQ 客户端在跑」与「需要 Frida 注入」绑成了一件事。二者其实独立——ekey(解密密钥)有三种存储形态,只有第三种才需要注入。前两层覆盖真实曲库的绝大多数文件,且都是纯 Rust。
|
||||
|
||||
**QMC 加密本体**(与 ncm 同构:字节流密码 + 可选密钥):
|
||||
|
||||
| 方案 | 密钥来源 | 适用 |
|
||||
|---|---|---|
|
||||
| QMC1 | 固定种子,**无需密钥** | 旧版 `.qmc0` / `.qmc3` / `.qmcflac` / `.qmcogg` |
|
||||
| QMC2 | ekey(base64 + TC-TEA 加密),密钥 ≤300B 走 Map XOR,>300B 走改性 RC4 | `.mgg` / `.mflac` 全系 |
|
||||
|
||||
**ekey 的三种存储形态 → 三层路由**:
|
||||
|
||||
| 层 | 形态 | 需要客户端? | 实现方式 |
|
||||
|---|---|---|---|
|
||||
| **①** | **尾部内嵌 ekey**:QTag 格式(ekey + 歌曲 ID + `QTag` 魔术)或 V1 格式(文件末尾 4 字节为 key 长度,key 在其前) | ❌ 不需要 | **纯 Rust 离线**,从文件尾直接提取 |
|
||||
| **②** | **musicex 尾部**(QQ 客户端 ≥ 19.57 / Win 22.x):尾部 192B 只存 song_id + media_mid + filename,**ekey 不落盘** | ✅ 需运行且已登录 | **纯 Rust**:读凭据 → 调 API 取 ekey |
|
||||
| **③** | 客户端内部导出(方案原文所选) | ✅ | Python sidecar + Frida attach `QQMusicCommon.dll` |
|
||||
|
||||
**第②层的完整链路**(全部可在 Rust 内完成,`windows-sys` 只差一个 feature):
|
||||
|
||||
1. 尾部检测:读末 8 字节,为 `"musicex\0"` 即 musicex;再向前读 `footer_size + 8` 解析完整 footer(`0x00` song_id u32LE、`0x0C` media_mid UTF-16LE 60B、`0x48` filename UTF-16LE 68B、`0xC0` footer_size、`0xC8` magic)。
|
||||
2. 取 `uin`:读 `%APPDATA%\Tencent\QQMusic\QQMusicServiceConfig.ini` 的 `[Account] Uin`(明文 INI)。
|
||||
3. 取 `authst`:**`authst` 在 Windows 上不落盘**,仅在运行中的 `QQMusic.exe` 进程内存里。用 `CreateToolhelp32Snapshot` + `Process32FirstW/NextW` 定位进程 → `OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ)` → `VirtualQueryEx` 遍历可读区(只需 `MEM_COMMIT`,跳过 `MEM_MAPPED`)→ `ReadProcessMemory` 按 1MB 分块 → 搜 `"authst":"` 取其后 Base64URL 串。实测约 0.5 秒。
|
||||
4. 调 API:`POST https://u.y.qq.com/cgi-bin/musicu.fcg`,`req_1.module = "music.vkey.GetEVkey"`、`method = "CgiGetEVkey"`;`param.filename` **必须带 `.mgg`/`.mflac` 后缀**、`param.songtype` **必须为 1**(否则返回 `104005`)、`param.platform = "27"`(Windows)。响应取 `req_1.data.midurlinfo[0].ekey`。
|
||||
|
||||
> 三处易错点:`MEMORY_BASIC_INFORMATION` 在 Win10 1803+ 有 2 字节 `PartitionId` 插在 `AllocationProtect` 与 `RegionSize` 之间,**漏掉会导致 `state` 读成 `protect`、所有内存区被跳过**;`filename` 不带扩展名返回空 ekey;`authst` 有效期约 22.3 小时会过期。
|
||||
|
||||
**前置检查与降级出口**(UI 状态卡据此渲染):QQ 未运行或未登录 → 提示"请启动并登录 QQ 音乐后重试";层①②均失败的文件才落到③;Frida 不可用时报可读错误并给排除指引,**不自动拉起 QQ 客户端**。
|
||||
|
||||
**③(P1b,按需)的形态**若将来要做:`qq_decrypt.py` 走 `include_str!` 内置(与 `bridge.rs:17` 的 `BRIDGE_SCRIPT` 同范式),一次进程 attach 一批文件,stdout JSON-Lines 回报进度;导出符号是 mangled name(`?Open@EncAndDesMediaFile@@…`),**按子串 `EncAndDesMediaFile` 模糊匹配,严禁硬编码地址或 RVA**。
|
||||
|
||||
**输出扩展名**(不能按输入扩展名机械映射):`.qmc0`→`.mp3`、`.qmc3`→`.mp3`、`.qmc2`→`.ogg`、`.qmcogg`→`.ogg`、`.qmcflac`→`.flac`、`.mgg`/`.mgg0`/`.mgg1`/`.mggl`→`.ogg`、`.mflac`/`.mflac0`/`.mflach`→`.flac`(均以首帧魔数兜底校验)。**`.mmp4` 的产物容器(m4a 还是 mp4)尚未独立证实,实施 P1 时必须用真机样本确认后再定**。
|
||||
|
||||
### 3.3 许可边界(必须遵守,三档口径)
|
||||
|
||||
- **MIT(可逐行对照)**:`taurusxin/ncmdump`(网易云 ncm 算法本体)。可直接对照 `src/ncmcrypt.cpp` 实现,仅需保留版权声明。
|
||||
- **GPLv3(只读文档与行为,严禁抄代码)**:`QQKWKG-TriMusicDecrypt`(+ FFmpeg GPL)、`ownlight6/qmc-decoder`。**整段搬代码 = 给本仓库引入 GPL 传染。** 允许的是:阅读其调用序列、常量、格式与协议说明后**独立重写**——本文档 §3.1 / §3.2 沉淀的正是这类非代码知识。
|
||||
- **合规口径**(UI 底部放一行):仅处理用户本人拥有合法访问权限的本地文件,不用于批量分发或规避付费授权。
|
||||
|
||||
---
|
||||
|
||||
## 4. 接口契约
|
||||
|
||||
### 4.1 Tauri 命令
|
||||
|
||||
```rust
|
||||
// 任务
|
||||
music_decrypt_run(task_id, files?, folder?, root?, out_dir?, in_place?) -> Result<(), String>
|
||||
music_decrypt_cancel(task_id: String) -> Result<bool, String>
|
||||
// 预览与状态
|
||||
music_decrypt_scan(folder: String, root: Option<String>) -> Result<ScanSummary, String>
|
||||
music_decrypt_qq_status() -> Result<QqOnlineStatus, String> // 只读本机,不发网络请求
|
||||
```
|
||||
|
||||
`QqOnlineStatus` 字段:`{ running, loggedIn, uin, ready, message, steps }`。
|
||||
**`authst` 不下发到前端**——它只活在后端内存里用于调接口。
|
||||
|
||||
- **注册是 3 处,不是 2 处**(实测仓库现状):
|
||||
1. `music/mod.rs` 的 `pub use commands::{...}` re-export(约 `mod.rs:48`);
|
||||
2. `lib.rs` 的 `collect_commands![]`(`export_bindings()` 内,`lib.rs:205`);
|
||||
3. `lib.rs` 的 `generate_handler![]`(`run()` 内,`lib.rs:348`)。
|
||||
漏第 2 处 = 运行时能调但 `bindings.ts` 缺类型;漏第 1、3 处 = 编译失败或调用失败。
|
||||
- 前端沿用本模块既有范式(`musicStore.ts` 全用原生 `invoke` + 手写类型,不用 `commands`),故解密 store 同样用 `invoke`。
|
||||
|
||||
### 4.2 事件 `music-decrypt-event`(登记进 `constants.rs` 音乐分组)
|
||||
|
||||
```typescript
|
||||
type MusicDecryptEvent = // 注意:只有 tag 是 kebab-case,**字段名仍是 snake_case**
|
||||
| { type: 'start'; task_id: string; total: number }
|
||||
| { type: 'file'; task_id: string; index: number; name: string;
|
||||
status: 'ok' | 'error' | 'unsupported';
|
||||
message: string | null; // 失败原因,或成功时的备注(平台 / 密钥形态 / 元数据摘要)
|
||||
output: string | null; // 主产物
|
||||
cover: string | null } // 单独落盘的封面(网易云带内嵌封面时才有)
|
||||
| { type: 'progress'; task_id: string; done: number; total: number;
|
||||
bytes_done: number; bytes_total: number; name: string }
|
||||
| { type: 'finished'; task_id: string; ok: number; failed: number; cancelled: number }
|
||||
```
|
||||
|
||||
> **字段名是 snake_case 而非 camelCase**:`DecryptEvent` 上只有 `#[serde(tag = "type", rename_all = "kebab-case")]`
|
||||
> 作用在 tag 上,变体字段名原样输出。前端 `decryptStore.ts` 的 `RawEvent` 必须照此声明
|
||||
> ——两边不一致时不会编译报错,只会表现为「任务建好了但进度永不动」。
|
||||
> Rust 侧有 `event_json_contract` 单测把形状钉死(§6.23)。
|
||||
>
|
||||
> 结果态没有 `already`:P0 不做「已解密过则跳过」(同一文件重解会产出 `_1` 后缀的新文件),
|
||||
> 语义比"猜哪份产物属于哪次输入"更可预测。
|
||||
|
||||
> 原先的 `deps-install` 事件随 `music_decrypt_install_deps` 一起取消——三层路由后不再需要 `pip install frida`。
|
||||
> 注意前端 `musicStore.ts:419` 是**硬编码事件名字符串**、并未引用前端常量表,故解密 store 同样硬编码,仅 Rust 侧登记常量。
|
||||
|
||||
### 4.3 文件识别(用户不选平台)
|
||||
|
||||
按扩展名路由,魔数校验兜底:
|
||||
|
||||
| 扩展名 | 路线 |
|
||||
|---|---|
|
||||
| `.ncm` | 网易云离线引擎(按内容魔数识别,不依赖后缀) |
|
||||
| `.mgg` / `.mgg0` / `.mgg1` / `.mggl` / `.mflac` / `.mflac0` / `.mflach` / `.mmp4` / `.qmc0` / `.qmc2` / `.qmc3` / `.qmcflac` / `.qmcogg` | QQ 引擎(按尾部形态决定是否联网) |
|
||||
| 其他 | 散选时保留为 `unsupported`;文件夹扫描时直接跳过 |
|
||||
|
||||
> 后缀矩阵原文档只列了 3 个,会**静默漏掉用户曲库里的常见文件**,故过滤列表与路由表**一次写全**。
|
||||
> 实际判定以**内容**为准(§4.5),后缀只用于文件对话框的过滤器。
|
||||
|
||||
### 4.3.1 QQ 音乐:是否需要登录?
|
||||
|
||||
这是使用者最常问的一点,所以结论放在前面:
|
||||
|
||||
| 文件来源 | 扩展名 | 需要 QQ 音乐登录? |
|
||||
|---|---|---|
|
||||
| QQ 客户端 **≤ 19.51** 下载 | `.qmc0` `.qmc3` `.qmcflac` `.qmcogg` | **不需要** |
|
||||
| QQ 客户端较旧版本下载(QTag / V1 尾部) | `.mgg` `.mflac` | **不需要** |
|
||||
| QQ 客户端 **≥ 19.57** 下载(musicex 尾部) | `.mgg` `.mflac` `.mmp4` | **需要**:客户端运行 + 已登录 |
|
||||
| 网易云(任何版本) | `.ncm` | **不需要** |
|
||||
|
||||
**为什么新版必须登录**:从 19.57 起,QQ 音乐不再把解密密钥(ekey)写进文件,
|
||||
只在文件末尾留 192 字节元数据;客户端自己也是在播放/下载时拿本机登录态
|
||||
(`uin` + `authst`)向服务器实时换取密钥。第三方要解开同一个文件,只能复刻这一步。
|
||||
|
||||
**这里的实现方式**:只读本机凭据(INI 里的 `uin` + 运行中 `QQMusic.exe` 内存里的 `authst`),
|
||||
再调官方 `music.vkey.GetEVkey` 接口取密钥——**不注入进程、不改写文件、不做任何反检测**。
|
||||
|
||||
**操作步骤**(与 UI 状态卡里的文案一致):
|
||||
|
||||
1. 在电脑上启动 QQ 音乐客户端(Windows 版)。
|
||||
2. 用它登录你的账号,并**保持客户端开着**(`authst` 只存在于运行期内存)。
|
||||
3. 回到「解密」页点「重新检测」,状态变为「已就绪」即可解密 musicex 文件。
|
||||
4. 若提示未取到登录令牌:先在客户端里**播放任意一首歌**触发一次网络请求,再重新检测。
|
||||
5. 仍失败则试过**以管理员身份运行**本应用(读其他进程内存可能需要更高权限)。
|
||||
6. 登录令牌约 **22.3 小时**过期;过期后重新检测即可,无需重装。
|
||||
|
||||
**UI 呈现**:状态卡显示三态(未运行 / 未登录 / 已就绪)+ QQ 号 + 「重新检测」按钮;
|
||||
未就绪时折叠区里就是上面这 6 条步骤。上方那句"旧版文件与 `.ncm` 本来就不需要登录"
|
||||
也会一并显示,避免用户误以为自己必须登录才能用这个功能。
|
||||
|
||||
### 4.4 输出路径规则
|
||||
|
||||
- **就地模式(`in_place = true`,文件夹批量的默认)**:产物与源文件**同目录同名**,
|
||||
仅按格式改扩展名(`Pop/a.mflac` → `Pop/a.flac`)。符合"就地解出来"的直觉,
|
||||
也天然不会与其他目录的同名文件冲突。此时 `out_dir` 不参与写盘。
|
||||
- **指定输出目录(`in_place = false`)**:默认根目录 `savedir/decrypted/`,
|
||||
并**按 `root` 还原相对目录结构**(`Pop/2026/b.ncm` → `out/Pop/2026/b.flac`)。
|
||||
散选文件没有相对目录,平铺到根目录。
|
||||
- **同名去重**:即使还原了目录结构,同一目录内仍可能撞名(如 `.mgg` 与 `.mgg1` 同基名)。
|
||||
规则:优先用原名,已存在(磁盘上或本批内已占位)则追加 `_1` / `_2`…
|
||||
- **输入输出相交保护**:非就地模式下,若某输入文件已位于输出目录内则剔除,
|
||||
避免"解出来再解"无限膨胀;全被剔除时报错并提示可改用「就地解密」。
|
||||
- 扩展名以**音频首帧魔数**决定(ncm 见 §3.1⑥,QMC 见 §3.2 末),不信任输入扩展名;
|
||||
魔数认不出时才回退到输入后缀映射。
|
||||
|
||||
### 4.5 文件夹批量
|
||||
|
||||
命令参数的关系:
|
||||
|
||||
| 参数 | 含义 |
|
||||
|---|---|
|
||||
| `folder` | **文件夹批量入口**:Rust 侧递归扫描该目录 |
|
||||
| `root` | 计算相对路径的基准(决定输出目录里还原哪几层) |
|
||||
| `files` | 散选文件列表(`folder` 为空时使用) |
|
||||
| `in_place` | 就地解密(默认 `true`,见 §4.4) |
|
||||
| `music_decrypt_scan` | 只扫描不解密,返回 `{ total, ncm, qmc }` 供 UI 预览 |
|
||||
|
||||
**平台判定按内容,不按后缀**(`scan::route`):
|
||||
|
||||
1. 读 8 字节魔数,命中 `CTENFDAM` → 网易云;
|
||||
2. 否则读尾部判 QMC 形态:后缀在 QMC 家族里 → QQ音乐;
|
||||
3. 后缀不认识时,只有**明确**的尾部形态(QTag / V1 / musicex)才认领——
|
||||
否则任何末尾凑巧不是 `QTag` 的文件都会被判成"QMC1",噪声太大。
|
||||
|
||||
理由:同一曲库里 `.ncm` / `.mflac` / `.qmcflac` / `.mgg` 混放是常态,且 QQ 还有
|
||||
`.mgg0` / `.mflac0` 等变体,靠后缀枚举必然漏。代价是**认不出的文件会被跳过**,
|
||||
所以扫描数可能少于用户预期——因此 UI 先调 `music_decrypt_scan` 显示
|
||||
"找到 N 个 · 网易云 x · QQ音乐 y",让用户在开跑前就能判断是否符合预期。
|
||||
|
||||
---
|
||||
|
||||
## 5. 架构与模块设计
|
||||
|
||||
### 5.1 Rust 侧 `src-tauri/src/music/decrypt/`(已实施的实际结构)
|
||||
|
||||
```
|
||||
decrypt/
|
||||
mod.rs // 任务表(Mutex<HashMap<taskId, 取消标志>>)、工作线程 + 节流事件转发、事件契约
|
||||
common.rs // 两引擎公共件:DecryptError、魔数定格式、同名去重、读满一块
|
||||
ncm.rs // 网易云离线引擎(AES-ECB + RC4 变体 + meta/封面)
|
||||
qmc.rs // QQ:QMC1 静态密钥 / QMC2 Map / QMC2 RC4 / tc_tea / 尾部形态 + 流密码
|
||||
qq_footer.rs // musicex 尾部解析(纯,可单测)
|
||||
qq_credentials.rs // 凭据:INI 解析(纯)+ 进程内存取 authst(平台胶水)
|
||||
qq_memscan.rs // Windows 专用:ToolHelp 枚举进程 + VirtualQueryEx/ReadProcessMemory(只读)
|
||||
qq_ekey.rs // GetEVkey 请求组装与响应解析(纯,可单测)
|
||||
qq_online.rs // 编排:musicex → 凭据 → 取密钥 → 解密;probe_status()
|
||||
scan.rs // 文件夹递归扫描 + 内容优先的平台路由
|
||||
commands.rs // run / cancel / scan / qq_status(四条命令)
|
||||
```
|
||||
|
||||
平台判定与密钥来源的**分工**:`scan.rs` 只决定"这文件归哪个引擎";
|
||||
`qmc.rs` 决定"密钥从哪来"(内嵌 / 静态);只有尾部是 musicex 时,
|
||||
调度层才把 `KeyRequired` 交给 `qq_online.rs` 转在线路径——这样离线路径保持零网络依赖。
|
||||
|
||||
`mod.rs` 挂到 `music/mod.rs` 的子模块列表;事件常量加进 `constants.rs` 音乐分组。
|
||||
|
||||
### 5.2 前端
|
||||
|
||||
```
|
||||
src/modules/music/components/DecryptPanel.vue // 页签内容
|
||||
src/stores/decryptStore.ts // 任务列表 + 事件监听(照 musicUploadStore 范式)
|
||||
MusicModule.vue // tabs 加一项 + <TabsContent value="decrypt">
|
||||
index.ts // searchItems 加「音乐解密」(tab: 'decrypt')
|
||||
```
|
||||
|
||||
**P0 / P1a / P1c UI 形态**(已实施):
|
||||
|
||||
- 顶部操作行:**选择文件夹** | 选择文件(dialog 多选,按 §4.3 全后缀过滤)| **就地解密开关** | 取消 / 清空记录
|
||||
- **QQ 音乐在线解密状态卡**:状态点(三态)+ 一句话状态 + QQ 号 + **重新检测** + 折叠的**操作步骤**;
|
||||
未就绪时折叠区里就是 §4.3.1 那 6 条,并附一句"旧版文件与 `.ncm` 本来就不需要登录"
|
||||
- 输出目录行:就地模式下置灰并显示"与源文件同目录"
|
||||
- **文件夹扫描预览条**:显示"找到 N 个 · 网易云 x · QQ音乐 y" + 开始解密按钮
|
||||
- 中部任务表:任务头(文件夹路径 / 进度条 / `bytes_done/bytes_total` / 打开产物目录)|
|
||||
文件行(文件名 | 平台徽标 | 状态徽章 | 打开产物目录 | 打开封面 | 备注或失败原因)
|
||||
- 空态用 `StateBlock variant="empty"`;进度条结构恒定(完成后保留满格,不整块消失)
|
||||
- 底部一行合规说明
|
||||
|
||||
### 5.3 数据流
|
||||
|
||||
与下载链路同构:前端 → `music_decrypt_run` → Rust 建 taskId 即回 → 后台执行 → `music-decrypt-event` → `decryptStore` 更新 → 列表刷新。页签切换组件卸载不影响任务(监听在 store)。
|
||||
|
||||
---
|
||||
|
||||
## 6. 关键实现细节与已知的坑
|
||||
|
||||
**ncm**(编号对应 §3.1 的条目号)
|
||||
|
||||
1. `aes 0.8` 只有块原语、`ecb` crate 不在依赖树:ECB 手写 16 字节块循环(`cipher::BlockDecrypt::decrypt_block`)。**不要**为此引入 `ecb` crate。
|
||||
2. **两段 XOR 常量不同**(`0x64` key / `0x63` meta)。照抄成同一个常量 = 必然失败。
|
||||
3. **PKCS#7 风格 padding**:AES-ECB 收尾取最后一字节为 padding 长度(`> 16` 视作 0),不是“去前缀”。
|
||||
4. **改性 RC4 KSA 的 `last_byte` 累加**(照抄参考实现即可,但别误解它):
|
||||
式子 `c = (swap + last_byte + key[key_offset]) & 0xff` 在模 256 下**恰好化简为标准 RC4**,
|
||||
实测两者密钥盒逐字节相同(256/256)。因此它**不是**"与标准 RC4 的关键差异",
|
||||
也不能靠与标准 RC4 比对来验证实现——验证只能靠固定向量(见 §6.25)。
|
||||
`key_offset` 触 keyLen 归零循环取 key 这一点照抄。
|
||||
5. **音频块之间不跳字节**,`0x8000` 只是块大小;`i` 是块内下标。原文档的"每 0x8000 跳过 5 字节"是错的(那 5 字节在 §① 的头部里,且已单独处理)。**但块边界必须由"读满一块"确定**,不能用 `Read::read` 的短读结果(见 §6.24)。
|
||||
6. **输出扩展名看音频首帧魔数**(`ID3` → `.mp3`,否则 `.flac`),不看 meta 的 `format`。
|
||||
实现比这条更宽一点:还识别 `fLaC` / `OggS` / `RIFF..WAVE` / `ftyp` / `wvpk`,
|
||||
给 P1 的 QQ 产物复用(ncmdump 的兜底同为 flac)。
|
||||
7. meta 段是**两层前缀**:先剥 22 字节 `163 key(Don't modify):`,再 base64,再 AES,再剥 6 字节 `music:`。
|
||||
8. **流式处理**:`0x8000` 块逐块读→解→写,禁止整文件读入内存(`.mmp4` 可能很大)。大文件下需按已处理字节数推 `progress`。
|
||||
9. **单测不依赖真实样本**:真实 FLAC 最小样本进不了仓库。改为对**中间产物**断言——AES-ECB 往返、KSA 密钥盒已知值、padding 剥离、魔数→扩展名判定、以及"自造一个合法 ncm 容器(用同一套算法正向构造)再解回来"的往返测试。真机样本走手动自测。
|
||||
10. 魔数/解析失败走 per-file `Err`,**不 panic、不中断整批**。
|
||||
|
||||
**QQ(P1)**
|
||||
|
||||
11. 第①层(QTag / V1)**完全离线**,不要因为"QQ 文件"就先去连客户端——先用尾部分支判形态再决定要不要读凭据。
|
||||
12. 第②层的 `authst` **只在 `QQMusic.exe` 运行期内存里**,不落盘;`uin` 在 `QQMusicServiceConfig.ini` 可明文读。`MEMORY_BASIC_INFORMATION` 的 2 字节 `PartitionId`(Win10 1803+)**必须包含**,否则 `state` 会读成 `protect`、所有内存区被跳过。
|
||||
13. API 三处必须:`filename` 带 `.mgg`/`.mflac` 后缀、`songtype = 1`、`module = music.vkey.GetEVkey`(不是 `GetVkey`)。否则 `104005` 或 ekey 为空。
|
||||
14. `authst` 约 22.3 小时过期:失败文案要给"重新登录 QQ 音乐"的出口,而不是只报网络错误。
|
||||
15. 第③层(Frida):必须**先启动 QQ 音乐**再 attach,`QQMusicCommon.dll` 打开主界面即加载;导出符号是 mangled name,**按子串 `EncAndDesMediaFile` 模糊匹配,严禁硬编码地址或 RVA**;被杀软拦截只给排除指引,**不做反检测动作**;批量时客户端 UI 可能短暂卡顿,属预期。
|
||||
16. `path_sensitive_mflac` 变体(同名文件不同目录内容不同)P1 不处理:报错带全路径,遇到再迭代。
|
||||
17. `.mmp4` 产物容器未证实,P1 先用真机样本确认再定(见 §3.2 末)。
|
||||
|
||||
**工程**
|
||||
|
||||
18. 新命令登记 **3 处**:`music/mod.rs` re-export、`lib.rs` 的 `collect_commands![]`、`lib.rs` 的 `generate_handler![]`(见 §4.1)。
|
||||
19. `music-decrypt-event` 常量进 `constants.rs` 音乐分组;前端沿用硬编码字符串(与 `musicStore.ts:419` 一致)。
|
||||
20. 解密 store 必须独立于组件生命周期:Tabs 非 active 会卸载内容,事件监听挂 store 不挂组件。
|
||||
21. **输出同名去重 + 输入输出相交保护**(见 §4.4)——原文档缺失,不做会静默覆盖用户文件。
|
||||
22. 三层路由后**不再需要便携 Python 与 frida**,`music_decrypt_install_deps` 命令取消;QQ 未登录的错误出口走状态卡提示。
|
||||
|
||||
**实施中新增确认的坑(2026-09-27 实测)**
|
||||
|
||||
23. **事件字段名是 snake_case**(不是 camelCase)。`#[serde(tag = ..., rename_all = "kebab-case")]`
|
||||
只作用于 tag,变体字段名原样输出。前后端不一致时**不报错**,只表现为进度不动。
|
||||
Rust 侧 `event_json_contract` 单测钉死 JSON 形状。
|
||||
24. **音频块边界必须用"读满一块"而非 `Read::read` 的返回值**。`BufReader::read` 会短读,
|
||||
块边界一漂移,解密式里的「块内偏移 `i`」就与加密侧错位,表现为**文件从中间某处起全是噪声**
|
||||
(实测首个坏字节落在 32418,仍在第一大块内),前半段却完全正常,极难排查。
|
||||
已加 `read_full()` 专门处理。
|
||||
25. **`last_byte` 累加在模 256 下是恒等变形**:`c = swap + last_byte + key` 与标准 RC4 的
|
||||
`j += s[i] + key` 结果**逐字节相同**(已实测 256/256 一致)。所以:
|
||||
- 不能靠"与标准 RC4 比对"来验证密钥盒实现;
|
||||
- 也**不要**以为它是"改性 RC4 的关键差异"而据此改写(本计划早期的 §6.4 表述即由此误导)。
|
||||
真正的验证手段是**固定向量**(`key_box_matches_reference_vectors` /
|
||||
`keystream_matches_reference_vector`)。
|
||||
26. **`MODIFY_KEY` 是 16 字节而非 17**(`aes::Aes128` 的密钥长度就是 16);
|
||||
`CORE_KEY` 的 17 字节是**解密后要剥掉的前缀**,与 AES 密钥不是同一个东西
|
||||
(AES 密钥是它的前 16 字节)。两者混用不会编译报错,只会全解错。
|
||||
27. **合成容器单测的 key 段必须带 `neteasecloudmusic` 前缀**——否则解密端剥前缀后拿到错种子。
|
||||
这个坑一度被"单循环 KSA"的错误实现掩盖(两边同时错、往返仍然自洽)。
|
||||
|
||||
**P1a(QQ 离线)实施中新增确认的坑**
|
||||
|
||||
28. **QMC2 Map 密码的 `scramble` 必须用 `wrapping_shl/shr`**(对移位量取模),
|
||||
不能写成 `u8::rotate_left/rotate_right`——后者会在内部再取一次模,结果**不同**。
|
||||
被 Apache 参考实现的原向量抓到(若不比对向量,会产出"能跑但全错"的解密)。
|
||||
29. **tc_tea 不是 TEA-ECB,而是 TEA 变体 + 自定义 CBC**:块与密钥字都是**大端**、
|
||||
16 轮(非 32)、单轮是 `((v<<4)+k1) ^ (sum+v) ^ ((v>>5)+k2)`,
|
||||
且明文前置 `1+pad+2` 字节头、尾部 7 字节 0 自校验。照 TEA-ECB 写会解出**部分可读的乱码**
|
||||
(表现极具迷惑性:能看到明文碎片)。尾部 0 校验正是"密钥对不对"的权威判据。
|
||||
30. **V1 尾部判定不能只看长度**:任意加密数据末尾都可能凑出 `0<n<=0x400`,
|
||||
只按长度判会把普通 QMC1 文件误判成 V1 并砍掉一大截音频(实测 32871 字节 → 4096)。
|
||||
必须追加"前面那一段像不像 base64 ekey"的校验。
|
||||
31. **`sniff_tail` 的 `audio_len` 必须换算成绝对长度**:它只读了尾部 probe,
|
||||
`detect_tail` 给出的是**相对 probe 起点**的偏移;QMC1(无尾部)必须回落到**整个文件大小**。
|
||||
另外**不要在两个地方各写一遍尾部探测**——当初 `decrypt_file` 自己复制了一遍,
|
||||
修了 `sniff_tail` 却没修它,症状是"探测结果对、实际产物只有 4KB"。
|
||||
32. **QMC1 的掩码分支是 `pos > 0x7FFF`(严格大于)**,不是 `>=`;写成 `>=` 会在回绕点差一字节。
|
||||
|
||||
**P1c(musicex 在线)实施中新增确认的点**
|
||||
|
||||
33. **`MEMORY_BASIC_INFORMATION` 的 `PartitionId`(Win10 1803+)**:直接沿用
|
||||
`windows-sys` 的结构体即可,但**自己手写 `#[repr(C)]` 时千万别漏**——漏了会让
|
||||
`RegionSize`/`State`/`Protect` 全部读错偏移,`VirtualQueryEx` 返回的 `State`
|
||||
读成 `Protect`(如 `0x04` 而非 `0x1000`),于是所有内存区被跳过、永远扫不到 token。
|
||||
34. **`getEVkey` 的三个"必须"**:`filename` 带扩展名、`songtype=1`、
|
||||
`module=music.vkey.GetEVkey`(不是 `GetVkey`)。任一写错都只是"拿不到 ekey",
|
||||
不会报错——所以请求体用纯函数组装并单测锁死(`qq_ekey::build_evkey_request`)。
|
||||
35. **`authst` 会过期(约 22.3 小时)**:失败文案必须给"重新登录 / 重新检测"的出口,
|
||||
否则用户会以为是网络问题。响应里的 `expiration` 已带进产物备注。
|
||||
36. **单元测试不要真的发网络请求**:本机一旦登录成功,测试就会去连 QQ 服务器,
|
||||
导致测试变慢变脆。改为验证"请求体能正确构造"+"`#!Qk` 头守卫"+"尾部能被解析出
|
||||
`media_mid`/`filename`"三段——真实响应留给真机端到端。
|
||||
37. **musicex 音频段要校验 `#!Qk` 头**:尾部像 musicex 不代表内容真是 QMC2 密文;
|
||||
没有这道守卫会把任意文件"解"成垃圾却报告成功。
|
||||
|
||||
**真机端到端验证后修正(2026-09-27)**
|
||||
|
||||
38. **`#!Qk` 不是 QMC2 密文的通用魔术**(推翻第 37 条的做法):真机 musicex 样本
|
||||
(Avicii - Heaven,197MB `.mflac`)的密文头是 **`51 74 03 75`**,按"必须以 `#!Qk`
|
||||
开头"写的守卫会把**完全合法的文件误拒**。
|
||||
正确做法是**用解密结果判定密钥是否正确**:用取到的密钥解出前 16 字节,
|
||||
看是否是已知音频魔术(`fLaC` / `OggS` / `ID3` / `ftyp`…)——密钥错时它是随机噪声,
|
||||
几乎不可能凑巧命中;命中即说明密钥对、文件也对。
|
||||
这也是"内容优先"原则的又一次应用:**不要用猜测的密文特征做判据,要用能验证的结果。**
|
||||
39. **文档给的 musicex 字段偏移在真样本上是对的**:`0x0C` media_mid(60B UTF-16LE)、
|
||||
`0x48` filename(68B UTF-16LE)、`0xC0` footer_size、`0xC8` magic 全部命中,
|
||||
尾部实测 192 字节、padding 区有 13 个非零字节(所以不能假设 padding 全 0)。
|
||||
40. **真机样本的规模提醒**:`.mflac` 可达 197MB / 192kHz / 24bit。
|
||||
`qq_online` 目前把音频段整段读入内存再解密(探针与生产路径都是),
|
||||
在这个量级下可用,但如果将来遇到多 G 的文件,应改成分块解密 + 流式写盘
|
||||
(`qmc` 的流密码本身已支持任意偏移)。
|
||||
|
||||
---
|
||||
|
||||
## 7. 分阶段计划
|
||||
|
||||
### P0 — 网易云 + 解密页签全链路(约 2 天)**✅ 已实施(2026-09-27)**
|
||||
|
||||
- [x] `useModuleTabs` + `TabsContent` 接「解密」页签;`index.ts` 搜索条目
|
||||
- [x] `decrypt/ncm.rs`:§3.1 全部要点 + 单测(**18 项通过**)
|
||||
- [x] `decrypt/mod.rs` + `commands.rs`:run / cancel + 事件发射;**三处**登记;`constants.rs` 事件常量
|
||||
- [x] `decryptStore.ts` + `DecryptPanel.vue`:选文件 → 批量任务 → 进度 → 打开输出目录
|
||||
- [x] 输出同名去重 + 输入输出相交保护(§4.4)
|
||||
- [x] 封面单独落盘(`<歌名>.cover.png|jpg`)——标签回填仍留 P2(`lofty` 需按容器分派)
|
||||
- [ ] **自测:真实 `.ncm` 样本解出**(需人工用真机样本验证;仓库内样本有版权且体积大,故算法靠 §6.9 的中间产物单测 + 合成容器往返覆盖)
|
||||
- **验收**:页签选 10 个 ncm 全部解出、失败有原因、切页签不丢任务、播放器直接可播
|
||||
|
||||
**已交付文件**:
|
||||
|
||||
| 文件 | 内容 |
|
||||
|---|---|
|
||||
| `src-tauri/src/music/decrypt/ncm.rs` | 网易云离线引擎(容器解析 / AES-ECB / 密钥盒 / 流式解密 / 魔数定格式 / 封面 / 同名去重)+ 单测 |
|
||||
| `src-tauri/src/music/decrypt/mod.rs` | 任务表、工作线程 + 节流事件转发、`DecryptEvent` 契约(含 JSON 形状单测) |
|
||||
| `src-tauri/src/music/decrypt/commands.rs` | `music_decrypt_run` / `music_decrypt_cancel` + 输出目录解析与相交保护 |
|
||||
| `src/stores/decryptStore.ts` | 任务状态 + 事件监听(挂 store,不随组件卸载) |
|
||||
| `src/modules/music/components/DecryptPanel.vue` | 页签 UI |
|
||||
| `music/mod.rs` · `lib.rs` · `constants.rs` | 子模块挂载、`MusicManager.decrypt` 字段、三处命令登记、事件常量 |
|
||||
|
||||
### P1a — QQ 离线解密 + 文件夹批量(**✅ 已实施,纯 Rust,无 Python/frida**)
|
||||
|
||||
- [x] `decrypt/qmc.rs`:QMC1 静态密钥表 / QMC2 Map 密码 / QMC2 RC4 变体 / tc_tea(TEA 变体 + 自定义 CBC)
|
||||
- [x] 第①层:QTag 与 V1 尾部 ekey 提取 → **离线解密**
|
||||
- [x] `decrypt/scan.rs`:递归扫描 + 内容优先的平台路由 + 保留相对目录结构
|
||||
- [x] **文件夹批量**:`folder` / `root` / `in_place` 三个参数 + `music_decrypt_scan` 预览命令
|
||||
- [x] `decrypt/common.rs`:两引擎统一的错误类型、魔数定格式、同名去重、读满一块
|
||||
- [x] 单测 **56 项**(模块合计 174 项全库通过),含参考实现的原始测试向量
|
||||
- [ ] 第②层 musicex + `GetEVkey` API(**未实施**,见 P1c)
|
||||
- [ ] 真实 `.mflac/.mgg/.qmcflac` 样本自测(需人工;仓库内不放版权样本)
|
||||
|
||||
**已交付文件(P1a 增量)**:
|
||||
|
||||
| 文件 | 内容 |
|
||||
|---|---|
|
||||
| `src-tauri/src/music/decrypt/qmc.rs` | QMC 全套离线算法 + 尾部形态判定 |
|
||||
| `src-tauri/src/music/decrypt/scan.rs` | 文件夹递归扫描与平台路由 |
|
||||
| `src-tauri/src/music/decrypt/common.rs` | 两引擎公共件 |
|
||||
|
||||
**算法来源(全部宽松许可,均有原始向量锁行为)**:
|
||||
|
||||
| 部分 | 来源 | 许可 |
|
||||
|---|---|---|
|
||||
| QMC1 静态密钥表 + 掩码规则 | `jixunmoe/qmc-decode` | MIT |
|
||||
| QMC2 密钥派生 / Map / RC4 / 尾部形态 | `bczhc/qmc-dec`(`qmc2-crypto`) | Apache-2.0 |
|
||||
| tc_tea | `tc_tea` crate | MIT/Apache-2.0 |
|
||||
|
||||
### P1b — Frida 兜底(按需,不计入本轮)
|
||||
|
||||
- [ ] `qq_decrypt.py`(`include_str!`):attach → `EncAndDesMediaFile` 调用序列 → 批量 → JSON-Lines 进度
|
||||
- [ ] `decrypt/qq_frida.rs`:前置检查、spawn、逐行读转发事件
|
||||
- **触发条件**:仅当 §3.2 的第③层文件在真实用户场景中被确认存在且前两层无法覆盖时才做
|
||||
|
||||
### P1c — musicex 联网取 ekey(**✅ 已实施**)
|
||||
|
||||
- [x] `qq_footer.rs`:musicex 尾部解析(song_id / media_mid / filename)
|
||||
- [x] `qq_credentials.rs`:读 `%APPDATA%\Tencent\QQMusic\QQMusicServiceConfig.ini` 的 `uin` + 扫进程内存取 `authst`
|
||||
- [x] `qq_memscan.rs`(Windows):`CreateToolhelp32Snapshot` + `OpenProcess` + `VirtualQueryEx` + `ReadProcessMemory`(**只读**)
|
||||
- [x] `qq_ekey.rs`:`GetEVkey` 请求组装与响应解析(`filename` 带扩展名 / `songtype=1` / `platform="27"`)
|
||||
- [x] `qq_online.rs`:编排 + `probe_status()` 在线能力探测
|
||||
- [x] `music_decrypt_qq_status` 命令 + UI 状态卡(含**逐步操作说明**)
|
||||
- [x] `windows-sys` 增开 `Win32_System_Diagnostics_ToolHelp` 与 `..._Debug`
|
||||
- [x] **本机实测**:`probe_status()` 返回 `running=true logged_in=true uin=1154027699 ready=true` —— 内存扫描确实取到了 `authst`
|
||||
- [x] **端到端已用真机样本跑通**(2026-09-27,见下)
|
||||
|
||||
#### 真机端到端验证记录(首个 musicex 样本)
|
||||
|
||||
样本:`C:\Users\Administrator\Music\Heaven - Avicii_EM.mflac`(197,104,516 字节,
|
||||
尾部 `musicex\0`,`song_id=233102682`,`media_mid=003iTvi44A6RMs`,
|
||||
`filename=AIM0002ELI6a1wXJDo.mflac`)
|
||||
|
||||
| 环节 | 实测结果 |
|
||||
|---|---|
|
||||
| 尾部解析 | song_id / quality1=2 / quality2=11 / media_mid / filename 全部正确 |
|
||||
| 凭据 | 返回 `running=true logged_in=true uin=1154027699 ready=true` |
|
||||
| `GetEVkey` | **成功**,拿到 704 字符 ekey;`expiration=80400`(22.3 小时,与文档一致) |
|
||||
| ekey → 密钥 | 解密出 **512 字节**原始密钥 → 命中 **RC4 变体**(>300 字节)分支 |
|
||||
| 音频段 | 197,104,324 字节(= 文件大小 − 192 字节尾部,完全吻合) |
|
||||
| 解密结果 | 首帧 `66 4c 61 43` = **`fLaC`** ✅ |
|
||||
| 产物校验(`lofty`) | **277.261 秒 · 192000 Hz · 24 bit · 2 声道 · 5686 kbps** —— 192kHz/24bit Hi-Res 无损 |
|
||||
|
||||
**验证方式**:`examples/decrypt_musicex_probe.rs` 走真实链路(读内存凭据 → 真实
|
||||
HTTP 请求 → 解密),再用 `examples/verify_audio.rs` 交给项目同款解析器确认产物合法。
|
||||
两个 example 都保留,供后续 QQ 改协议时快速定位。
|
||||
|
||||
**这次验证推翻了一个错误假设**:样本的密文头是 `51 74 03 75`,**不是**文档里提到的
|
||||
`#!Qk`。原先按"密文必须以 `#!Qk` 开头"写的守卫会把完全合法的文件误拒——已改为
|
||||
**用解密结果判定**(解出的前 16 字节是否为已知音频魔术),见 §6.38。
|
||||
|
||||
**凭据可用性已知限制**:
|
||||
|
||||
| 维度 | 情况 |
|
||||
|---|---|
|
||||
| `uin` 来源 | INI 明文,稳定 |
|
||||
| `authst` 来源 | 仅运行期内存;**QQ 音乐必须开着且已登录** |
|
||||
| 有效期 | 约 22.3 小时(响应 `expiration` 字段,已带进产物备注) |
|
||||
| 权限 | 读他人进程内存可能需管理员;失败文案已提示 |
|
||||
| 是否注入 | **否**,纯只读——这是它与 Frida 兜底的本质区别 |
|
||||
|
||||
### P2 — 按需增强(不进本轮)
|
||||
|
||||
- **ID3 / FLAC / MP4 标签回填**(用 `lofty`,按容器分派;meta JSON 已在解密时解析出来)
|
||||
- 解密完成 →「加入本地曲库」/ 上传飞牛(复用 `musicUploadStore`)
|
||||
- 拖拽文件进页签、解密历史持久化
|
||||
- 酷狗 / 酷我(除非再次明确要求)
|
||||
- QQ 变体适配(path_sensitive_mflac)
|
||||
|
||||
> **变更**:原计划把「封面提取 / ID3 标签回填」一起从 P2 提前到 P0。**实际只提前了封面提取**——
|
||||
> 封面字节在解析容器时顺手就读出来了,落盘是十几行,且不做就"能播但难用"。
|
||||
> 标签回填仍留 P2:它需要 `lofty` 且要按 mp3/flac/m4a 分派容器,属于增强而非可用性门槛。
|
||||
|
||||
---
|
||||
|
||||
## 8. 风险与开放问题
|
||||
|
||||
| 风险 | 影响 | 对策 |
|
||||
|---|---|---|
|
||||
| QQ 改 musicex 尾部/API 协议 | 第②层失效 | 协议字段集中在 `qq_footer` / `qq_ekey` 两处;错误文案带原始响应码;关注 qmc-decoder issue |
|
||||
| `authst` 提取被安全软件拦截 | 第②层失效 | **只读**内存、不注入;失败给"以管理员身份运行"出口 |
|
||||
| **musicex 端到端** | ~~真实响应字段可能与文档不符~~ **已验证通过**(真机 197MB 样本,产物为合法 192kHz/24bit FLAC) | 保留 `examples/decrypt_musicex_probe.rs` + `verify_audio.rs`,QQ 改协议时可快速定位 |
|
||||
| `authst` 过期(22.3h) | 第②层短期失效 | 错误文案给"重新登录/重新检测"出口;有效期带进产物备注 |
|
||||
| QQ 版本升级改 mangled 导出符号 | 仅第③层(Frida)失效 | 子串模糊匹配;第③层不在实施范围,影响面已缩小 |
|
||||
| 真实样本不足导致算法细节偏差 | 解出错文件 | **已用参考实现的原始测试向量交叉验证**(QMC1 掩码 / Map / RC4 / tc_tea / ekey 端到端) |
|
||||
| GPLv3 边界被无意破坏 | 许可风险 | 三档口径见 §3.3;QMC 只取 MIT / Apache-2.0 两份来源的**代码与数据** |
|
||||
| 网易云改 ncm 格式 | 个别文件失败 | per-file error 不中断整批 |
|
||||
| 同名文件落盘互相覆盖 | **用户文件丢失** | §4.4 同名去重 + 相交保护 |
|
||||
| 文件夹扫描漏文件(内容认不出) | 用户以为解完了 | UI 先出 `music_decrypt_scan` 预览数量 |
|
||||
|
||||
**开放问题**:
|
||||
|
||||
1. 解密输出默认就地(文件夹批量)或 `savedir/decrypted/`(散选);独立设置项留 P2。
|
||||
2. QQ 未运行时是否自动拉起?**离线层与 `.ncm` 完全不需要客户端**;只有 musicex 需要,
|
||||
当前选择"只提示、不自动拉"(客户端要登录,自动拉起也解决不了登录态)。
|
||||
3. `.mmp4` 的产物容器(m4a / mp4)待真机样本确认——当前靠首帧 `ftyp` 魔数判定,认不出时按后缀落 `m4a`。
|
||||
(`.mflac` 已实测确认:产物为 192kHz/24bit 的 `.flac`。)
|
||||
4. ~~musicex 端到端未验证~~ **已解决**(2026-09-27,真机样本跑通,见 P1c 的验证记录)。
|
||||
5. `.mflac0` / `.mgg1` 等变体按 QMC2 处理,但**未用真实样本验证**过其尾部形态与 `.mflac` / `.mgg` 一致。
|
||||
6. 微信登录的 QQ 音乐 (`tmeLoginType=3`):实现上 `authst` 与 QQ 登录通用,
|
||||
但 `login_type` 目前固定发 `1`(QQ 登录实测可用)——若真机发现微信登录取不到 ekey,需按凭据来源推断。
|
||||
7. **大文件内存占用**:`qq_online` 目前整段读入内存解密;197MB 实测可用,
|
||||
但 `.mflac` 可以更大。若遇到多 G 文件,应改流式(`qmc` 的流密码已支持任意偏移)。
|
||||
|
||||
---
|
||||
|
||||
## 附录 A:参考项目对照(只取思路)
|
||||
|
||||
### A.1 QKKDecrypt 实测结论(2026-09-27 深读 `main@938b22d`,来自其源码而非猜测)
|
||||
|
||||
**最重要的一条**:该项目 QQ 路径**完全不解析 QMC 加密格式**——它把原始加密文件整包交给 QQ 自己的 DLL 解密,因此不受 static/map cipher 变体影响。**代价是强依赖四项**:QQ 客户端运行 + `QQMusicCommon.dll` 已加载 + **管理员权限**(`cli.py::_require_admin()`,非管理员直接 `return 2` 并打印"已禁止继续使用")+ mangled 名/编译器版本不变。**这四项与它的"回退"一起,正是我们改走 §3.2 分层路由的原因。**
|
||||
|
||||
| QKKDecrypt 文件 | 可借鉴 | 不可借鉴 |
|
||||
|---|---|---|
|
||||
| `platforms/qq/adapter.py` | `SUPPORTED_SUFFIXES` 仅 `.mflac/.mgg/.mmp4`;前置检查项;ASCII 暂存 |
|
||||
| `qq/runtime/qqmusic_decrypt.py` | `EncAndDesMediaFile` 的 3 组候选 mangled 名、NativeFunction 全 `thiscall` 签名、调用序(`Memory.alloc(0x28)` → ctor → `allocUtf16String` → `Open(..,1,0)` → `GetSize` → `Read` → dtor) | **硬编码**;整文件读入内存;未校验 `Open`/`Read` 返回值 |
|
||||
| `qq/runtime/frida_decrypt_gateway.py` | 进程查找用**子串匹配** `"qqmusic"`;**每批次只 attach 一次**并缓存 session | 无 session 重连(QQ 中途重启即失效) |
|
||||
| `qq/variant_adapter.py` | "路径敏感型 mflac"→**解密前先复制到纯 ASCII 路径**(`pick_safe_tmp_dir`:盘根 `_qqmusic_tmp` → 项目根 → `tempfile.gettempdir()`) | 只实装了这一个变体 |
|
||||
| `qq/internal_direct.py` / `qq/export_fallback.py` | — | **存在但未接入主流程 = 死代码**,不可当作可用的回退能力承诺 |
|
||||
| `platforms/netease/adapter.py` | 输出扩展白名单法 | **它没有自研 ncm 算法**——直接 `from ncmdump import NeteaseCloudMusicFile` 委托 PyPI 的 `ncmdump-py`;且 `predicted_extension()` 会**多解密一遍**(性能坑) |
|
||||
| `Application/decrypt_service.py` | 事件粒度 = **逐文件 `index`/`total`**;`file_finished.result ∈ success/failed/already_decrypted` | 事件种类过多(20+) |
|
||||
| `cover_art_service.py` | "本地同名图 → 缓存 → 联网"的 local-first 顺序 | **给网易云产物做封面兜底时查的是 QQ 音乐 API** |
|
||||
| `THIRD_PARTY_LICENSES.md` | 合规口径与风险表述 | 内置 FFmpeg 为 `--enable-gpl --enable-version3` 构建 → 传染面比"仓库 GPLv3"更大 |
|
||||
|
||||
**对本文档的两处直接修正**:
|
||||
|
||||
1. **"输出扩展名看音频首帧魔数"得到双重印证**——QKKDecrypt 的最终扩展名同样**不取映射表**,而是 `detect_audio_container()` 从实际字节判定(`fLaC`/`OggS`/`RIFF..WAVE`/`ID3`/`0xFF 0xFB|0xF3|0xF2`/偏移 4 处 `ftyp`)。故 §3.2 的输出扩展名表仅作**声明/预期**用,实际以魔数为准。
|
||||
2. **`.mgg` 解出后它强制归一为 `.m4a`**(`normalize_target_format` 把 `ogg→m4a`)。本项目**不跟**这个行为——`Cargo.toml:112` 已确认 symphonia 默认特性含 `ogg/vorbis`,直接落 `.ogg` 即可播,保持"所见即所得"(§3.1 原口径)。
|
||||
3. QKKDecrypt 不支持 `.mflac0/.mgg1/.mflac1/.qmc*`——**我们的扩展面比它宽**(§4.3),但格式知识来源是 qmc-decoder 的**文档**(GPLv3,不抄代码)。
|
||||
|
||||
### A.2 借鉴到 P0 的一条设计(**最终未采用,附理由**)
|
||||
|
||||
QKKDecrypt 的 `file_finished.result` 含 `already_decrypted` 与 `stopped_by_user` 两个态。
|
||||
**`stopped_by_user` 已采纳**(取消后 `finished.cancelled > 0`,任务落为"已取消")。
|
||||
**`already_decrypted` 决定不做**:它要判断"某份已存在的产物是否就是本次输入的产物",
|
||||
在扁平输出目录里只能靠文件名猜,猜错就静默跳过用户的文件——代价大于收益。
|
||||
P0 改为**永不跳过**:目标名被占用就写 `<名>_1.<ext>`,宁可多一份产物也不丢工作。
|
||||
(`ncm::unique_output` 同时处理"磁盘上已存在"与"本批次内已占用"两种情况。)
|
||||
@@ -0,0 +1,303 @@
|
||||
# 音乐模块 · 手机端连接与控制规划(Music Remote Plan)
|
||||
|
||||
> 状态:**规划中**(未开始实施)
|
||||
> 定位:音乐模块的"手机互联"子能力,不是独立模块——挂靠 `music` 模块,Rust 侧新增 `music/remote/` 子系统
|
||||
> 日期:2026-09-25
|
||||
> 关联文档:`AI_DEV_GUIDE.md`(模块注册 / IPC 范式——注意其未涵盖 specta,绑定范例见 `lib.rs` 的 `export_bindings()`)、`TERMINAL_MODULE_PLAN.md`(规划文档范式)
|
||||
> 对端文档:`F:\AtieProject\LFMusic\PLAN.md`(手机端 LFMusic 的功能与实现规划,协议以本文 §4(协议)/ §5(实现)为准)
|
||||
|
||||
---
|
||||
|
||||
## 0. 结论先行
|
||||
|
||||
四个关键判断,先摆在这里,后文展开论证:
|
||||
|
||||
1. **"获取电脑端正在播放的内容(不管是不是 Thing 播的)"必须走 GSMTC**(`GlobalSystemMediaTransportControlsSessionManager`),而不是扩展现有的 `smtc.rs`。`smtc.rs` 以"Thing → 系统"的元数据/进度上报为主(`ISystemMediaTransportControlsInterop::GetForWindow`),并经 `TypedEventHandler` 接收系统按钮回传(双向)——但它只管自己这条会话;要读到**系统里所有应用的媒体会话**(网易云、QQ 音乐、浏览器、Thing 自己……),唯一官方通道是 GSMTC 的全局会话管理器。两者方向相反、互不冲突,`smtc.rs` 原样保留。
|
||||
|
||||
2. **控制链路统一走 GSMTC 的 `Try*Async`,Thing 自己不特殊处理**。手机发的播放/暂停/切歌 → Thing 的 GSMTC 调用 → 系统把按钮事件派发给目标会话。Thing 自己因为已在 `smtc.rs` 注册了 SMTC 会话并有按钮事件回传链路(`music-smtc-button` → 前端执行),这条环路是现成的,**对 Thing 自身会话近乎零新增执行代码**(需补的是 cmd-ack 语义与派发时序定义,见 §4.2 / §5.2)。不要为 Thing 自建"直通 AudioEngine"的旁路——多一条路径就多一类不一致(P1 若延迟体感明显再优化)。
|
||||
|
||||
3. **局域网服务用 axum(已有依赖)新增 HTTP + WebSocket 双通道,发现用"电脑广播 beacon + 手动扫码"双保险**。axum 已在 `download_engine/server.rs` 和 `feiniu/proxy.rs` 两处落地,范式现成。发现协议不选 mDNS 做 P0 主路径:Android/iOS 的 mDNS 栈碎片化、路由器 AP 隔离下失效、iOS 后台受限;而电脑端周期性 UDP 广播 + 手机被动监听实现最简、权限最友好,配合二维码手动配对兜底已覆盖 99% 场景。mDNS 降级为 P1 增强。
|
||||
|
||||
4. **安全按"配对制"设计,不做裸奔**。首次连接用一次性配对码(Thing 弹窗展示,手机扫码/手输),换取长期设备 token;token 两侧持久化(Thing 侧入 keyring,手机侧入系统安全存储),后续连接 WS 握手鉴权,设置页可随时撤销设备。局域网明文 HTTP 在 P0 可接受(风险面:同网段已配对 token 泄露才会被利用),TLS 自签放 P2。
|
||||
|
||||
**工作量估算**:P0(系统会话捕获 + LAN 服务 + 发现配对 + 基础遥控)约 6~9 个工作日;P1(mDNS、多会话切换、系统音量、投播)约 5~8 个工作日;P2(TLS、队列投播完善)按需。
|
||||
|
||||
---
|
||||
|
||||
## 1. 需求解构
|
||||
|
||||
用户需求拆成可执行的规格:
|
||||
|
||||
| 用户原话 | 解构为 | 落点 |
|
||||
|---|---|---|
|
||||
| 「手机端 app 打开后自动连接局域网电脑上的 Thing」 | 电脑端局域网服务(HTTP+WS)+ 自动发现(UDP beacon)+ 配对与鉴权 | §3.2 / §3.3 / §3.4 |
|
||||
| 「可以获取到电脑端正在播放的内容(不管是 Thing 自己播放的,或是其他应用播放的)」 | GSMTC 全局会话监视:当前活跃会话的元数据、进度、播放状态、封面 | §3.1 / §5.2 |
|
||||
| 「显示例如歌曲名,歌手,专辑,封面,进度」 | `NowPlaying` 状态模型 + WS 增量推送 + 封面 HTTP 端点 | §4 / §5.2 |
|
||||
| 「控制等等」 | 播放/暂停/上一首/下一首/seek/停止,走 GSMTC `Try*Async`;音量 P1 | §3.1 / §5.3 |
|
||||
| (自然延伸,非本次明说) | 投播:手机选歌 → 电脑播放(Thing 曲库播放队列控制) | §7 P2 |
|
||||
| 「打开后自动连接」的边界 | 首次需用户在电脑设置页点「连接手机」弹出配对码/二维码,5 分钟内完成一次配对;此后已配对设备才自动重连 | §3.4 / 对端文档 §5.1 |
|
||||
|
||||
---
|
||||
|
||||
## 2. 现状勘察(2026-09-25 从仓库实际读取)
|
||||
|
||||
### 2.1 已具备的基建(直接复用)
|
||||
|
||||
| 能力 | 现有实现 | 本功能可复用的部分 |
|
||||
|---|---|---|
|
||||
| 播放引擎 | `music/audio/engine.rs`:`AudioEngine`(symphonia + cpal/WASAPI 独立线程),`AudioState` 快照 + `music-audio-ended` / `music-audio-error` 事件 | Thing 自身播放状态的事实来源;封面/元数据兜底可直读播放队列 |
|
||||
| SMTC 上报 | `music/smtc.rs`:`SmtcController`(GetForWindow 全字段上报 + 系统按钮事件 `music-smtc-button` 回传前端) | **零改动保留**;它让 Thing 拥有一条标准 SMTC 会话,GSMTC 控制才能作用到 Thing 自己 |
|
||||
| HTTP 服务范式 | `download_engine/server.rs`、`feiniu/proxy.rs` 均为 axum + `tokio::net` | 新 LAN 服务照抄此范式(`axum::serve` + tokio) |
|
||||
| WebSocket | `tokio-tungstenite 0.24` 已在依赖树 | 备选;WS 通道直接用 axum 的 `ws` feature 更统一 |
|
||||
| 凭据存储 | `secrets.rs`(keyring + Windows 凭据管理器)、`music/secrets.rs` | 设备 token / 配对密钥持久化 |
|
||||
| 类型绑定 | tauri-specta 自动生成 `src/lib/bindings.ts` | remote 命令与消息类型走 specta,前端零手写类型 |
|
||||
| 设置持久化 | `MusicManager::load_settings / save_settings`(settings.json + 500ms 缓存) | remote 开关/端口等设置项追加到 `MusicSettings` |
|
||||
| 日志 | `logger.rs` 统一日志 | remote 全链路日志 |
|
||||
|
||||
### 2.2 关键缺口(需新增)
|
||||
|
||||
| 缺口 | 现状 | 方案 |
|
||||
|---|---|---|
|
||||
| 系统媒体会话读取 | 无。`windows` crate 未开 `Media_Control` feature | 开启 feature,新增 `music/remote/glsmtc.rs`(见 §3.1) |
|
||||
| 局域网服务 | axum 仅用于本机/代理场景,无对外 LAN 端点 | 新增 `music/remote/server.rs`,监听 `0.0.0.0` |
|
||||
| 设备发现 | 无 | 新增 `music/remote/discovery.rs`(UDP beacon) |
|
||||
| 配对与设备管理 | 无 | 新增 `music/remote/pairing.rs` |
|
||||
| 二维码渲染 | 无 | 前端引入 `qrcode`/`qr-code-styling`(纯前端生成即可) |
|
||||
|
||||
---
|
||||
|
||||
## 3. 技术选型
|
||||
|
||||
### 3.1 系统媒体捕获:GSMTC
|
||||
|
||||
Windows 10 1809+ 的 `Windows.Media.Control` 命名空间是**唯一**能枚举/监视/控制系统全部 SMTC 会话的公开 API。凡是有标准系统集成(SMTC)的播放器——网易云、QQ 音乐、foobar2000、浏览器、以及 Thing 自己——都会出现在会话列表里。
|
||||
|
||||
Rust 侧路径:`windows` crate(当前 0.52)增加 `"Media_Control"` feature,类型位于 `windows::Media::Control`:
|
||||
|
||||
```rust
|
||||
use windows::Media::Control::{
|
||||
GlobalSystemMediaTransportControlsSessionManager,
|
||||
GlobalSystemMediaTransportControlsSession,
|
||||
};
|
||||
```
|
||||
|
||||
核心 API 清单:
|
||||
|
||||
| API | 用途 |
|
||||
|---|---|
|
||||
| `SessionManager::RequestAsync()` | 取全局管理器单例(惰性初始化,失败则整个能力降级关闭) |
|
||||
| `manager.GetSessions()` | 枚举所有会话——**同步**返回 `IVectorView`(0.52 投影无 Async 版本,计划原文 `GetSessionsAsync` 有误,以实测为准) |
|
||||
| `manager.GetCurrentSession()` | 当前"活跃"会话(系统自动判定:最近操作的会话);**同步**,无会话时 ABI 返回 null → windows-rs 投影为 `Err(E_POINTER)`,按"无会话"分支处理。**实测修正:WinRT 没有 `SetCurrentSessionAsync`**——P1 多会话切换采用 Thing 侧"选中覆盖"(§7),不修改系统判定 |
|
||||
| `session.SourceAppUserModelId` | 来源应用标识(用于显示"正在播放的应用",也作为会话 key) |
|
||||
| `session.TryGetMediaPropertiesAsync()` | 元数据:Title / Artist / AlbumTitle / AlbumArtist / **Thumbnail** |
|
||||
| `session.GetTimelineProperties()` | Position / EndTime / **LastUpdatedTime**(进度推算基准,见 §6.4) |
|
||||
| `session.GetPlaybackInfo()` | PlaybackStatus / Controls(`IsPlayEnabled` 等能力位)/ PlaybackRate |
|
||||
| `TryPlayAsync` / `TryPauseAsync` / `TryStopAsync` / `TrySkipNextAsync` / `TrySkipPreviousAsync` | 控制(即手机端全部按钮的实现) |
|
||||
| `TryChangePlaybackPositionAsync(ticks)` | seek(仅当会话 `IsSeekEnabled`) |
|
||||
| 事件:`CurrentSessionChanged` / `MediaPropertiesChanged` / `TimelinePropertiesChanged` / `PlaybackInfoChanged` / `SessionsChanged` | 状态变更推送源 |
|
||||
|
||||
**线程与套间**(沿用 `smtc.rs` 已验证的范式,但有一处关键差异):
|
||||
|
||||
- 初始化(`RequestAsync`)与事件订阅在**主线程**执行(`run_on_main_thread` 抛过去),与 `smtc.rs` 一致。
|
||||
- **`Try*Async` 的 `.get()` 阻塞等待必须放专用工作线程**,不能在主线程 `.get()`——STA 上阻塞等待 WinRT async 有死锁风险,而 `smtc.rs` 那种"fire-and-forget 更新属性"不涉及等待所以没踩到。设计上:主线程只做"发起",等待统一丢给 `tokio::task::spawn_blocking` 或专用线程。
|
||||
- 所有 GSMTC 对象是 agile 的,跨线程传引用安全(与 smtc.rs 注释同源结论)。
|
||||
|
||||
**失败策略**:与 `smtc.rs` 同哲学——GSMTC 任何一步失败只记日志,不影响播放;GSMTC 初始化失败时整个"远程查看/控制其他应用"能力降级为"仅 Thing 自身"(可从 `AudioEngine.state()` 兜底聚合,见 §5.2)。
|
||||
|
||||
### 3.2 局域网服务:axum HTTP + WebSocket
|
||||
|
||||
单端口(默认候选 **26124**,被占则 +1 重试至 26139,实际端口写进 beacon 与二维码):
|
||||
|
||||
| 端点 | 方法 | 用途 |
|
||||
|---|---|---|
|
||||
| `/ws` | GET(Upgrade) | 主通道:鉴权、状态推送(server→client)、控制指令(client→server) |
|
||||
| `/api/state` | GET | REST 兜底快照(WS 不可用/调试用),Bearer token 鉴权 |
|
||||
| `/cover/:hash` | GET | 封面字节流(内存缓存,`hash` 由状态推送携带,`?v=` 控制刷新),Bearer token(query 参数 `t=`,`<img>` 标签无法带 header);**访问日志不打印 query**,token 不落日志 |
|
||||
| `/pair` | POST | 配对:`{ pairingCode, deviceName }` → `{ token, deviceId }` |
|
||||
|
||||
WS 承载双向消息(协议见 §4.2);HTTP 承载资源(封面)与低频操作。全部监听 `0.0.0.0`。
|
||||
|
||||
**防火墙注意**:首次监听 LAN 端口 Windows 会弹防火墙授权(专用网络勾选即可)。在设置页 remote 开关旁给出说明文案;不做 `netsh` 自动加规则(改系统防火墙属于越权行为,且需要管理员)。
|
||||
|
||||
### 3.3 设备发现:UDP beacon(P0 主)+ 扫码兜底(P0)+ mDNS(P1)
|
||||
|
||||
| 方案 | 机制 | 判断 |
|
||||
|---|---|---|
|
||||
| **UDP beacon(推荐 P0)** | 电脑每 3s 向 `255.255.255.255:26123` 与各网卡定向广播地址发 JSON 包:`{ "service": "thing-music", "deviceId", "name", "port", "protoVer" }`;手机监听 26123 被动收集 | 实现最简(一个 tokio interval + UdpSocket);手机端只需 bind 收包,**Android 免多播权限问题,iOS 不触发 multicast entitlement**(仍会触发本地网络权限弹窗,属正常) |
|
||||
| 扫码/手输(P0 兜底) | Thing 设置页展示二维码:`thingmusic://connect?ip=…&port=…&code=…`;手机扫码或手输 IP+配对码 | AP 隔离下 beacon 不可达时的最后手段;同时它就是配对入口(见 §3.4) |
|
||||
| mDNS(P1 增强) | `mdns-sd` crate 注册 `_thingmusic._tcp.local.`,手机 browse | 生态标准、后台发现友好;但依赖各端 mDNS 栈质量,放 P1 不阻塞 |
|
||||
|
||||
beacon 里**不含**任何敏感信息(无 token、无配对码),只描述"这里有一个 Thing 音乐服务"。手机端根据 deviceId 去重。
|
||||
|
||||
### 3.4 安全与配对
|
||||
|
||||
流程(对齐业界遥控 App 的标准做法):
|
||||
|
||||
1. 手机端发起配对:beacon 得到 ip:port 后 POST `/pair`,携带 6 位一次性配对码 + 设备名。
|
||||
2. 配对码由 Thing 侧生成:用户在设置页点击「连接手机」→ 弹窗展示 6 位码 + 二维码(码内含 ip/port/code,扫码即完成 1、2 两步),有效期 5 分钟,一次性。
|
||||
3. 校验通过 → 生成 32 字节随机 hex 设备 token,返回手机;Thing 侧持久化 `{deviceId, deviceName, token}` 到 keyring(复用 `secrets.rs` 范式),列表落 settings。
|
||||
4. 后续连接:WS 握手首条消息 `hello { token }`(或 HTTP `Authorization: Bearer`),校验失败 3 次即拉黑该 IP 60s;`/pair` 的配对码校验执行同一限速(防 6 位码爆破,配对响应也只在成功时下发 token)。
|
||||
5. 设置页设备列表:展示在线/离线、最后连接时间,可撤销(吊销 token)。
|
||||
|
||||
P2 增强:自签 TLS(`rcgen` 生成 + `rustls`,二维码里带证书指纹)。P0 明文 HTTP 的风险面评估:同局域网内明文嗅探只能看到 token 之后的媒体元数据;token 本身仅在配对响应中明文传输一次,可接受。
|
||||
|
||||
---
|
||||
|
||||
## 4. 状态模型与协议设计
|
||||
|
||||
### 4.1 `NowPlaying`(核心状态, specta 类型双端共享)
|
||||
|
||||
```typescript
|
||||
interface NowPlaying {
|
||||
sessionId: string // 会话 key(SourceAppUserModelId;Thing 自身 = "thing.self")
|
||||
sourceApp: string // 来源应用显示名(AUMID 末段或注册表友好名)
|
||||
isThing: boolean // 是否 Thing 自身播放(决定封面/元数据兜底来源)
|
||||
title: string
|
||||
artist: string
|
||||
album: string
|
||||
coverHash: string | null // 封面缓存键;封面从 /cover/:hash 拉
|
||||
status: 'playing' | 'paused' | 'stopped'
|
||||
durationSec: number
|
||||
positionSec: number // 推送时刻的位置
|
||||
positionUpdatedAtMs: number // 电脑时钟毫秒(源自 TimelineProperties.LastUpdatedTime,见 §6.4);仅供校准,手机端 elapsed 一律以本地收包时刻起算(见 §6.10)
|
||||
playbackRate: number
|
||||
canControl: { play: boolean; pause: boolean; next: boolean; prev: boolean; seek: boolean }
|
||||
deviceId: string // 电脑标识(多电脑预留)
|
||||
}
|
||||
```
|
||||
|
||||
### 4.2 WS 消息(JSON,`type` 字段区分)
|
||||
|
||||
| 方向 | type | 载荷 | 时机 |
|
||||
|---|---|---|---|
|
||||
| c→s | `hello` | `{ token, deviceName, protoVer }` | 连接后首条;失败即断开 |
|
||||
| s→c | `welcome` | `{ deviceId, deviceName, protoVer }` | 鉴权通过 |
|
||||
| s→c | `state` | `NowPlaying`(全量) | 连接后、以及任何变更(见 §6.3 节流;**由 `cmd` 触发的变更立即推一帧,绕过节流**) |
|
||||
| c→s | `cmd` | `{ id, action, args? }`,action ∈ `play / pause / toggle / next / prev / stop / seek(posSec)` | 用户操作 |
|
||||
| s→c | `cmd-ack` | `{ id, ok, error? }` | 回执语义 = **"指令已被接受/派发"**(GSMTC 路径 = Try*Async 完成;前端兜底路径 = 事件已投递),不代表播放状态已切换;UI 轻提示,真实状态以随后的 `state` 为准 |
|
||||
| c→s | `ping` / s→c `pong` | `{ ts }` | 30s 心跳,双向判活 |
|
||||
|
||||
版本策略:`protoVer` 从 1 起,不匹配时 `welcome` 带最新版本号,手机端提示升级。
|
||||
|
||||
---
|
||||
|
||||
## 5. 架构与模块设计
|
||||
|
||||
### 5.1 Rust 侧:`src-tauri/src/music/remote/`
|
||||
|
||||
```
|
||||
src-tauri/src/music/remote/
|
||||
├── mod.rs # RemoteManager:manage() 进 State;启动/停止服务与 beacon;开关状态
|
||||
├── server.rs # axum app:路由 /ws /api/state /cover /pair;WS 会话表(fanout 广播)
|
||||
├── glsmtc.rs # GsmtcMonitor:GSMTC 初始化、事件订阅 → 聚合 NowPlaying → 广播
|
||||
├── discovery.rs # UdpBeacon:3s 周期广播(255.255.255.255 + 各网卡定向广播)
|
||||
├── pairing.rs # 配对码生成/校验、设备 token 签发、设备表(keyring + settings)
|
||||
└── proto.rs # NowPlaying / WS 消息类型(serde + specta,前端 bindings 自动生成)
|
||||
```
|
||||
|
||||
数据流:
|
||||
|
||||
```
|
||||
GSMTC 事件(主线程订阅)──→ GsmtcMonitor 聚合/节流 ──→ Server 广播到全部 WS 客户端
|
||||
AudioEngine.state()(兜底聚合,isThing 时封面/元数据来源之一)┘
|
||||
手机 cmd ──→ server.rs ──→ glsmtc.rs(spawn_blocking 调 Try*Async)──→ 系统派发给目标会话
|
||||
└─ Thing 自身会话:SMTC 按钮 → smtc.rs 既有链路 → 前端 feiniuStore 执行(既有链路,约束见 §5.2)
|
||||
```
|
||||
|
||||
`MusicManager` 增加 `remote: RemoteManager` 字段(或平级 manage,倾向后者,避免 MusicManager 继续膨胀);`lib.rs` 注册 `remote_*` 系列命令:
|
||||
|
||||
| 命令 | 用途 |
|
||||
|---|---|
|
||||
| `remote_get_config` / `remote_set_enabled` | 开关(MusicSettings 追加 `remote_enabled`、`remote_port`) |
|
||||
| `remote_status` | 服务状态、端口、在线设备 |
|
||||
| `remote_start_pairing` | 生成配对码 + 二维码 payload(前端渲染二维码) |
|
||||
| `remote_cancel_pairing` | 取消 |
|
||||
| `remote_list_devices` / `remote_revoke_device` | 设备管理 |
|
||||
|
||||
### 5.2 双来源聚合规则(GSMTC 为主,AudioEngine 兜底)
|
||||
|
||||
- GSMTC 可用:一切以 GSMTC 当前会话为准。Thing 自身播放时它就是一条普通会话(`SourceAppUserModelId` 识别后标 `isThing: true`)。
|
||||
- GSMTC 无会话但 `AudioEngine` 在播放(GSMTC 初始化失败或会话丢失的兜底):从 `AudioEngine.state()` + 播放队列聚合出 `NowPlaying`(`isThing: true`);控制指令由 server 复用 `music-smtc-button` 事件(同名、同 payload)emit 给前端执行。**既有架构约束**:队列控制逻辑(toggle/next/prev/播放模式)在前端 `feiniuStore`,AudioEngine 本身只有 play/set_playing/seek/stop——兜底路径依赖 WebView 存活,WebView 未就绪时直接回 `cmd-ack { ok: false, error: "frontend-unavailable" }`。
|
||||
- 两者都无:`status: 'stopped'`,手机端显示"电脑未在播放"。
|
||||
|
||||
### 5.3 前端侧
|
||||
|
||||
- `src/modules/music/components/settings/RemoteSettings.vue`:总开关、端口、设备列表(在线状态/撤销)、「连接手机」按钮 → 配对码 + 二维码(`qrcode` 库,5s 轮询 status 刷新倒计时/在线态)。
|
||||
- 状态存放:P0 用 RemoteSettings **组件本地状态**(5s 轮询 `remote_status`),不扩 musicStore——当前无其他消费方;遥控 UI 出现共享需求时再入 store。
|
||||
- `constants.rs`:`REMOTE_WS_*` 等消息类型常量(如需要);本功能的"事件"主要是 WS 而非 Tauri event,前端基本只走 invoke + bindings。
|
||||
|
||||
### 5.4 生命周期
|
||||
|
||||
- 随应用启动初始化(不随模块启用——music 默认启用且常驻),`remote_enabled = false` 时仅不启服务/beacon,GSMTC 监视可保持惰性。
|
||||
- 应用退出:axum graceful shutdown、beacon 停发(`cleanup_on_exit` 挂钩,参照 `MusicManager::cleanup_on_exit` 范式)。
|
||||
- 系统休眠/网络切换:WS 断开由心跳判活;beacon 无状态持续广播即可,无需额外处理。
|
||||
|
||||
---
|
||||
|
||||
## 6. 关键实现细节与已知的坑
|
||||
|
||||
1. **GSMTC 在非打包桌面应用可用**(unpackaged desktop app 明确支持,1809+)。不要被"WinRT 需要 package identity"的泛泛说法劝退——GSMTC 不在受限之列,开源社区大量此类工具可佐证。**2026-09-25 已实证**:`examples/gsmtc_probe.rs`(unpackaged 控制台进程)跑通,读到当前会话元数据/状态/时间轴,核心假设成立。
|
||||
2. **封面(Thumbnail)是 `RandomAccessStreamReference`**:`OpenReadAsync()` → 按 `ContentType`(image/png|jpeg)读全量字节 → 以 `hash(sourceApp + title + album + 尺寸)` 为键存内存 LRU(上限 ~20 张)。推送里只带 `coverHash`,封面走 HTTP 拉取,避免 WS 帧被几百 KB 图片打爆。
|
||||
3. **事件风暴节流**:`TimelinePropertiesChanged` 在部分播放器上高频触发(每次内部时钟更新都发)。聚合层统一节流:任何状态变更合并后**最快 1Hz** 推送 `state`;进度靠手机端 `positionSec + elapsed` 本地推算(`status=playing` 时每秒 +1,收到新 `state` 校准),不依赖高频推送。**例外**:由 `cmd` 触发的状态变更立即推一帧(绕过 1Hz 节流),避免按钮"没反应"的体感——节流仅约束进度等自然高频变更。
|
||||
4. **进度推算基准用 `TimelineProperties.LastUpdatedTime`**,不要用"收到事件的本地时刻"——事件分发有延迟,`LastUpdatedTime` 是播放器侧的权威时间戳。(本条约束 **Thing 侧**把 GSMTC 事件组装成 `positionSec/positionUpdatedAtMs` 的动作;**手机侧** elapsed 的起算基准见 §6.10,两层不要混用。)
|
||||
5. **会话 key 的稳定性**:GSMTC 无显式 sessionId,用 `SourceAppUserModelId` 作 key;同一应用双会话(极少见)时后者覆盖前者,P1 的多会话切换再处理。
|
||||
6. **`Try*Async` 的返回值不可全信**:部分播放器对不可用操作静默成功,回执只做 UI 轻提示,真实状态以下一帧 `state` 为准(`canControl` 能力位已尽力过滤)。
|
||||
7. **AUMID → 友好名**:`SourceAppUserModelId` 是 `PackageFamilyName!App` 或注册表 AUMID,显示名需查 `Get-StartApps` 等价逻辑(注册表 `HKCU\Software\Classes\AppUserModelId`);先显示末段兜底,友好名缓存 LRU。
|
||||
8. **防火墙弹窗只出现一次**(每个 exe 路径 × 网络类型),开发期 `tauri dev` 与正式版 exe 路径不同会各弹一次,属预期。
|
||||
9. **Windows 通知区域"媒体"浮层与 GSMTC 互不干扰**:`smtc.rs` 的上报会话照常工作;手机控制 Thing 自身时,系统面板同步可见,是 feature 不是 bug。
|
||||
10. **进度推算的时钟基准分两层,不要混用**:Thing 侧组装 `positionSec/positionUpdatedAtMs` 用 `TimelineProperties.LastUpdatedTime`(§6.4);手机侧 `elapsed` **一律以本地收到该条 `state` 的时刻起算**,禁止拿 `positionUpdatedAtMs` 与手机本机时间直接做差——电脑时钟偏差(手动对时/休眠漂移可差数秒以上)会整体拖偏进度条。手机端检测到两端时钟偏差 >5s 时冻结推算、只显示基准值,等待下一条 `state` 校准。两端时钟正常时(NTP 同步)此方案残差 ≤ 推送延迟(LAN 上 <1s,且播放中 ~1Hz 校准)。
|
||||
|
||||
---
|
||||
|
||||
## 7. 分阶段计划
|
||||
|
||||
### P0:可用版本(目标:手机能看到并控制电脑当前播放)
|
||||
|
||||
- [x] `windows` crate 开 `Media_Control` feature;10 行探测 demo 验证 GSMTC 在本机可用 —— **2026-09-25 实测通过**(`examples/gsmtc_probe.rs`,unpackaged 控制台进程:读到 1 会话 + 元数据/状态/时间轴全通;注意 `GetSessions`/`GetCurrentSession` 是同步 API,见 §3.1)
|
||||
- [x] `remote/proto.rs`:类型定义(serde,未进 specta——WS 对端是手机,Thing 前端不消费)+ 单测(序列化往返/时间换算/会话 key)——**2026-09-26 完成,8 单测全绿**
|
||||
- [x] `remote/glsmtc.rs`:初始化、事件订阅、`NowPlaying` 聚合、封面 LRU、节流(1Hz + cmd Force 例外)——**完成**;订阅 P0 只挂 Manager 级两事件 + 500ms 节拍轮询(会话级事件需随会话订阅/退订,列入 P1)
|
||||
- [x] `remote/server.rs`:axum 路由 + WS 会话表 + 广播 + 心跳判活 + Bearer/hello 鉴权(+ /pair 限速、封面 token 走 query)——**完成**
|
||||
- [x] `remote/discovery.rs`:UDP beacon(GetAdaptersAddresses 各网卡定向广播)——**完成**
|
||||
- [x] `remote/pairing.rs`:配对码 + token 签发 + 设备表(keyring `music-remote-token-*`)——**完成**(单测含限速)
|
||||
- [x] 控制指令:play/pause/toggle/next/prev/stop/seek → `Try*Async`(spawn_blocking);**Thing 自身 seek 直通 AudioEngine**(SMTC 回环无 seek 通道)——**完成**
|
||||
- [x] 命令注册(collect_commands + generate_handler 双处)+ `RemoteSettings.vue`(开关/配对二维码/设备列表;qrcode 库前端生成)——**完成**;改为组件本地状态,不扩 musicStore(当前无其他消费方,需要时再入 store)
|
||||
- [x] `AudioEngine` 兜底聚合(+ `SmtcMetaCache` 回填标题/歌手/专辑)——**完成**
|
||||
- [x] 运行时冒烟(2026-09-26):自启绑定 `0.0.0.0:26124` ✓、beacon 实收(`addrs=["192.168.110.40"]`、deviceId 落盘)✓、`/api/state` 401 ✓、`/pair` 错码 403 ✓、日志「GSMTC 已初始化(专用线程 MTA)」✓、运行时 bindings 导出含 remote 命令 ✓
|
||||
- [x] 联调:**真机 E2E 完成(2026-09-26)**——LFMusic 真机客户端全流程实测:配对码 142919 → `/pair` 成功(192.168.110.27)→ WS hello 鉴权 → state 推送(封面/元数据/thing.self/能力位)→ 播放暂停上下首控制生效 → App 重启后自动重连。过程修复:手机端 deviceId 语义(存电脑 id 而非 Thing 分配的行 id)与对端显示名两处关联 bug
|
||||
- [ ] P0 验收口径(联调时执行):遥控界面显示 GSMTC `GetCurrentSession` 判定的活跃会话("最近操作"语义,多会话切换只留 UI 入口);进度推算按 §6.10 时钟基准联调;`cmd` 后 1s 内看到状态变化
|
||||
|
||||
### P1:体验完善 —— **2026-09-26 除两项暂缓外全部完成**
|
||||
|
||||
- [ ] mDNS 发现(mdns-sd 注册 `_thingmusic._tcp`)——**暂缓**:beacon 在目标网络 100% 可用且扫码兜底已覆盖;双端 mDNS(含 Android MulticastLock/Kotlin 桥)成本高、当前无失效场景驱动,等 beacon 实际失效案例再做
|
||||
- [x] 多会话列表与手动切换——**完成**:`sessions` WS 消息(watch 变化推送 + 连接首帧)+ `select` 动作(**WinRT 无 SetCurrentSession,实测修正**:Thing 侧选中覆盖,空 id = 跟随系统 current;选中会话消失自动回落);手机端 chips UI(高亮 `isCurrent`)+「跟随系统」
|
||||
- [x] **会话级事件精细化订阅**——**完成**:`SessionSubs` 随目标会话换绑 `MediaPropertiesChanged`/`TimelinePropertiesChanged`/`PlaybackInfoChanged`(切换时先退订后订阅,线程退出统一清理);Manager 级两事件 + 500ms 节拍轮询保留为保底
|
||||
- [x] 系统音量控制 + 手机端音量条——**完成**:`volume.rs`(MMDevice → `IAudioEndpointVolume`,每次现取 COM 对象避免 Send/Sync 争议);监视线程 500ms 轮询进 `NowPlaying.volume/muted`(指纹纳入、变化即推);`volume` 动作 0~1、**>0 自动解除静音**;手机端 🔊 音量条(松手发送)
|
||||
- [x] Thing 直通控制路径评估——**评估结论:落地直通**:`isThing` 按钮类指令直接 emit `music-smtc-button`(跳过 GSMTC→系统→SMTC 回环,少一跳系统派发延迟);seek 本就直通 AudioEngine;非 Thing 会话仍走 GSMTC `Try*Async`。系统面板同步不受影响(面板状态由前端持续上报 smtc.rs)。**真机复测**:非 Thing 路径(QQMusic 播放恢复)通过;isThing 直通与 P0 事件链同码,待 Thing 下次自身播放时自然覆盖
|
||||
- [x] AUMID 友好名缓存、封面本地持久化缓存——**完成**:`friendly_name`(`HKCU\Software\Classes\AppUserModelId\<aumid>\DisplayName` 查询 + 128 条缓存,查不到退回 AUMID 简化段;路径形 AUMID 跳过注册表);`CoverStore` 写透 `{app_data}/remote_covers`(内存+磁盘双层 LRU 各 20 张,冷启动可回源)。**真机复测**:友好名生效(QQMusic / Microsoft.ZuneMusic);持久化目录已创建,落盘写入待下次取到封面时自然验证(当前可见会话均无缩略图)
|
||||
- [ ] 手机端通知栏/锁屏媒体控件联动(LFMusic 侧 native-audio / MediaSession,见对端文档)——**暂缓**:被 LFMusic M1(集成 `tauri-plugin-native-audio`)阻塞,M1 完成后按对端文档回填
|
||||
|
||||
### P2:增强(按需)
|
||||
|
||||
- [ ] 自签 TLS(rcgen + rustls,二维码带证书指纹)
|
||||
- [ ] 投播:手机浏览 Thing 曲库 → 远程下发放进 Thing 播放队列(`/queue` 端点 + AudioEngine 队列 API 暴露)
|
||||
- [ ] 歌词推送(Thing 已有 lyric 能力,同步到手机端滚动显示)
|
||||
- [ ] 多电脑:beacon 天然支持,配对表按 deviceId 区分,UI 侧完善
|
||||
|
||||
---
|
||||
|
||||
## 8. 风险与开放问题
|
||||
|
||||
| 风险/问题 | 影响 | 对策 |
|
||||
|---|---|---|
|
||||
| GSMTC 某播放器不上报专辑/封面(上报方行为,非 bug) | 手机端显示缺字段 | UI 兜底占位;Thing 自身播放时从曲库元数据补全(lofty 已有) |
|
||||
| 路由器 AP 隔离导致广播不可达 | 手机发现不了电脑 | 扫码/手输 IP 兜底(P0 已含);mDNS 同样受影响,不是银弹 |
|
||||
| 防火墙/杀软拦截 LAN 监听 | 手机连不上 | 设置页说明 + 连接失败诊断提示(检测本机端口监听、提示放行) |
|
||||
| 手机休眠断 WS | 状态不实时 | 心跳 + 重连退避(手机端职责,见对端文档);恢复前台即拉 `/api/state` 快照 |
|
||||
| `TryChangePlaybackPositionAsync` 部分应用不支持 | seek 无效 | `canControl.seek` 能力位隐藏进度条拖动 |
|
||||
| 多网段/VPN 虚拟网卡产生杂音 beacon | 发现列表脏数据 | beacon 携带本机各网卡地址,手机端按连通性优选;显示名可区分 |
|
||||
|
||||
**开放问题**(实施前确认):
|
||||
1. 是否需要"电脑端显示已连接手机"的托盘/OSD 提示?(倾向 P1,托盘菜单加一行在线设备数即可)
|
||||
2. 投播的队列控制 API 形态(P2 前与 LFMusic 端一起定)。
|
||||
3. 遥控界面是否需要歌词显示?用户需求"显示音乐信息"是否含歌词——Thing 已有 lyric 能力,但"歌词推送"列在 P2,需两端确认是否提前。
|
||||
4. 音量控制是否提前到 P0?用户"控制电脑端"可能隐含音量——当前计划在 P1(`IAudioEndpointVolume`)。
|
||||
@@ -111,7 +111,7 @@ Thing/
|
||||
- [x] 自建进程内下载引擎(多线程 HTTP/HTTPS,无需外部内核)
|
||||
- [x] 接管浏览器下载,浏览器扩展(Thing Extension)
|
||||
- [x] HTTP 下载支持
|
||||
- [ ] BT/磁力链接支持(后续支持)
|
||||
- [x] BT/磁力链接支持(后续支持)
|
||||
- [x] 下载任务管理(历史)
|
||||
- [x] 速度限制
|
||||
- [x] 断点续传
|
||||
@@ -124,8 +124,8 @@ Thing/
|
||||
|
||||
### 第三阶段:优化与完善
|
||||
|
||||
- [x] 性能优化(P1/P2:轮询随窗口可见性暂停、批量测速限并发、渲染 memo 化等,见 MODULE_REVIEW.md)
|
||||
- [x] 错误处理与日志完善(B5 进程级全局日志器、异常兜底)
|
||||
- [x] 性能优化(见 MODULE_REVIEW.md)
|
||||
- [x] 错误处理与日志完善(全局日志器、异常兜底)
|
||||
- [x] 用户体验优化(混合 DPI 定位、rAF 节流、UI 细节)
|
||||
- [x] 自动更新机制
|
||||
- [x] 打包发布
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -66,6 +66,8 @@ internal sealed class KernelStatus
|
||||
{
|
||||
public bool Ready { get; set; }
|
||||
public bool IsAdmin { get; set; }
|
||||
/// <summary>PawnIO 驱动是否已安装(ring0 传感器读取依赖它或 WinRing0,缺失时温度/频率通常无法读取)</summary>
|
||||
public bool PawnIoInstalled { get; set; }
|
||||
public double UptimeMs { get; set; }
|
||||
public int GroupCount { get; set; }
|
||||
public int SensorCount { get; set; }
|
||||
|
||||
+45
-11
@@ -24,6 +24,9 @@ internal sealed class HardwareManager : IDisposable
|
||||
private readonly bool _isAdmin;
|
||||
private readonly double _coldStartMs;
|
||||
private readonly Stopwatch _startupSw;
|
||||
// 传感器 ID 缓存:避免每秒为每个传感器重复拼接字符串(减少 GC 压力)
|
||||
private readonly Dictionary<ISensor, string> _sensorIdCache = new();
|
||||
private bool _coldStartSent;
|
||||
private bool _ready;
|
||||
private bool _closed;
|
||||
private HardwareConfig _config;
|
||||
@@ -84,7 +87,7 @@ internal sealed class HardwareManager : IDisposable
|
||||
|
||||
/// <summary>
|
||||
/// 全量 Update 所有硬件。
|
||||
/// 由 SamplingScheduler 按通道分频调用。
|
||||
/// 仅用于构造函数首轮填充,运行期由调度器分频调用 UpdateFastOnly/UpdateSlowOnly。
|
||||
/// </summary>
|
||||
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>
|
||||
/// 仅 Update 慢通道硬件(Storage/PSU/Battery 等)。
|
||||
/// 快通道硬件(CPU/GPU/Memory/Network)由调度器更高频调用 UpdateAll。
|
||||
/// 快通道硬件(CPU/GPU/Memory/Network)由调度器更高频调用 UpdateFastOnly。
|
||||
/// </summary>
|
||||
public void UpdateSlowOnly()
|
||||
{
|
||||
@@ -123,10 +141,11 @@ internal sealed class HardwareManager : IDisposable
|
||||
Ready = _ready,
|
||||
};
|
||||
|
||||
// 首个快照带上冷启动耗时,后续为 0
|
||||
if (_coldStartMs > 0 && snap.Timestamp > 0)
|
||||
// 首个快照带上冷启动耗时,后续为 0(修复:此前每个快照都携带 ColdStartMs)
|
||||
if (_coldStartMs > 0 && !_coldStartSent)
|
||||
{
|
||||
snap.ColdStartMs = Math.Round(_coldStartMs, 1);
|
||||
_coldStartSent = true;
|
||||
}
|
||||
|
||||
// 重新遍历以读取最新传感器值(visitor 缓存的是 hardware 引用,sensor 值实时)
|
||||
@@ -156,7 +175,7 @@ internal sealed class HardwareManager : IDisposable
|
||||
|
||||
g.Sensors.Add(new SensorEntry
|
||||
{
|
||||
Id = $"{groupId}/{hw.Name}/{s.SensorType}/{s.Name}".Replace(' ', '_').ToLowerInvariant(),
|
||||
Id = GetSensorId(s, groupId, hw.Name),
|
||||
Name = s.Name,
|
||||
Type = sensorType,
|
||||
Value = s.Value,
|
||||
@@ -169,6 +188,21 @@ internal sealed class HardwareManager : IDisposable
|
||||
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>
|
||||
/// 为已启用但 LHB 未枚举到的硬件类型预创建空分组。
|
||||
/// 场景:用户在设置中勾选了主板/电池/电源等,但 LHB 在当前权限或机型下检测不到对应硬件,
|
||||
@@ -243,7 +277,7 @@ internal sealed class HardwareManager : IDisposable
|
||||
_ => "",
|
||||
};
|
||||
|
||||
private static bool IsRunningAsAdmin()
|
||||
internal static bool IsRunningAsAdmin()
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -290,14 +324,14 @@ internal sealed class SnapshotVisitor : IVisitor
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 采样调度器:按快/慢通道分频驱动 HardwareManager.UpdateAll。
|
||||
/// 采样调度器:按快/慢通道分频驱动 HardwareManager 的分层 Update。
|
||||
/// 使用 Channel 向 SSE 推送层广播快照(解耦:调度器不关心有几个订阅者)。
|
||||
///
|
||||
/// 调度策略:
|
||||
/// - 快通道 tick:UpdateAll(含慢通道硬件,因 UpdateAll 成本主要在 SMART,已通过慢通道分频减少调用频率)
|
||||
/// 实际优化:快通道 tick 只 Update 快通道硬件(UpdateFastOnly),慢通道单独按慢节奏 Update
|
||||
/// - 快通道 tick:UpdateFastOnly(仅 CPU/GPU/Memory/Network 等轻量硬件),
|
||||
/// 避免 SMART 等重查询每秒执行拖慢采样节奏
|
||||
/// - 慢通道 tick:UpdateSlowOnly(仅 Storage/PSU/Motherboard 等)
|
||||
/// - 每个 tick 结束后构建快照并广播
|
||||
/// - 快通道每个 tick 结束后构建快照并广播(慢通道更新后的值随下一帧带出)
|
||||
/// </summary>
|
||||
internal sealed class SamplingScheduler : IDisposable
|
||||
{
|
||||
@@ -352,7 +386,7 @@ internal sealed class SamplingScheduler : IDisposable
|
||||
{
|
||||
try
|
||||
{
|
||||
_hw.UpdateAll();
|
||||
_hw.UpdateFastOnly();
|
||||
var snap = _hw.BuildSnapshot();
|
||||
_cache.Update(snap);
|
||||
_broadcast.Writer.TryWrite(snap);
|
||||
|
||||
@@ -44,6 +44,7 @@ internal static class HttpEndpoints
|
||||
{
|
||||
Ready = hw?.Ready ?? false,
|
||||
IsAdmin = hw?.IsAdmin ?? false,
|
||||
PawnIoInstalled = PawnIoSupport.IsServiceInstalled(),
|
||||
UptimeMs = kernel.Uptime.Elapsed.TotalMilliseconds,
|
||||
GroupCount = snap?.Groups.Count ?? 0,
|
||||
SensorCount = kernel.Scheduler.Cache.SensorCount,
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
using System.Diagnostics;
|
||||
using Microsoft.Win32;
|
||||
|
||||
namespace ThingHK;
|
||||
|
||||
/// <summary>
|
||||
/// PawnIO 驱动支持:检测 + 静默安装。
|
||||
///
|
||||
/// 背景:LHM 读取 CPU 温度/频率等 ring0 数据依赖内核驱动,回退用的 WinRing0 被
|
||||
/// 微软"易受攻击的驱动程序阻止列表"和部分杀软(如火绒)拦截,导致传感器缺失。
|
||||
/// PawnIO 是正规签名的替代驱动(不在阻止列表、兼容 HVCI/安全启动),
|
||||
/// LHM 0.9.5+ 检测到已安装时优先使用,无需任何代码开关。
|
||||
///
|
||||
/// 安装器约定:PawnIO_setup.exe 与 ThingHK.exe 同目录
|
||||
/// (由 Tauri 侧 prepare_kernel 从资源目录随内核一起复制到 {app_data}/monitor/cores/)。
|
||||
///
|
||||
/// 静默参数:-install -silent(官方 CLI 参数,见 namazso/PawnIO.Setup)。
|
||||
/// 退出码:0=成功;3010=成功但需重启(ERROR_SUCCESS_REBOOT_REQUIRED)。
|
||||
///
|
||||
/// 策略:仅在内核已提权时安装。两种提权模式(Thing 提权继承 / 仅提权 ThingHK)
|
||||
/// 都只有一次 UAC,内核拿到权限后自行静默安装,避免二次弹窗。
|
||||
/// serve 模式调用;scan 诊断模式不安装,保持被动。
|
||||
/// </summary>
|
||||
internal static class PawnIoSupport
|
||||
{
|
||||
/// <summary>驱动服务注册表键:存在即认为已安装</summary>
|
||||
private const string ServiceKeyName = @"SYSTEM\CurrentControlSet\Services\PawnIO";
|
||||
|
||||
private const string SetupFileName = "PawnIO_setup.exe";
|
||||
|
||||
/// <summary>3010 = ERROR_SUCCESS_REBOOT_REQUIRED(安装成功但需重启生效)</summary>
|
||||
private const int ExitCodeRebootRequired = 3010;
|
||||
|
||||
/// <summary>驱动安装通常数秒内完成,留足余量防止卡死启动流程</summary>
|
||||
private const int InstallTimeoutMs = 90_000;
|
||||
|
||||
/// <summary>检测 PawnIO 驱动服务是否已注册</summary>
|
||||
public static bool IsServiceInstalled()
|
||||
{
|
||||
try
|
||||
{
|
||||
using var key = Registry.LocalMachine.OpenSubKey(ServiceKeyName);
|
||||
return key != null;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 确保 PawnIO 就绪:已安装直接返回;未安装且当前已提权时静默安装。
|
||||
/// 返回描述性结果(写入 stderr 日志 + /status 诊断)。
|
||||
/// </summary>
|
||||
public static string EnsureInstalled()
|
||||
{
|
||||
if (IsServiceInstalled())
|
||||
return "already-installed";
|
||||
|
||||
if (!HardwareManager.IsRunningAsAdmin())
|
||||
return "skipped: not elevated (温度/频率等传感器需要提权运行)";
|
||||
|
||||
string setupPath = Path.Combine(AppContext.BaseDirectory, SetupFileName);
|
||||
if (!File.Exists(setupPath))
|
||||
return $"skipped: {SetupFileName} 未找到(应随内核一起部署,见 prepare_kernel)";
|
||||
|
||||
try
|
||||
{
|
||||
using var process = Process.Start(new ProcessStartInfo
|
||||
{
|
||||
FileName = setupPath,
|
||||
Arguments = "-install -silent",
|
||||
UseShellExecute = false,
|
||||
CreateNoWindow = true,
|
||||
});
|
||||
if (process == null)
|
||||
return "failed: Process.Start 返回 null";
|
||||
|
||||
if (!process.WaitForExit(InstallTimeoutMs))
|
||||
{
|
||||
try { process.Kill(); } catch { /* 超时后进程可能已自行退出 */ }
|
||||
return "failed: 安装超时";
|
||||
}
|
||||
|
||||
int code = process.ExitCode;
|
||||
if (code == ExitCodeRebootRequired)
|
||||
return "installed: 需重启后生效";
|
||||
|
||||
if (code != 0)
|
||||
return $"failed: 安装器退出码 {code}";
|
||||
|
||||
return IsServiceInstalled()
|
||||
? "installed"
|
||||
: "failed: 安装器返回 0 但服务未注册";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return $"failed: {ex.Message}";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -87,6 +87,11 @@ internal static class Program
|
||||
|
||||
Console.Error.WriteLine($"[ThingHK] serve 模式: port={port} config={configPath ?? "(默认)"} fast={fastMs}ms slow={slowMs}ms");
|
||||
|
||||
// PawnIO:ring0 传感器读取的首选驱动(未安装且已提权时静默安装,
|
||||
// 避开 WinRing0 被系统阻止列表/杀软拦截导致的温度/频率缺失)
|
||||
string pawnIoResult = PawnIoSupport.EnsureInstalled();
|
||||
Console.Error.WriteLine($"[ThingHK] PawnIO: {pawnIoResult}");
|
||||
|
||||
using var kernel = new KernelHost();
|
||||
await kernel.StartAsync(configPath, fastMs, slowMs);
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<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" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@@ -0,0 +1,797 @@
|
||||
# Thing UI 设计系统与开发约束
|
||||
|
||||
> **适用范围**:`src/` 下全部前端代码(12 个模块、220+ 组件)
|
||||
> **约束力**:第 7 章为硬性约束,Code Review 据此判定;第 3–5 章为实现规范
|
||||
> **配套**:`UI Design System` 画布(色彩 / 排版 / 组件 / 骨架四屏可视化规范)
|
||||
> **唯一事实来源**:token 值以 `src/style.css` 为准,本文档与之同步
|
||||
|
||||
---
|
||||
|
||||
## 1. 设计原则
|
||||
|
||||
以下 8 条为不可协商项,贯穿全部模块。
|
||||
|
||||
**P1 · 单一强调色**
|
||||
全应用只有 `--primary` 一种交互色,用于按钮、链接、选中态、焦点环。不存在"第二个主题色"。状态色(success/warning/danger)仅表达**状态**,不得用于可点击元素。
|
||||
|
||||
**P2 · 颜色只能来自 token**
|
||||
禁止在组件内写 hex、rgb、oklch,禁止引用 Tailwind 原生色阶(`bg-blue-500`、`text-emerald-700`)。组件里出现的每个颜色都必须能追溯到 `style.css` 的一个语义变量。
|
||||
|
||||
**P3 · 状态必须四态齐全**
|
||||
任何数据驱动的界面必须实现 **加载 / 空 / 错误 / 成功** 四态。禁止空白,禁止静默失败。这是最容易漏、也最影响质感的一条。
|
||||
|
||||
**P4 · 一个主区域,一个主操作**
|
||||
每屏有且仅有一个视觉重心、一个主按钮。破坏性操作(停止内核、删除记录)必须视觉降级或二次确认,且不得与主操作同权重。
|
||||
|
||||
**P5 · 骨架统一,内容区自治**
|
||||
所有模块共享同一套外壳(侧边栏 / 标题栏 / Tab 行)。**模块之间允许不同的只有内容区布局**——这是"统一"与"灵活"的分界线。
|
||||
|
||||
**P6 · 密度一致**
|
||||
全应用统一使用**紧凑偏中**密度:13px 正文、34px 控件、16px 卡片内边距。禁止在同一屏内混用疏密两种节奏。
|
||||
|
||||
**P7 · 卡片统一描边 + 轻阴影,浮层用重阴影**
|
||||
层级靠**表面色差 + 1px 描边 + 轻阴影(`shadow-sm` / `--shadow-card`)**表达。浮层(下拉、气泡、对话框)使用更重的 `--shadow-popover` / `--shadow-dialog`。
|
||||
|
||||
**P8 · 中文界面不做负字距**
|
||||
字体模板中的负字距(`-0.28px` 等)是为拉丁字母设计的,会让中文发挤。**拉丁文与数字可保留微调,中文一律 `letter-spacing: 0`。**
|
||||
|
||||
---
|
||||
|
||||
## 2. Design Token
|
||||
|
||||
### 2.1 命名与结构
|
||||
|
||||
Token 分四组,**在现有 shadcn 变量之上扩展,不另起一套**:
|
||||
|
||||
```
|
||||
shadcn 既有(值调整) → --background / --foreground / --primary / --card / --border / ...
|
||||
本项目扩展 → --canvas / --fg-* / --success / --warning / --data-* / --shadow-*
|
||||
```
|
||||
|
||||
**关键调整**:把 shadcn 的 `--primary` 从当前近黑色(`oklch(0.21 0.006 285.885)`)改为强调蓝 `#0066CC`。这样全部 shadcn 组件(Button / Switch / Checkbox / focus ring)自动获得统一的交互色,无需逐组件改样式。
|
||||
|
||||
### 2.2 色彩
|
||||
|
||||
#### 浅色模式(`:root`)
|
||||
|
||||
```css
|
||||
:root {
|
||||
/* ── 表面 ───────────────────────────── */
|
||||
--canvas: #F5F5F7; /* 应用底 / 模块内容区背景 */
|
||||
--background: #FFFFFF; /* shadcn 基准面 */
|
||||
--card: #FFFFFF; /* 卡片 / 面板 */
|
||||
--popover: #FFFFFF; /* 浮层 */
|
||||
--subtle: #F0F0F2; /* 次级填充:搜索框底、分段控件槽、代码块 */
|
||||
--hover: #EBEBED; /* 通用中性 hover:按钮、菜单项、数据表、导航 */
|
||||
--active: #E4E4E7; /* 幽灵控件 active */
|
||||
--row-hover: #EBF3FB; /* 内容行 hover(= primary 8% 混入 card,随主题色变) */
|
||||
--row-selected: #D9E8F7; /* 内容行选中(= primary 15% 混入 card) */
|
||||
--row-hover-veil: color-mix(in srgb, var(--primary) 16%, transparent); /* mica 弹窗行 hover */
|
||||
--row-selected-veil: color-mix(in srgb, var(--primary) 30%, transparent); /* mica 弹窗行选中 */
|
||||
|
||||
/* ── 描边 ───────────────────────────── */
|
||||
--border: #E4E4E7; /* 卡片外框、输入框 */
|
||||
--border-strong: #D1D1D6; /* 需要更强分隔时 */
|
||||
--divider: #F0F0F2; /* 卡片内部分隔线(1px) */
|
||||
--input: #E4E4E7;
|
||||
|
||||
/* ── 文字 ───────────────────────────── */
|
||||
--foreground: #1D1D1F; /* 主文字:标题、正文、数值 */
|
||||
--fg-secondary: #55555C; /* 次文字:键名、标签说明、幽灵控件文字 */
|
||||
--muted-foreground: #8A8A90; /* 辅助:占位符、规格说明、次级 meta */
|
||||
--fg-disabled: #B4B4BA; /* 禁用 */
|
||||
|
||||
/* ── 强调 ───────────────────────────── */
|
||||
--primary: #0066CC;
|
||||
--primary-hover: #0055B3;
|
||||
--primary-active: #004A9E;
|
||||
--primary-foreground: #FFFFFF;
|
||||
--primary-soft: #E8F1FC; /* 选中 Tab 底、选中行底 */
|
||||
--primary-soft-text: #004F9E; /* 上述底上的文字 */
|
||||
--ring: #0071E3;
|
||||
|
||||
/* ── 语义状态 ───────────────────────── */
|
||||
--success: #0F7B4F; --success-soft: #E7F5EE; --success-text: #0B5C3B;
|
||||
--warning: #A96B00; --warning-soft: #FDF4E4; --warning-text: #7D4F00;
|
||||
--danger: #C7362F; --danger-soft: #FDECEA; --danger-text: #9A2620;
|
||||
--info: #0066CC; --info-soft: #E8F1FC; --info-text: #004F9E;
|
||||
--neutral: #8A8A90; --neutral-soft: #F0F0F2; --neutral-text: #55555C;
|
||||
--destructive: #C7362F; /* shadcn 兼容别名,指向 danger */
|
||||
--destructive-foreground: #FFFFFF;
|
||||
|
||||
/* ── 数据方向(与状态语义解耦)───────── */
|
||||
--data-down: #0F7B4F; /* 下载 / 入站 */
|
||||
--data-up: #C7362F; /* 上传 / 出站 */
|
||||
|
||||
/* ── 尺寸 ───────────────────────────── */
|
||||
--radius: 12px;
|
||||
--radius-xs: 4px; --radius-sm: 6px; --radius-md: 8px;
|
||||
--radius-lg: 12px; --radius-xl: 16px;
|
||||
|
||||
/* ── 阴影 ───────────────────────────── */
|
||||
--shadow-card: 0 1px 2px rgba(0,0,0,0.06);
|
||||
--shadow-popover: 0 1px 3px rgba(0,0,0,0.06), 0 4px 16px rgba(0,0,0,0.10);
|
||||
--shadow-dialog: 0 4px 12px rgba(0,0,0,0.08), 0 20px 48px rgba(0,0,0,0.16);
|
||||
}
|
||||
```
|
||||
|
||||
#### 深色模式(`.dark`)
|
||||
|
||||
深色下**必须成对重定义**,且强调色改为亮蓝(`#0066CC` 在深底上对比度不足):
|
||||
|
||||
```css
|
||||
.dark {
|
||||
--canvas: #16161A;
|
||||
--background: #16161A;
|
||||
--card: #1E1E22;
|
||||
--popover: #1E1E22;
|
||||
--subtle: #26262B;
|
||||
--hover: #2C2C32;
|
||||
--active: #33333A;
|
||||
--row-hover: #1F2B3A; /* = primary 11% 混入 card(深色下用更高强度) */
|
||||
--row-selected: #213E5C; /* = primary 26% 混入 card */
|
||||
/* --row-*-veil 刻意不在此重写:半透明叠在壁纸上,深浅由 --primary 自动决定 */
|
||||
|
||||
--border: #2E2E34;
|
||||
--border-strong: #3A3A42;
|
||||
--divider: #26262B;
|
||||
--input: #2E2E34;
|
||||
|
||||
--foreground: #F5F5F7;
|
||||
--fg-secondary: #A8A8B0;
|
||||
--muted-foreground: #7A7A82;
|
||||
--fg-disabled: #55555C;
|
||||
|
||||
--primary: #2997FF;
|
||||
--primary-hover: #4AA8FF;
|
||||
--primary-active: #1A85E8;
|
||||
--primary-foreground: #FFFFFF;
|
||||
--primary-soft: #14304D;
|
||||
--primary-soft-text: #7FC0FF;
|
||||
--ring: #2997FF;
|
||||
|
||||
--success: #3DC77F; --success-soft: #12301F; --success-text: #7FE0AB;
|
||||
--warning: #E0A83C; --warning-soft: #33260E; --warning-text: #F0C976;
|
||||
--danger: #FF6B60; --danger-soft: #3A1A18; --danger-text: #FF9E96;
|
||||
--info: #2997FF; --info-soft: #14304D; --info-text: #7FC0FF;
|
||||
--neutral: #7A7A82; --neutral-soft: #26262B; --neutral-text: #A8A8B0;
|
||||
--destructive: #FF6B60; --destructive-foreground: #FFFFFF;
|
||||
|
||||
--data-down: #3DC77F;
|
||||
--data-up: #FF6B60;
|
||||
}
|
||||
```
|
||||
|
||||
#### 状态色三件套的用法
|
||||
|
||||
每个语义状态有 **3 个** token,用途严格区分:
|
||||
|
||||
| Token | 用途 | 示例 |
|
||||
|---|---|---|
|
||||
| `--success` | 实心:状态点、图标、粗体数值 | ● 运行中 的圆点 |
|
||||
| `--success-soft` | 浅底:徽章背景、行高亮 | `<span class="bg-success-soft">` |
|
||||
| `--success-text` | 浅底上的文字 | 徽章内的"已安装" |
|
||||
|
||||
**禁止**把 `--success` 用作文字色 + `--success-soft` 以外的底色组合,也**禁止**用状态色做可点击元素的颜色(见 P1)。
|
||||
|
||||
#### 强调色的使用边界
|
||||
|
||||
`--primary` 只表达两件事:**这里可以点**、**这里是当前项**。
|
||||
|
||||
| 用 | 不用 |
|
||||
|---|---|
|
||||
| 主按钮底色、开关开启态、焦点环 | 卡片标题前的**装饰性图标** |
|
||||
| 当前 Tab / 选中列表行 / 选中项 | 全部 Tab 的图标 |
|
||||
| 可点击的文字链接 | 状态徽章(那是状态语义色的职责) |
|
||||
| 输入框聚焦态 | 大面积背景、分隔线、装饰元素 |
|
||||
|
||||
**反例(已修正)**:proxy 概览页的 6 个卡片标题图标全部用了 `text-primary`,加上主按钮、开关、选中态,整屏发蓝 —— 结果"蓝色"不再意味着"可点击",层次感也丢了。已统一改为 `--fg-secondary`。
|
||||
|
||||
#### 数据方向色(`--data-*`)
|
||||
|
||||
下载/上传速率沿用现有视觉(绿/红),但独立成 token,**与 `success/danger` 解耦**。
|
||||
|
||||
> **待决策**:当前 `data-up` 与 `danger` 同色,会让人把"上传速率"误读为"异常"。若希望彻底解耦,建议改为
|
||||
> `--data-down: #0066CC`(蓝)/ `--data-up: #A96B00`(琥珀)。这是**唯一改动成本为零**的时机——只需改两个 token。
|
||||
|
||||
### 2.3 排版
|
||||
|
||||
字体族保持不变(现有 `--font-sans` 已正确针对中文优化):
|
||||
|
||||
```css
|
||||
--font-sans: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
|
||||
'Microsoft YaHei', 'PingFang SC', 'Noto Sans SC', sans-serif;
|
||||
--font-mono: 'JetBrains Mono', 'Cascadia Code', Consolas, monospace;
|
||||
```
|
||||
|
||||
生产代码不引用外部字体 CDN(设计稿 / 原型页可保留 Inter);数值对齐通过全局 `font-feature-settings: 'tnum','lnum'` 实现,不依赖具体字体。
|
||||
|
||||
字号标尺(9 级,全部为 `px`):
|
||||
|
||||
| Token | 字号 / 字重 | 行高 | 用途 |
|
||||
|---|---|---|---|
|
||||
| `display` | 28 / 700 | 36 | 页面级大标题(设置页、关于页),**全应用不超过 1 处/屏** |
|
||||
| `metric` | 22 / 600 | 28 | 关键数值(速率、容量)· **必须 `font-variant-numeric: tabular-nums`** |
|
||||
| `h1` | 16 / 600 | 24 | 模块标题、卡片标题 |
|
||||
| `h2` | 14 / 600 | 20 | 区块标题、卡片标题(小卡) |
|
||||
| `h3` | 13 / 600 | 20 | 小节标题、列表分组标题 |
|
||||
| `body` | 13 / 400 | 20 | **界面默认正文** |
|
||||
| `body-strong` | 13 / 600 | 20 | 行内强调、键值行的键 |
|
||||
| `caption` | 12 / 400 | 18 | 辅助说明、参数解释 |
|
||||
| `label` | 11 / 500 | 16 | 徽章、标签、表头、单位 |
|
||||
|
||||
**规则**:
|
||||
|
||||
1. 字号只从以上 9 级中取,**禁止 `text-[13.5px]` 这类任意值**。
|
||||
2. 数值(速率、版本号、计数)统一用 `tabular-nums`,避免刷新时数字跳动。
|
||||
3. 中文 `letter-spacing: 0`;拉丁小标题可 `-0.1px`,正文一律 `0`。
|
||||
4. 行高按表中固定值写,不用 Tailwind 默认相对行高。
|
||||
|
||||
### 2.4 间距
|
||||
|
||||
4px 基数,**8 个值,用尽即止**:
|
||||
|
||||
| Token | 值 | 典型用途 |
|
||||
|---|---|---|
|
||||
| `space-1` | 4 | 图标与文字间隙、徽章内边距(纵向) |
|
||||
| `space-2` | 8 | 控件内元素间隙、徽章内边距(横向) |
|
||||
| `space-3` | 12 | 列表行内间隙、卡片标题与内容间距 |
|
||||
| `space-4` | 16 | **卡片内边距、卡片间距** |
|
||||
| `space-5` | 20 | **模块内容区默认内边距** |
|
||||
| `space-6` | 24 | 区块之间、对话框内边距 |
|
||||
| `space-8` | 32 | 大区块分隔 |
|
||||
| `space-12` | 48 | 页面级分段 |
|
||||
|
||||
**禁止** `p-[18px]`、`gap-[14px]`、`mt-[6px]`。需要更细的调整时,说明是布局问题而非间距问题。
|
||||
|
||||
### 2.5 圆角
|
||||
|
||||
| Token | 值 | 适用 |
|
||||
|---|---|---|
|
||||
| `radius-xs` | 4 | 内联小元素:标签内块、进度条端点 |
|
||||
| `radius-sm` | 6 | 徽章、小按钮、下拉项 |
|
||||
| `radius-md` | 8 | **按钮、输入框、下拉框、分段控件、Tab 项** |
|
||||
| `radius-lg` | 12 | **卡片、面板、样张容器** |
|
||||
| `radius-xl` | 16 | 对话框、大浮层 |
|
||||
| `radius-full` | 9999 | 状态点、开关、头像、搜索框(胶囊) |
|
||||
|
||||
**规则**:同层级控件必须同圆角。按钮 8px 就全应用 8px,不允许某模块用 6px。
|
||||
|
||||
### 2.6 阴影与层级
|
||||
|
||||
**层级主要靠表面色差 + 描边 + 轻阴影**(P7):
|
||||
|
||||
| 层级 | 表现 | 用途 |
|
||||
|---|---|---|
|
||||
| L0 应用底 | `--canvas`,无描边无阴影 | 窗口、模块内容区 |
|
||||
| L1 卡片 | `--card` + 1px `--border` + 轻阴影 `shadow-sm` | 所有卡片、面板 |
|
||||
| L1.5 次级容器 | `--subtle`,无描边 | 搜索框底、分段控件槽、代码块 |
|
||||
| L2 浮层 | `--card` + `--shadow-popover` | 下拉菜单、气泡、tooltip、右键菜单 |
|
||||
| L3 模态 | `--card` + `--shadow-dialog` + 遮罩 | 对话框、AlertDialog |
|
||||
|
||||
卡片默认使用轻阴影 `--shadow-card`(`shadow-sm`);`--shadow-popover` / `--shadow-dialog` 仅用于浮层与模态。
|
||||
|
||||
### 2.7 动效
|
||||
|
||||
```css
|
||||
--ease-standard: cubic-bezier(0.22, 0.61, 0.36, 1); /* 沿用现有 tab-animate 曲线 */
|
||||
--duration-fast: 120ms; /* hover、颜色变化 */
|
||||
--duration-base: 200ms; /* 展开、浮层出现 */
|
||||
--duration-slow: 320ms; /* 页面/Tab 切换 */
|
||||
```
|
||||
|
||||
**规则**:
|
||||
|
||||
1. 只对 `opacity` 和 `transform` 做动画(性能)。
|
||||
2. 按钮按下统一 `transform: scale(0.97)`,不用颜色变化模拟按压。
|
||||
3. 所有动画必须包在 `@media (prefers-reduced-motion: reduce)` 里降级为 `none`(现有 `.music-eq` 已正确实现,作为模板)。
|
||||
4. Tab 切换复用现有全局 `.tab-animate` 类,**不要各模块自建过渡**。
|
||||
|
||||
### 2.8 图标
|
||||
|
||||
- 库:`@lucide/vue`,**禁止混用其他图标库或内联 Unicode 符号**(`↓` `✓` `●` 等)。
|
||||
- 尺寸只有 3 档:`14`(行内 / 徽章内)、`16`(按钮、Tab、默认)、`20`(侧边栏、卡片标题)。
|
||||
- `stroke-width` 统一 `1.75`(lucide 默认 2,偏粗,与 13px 正文不协调)—— 在 `style.css` 里对 `.lucide` 全局设置,不要逐个组件写。
|
||||
- 图标**不单独承载语义**:状态点旁必须有文字,工具栏图标必须有 tooltip 或文字标签(P4 可理解性)。
|
||||
|
||||
### 2.9 主题色自定义(已落地)
|
||||
|
||||
**需求**:设置页提供主题色选择,统一改变全应用的强调色。
|
||||
|
||||
**可行性**:可行且成本低 —— 因为全应用的"可交互色"已经收敛到单一来源 `--primary`。落地后组件层改动为 0。
|
||||
|
||||
**实现**:`src/lib/theme.ts`(派生 + 应用)+ `appStore.setAccent()` + 设置页「主题色」卡片。
|
||||
用户**只选一个基色**,深浅两套由代码派生 —— 不需要为浅色/深色各选一次(同色相两个亮度是既有做法:
|
||||
浅 `#0066cc` / 深 `#2997ff`),也不会出现"浅色选青、深色选紫"的语义割裂。
|
||||
|
||||
#### 需要派生的变量
|
||||
|
||||
只改基色是不够的,必须同时派生 7 个变量,否则 hover / 选中态仍是旧色:
|
||||
|
||||
| 变量 | 派生规则(OKLCH,色相 H 原样保留) | 用途 |
|
||||
|---|---|---|
|
||||
| `--primary` | 基色,L 归一到 `0.42–0.58`(浅)/ `0.68–0.80`(深),C 限制在 `0.06–0.20` | 主按钮、开关、焦点环 |
|
||||
| `--primary-hover` | 浅:L − 0.08;深:L + 0.06 | 主按钮 hover |
|
||||
| `--primary-active` | 浅:L − 0.16;深:L − 0.10 | 主按钮按下 |
|
||||
| `--primary-soft` | 浅:`oklch(0.95, C×0.30, H)`;深:`oklch(0.30, C×0.45, H)` | 选中底、幽灵按钮 hover |
|
||||
| `--primary-soft-text` | 基色加深/提亮起步,再按对比度推进到 ≥4.5:1 | 上述底上的文字 |
|
||||
| `--ring` | 同 `--primary` | 焦点环 |
|
||||
| `--primary-foreground` | 白字低于 2.5:1 时才换 `#1D1D1F` | 填充上的文字 |
|
||||
|
||||
深色模式**单独派生一套**(深底上要提亮),不能复用浅色值。
|
||||
|
||||
行高亮这一族(`--row-hover` / `--row-selected` / `--row-hover-veil` / `--row-selected-veil`)
|
||||
**不在这 7 个之内**:它们在 `style.css` 里写成 `color-mix(..., var(--primary) ...)`,
|
||||
而 `--primary` 的行内覆盖是惰性求值的,所以换主题色时自动跟着变,
|
||||
不需要进 `theme.ts` 的派生组,也不需要新增断言。
|
||||
|
||||
#### 关键技术点
|
||||
|
||||
1. **用 OKLCH 做派生,不要用 HSL。**
|
||||
只换色相 H、锁定 L 与 C,才能保证换任意色相后对比度一致。HSL 的"明度"感知不均匀,换色相会时亮时暗。
|
||||
|
||||
2. **对比度靠"推进亮度"而不是固定阈值判定。**
|
||||
同一 OKLCH L 下不同色相的 WCAG 亮度差很多(L=0.58 的青柠对白底只有 ~2.8:1,蓝色却有 ~5:1),
|
||||
所以归一到区间后还要继续推进 L 直到达标:
|
||||
- 浅色:`--primary` 对 `#FFFFFF` ≥ 4.5:1(它会被当文字用在白卡上)→ 选亮色自动压暗
|
||||
- 深色:`--primary` 对 `#1E1E22` ≥ 4.5:1 → 自动提亮
|
||||
- `--primary-soft-text` 对 `--primary-soft` ≥ 4.5:1
|
||||
以上断言在 `src/lib/theme.test.ts` 里对 10 个预设 × 2 模式全量校验。
|
||||
|
||||
3. **`--primary-foreground` 的取舍是有意的。**
|
||||
深色模式下强调色必须够亮才能在深底上当文字用(≥4.5:1),同一颜色做填充时白字只能到 2.7–3:1 ——
|
||||
现有主题就是这个取舍(`#2997ff` + 白字 ≈ 2.98:1)。因此门槛按 UI 组件的 2.5:1 兜底,
|
||||
只在自定义极亮色时才改深墨。
|
||||
|
||||
4. **只开放"强调色",不开放状态色。**
|
||||
`success` / `warning` / `danger` 是语义色,改了会破坏"绿色=成功"的心智模型。`--data-*` 同理。
|
||||
`--info` 一族当前取值与强调色相同(蓝),但**不跟随**主题色 —— 它表达"信息"而非"可交互",
|
||||
换紫/绿主色后少数徽标(代理"国外"、HTTP 1xx/3xx、快速面板分类)仍是蓝色,属有意的语义区分。
|
||||
|
||||
5. **预设 + 自定义。**
|
||||
10 个预设(默认蓝 / 靛蓝 / 紫罗兰 / 玫红 / 橙 / 琥珀 / 青柠 / 翠绿 / 青绿 / 石墨)+ 原生取色器。
|
||||
纯自由取色很容易选出对比度不达标的颜色,所以色板优先。
|
||||
色板显示色用**派生后的浅色模式主色**(所见即所得,如青柠显示为压暗后的绿)。
|
||||
|
||||
6. **实时预览 + 可回滚。**
|
||||
点击色块 / 拖动取色器立即生效(写 7 个变量,无防抖);「恢复默认」清除行内变量回到内置蓝。
|
||||
|
||||
7. **持久化**:随其它设置写入 `thing_app_settings`(`accentId` + `accentHex`)。
|
||||
属**纯增量字段**,`SETTINGS_VERSION` 不递增 —— 递增会命中"版本不匹配清空"分支,
|
||||
把用户的模块排序/启停/开机自启一并抹掉,为零收益付真实数据损失。
|
||||
|
||||
8. **行内变量的优先级陷阱。**
|
||||
变量写在 `documentElement` 的行内样式上,优先级高于 `:root` 与 `.dark` 两条规则,因此:
|
||||
切模式必须**整组 7 个重写**(否则浅色的行内值会残留到深色模式);
|
||||
恢复默认必须 `removeProperty`(写空串仍算"已设置")。
|
||||
|
||||
#### 落地范围
|
||||
|
||||
- `src/lib/theme.ts` —— 派生计算 + 应用/清除(新增,含单测)
|
||||
- `src/stores/appStore.ts` —— `accentId`/`accentHex` + `setAccent()`,在 `applyTheme()` 与
|
||||
`handleSystemThemeChange()` 里按当前模式应用
|
||||
- `src/modules/settings/GeneralSettings.vue` —— 「主题色」卡片
|
||||
- 9 个独立窗口(快速面板 / 托盘菜单 / 下载窗 / 剪贴板弹窗与预览 / 翻译弹窗 / 截图覆盖层·编辑器·贴图)
|
||||
各加一行 `applyStoredAccent()`;托盘菜单额外补 `storage` 监听
|
||||
- `src/style.css` —— **无需改动**(7 个变量已是 CSS 变量)
|
||||
- **首屏闪烁(FOUC)不需要额外处理**:主窗口 `visible: false`,`appStore.init()` 在 `show()` 前完成应用;
|
||||
文档原建议的 Rust `initialization_script` 方案与本仓库 localStorage 方案冲突,不实施
|
||||
|
||||
**影响面:0 处组件改动。** 这正是把交互色收敛到 `--primary` 单点带来的收益 —— 现在不做,将来也不用挨个改组件。
|
||||
|
||||
---
|
||||
|
||||
## 3. 页面框架
|
||||
|
||||
框架只定义三件事:**谁多高、谁滚动、padding 加在哪**。这三件事定死之前,任何模块级的美化都会被布局 bug 吃掉。
|
||||
|
||||
### 3.1 分区与高度约束链
|
||||
|
||||
```
|
||||
AppShell h-screen flex-col
|
||||
├ TitleBar h-14 shrink-0 固定 · 侧栏图标 + 模块 Tab + 搜索
|
||||
└ 主体 flex-1 min-h-0 flex-row
|
||||
├ Sidebar w-15 shrink-0 60px 固定
|
||||
└ 内容滚动区 flex-1 min-h-0 overflow-y-auto ← 全应用唯一滚动容器
|
||||
└ 内容 wrapper p-5(占满内容宽,无 max-width)
|
||||
```
|
||||
|
||||
Tab 已并入标题栏(见 3.5),内容区不含独立 Tab 行,纵向空间最大化。
|
||||
|
||||
**三个必须遵守的点**(都是实际踩过的坑,不是理论):
|
||||
|
||||
1. **`min-h-0` 不能漏。**
|
||||
flex 子项默认 `min-height: auto` —— 内容变高时它**不收缩**,直接把父容器顶破,底部 padding 被推出视口。这就是"卡片贴着应用底部"的根因。
|
||||
|
||||
2. **padding 加在滚动容器**内部**的 wrapper 上。**
|
||||
加在滚动容器自身,底部 padding 会被内容高度覆盖,滚动到底依然贴边。
|
||||
|
||||
3. **断点按内容宽度选,不按视口宽度。**
|
||||
侧边栏固定占 60px —— 视口 1000px 时内容只剩 940px。两列网格必须用 `md`(768) 而不是 `lg`(1024),否则窗口一窄就退化成单列全宽、卡片大片留白。
|
||||
|
||||
### 3.2 滚动归属
|
||||
|
||||
**全应用只有一处滚动容器。**
|
||||
|
||||
- 模块内容区随外层滚动,**不是**每个模块各建一个滚动容器
|
||||
- 模块根 / 页面级容器**禁止** `overflow-y-auto` —— 那会绕过外层 `ScrollArea`,出现原生宽滚动条(快速面板踩过);根容器一律 `min-h-full`
|
||||
- 局部列表(剪贴板历史、音乐队列等)**可以用 `ScrollArea` 组件**做独立滚动 —— 这是「局部区域」而非「页面级」
|
||||
- 需要固定表头的长表格:用 `position: sticky` 固定表头,而不是给表格单独开滚动容器
|
||||
- 例外:terminal / translate 的工作台面板内部滚动(workbench 模式特征)
|
||||
- 代价:切换 Tab 时共享同一个滚动位置(可以接受,反而更符合"翻页"直觉)
|
||||
|
||||
**统一组件使用规则**(违规即 UI 不一致,等同违反第 5 章 D 系):
|
||||
|
||||
| 需求 | 用 | 禁止 |
|
||||
|---|---|---|
|
||||
| 页面滚动 | 外层 `ScrollArea`(自动,模块无需处理) | 模块根 `overflow-y-auto` |
|
||||
| 局部列表滚动 | `ScrollArea` 组件 | 原生 `overflow` |
|
||||
| 键值行 / 状态点 / 徽章 / 大数值 | `@/components/common` 对应组件 | 手写 flex 结构 |
|
||||
| 卡片 | `Card` / `InfoGroup(card)` / `StatCard`(统一 `shadow-sm`) | 手写描边块 |
|
||||
| 多分组设置表单 | `SettingGroup` + `SettingRow` | 手写行 |
|
||||
|
||||
### 3.3 内容区宽度
|
||||
|
||||
内容区**不限宽,占满窗口宽度**(已移除 `max-w-6xl` 限制)。窗口拉宽时卡片随内容区延展,不再居中约束。
|
||||
|
||||
### 3.4 内容区布局模式
|
||||
|
||||
内容区**只能**从以下五种里选,不得自创:
|
||||
|
||||
| 模式 | 适用 | 规格 |
|
||||
|---|---|---|
|
||||
| `grid` | 概览 / 状态总览 | `grid-cols-1 md:grid-cols-2`·gap 16·`items-start` 让卡片各自高度 |
|
||||
| `split` | 列表类(clipboard / music / terminal) | 左栏 280–320px·右栏 fill·中间 1px `--border`·无 padding |
|
||||
| `workbench` | 输入-输出类(devtools / translate) | 纵向堆叠·gap 12 |
|
||||
| `settings` | 设置页 | 纵向堆叠·gap 24·复用 `SettingGroup` |
|
||||
| `plain` | 其他 | 纵向堆叠·gap 12 |
|
||||
|
||||
**`grid` 的用法边界**:只适合「各块内容量接近」的概览页。若各块信息量差异大,两列会让矮的那列留空。
|
||||
|
||||
**概览页标准结构 · 「状态横幅 + 卡片网格」**(适用于 proxy / 下载 / 硬件监控,四处横幅已统一,见下方「落地状态」):
|
||||
|
||||
```
|
||||
第一行:状态横幅(全宽,独立于网格,高约 76px)
|
||||
├ 容器 `Card`(`!py-0 !gap-0`)+ `CardContent`(`flex flex-wrap items-center gap-x-6 gap-y-3 px-4 py-4`)
|
||||
│ 圆角/描边/阴影一律由 Card 提供(`rounded-xl + border + shadow-sm`),禁止手写 `rounded-lg border bg-card`
|
||||
├ 左组成组(状态 → 核心属性 → 实时指标,依次靠左,不把指标悬在中间)
|
||||
│ 状态区 状态点 8px + 状态文字 13px/500 + 进程名 13px 次要色(状态点/文字用语义色;运行态加 status-dot-pulse)
|
||||
│ 指标区 label 11px 灰 + 数值 18px/600 tabular-nums;核心属性(如内核版本、PID)也占一个指标位
|
||||
└ 操作区 运行中 = 重启(outline)+停止(destructive);停止 = 启动(primary);sm = 32px;`ml-auto` 推到行尾
|
||||
下方:**两列瀑布流** `columns-1 md:columns-2`(卡片 `break-inside-avoid`,列间距/卡间距 16px),`InfoGroup variant="card"`
|
||||
├ 卡内键值**一律单列**(`InfoGroup columns=1`,一行一条)—— 双列键值会挤压值区,路径类长值被截断
|
||||
├ 瀑布流各卡自然高度、列内堆叠,**没有「同行等高」的配对压力** —— 双列网格的配对调整是反复返工的根源,已废弃
|
||||
├ 表单类内容(下拉/输入)用「label 在上 + 控件全宽」纵排,不塞进键值行的值区
|
||||
└ 阅读顺序为纵向(先左列后右列),分组按重要性排序;列底部不齐是模型特征,不是缺陷
|
||||
```
|
||||
|
||||
**适用判断**:模块概览有「一个核心状态 + 2-4 个实时指标 + 一个主操作」就用横幅;三者不齐的模块直接用卡片网格,不要硬凑横幅。
|
||||
|
||||
**落地状态**(2026-09-21 统一):proxy 概览 / proxy 连接 / 下载任务 / 硬件监控概览四处横幅均按本节实现 ——
|
||||
- 硬件监控:`PID / 传感器 / 重启 / 事件` 从 `text-xs` 内联「标签: 值」提升为指标位,进程名用 `ThingHK`,操作区 `xs` → `sm`,停止按钮改 `destructive`
|
||||
- 下载:`下载中 / 等待 / 已暂停 / 已完成 / 已取消` 从 `Badge` 改为指标位,且恒显(0 比隐藏更真实,也避免位置漂移)
|
||||
- 状态文字一律「状态 + 进程名」顺序(`运行中 mihomo` / `已连接 ThingHK` / `运行中 下载引擎`)
|
||||
|
||||
**已否决的两个方案**(避免回头再试):
|
||||
- **平铺分组**(InfoGroup 无容器版):无容器所以视觉"散";键值两端对齐导致一行一条时"空"。
|
||||
- **等宽两列卡片**:内容量不齐导致列内留白。D2 之所以成立,是横幅吸收了最"高"的内容(状态+指标),剩下的卡片内容量天然接近。
|
||||
|
||||
**设置行**结构(`SettingGroup` + `SettingRow`):
|
||||
```
|
||||
分组标题(h2 14/600)+ 可选说明
|
||||
└ 设置行:左 label · 右控件,行高 44,行间 1px --divider
|
||||
```
|
||||
|
||||
### 3.5 导航与 Tab
|
||||
|
||||
**Tab 只有一处:标题栏。** 模块内容区不再渲染 Tab 行。
|
||||
|
||||
| 层级 | 位置 | 内容 |
|
||||
|---|---|---|
|
||||
| 一级导航 | 侧边栏 60px | 模块图标(代理 / 音乐 / 剪贴板…) |
|
||||
| 二级导航 | **标题栏内** | 当前模块的 Tab(概览 / 连接 / 节点 / 订阅 / 设置) |
|
||||
|
||||
**为什么**:Tab 行独占 48px 纵向空间,却只承载一个切换器。并入标题栏后,内容区最大化。
|
||||
|
||||
**实现**:
|
||||
```ts
|
||||
useModuleTabs('proxy', activeTab, tabs, { alwaysVisible: true })
|
||||
```
|
||||
- 模块**不渲染** `TabsList`,标题栏切换器常驻
|
||||
- 传 `alwaysVisible` 后不再注册 `IntersectionObserver`
|
||||
- 未传该选项的模块保持原行为(Tab 行滚出视口时才在标题栏补一个)—— 属过渡状态,应逐步迁移
|
||||
|
||||
**选中态**:`--primary` 实心胶囊 + 白字。标题栏空间小、Tab 数量少,实心比下划线更易扫读。
|
||||
|
||||
> 过渡期存在两套 Tab 外观:模块内的 `TabsList`(下划线)与标题栏切换器(实心胶囊)。**全部模块迁移完成后,只保留标题栏这一套**,那时 `TabsTrigger` 的下划线样式可以简化掉。
|
||||
|
||||
### 3.6 状态覆盖(P3 落地)
|
||||
|
||||
每种模式都必须实现四态,**抽成通用组件,不在模块内手写**:
|
||||
|
||||
| 状态 | 组件 | 表现 |
|
||||
|---|---|---|
|
||||
| 加载 | `<StateBlock variant="loading">` | Spinner 16px + "加载中…",高度撑满容器最小 120px |
|
||||
| 空 | `<StateBlock variant="empty">` | 图标 32px(`--muted-foreground`) + 说明 caption + 可选主按钮 |
|
||||
| 错误 | `<StateBlock variant="error">` | 图标 32px(`--danger`) + 错误信息 + "重试"次按钮 |
|
||||
| 无权限 | `<StateBlock variant="denied">` | 图标 + 说明 + 引导操作 |
|
||||
|
||||
**验收**:随机打开任一模块的任一 Tab,断网/清空数据/制造错误,都必须看到对应的块,而不是空白。
|
||||
|
||||
### 3.7 页面构造示例 · proxy(样板,含其余四页规划)
|
||||
|
||||
概览页已定稿(横幅 + 瀑布流)。其余四页用**同一套模式**组装,空态一律按 M8(结构恒定 + `—` 占位):
|
||||
|
||||
**统一原则(四页共用)**
|
||||
1. 每页从 3.4 的模式里选一种承载,不自创
|
||||
2. 统计类信息统一用「指标行」形态(与横幅指标区同构:label 11 + 数值 18/600),容器口径同横幅 —— 用 `Card` 承载,不做裸指标行(M8)
|
||||
3. 表格/列表统一用卡片承载,长表头 `sticky`
|
||||
4. 行内操作集中在行尾,用 `icon-sm`(28px),禁微缩按钮
|
||||
|
||||
**连接** —— 指标行 + 表格卡(workbench 变体)
|
||||
```
|
||||
指标行:活跃连接 + 规则命中 chips(与概览横幅同容器 Card + `px-4 py-4`;chips 紧挨活跃连接,随命中项变化向右延伸)
|
||||
下载/上传速率已删(与概览横幅重复);命中规则计数已删(恒等于活跃连接数)
|
||||
表格卡(全宽):进程/域名 + 国内国外徽章 + 规则 + 上下行流量 + 断开
|
||||
表头 sticky · 行 hover(bg-hover) · 空态「暂无活跃连接」
|
||||
```
|
||||
|
||||
**节点** —— 组导航 + 节点网格
|
||||
```
|
||||
顶部:代理组切换(SegmentedNav,组多时降级为 Select)+ 测速按钮(行右)
|
||||
节点网格:节点小卡(名称 + 延迟徽章 + 选中态 primary-soft),grid-cols-2 lg:grid-cols-3
|
||||
未运行时网格空态「暂无节点」,结构不变
|
||||
```
|
||||
|
||||
**订阅** —— 列表卡 + 导入区(plain 模式)
|
||||
```
|
||||
列表卡:行式(名称 / 更新时间 / 节点数 + 更新、删除),行高 52,行间 1px divider
|
||||
导入区:URL 输入 + 导入按钮,置于列表卡上方
|
||||
空态「暂无订阅」+ 主按钮引导导入
|
||||
```
|
||||
|
||||
**设置** —— 单卡 + 卡内标题(峰定稿偏好:设置页标题留在卡片内)
|
||||
```
|
||||
单张设置卡承载全部设置项,卡片占满内容宽(放大居中与概览/连接一致)
|
||||
输入类双列(md:grid-cols-2)、开关行「左说明右开关」、提示条 primary-soft 底;保存按钮在标题栏
|
||||
(SettingGroup / SettingRow 保留,用于全局设置页等多分组场景)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. 组件规范
|
||||
|
||||
### 4.1 业务组件清单(统一从 `@/components/common` 导入)
|
||||
|
||||
以下 14 个组件已建立完成。**模块内不得再手写同类结构**——这是"UI 不统一"反复复发的根本原因:只要没有现成的替代品,开发者就只能手写。
|
||||
|
||||
| # | 组件 | 解决的问题 | 关键 props |
|
||||
|---|---|---|---|
|
||||
| 1 | `ModuleShell` | **页面框架落地件**:高度约束链 + 滚动归属 + 内容区 padding/限宽 | `layout`, `padded`, `maxWidth`, `tabs` |
|
||||
| 2 | `ModuleToolbar` | 模块内容区顶部操作条 | `slot: left/right` |
|
||||
| 3 | `SectionHeader` | 区块标题 + 说明 + 右侧操作 | `title`, `description`, `slot: action` |
|
||||
| 4 | `StatCard` | 键值卡片(需要视觉分组的独立块) | `title`, `description`, `slot: action` |
|
||||
| 4a | `InfoGroup` | **平铺分组**(概览页键值快照,密度优先) | `title`, `columns`, `slot: action` / `slot: footer` |
|
||||
| 5 | `MetricValue` | 大数值 + 标签 + 单位 + 方向色 | `value`, `unit`, `label`, `trend` |
|
||||
| 6 | `KeyValueRow` | 键值行(状态/版本/路径) | `label`, `value`, `slot: value` |
|
||||
| 7 | `StatusDot` | 状态点 + 文字 | `state: success/warning/danger/neutral`, `label` |
|
||||
| 8 | `StatusBadge` | 徽章 | `variant`, `size: sm/md` |
|
||||
| 9 | `SettingRow` | 设置行 | `label`, `description`, `slot: control` |
|
||||
| 10 | `SettingGroup` | 设置分组 | `title`, `description` |
|
||||
| 11 | `DataListRow` | 列表行(主从分栏左栏) | `title`, `subtitle`, `active`, `slot: trailing` |
|
||||
| 12 | `StateBlock` | 加载/空/错误/无权限 | `variant`, `title`, `description`, `slot: action` |
|
||||
| 13 | `CopyField` | 可复制文本(路径、版本号) | `value`, `mono` |
|
||||
| 14 | `ConfirmDialog` | 破坏性操作确认 | `title`, `description`, `variant: danger` |
|
||||
|
||||
### 4.2 关键组件规格
|
||||
|
||||
**按钮**(基于 shadcn `Button`,只调 token 与尺寸)
|
||||
|
||||
| 变体 | 底色 | 文字 | 描边 | 用途 |
|
||||
|---|---|---|---|---|
|
||||
| `default`(主) | `--primary` | `--primary-foreground` | 无 | 每屏仅 1 个 |
|
||||
| `outline`(次) | `--card` | `--foreground` | `--border-strong` | 常规操作 |
|
||||
| `ghost`(幽灵) | 无底 / hover `--primary-soft` | `--fg-secondary` / hover `--primary-soft-text` | 无 | 工具栏、行内 |
|
||||
| `destructive`(危险) | `--danger` | 白 | 无 | 停止/删除,需确认 |
|
||||
|
||||
尺寸:`sm` 高 28 / `default` 高 34 / `lg` 高 40。内边距 `px-3.5`(default),圆角 `radius-md`。按下统一 `scale(0.97)`。
|
||||
**禁止** `h-4 px-1.5 text-[10px]` 这类微缩按钮(`ProxyModule.vue:1768` 有此写法)——需要更小的按钮时用 `StatusBadge`。
|
||||
|
||||
**交互反馈(hover / active / focus)**
|
||||
|
||||
| 场景 | hover | active |
|
||||
|---|---|---|
|
||||
| 主按钮 | `--primary-hover`(变深) | `--primary-active` |
|
||||
| 次按钮 / 卡片 | `--hover`(中性加深) | `--active` |
|
||||
| 幽灵按钮 / 图标按钮 | `--primary-soft` + `--primary-soft-text` | `--primary-soft` |
|
||||
| 内容列表行 / 选项卡片 | `--row-hover`(主题色弱底) | — |
|
||||
| mica / acrylic 弹窗内的行(快速面板、托盘菜单) | `--row-hover-veil`(半透明蒙层) | `--row-selected-veil`(按下/光标) |
|
||||
| 菜单项 / 数据表行 / 导航 / 分段 / 折叠头 | `--hover` | — |
|
||||
| 选中行 | — | `--row-selected` |
|
||||
| 选中 Tab | — | `--primary-soft` |
|
||||
|
||||
**焦点环**全应用统一:`ring-2 ring-ring/40`。hover ≠ selected:hover 表达"可以点",selected 表达"已经选中",后者才用强调色。
|
||||
|
||||
**内容行 vs 通用中性(2026-09 修订)**
|
||||
|
||||
`--hover` 与行高亮的分工,不是"哪个好看",而是语义:
|
||||
|
||||
| | 用 `--hover`(中性) | 用行高亮(主题色) |
|
||||
|---|---|---|
|
||||
| 判断依据 | 控件本身可点,不承载数据对象 | 一行/一卡承载一个**对象**(歌曲、任务、主机、密钥、设备、剪贴项) |
|
||||
| 典型 | 按钮、菜单项、代理连接表、侧栏、Tab、设置行 | 音乐列表/队列/歌单/搜索结果、任务列表、主机/密钥/shell 卡片、监控设备项、历史命令、剪贴板条目、快速面板与托盘菜单条目 |
|
||||
|
||||
**四种值的选择(2×2)**
|
||||
|
||||
先问两件事:**是不是"一行一个对象"** → 否则用 `--hover`;**这一行坐在什么底上** → 决定用哪一对:
|
||||
|
||||
| 行所在的面 | hover | 选中 |
|
||||
|---|---|---|
|
||||
| 不透明(卡片、面板、弹窗自带底色) | `--row-hover` 8% / 11% | `--row-selected` 15% / 26% |
|
||||
| mica / acrylic 糊化层(行直接画在壁纸上,窗口无自身底色) | `--row-hover-veil` 16% | `--row-selected-veil` 30% |
|
||||
|
||||
五条硬约束:
|
||||
|
||||
1. **不能全局把 `--hover` 改成主题色**。次按钮 hover 会与幽灵按钮(`--primary-soft`)撞色,菜单项与数据表整片变蓝,按钮层级和"hover 中性"的既有观感一起塌。必须是新增 token 分开用。
|
||||
2. **行选中不能用 `--primary-soft`**。`--primary-soft` ≈ primary 10% 混白,和 8% 的 `--row-hover` 只差 2 个色阶,悬停已选中项时看不出区别 —— 这就是 `--row-selected`(15%)存在的原因。`--primary-soft` 留给"选中 Tab / 幽灵按钮 hover"。
|
||||
3. **透明面上的行必须用 veil 而不是不透明色**。不透明浅底在糊化层上会变成一块"贴上去的白块",并盖掉 mica 质感;半透明会与壁纸自然叠合(浅壁纸偏浅、深壁纸偏深),因此 veil 只在 `:root` 定义一次,不在 `.dark` 重写。veil 也明显更重(16% vs 8%)—— 不透明的 8% 放到壁纸上基本看不见;但也不能一路加重,20% 起就偏"罩住"了,16% / 30% 是实测的手感点。
|
||||
4. **禁止在内容行上继续用 `--accent/40 ~ /60`**。半透明中性灰在白卡上只有 3% 明度差,等于 hover 无效——这是本次修订要清掉的存量问题。
|
||||
5. **选中态必须显式盖过 hover**。二者的 CSS 特异性经常是平的或反过来:纯 CSS 里 `:hover`((0,2,0))高于单类((0,1,0)),要写 `.sel:hover` 同规则;Vue 里静态的 `hover:bg-row-hover` 不能和条件类的 `bg-row-selected` 并存,必须写成三元互斥(见 `SftpPanel.vue` 文件表格与 `TrackItem.vue`)。
|
||||
|
||||
**状态点**
|
||||
|
||||
```
|
||||
8px 圆 · border-radius: full · 底色 = 对应 --<state>
|
||||
与文字间距 6px · 文字用 body 或 label
|
||||
```
|
||||
可选呼吸动效(运行中):`opacity` 1↔0.55,1.8s 循环,`prefers-reduced-motion` 下禁用。
|
||||
|
||||
**徽章**
|
||||
|
||||
```
|
||||
高 20 · 内边距 3px 8px · 圆角 radius-sm
|
||||
底 --<state>-soft · 文字 --<state>-text · 字号 label(11/500)
|
||||
```
|
||||
|
||||
**卡片**
|
||||
|
||||
```
|
||||
底 --card · 1px --border · 圆角 radius-lg(12) · 内边距 space-4(16)
|
||||
标题 h2(14/600) · 标题与内容间距 space-3(12)
|
||||
统一轻阴影 shadow-sm(--shadow-card)—— shadcn Card / InfoGroup card / StatCard 一致
|
||||
```
|
||||
|
||||
**输入 / 下拉 / 分段控件**
|
||||
|
||||
```
|
||||
高度 34 · 圆角 radius-md(8) · 1px --border
|
||||
输入与下拉态:底 --card
|
||||
分段控件:外槽底 --subtle,内边距 3,选中项底 --card + 文字 --foreground,未选中项文字 --fg-secondary
|
||||
聚焦:border 不变,box-shadow: 0 0 0 2px --ring(40% alpha)
|
||||
```
|
||||
|
||||
### 4.3 组件用法要点
|
||||
|
||||
- 业务组件统一从 `@/components/common` 导入(见 4.1 清单),模块内禁止手写同类结构。
|
||||
- 页面用 `ModuleShell` 包裹,通过 `layout`(grid / split / workbench / settings / plain)选内容区模式。
|
||||
- 内容区先按四态组织:先 `loading`,再 `empty`/`error`,最后才是数据内容(见 3.6 / M8)。
|
||||
- 颜色只用 token 类名(`bg-card border border-border`),禁止 hex 与原生色阶(见第 5 章 D1–D2)。
|
||||
- 数值统一 `tabular-nums`;状态点 / 徽章用 `StatusDot` / `StatusBadge`,键值用 `KeyValueRow` / `InfoGroup`。
|
||||
|
||||
---
|
||||
|
||||
## 5. 开发约束(硬性)
|
||||
|
||||
### 5.1 禁止清单
|
||||
|
||||
| # | 禁止 | 替代方案 |
|
||||
|---|---|---|
|
||||
| D1 | 组件内出现 hex / rgb / oklch 字面量 | 用语义 token 类名 |
|
||||
| D2 | Tailwind 原生色阶 `bg-blue-500` `text-emerald-700` `border-slate-200` | 用 `bg-primary` `text-success-text` `border-border` |
|
||||
| D3 | 间距/圆角/尺寸的任意值 `p-[18px]` `rounded-[10px]` | 归位 4px 栅格:`p-4` `rounded-md`(非 4 倍数就近归档)。**字号例外**:正文标准档 `text-[11px]`~`text-[14px]` 是项目字号体系(Tailwind 无 13px 预设),允许保留;非标准档(15/13.5/16px 等)归位最近标准档 |
|
||||
| D4 | 用状态色表达可点击性(绿色按钮 = 主操作) | 主操作一律 `--primary` |
|
||||
| D5 | 卡片使用重阴影(shadow-popover / shadow-dialog 或 hover 抬起阴影) | 卡片统一轻阴影 `shadow-sm` |
|
||||
| D6 | 模块内手写状态点 / 徽章 / 卡片标题 / 键值行 | 用第 4.1 节组件 |
|
||||
| D7 | 混用图标库,或用 Unicode 符号(`↓ ✓ ● ▸`)当图标 | lucide,尺寸 14/16/20 |
|
||||
| D8 | 中文加负字距 | `letter-spacing: 0` |
|
||||
| D9 | 生产代码 `@import` 外部字体 CDN | 系统字体栈 |
|
||||
| D10 | 数据驱动界面缺四态之一 | `StateBlock` |
|
||||
| D11 | 一屏多个主按钮 / 破坏性操作与主操作同权重 | 视觉降级 + `ConfirmDialog` |
|
||||
| D12 | 在 `.dark` 下靠改组件类名做适配 | 只改 token,组件代码不感知主题 |
|
||||
|
||||
### 5.2 必须清单
|
||||
|
||||
- **M1** 新增模块必须使用 `ModuleShell`,内容区三选一(第 3.2 节)
|
||||
- **M2** 所有颜色/间距/圆角/字号可追溯到 `style.css` 的 token
|
||||
- **M3** 深色模式与浅色模式同时验证,不得只测一套
|
||||
- **M4** 数值使用 `tabular-nums`
|
||||
- **M5** 动效尊重 `prefers-reduced-motion`
|
||||
- **M6** 控件最小点击区 28×28(桌面标准,非触摸的 44)
|
||||
- **M7** 文字与背景对比度 ≥ 4.5:1;`--muted-foreground` 不得用于正文,只用于 ≥12px 的辅助信息
|
||||
- **M8** 数据驱动的界面**结构恒定**:无数据时保持完整结构、值用 `—` 占位(横幅、键值行、表格单元同规则);**不得**用「xx 未运行」之类文案整块替换结构。运行状态由横幅状态区或状态点表达,不在卡片内复述。控件在不可用时禁用,而不是隐藏整块。
|
||||
`—` 与 `0` 的区分:`—` = 数据缺失/不适用(如未运行时的 PID);`0` = 语义上就是零(如未运行时的连接数、速率)—— 可计数指标显示 0 比 `—` 更真实。指标行/横幅必须有容器(卡片),裸指标行浮在画布上与页面不协调。
|
||||
- **M9** 动态数值的指标位**按数据类型固定最小宽度**:速率/流量/计数高频刷新,宽度变化会左右推移兄弟元素。做法同 OSD(`tabular-nums` + `min-width`)。**宽度按内容定,不要一刀切**——速率 `min-w-24`(容纳 `999 KB/s`)、版本/累计 `min-w-20`、纯计数 `min-w-12`;统一给大值会留白并把同卡操作按钮挤换行
|
||||
- **M8** 键盘可聚焦元素必须有可见焦点环(`ring-2 ring-ring/40`)
|
||||
|
||||
### 5.3 Code Review 检查点
|
||||
|
||||
提交前自查(建议做成 MR 模板 checklist):
|
||||
|
||||
1. `grep -rE "(#[0-9a-fA-F]{3,8}|(bg|text|border)-(slate|gray|zinc|blue|emerald|amber|red|rose|orange|sky|purple|violet)-[0-9]{2,3})" src/` **无新增命中**
|
||||
2. `grep -rE "\w-\[[^\]]+\]" src/` 新增行数可控且能说明理由
|
||||
3. 深浅两套主题截图留存
|
||||
4. 加载/空/错误三态至少手动触发过一次
|
||||
5. 破坏性操作有确认
|
||||
|
||||
**建议自动化**:加入 ESLint 规则,直接拦截 D1–D3。
|
||||
|
||||
```js
|
||||
// eslint 思路示例:禁止特定 class 模式
|
||||
{
|
||||
files: ['**/*.vue'],
|
||||
rules: {
|
||||
'no-restricted-syntax': [
|
||||
'error',
|
||||
{
|
||||
selector: 'Literal[value=/(bg|text|border)-(slate|gray|zinc|blue|emerald|amber|red|rose|orange|sky|purple|violet)-\\d{3}/]',
|
||||
message: '禁止使用 Tailwind 原生色阶,请使用语义 token(见 UI_DESIGN_SYSTEM.md 第 5.1 节 D2)'
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 6. 工具与状态
|
||||
|
||||
### 6.1 组件预览页(改 token 后的回归工具)
|
||||
|
||||
路径:`preview/` —— **不在生产构建入口内**,只在 `bun dev` 时可访问。
|
||||
|
||||
```bash
|
||||
bun dev
|
||||
# 浏览器打开 http://localhost:14210/preview/index.html
|
||||
```
|
||||
|
||||
用途:改完 `src/style.css` 的 token 后,把全部基础组件与业务组件过一遍,确认浅色 / 深色两套都正确 —— 替代"改完 token 靠记忆推断影响面"。本页不依赖任何 Tauri API,纯浏览器即可运行。
|
||||
|
||||
查询参数:
|
||||
|
||||
| 参数 | 作用 | 示例 |
|
||||
|---|---|---|
|
||||
| `theme=dark` | 以深色模式启动 | `?theme=dark` |
|
||||
| `only=<id>` | 只渲染指定分区,便于放大核对 | `?only=data` |
|
||||
|
||||
已内置 `id` 的分区:`forms`、`data`、`shell`。需要放大看其他分区时,按同样方式给 `<section>` 加 `id` 即可。
|
||||
|
||||
> **实现注意**:`only` 的隔离 CSS 只能用**显式标记**(`[data-block]` / `[data-page-header]`),**不能用 `section` / `header` 这类标签选择器**——`StatCard` 内部也用 `<section>` 和 `<header>`,会被一起隐藏,产生"组件没渲染"的假象。
|
||||
|
||||
### 6.2 当前状态
|
||||
|
||||
- 业务组件层(第 4.1 节 14 个组件)与 Token 层已落地,`preview/` 预览页已完成浅色/深色视觉回归。
|
||||
- 色阶治理:Tailwind 原生色阶从约 155 处降至 3 处(proxy / terminal / monitor / translate / music 的色阶与 Tabs 已完成)。
|
||||
- proxy 概览页定稿为「状态横幅 + 两列瀑布流」,InfoGroup 新增 `variant="card"`。
|
||||
- 状态横幅统一(2026-09-21):proxy 概览 / proxy 连接 / 下载任务 / 硬件监控概览四处横幅统一为 §3.4 的三段式(状态区 → 指标区 → 操作区)+ `Card` 容器;监控与下载的旧样式(`text-xs` 内联键值、Badge 计数、`xs` 按钮)已废弃。
|
||||
- 主题色自定义落地(2026-09-21,见 §2.9):`src/lib/theme.ts` + `appStore.setAccent()` + 设置页「主题色」卡片(10 预设 + 自定义),深浅两套自动派生、对比度自动兜底;组件层 0 改动。
|
||||
- 终端模块非终端页对齐(2026-09-21,见 TERMINAL_MODULE_PLAN.md §5):根 padding 归类、列表 Card 化、表单走 `@/components/ui` 原语、四态/徽章走 `@/components/common`、设置页用 `SettingGroup`/`SettingRow`(此后二者与 `StateBlock`/`StatusBadge` 有真实消费者);终端画布、状态栏、`h-11` 契约、xterm 链保持不动。
|
||||
- 剩余项:
|
||||
- `OsdWindow` 免改(功能性配置,非 UI token 问题)
|
||||
- `DownloadWindow` / `ClipboardPopup` 仍有少量 hex,待统一
|
||||
- ESLint 约束规则(第 5.3 节)尚未搭建
|
||||
|
||||
### 6.3 待决策
|
||||
|
||||
| # | 问题 | 状态 | 结论 / 影响 |
|
||||
|---|---|---|---|
|
||||
| 1 | 数据方向色是否与状态色解耦 | 已定(暂保留现有取值) | 保留"下载=绿、上传=红",已独立成 `--data-*` token,要换色只改这 2 个值 |
|
||||
| 2 | 强调色用 `#0066CC` | ✅ 已采用 | 落地;同时解决 shadcn primary 近黑导致按钮发灰 |
|
||||
| 3 | 浮窗(OSD/截图/下载)是否纳入统一体系 | 部分已定 | `OsdWindow` 免改(功能性配置);`DownloadWindow`/`ClipboardPopup` 少量 hex 待统一;不强行并入主界面 token |
|
||||
| 4 | `--font-mono` 是否用网络字体 | ✅ 已定 | 系统 `Cascadia Code` / `Consolas`,不引外部字体 |
|
||||
| 5 | 侧边栏宽度 60px | ✅ 已定 | 沿用现有实现 |
|
||||
| 6 | 内容区限宽 | ✅ 已定 | 改为**不限宽占满**窗口宽度(原 `max-w-6xl` 限制已移除) |
|
||||
| 7 | 卡片阴影 | ✅ 已定 | 卡片统一轻阴影 `shadow-sm`(shadcn Card / InfoGroup card / StatCard 一致),浮层仍用 `shadow-popover`/`shadow-dialog` |
|
||||
|
||||
---
|
||||
|
||||
**维护约定**:Token 值以 `src/style.css` 为唯一事实来源,本文档与之同步;两者冲突时以本文档为准并修正代码。新增 token 或组件须同步更新第 2、4 章。
|
||||
@@ -13,9 +13,18 @@
|
||||
"@tauri-apps/plugin-global-shortcut": "^2",
|
||||
"@tauri-apps/plugin-opener": "^2",
|
||||
"@vueuse/core": "^14.4.0",
|
||||
"@xterm/addon-fit": "^0.11.0",
|
||||
"@xterm/addon-search": "^0.16.0",
|
||||
"@xterm/addon-serialize": "^0.14.0",
|
||||
"@xterm/addon-unicode11": "^0.9.0",
|
||||
"@xterm/addon-web-links": "^0.12.0",
|
||||
"@xterm/addon-webgl": "^0.19.0",
|
||||
"@xterm/xterm": "^6.0.0",
|
||||
"class-variance-authority": "^0.7.1",
|
||||
"clsx": "^2.1.1",
|
||||
"pinia": "^3.0.4",
|
||||
"pinyin-pro": "^3.28.2",
|
||||
"qrcode": "^1.5.4",
|
||||
"reka-ui": "^2.10.1",
|
||||
"tailwind-merge": "^3.6.0",
|
||||
"tailwindcss": "^4.3.2",
|
||||
@@ -26,7 +35,11 @@
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "^2",
|
||||
"@types/node": "^26.1.1",
|
||||
"@types/qrcode": "^1.5.6",
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
"@vue/eslint-config-typescript": "^14.9.0",
|
||||
"eslint": "^10.11.0",
|
||||
"eslint-plugin-vue": "^10.11.0",
|
||||
"tw-animate-css": "^1.4.0",
|
||||
"typescript": "~5.6.2",
|
||||
"vite": "^6.0.3",
|
||||
@@ -43,6 +56,10 @@
|
||||
|
||||
"@babel/types": ["@babel/types@7.29.7", "https://registry.npmmirror.com/@babel/types/-/types-7.29.7.tgz", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA=="],
|
||||
|
||||
"@cacheable/memory": ["@cacheable/memory@2.2.0", "https://registry.npmmirror.com/@cacheable/memory/-/memory-2.2.0.tgz", { "dependencies": { "@cacheable/utils": "^2.5.0", "@keyv/bigmap": "^1.3.1", "hookified": "^1.15.1", "keyv": "^5.6.0" } }, "sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ=="],
|
||||
|
||||
"@cacheable/utils": ["@cacheable/utils@2.5.0", "https://registry.npmmirror.com/@cacheable/utils/-/utils-2.5.0.tgz", { "dependencies": { "hashery": "^1.5.1", "keyv": "^5.6.0" } }, "sha512-buipgOVDkkPXNR5+xBpDw7Zk2n1EvU7qBJCNUcL7rhQ//kfpOXPAvQ511Os0vpLYJ1pZnvudNytkQt2hst3wqA=="],
|
||||
|
||||
"@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.12", "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz", { "os": "aix", "cpu": "ppc64" }, "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA=="],
|
||||
|
||||
"@esbuild/android-arm": ["@esbuild/android-arm@0.25.12", "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.25.12.tgz", { "os": "android", "cpu": "arm" }, "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg=="],
|
||||
@@ -95,6 +112,20 @@
|
||||
|
||||
"@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.12", "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", { "os": "win32", "cpu": "x64" }, "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA=="],
|
||||
|
||||
"@eslint-community/eslint-utils": ["@eslint-community/eslint-utils@4.10.1", "https://registry.npmmirror.com/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz", { "dependencies": { "eslint-visitor-keys": "^3.4.3" }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg=="],
|
||||
|
||||
"@eslint-community/regexpp": ["@eslint-community/regexpp@4.12.2", "https://registry.npmmirror.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", {}, "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew=="],
|
||||
|
||||
"@eslint/config-array": ["@eslint/config-array@0.23.5", "https://registry.npmmirror.com/@eslint/config-array/-/config-array-0.23.5.tgz", { "dependencies": { "@eslint/object-schema": "^3.0.5", "debug": "^4.3.1", "minimatch": "^10.2.4" } }, "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA=="],
|
||||
|
||||
"@eslint/config-helpers": ["@eslint/config-helpers@0.7.0", "https://registry.npmmirror.com/@eslint/config-helpers/-/config-helpers-0.7.0.tgz", { "dependencies": { "@eslint/core": "^1.2.1" } }, "sha512-DObd/KKUsU+FaFv4PLxSRenpXfQWmPXXP3pPZ6/K1PCrMu2vQpMDMuQe/BqYeoLcz8ro0bVDF1RxOJgfVEdhUw=="],
|
||||
|
||||
"@eslint/core": ["@eslint/core@1.2.1", "https://registry.npmmirror.com/@eslint/core/-/core-1.2.1.tgz", { "dependencies": { "@types/json-schema": "^7.0.15" } }, "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ=="],
|
||||
|
||||
"@eslint/object-schema": ["@eslint/object-schema@3.0.5", "https://registry.npmmirror.com/@eslint/object-schema/-/object-schema-3.0.5.tgz", {}, "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw=="],
|
||||
|
||||
"@eslint/plugin-kit": ["@eslint/plugin-kit@0.7.3", "https://registry.npmmirror.com/@eslint/plugin-kit/-/plugin-kit-0.7.3.tgz", { "dependencies": { "@eslint/core": "^1.2.1", "levn": "^0.4.1" } }, "sha512-IkO+/KEUvwbVpiURZg+P7zF74z5Jxe0UgJxVni+RtoHQ6IZieXaO02kmadomap/q+l6bc/jdPGGqTjhuZnuz1Q=="],
|
||||
|
||||
"@floating-ui/core": ["@floating-ui/core@1.8.0", "https://registry.npmmirror.com/@floating-ui/core/-/core-1.8.0.tgz", { "dependencies": { "@floating-ui/utils": "^0.2.12" } }, "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ=="],
|
||||
|
||||
"@floating-ui/dom": ["@floating-ui/dom@1.8.0", "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.8.0.tgz", { "dependencies": { "@floating-ui/core": "^1.8.0", "@floating-ui/utils": "^0.2.12" } }, "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg=="],
|
||||
@@ -103,6 +134,16 @@
|
||||
|
||||
"@floating-ui/vue": ["@floating-ui/vue@1.1.11", "https://registry.npmmirror.com/@floating-ui/vue/-/vue-1.1.11.tgz", { "dependencies": { "@floating-ui/dom": "^1.7.6", "@floating-ui/utils": "^0.2.11", "vue-demi": ">=0.13.0" } }, "sha512-HzHKCNVxnGS35r9fCHBc3+uCnjw9IWIlCPL683cGgM9Kgj2BiAl8x1mS7vtvP6F9S/e/q4O6MApwSHj8hNLGfw=="],
|
||||
|
||||
"@humanfs/core": ["@humanfs/core@0.19.2", "https://registry.npmmirror.com/@humanfs/core/-/core-0.19.2.tgz", { "dependencies": { "@humanfs/types": "^0.15.0" } }, "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA=="],
|
||||
|
||||
"@humanfs/node": ["@humanfs/node@0.16.8", "https://registry.npmmirror.com/@humanfs/node/-/node-0.16.8.tgz", { "dependencies": { "@humanfs/core": "^0.19.2", "@humanfs/types": "^0.15.0", "@humanwhocodes/retry": "^0.4.0" } }, "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ=="],
|
||||
|
||||
"@humanfs/types": ["@humanfs/types@0.15.0", "https://registry.npmmirror.com/@humanfs/types/-/types-0.15.0.tgz", {}, "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q=="],
|
||||
|
||||
"@humanwhocodes/module-importer": ["@humanwhocodes/module-importer@1.0.1", "https://registry.npmmirror.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", {}, "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="],
|
||||
|
||||
"@humanwhocodes/retry": ["@humanwhocodes/retry@0.4.3", "https://registry.npmmirror.com/@humanwhocodes/retry/-/retry-0.4.3.tgz", {}, "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ=="],
|
||||
|
||||
"@internationalized/date": ["@internationalized/date@3.12.2", "https://registry.npmmirror.com/@internationalized/date/-/date-3.12.2.tgz", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-FY1Y+H64NDs+HAF6omlnWxm3mEpfgaCSWtL5l551ZZfImA+kGjPFgrnJrGjH6lfmLL0g8Z/mBu1R3kufeCp6Jw=="],
|
||||
|
||||
"@internationalized/number": ["@internationalized/number@3.6.7", "https://registry.npmmirror.com/@internationalized/number/-/number-3.6.7.tgz", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-3ji1fcrT+FPAK86UqEhB/psHixYo6niWPJtt7+qRaYFynt/BaJG8GhAPimtWUpEiVSTq8ZM8L5psMxGquiB/Vg=="],
|
||||
@@ -117,8 +158,18 @@
|
||||
|
||||
"@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
|
||||
|
||||
"@keyv/bigmap": ["@keyv/bigmap@1.3.1", "https://registry.npmmirror.com/@keyv/bigmap/-/bigmap-1.3.1.tgz", { "dependencies": { "hashery": "^1.4.0", "hookified": "^1.15.0" }, "peerDependencies": { "keyv": "^5.6.0" } }, "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ=="],
|
||||
|
||||
"@keyv/serialize": ["@keyv/serialize@1.1.1", "https://registry.npmmirror.com/@keyv/serialize/-/serialize-1.1.1.tgz", {}, "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA=="],
|
||||
|
||||
"@lucide/vue": ["@lucide/vue@1.28.0", "https://registry.npmmirror.com/@lucide/vue/-/vue-1.28.0.tgz", { "peerDependencies": { "vue": ">=3.0.1" } }, "sha512-cO89UyNM/0i2Srdi04nFWeEOQkqzDZlM2ehtWyBhcMpRTJDKpMZPCGAVlmVBgBgr5HaeL5L6FsU8RHsOdwXtKw=="],
|
||||
|
||||
"@nodelib/fs.scandir": ["@nodelib/fs.scandir@2.1.5", "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", { "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="],
|
||||
|
||||
"@nodelib/fs.stat": ["@nodelib/fs.stat@2.0.5", "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", {}, "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="],
|
||||
|
||||
"@nodelib/fs.walk": ["@nodelib/fs.walk@1.2.8", "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", { "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="],
|
||||
|
||||
"@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.62.2", "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz", { "os": "android", "cpu": "arm" }, "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg=="],
|
||||
|
||||
"@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.62.2", "https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz", { "os": "android", "cpu": "arm64" }, "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw=="],
|
||||
@@ -239,14 +290,40 @@
|
||||
|
||||
"@tauri-apps/plugin-opener": ["@tauri-apps/plugin-opener@2.5.4", "https://registry.npmmirror.com/@tauri-apps/plugin-opener/-/plugin-opener-2.5.4.tgz", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-1HnPkb+AmgO29HBazm4uPLKB+r7zzcTBW1d0fyYp1uP+jwtpoiNDGKMMzz58SFp49nOIrxdE3aUJtT57lfO9CQ=="],
|
||||
|
||||
"@types/esrecurse": ["@types/esrecurse@4.3.1", "https://registry.npmmirror.com/@types/esrecurse/-/esrecurse-4.3.1.tgz", {}, "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw=="],
|
||||
|
||||
"@types/estree": ["@types/estree@1.0.9", "https://registry.npmmirror.com/@types/estree/-/estree-1.0.9.tgz", {}, "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg=="],
|
||||
|
||||
"@types/json-schema": ["@types/json-schema@7.0.15", "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.15.tgz", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
|
||||
|
||||
"@types/node": ["@types/node@26.1.1", "https://registry.npmmirror.com/@types/node/-/node-26.1.1.tgz", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw=="],
|
||||
|
||||
"@types/qrcode": ["@types/qrcode@1.5.6", "https://registry.npmmirror.com/@types/qrcode/-/qrcode-1.5.6.tgz", { "dependencies": { "@types/node": "*" } }, "sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw=="],
|
||||
|
||||
"@types/sortablejs": ["@types/sortablejs@1.15.9", "https://registry.npmmirror.com/@types/sortablejs/-/sortablejs-1.15.9.tgz", {}, "sha512-7HP+rZGE2p886PKV9c9OJzLBI6BBJu1O7lJGYnPyG3fS4/duUCcngkNCjsLwIMV+WMqANe3tt4irrXHSIe68OQ=="],
|
||||
|
||||
"@types/web-bluetooth": ["@types/web-bluetooth@0.0.21", "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz", {}, "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA=="],
|
||||
|
||||
"@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.70.0.tgz", { "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.70.0", "@typescript-eslint/type-utils": "8.70.0", "@typescript-eslint/utils": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.70.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-/v8HZt6RlyIZxB3ntehELOcUcfxKPVGWXnQdJuHRmzrqgF8nQypcC/oxGW+Ot4VGKDq81XugPKxx0n5PBtf9PA=="],
|
||||
|
||||
"@typescript-eslint/parser": ["@typescript-eslint/parser@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-8.70.0.tgz", { "dependencies": { "@typescript-eslint/scope-manager": "8.70.0", "@typescript-eslint/types": "8.70.0", "@typescript-eslint/typescript-estree": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0", "debug": "^4.4.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-zYvrmj9Yxd63UGaXw+kdt6A0F0s0qveJyuatIM77bYC2DE4pgmg7a50u8LR7PRtXd0x+h+Tl3eXabGm06SWd3Q=="],
|
||||
|
||||
"@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/project-service/-/project-service-8.70.0.tgz", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.70.0", "@typescript-eslint/types": "^8.70.0", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-hFHbTNqhU9G+2eKFXCBVb1tjFT/LceiJ4+HfLO4pTpDI0KHi6iajpcFFkaSQ9gXmCh7n82A0PthaayEdN6mspQ=="],
|
||||
|
||||
"@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-8.70.0.tgz", { "dependencies": { "@typescript-eslint/types": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0" } }, "sha512-8nP3Kwh5hlgZ4FicGvmznAmJe8UL4sdU8tLukrPaMuQmDuk4Y8xYfzu/aYZW4xT2JCgc7H/TpDI5cGlxcWJSqQ=="],
|
||||
|
||||
"@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.70.0.tgz", { "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-adnkeeNq9Sq1sUf4+FRVc0KdgYghzsgFpZSQVZVvY0LCuUuN0FnQgyGzCJeC4fW1cdXseBAjU2EOqUIjbNcZUw=="],
|
||||
|
||||
"@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-8.70.0.tgz", { "dependencies": { "@typescript-eslint/types": "8.70.0", "@typescript-eslint/typescript-estree": "8.70.0", "@typescript-eslint/utils": "8.70.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-NUMKIhYVaVIVLnRL9CRt+VVcuLgSHUCpXn4/+K8wql+vdInUzvx8BjUO1oJ7cG9shjFJKtF8F8Hh2kCh3/KBVw=="],
|
||||
|
||||
"@typescript-eslint/types": ["@typescript-eslint/types@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/types/-/types-8.70.0.tgz", {}, "sha512-asTOIYhDg4zdzOScCyaytrsV3cR6B4ecPQlXw/dJIm7J/MZTtCtfVII9JD8Geh4jTCrK/Xe6cg5UevoleMcoJQ=="],
|
||||
|
||||
"@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.70.0.tgz", { "dependencies": { "@typescript-eslint/project-service": "8.70.0", "@typescript-eslint/tsconfig-utils": "8.70.0", "@typescript-eslint/types": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-d9NmHMPEKQ7QCLLm1jI3zmoQBwT5KwFYjXBJ9ymZfKCUU+5rmTRykKAFvH5Qn/ZCds3CEAFS9OC9M/jkl0X2bA=="],
|
||||
|
||||
"@typescript-eslint/utils": ["@typescript-eslint/utils@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-8.70.0.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.70.0", "@typescript-eslint/types": "8.70.0", "@typescript-eslint/typescript-estree": "8.70.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-oZmtKJz/4fufZ2p3+Cn3ijEojcdfR+1zYDH2xKYrEly0dR/Q/1xUPRCOlKGxod78nWlU2UnDe09GZ3TaknBFGA=="],
|
||||
|
||||
"@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.70.0.tgz", { "dependencies": { "@typescript-eslint/types": "8.70.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-BoC8PiO4Hkdo0TVJh9Ntxr5MxPDI7/oFsrygN5ADelFSeXG/qgNuucIGA+L5Z6JpPTE/uRfcTWtscjbUaufepQ=="],
|
||||
|
||||
"@vitejs/plugin-vue": ["@vitejs/plugin-vue@5.2.4", "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz", { "peerDependencies": { "vite": "^5.0.0 || ^6.0.0", "vue": "^3.2.25" } }, "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA=="],
|
||||
|
||||
"@volar/language-core": ["@volar/language-core@2.4.15", "https://registry.npmmirror.com/@volar/language-core/-/language-core-2.4.15.tgz", { "dependencies": { "@volar/source-map": "2.4.15" } }, "sha512-3VHw+QZU0ZG9IuQmzT68IyN4hZNd9GchGPhbD9+pa8CVv7rnoOZwo7T8weIbrRmihqy3ATpdfXFnqRrfPVK6CA=="],
|
||||
@@ -271,6 +348,8 @@
|
||||
|
||||
"@vue/devtools-shared": ["@vue/devtools-shared@7.7.10", "https://registry.npmmirror.com/@vue/devtools-shared/-/devtools-shared-7.7.10.tgz", { "dependencies": { "rfdc": "^1.4.1" } }, "sha512-wOPslzB8vTvpxwdaOcR2qAbwmuSP0L+rhpoC6Cf56V3Jip+HWb7PQQXOUPgBNQARpXsbQX/+mvi8kKucmBGRwQ=="],
|
||||
|
||||
"@vue/eslint-config-typescript": ["@vue/eslint-config-typescript@14.9.0", "https://registry.npmmirror.com/@vue/eslint-config-typescript/-/eslint-config-typescript-14.9.0.tgz", { "dependencies": { "@typescript-eslint/utils": "^8.60.0", "fast-glob": "^3.3.3", "typescript-eslint": "^8.60.0", "vue-eslint-parser": "^10.4.0" }, "peerDependencies": { "eslint": "^9.10.0 || ^10.0.0", "eslint-plugin-vue": "^9.28.0 || ^10.0.0", "typescript": ">=4.8.4" }, "optionalPeers": ["typescript"], "bin": { "vue-eslint-config-typescript": "./dist/bin.js" } }, "sha512-E3j9hDlfVf10F30MRcLTPY2IIhWIx1nsvkVukk14kTcuA+oBVot9zsP1hzsO+PAMDxV3Fd9FimBJtUBNBL5KFA=="],
|
||||
|
||||
"@vue/language-core": ["@vue/language-core@2.2.12", "https://registry.npmmirror.com/@vue/language-core/-/language-core-2.2.12.tgz", { "dependencies": { "@volar/language-core": "2.4.15", "@vue/compiler-dom": "^3.5.0", "@vue/compiler-vue2": "^2.7.16", "@vue/shared": "^3.5.0", "alien-signals": "^1.0.3", "minimatch": "^9.0.3", "muggle-string": "^0.4.1", "path-browserify": "^1.0.1" }, "peerDependencies": { "typescript": "*" }, "optionalPeers": ["typescript"] }, "sha512-IsGljWbKGU1MZpBPN+BvPAdr55YPkj2nB/TBNGNC32Vy2qLG25DYu/NBN2vNtZqdRbTRjaoYrahLrToim2NanA=="],
|
||||
|
||||
"@vue/reactivity": ["@vue/reactivity@3.5.39", "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.39.tgz", { "dependencies": { "@vue/shared": "3.5.39" } }, "sha512-TpsuBJ9gGlZa5d23XcM2y8EXanz9dZeVDQBXRwzy46ItgvM+rWpzs+UVM0wcRLxGvcav0HE5jz2gNL53xlRAog=="],
|
||||
@@ -289,52 +368,174 @@
|
||||
|
||||
"@vueuse/shared": ["@vueuse/shared@14.4.0", "https://registry.npmmirror.com/@vueuse/shared/-/shared-14.4.0.tgz", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-JRgY90Sz8DDtPMsaDflvPMp9xYk69JZAmbuDvAquUVXKr2gEjqtzGNTTthLfckH0BzBqvnu31gb4a8TGLRe79g=="],
|
||||
|
||||
"@xterm/addon-fit": ["@xterm/addon-fit@0.11.0", "https://registry.npmmirror.com/@xterm/addon-fit/-/addon-fit-0.11.0.tgz", {}, "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g=="],
|
||||
|
||||
"@xterm/addon-search": ["@xterm/addon-search@0.16.0", "https://registry.npmmirror.com/@xterm/addon-search/-/addon-search-0.16.0.tgz", {}, "sha512-9OeuBFu0/uZJPu+9AHKY6g/w0Czyb/Ut0A5t79I4ULoU4IfU5BEpPFVGQxP4zTTMdfZEYkVIRYbHBX1xWwjeSA=="],
|
||||
|
||||
"@xterm/addon-serialize": ["@xterm/addon-serialize@0.14.0", "https://registry.npmmirror.com/@xterm/addon-serialize/-/addon-serialize-0.14.0.tgz", {}, "sha512-uteyTU1EkrQa2Ux6P/uFl2fzmXI46jy5uoQMKEOM0fKTyiW7cSn0WrFenHm5vO5uEXX/GpwW/FgILvv3r0WbkA=="],
|
||||
|
||||
"@xterm/addon-unicode11": ["@xterm/addon-unicode11@0.9.0", "https://registry.npmmirror.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0.tgz", {}, "sha512-FxDnYcyuXhNl+XSqGZL/t0U9eiNb/q3EWT5rYkQT/zuig8Gz/VagnQANKHdDWFM2lTMk9ly0EFQxxxtZUoRetw=="],
|
||||
|
||||
"@xterm/addon-web-links": ["@xterm/addon-web-links@0.12.0", "https://registry.npmmirror.com/@xterm/addon-web-links/-/addon-web-links-0.12.0.tgz", {}, "sha512-4Smom3RPyVp7ZMYOYDoC/9eGJJJqYhnPLGGqJ6wOBfB8VxPViJNSKdgRYb8NpaM6YSelEKbA2SStD7lGyqaobw=="],
|
||||
|
||||
"@xterm/addon-webgl": ["@xterm/addon-webgl@0.19.0", "https://registry.npmmirror.com/@xterm/addon-webgl/-/addon-webgl-0.19.0.tgz", {}, "sha512-b3fMOsyLVuCeNJWxolACEUED0vm7qC0cy4wRvf3oURSzDTYVQiGPhTnhWZwIHdvC48Y+oLhvYXnY4XDXPoJo6A=="],
|
||||
|
||||
"@xterm/xterm": ["@xterm/xterm@6.0.0", "https://registry.npmmirror.com/@xterm/xterm/-/xterm-6.0.0.tgz", {}, "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg=="],
|
||||
|
||||
"acorn": ["acorn@8.18.0", "https://registry.npmmirror.com/acorn/-/acorn-8.18.0.tgz", { "bin": { "acorn": "bin/acorn" } }, "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ=="],
|
||||
|
||||
"acorn-jsx": ["acorn-jsx@5.3.2", "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="],
|
||||
|
||||
"ajv": ["ajv@6.15.0", "https://registry.npmmirror.com/ajv/-/ajv-6.15.0.tgz", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw=="],
|
||||
|
||||
"alien-signals": ["alien-signals@1.0.13", "https://registry.npmmirror.com/alien-signals/-/alien-signals-1.0.13.tgz", {}, "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg=="],
|
||||
|
||||
"ansi-regex": ["ansi-regex@5.0.1", "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
|
||||
|
||||
"ansi-styles": ["ansi-styles@4.3.0", "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
|
||||
|
||||
"aria-hidden": ["aria-hidden@1.2.6", "https://registry.npmmirror.com/aria-hidden/-/aria-hidden-1.2.6.tgz", { "dependencies": { "tslib": "^2.0.0" } }, "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA=="],
|
||||
|
||||
"balanced-match": ["balanced-match@1.0.2", "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
|
||||
"balanced-match": ["balanced-match@4.0.4", "https://registry.npmmirror.com/balanced-match/-/balanced-match-4.0.4.tgz", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="],
|
||||
|
||||
"birpc": ["birpc@2.9.0", "https://registry.npmmirror.com/birpc/-/birpc-2.9.0.tgz", {}, "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw=="],
|
||||
|
||||
"brace-expansion": ["brace-expansion@2.1.2", "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.1.2.tgz", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA=="],
|
||||
"boolbase": ["boolbase@1.0.0", "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz", {}, "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="],
|
||||
|
||||
"brace-expansion": ["brace-expansion@5.0.12", "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-5.0.12.tgz", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ=="],
|
||||
|
||||
"braces": ["braces@3.0.3", "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="],
|
||||
|
||||
"cacheable": ["cacheable@2.5.0", "https://registry.npmmirror.com/cacheable/-/cacheable-2.5.0.tgz", { "dependencies": { "@cacheable/memory": "^2.2.0", "@cacheable/utils": "^2.5.0", "hookified": "^1.15.0", "keyv": "^5.6.0", "qified": "^0.10.1" } }, "sha512-60cyAOytib/OzBw1JNSoSV/boK1AtHryDIjvVBk7XbN4ugfkM3+Sry7fEjNgPMGgOjuaZPAp8ruZ0Cxafwyq9g=="],
|
||||
|
||||
"camelcase": ["camelcase@5.3.1", "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="],
|
||||
|
||||
"class-variance-authority": ["class-variance-authority@0.7.1", "https://registry.npmmirror.com/class-variance-authority/-/class-variance-authority-0.7.1.tgz", { "dependencies": { "clsx": "^2.1.1" } }, "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg=="],
|
||||
|
||||
"cliui": ["cliui@6.0.0", "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^6.2.0" } }, "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="],
|
||||
|
||||
"clsx": ["clsx@2.1.1", "https://registry.npmmirror.com/clsx/-/clsx-2.1.1.tgz", {}, "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA=="],
|
||||
|
||||
"color-convert": ["color-convert@2.0.1", "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="],
|
||||
|
||||
"color-name": ["color-name@1.1.4", "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
|
||||
|
||||
"copy-anything": ["copy-anything@4.0.5", "https://registry.npmmirror.com/copy-anything/-/copy-anything-4.0.5.tgz", { "dependencies": { "is-what": "^5.2.0" } }, "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA=="],
|
||||
|
||||
"cross-spawn": ["cross-spawn@7.0.6", "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.6.tgz", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="],
|
||||
|
||||
"cssesc": ["cssesc@3.0.0", "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz", { "bin": { "cssesc": "bin/cssesc" } }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="],
|
||||
|
||||
"csstype": ["csstype@3.2.3", "https://registry.npmmirror.com/csstype/-/csstype-3.2.3.tgz", {}, "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ=="],
|
||||
|
||||
"de-indent": ["de-indent@1.0.2", "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz", {}, "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="],
|
||||
|
||||
"debug": ["debug@4.4.3", "https://registry.npmmirror.com/debug/-/debug-4.4.3.tgz", { "dependencies": { "ms": "^2.1.3" }, "peerDependencies": { "supports-color": "*" }, "optionalPeers": ["supports-color"] }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="],
|
||||
|
||||
"decamelize": ["decamelize@1.2.0", "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz", {}, "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="],
|
||||
|
||||
"deep-is": ["deep-is@0.1.4", "https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz", {}, "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="],
|
||||
|
||||
"defu": ["defu@6.1.7", "https://registry.npmmirror.com/defu/-/defu-6.1.7.tgz", {}, "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ=="],
|
||||
|
||||
"detect-libc": ["detect-libc@2.1.2", "https://registry.npmmirror.com/detect-libc/-/detect-libc-2.1.2.tgz", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
|
||||
|
||||
"dijkstrajs": ["dijkstrajs@1.0.3", "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz", {}, "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="],
|
||||
|
||||
"emoji-regex": ["emoji-regex@8.0.0", "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
|
||||
|
||||
"enhanced-resolve": ["enhanced-resolve@5.21.6", "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.21.6.tgz", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.3" } }, "sha512-aNnGCvbJ/RIyWo1IuhNdVjnNF+EjH9wpzpNHt+ci/m9He9LJvUN8wrCcXjp9cWsGNAuvSpVFTx/vraAFQ8qGjQ=="],
|
||||
|
||||
"entities": ["entities@7.0.1", "https://registry.npmmirror.com/entities/-/entities-7.0.1.tgz", {}, "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA=="],
|
||||
|
||||
"esbuild": ["esbuild@0.25.12", "https://registry.npmmirror.com/esbuild/-/esbuild-0.25.12.tgz", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.12", "@esbuild/android-arm": "0.25.12", "@esbuild/android-arm64": "0.25.12", "@esbuild/android-x64": "0.25.12", "@esbuild/darwin-arm64": "0.25.12", "@esbuild/darwin-x64": "0.25.12", "@esbuild/freebsd-arm64": "0.25.12", "@esbuild/freebsd-x64": "0.25.12", "@esbuild/linux-arm": "0.25.12", "@esbuild/linux-arm64": "0.25.12", "@esbuild/linux-ia32": "0.25.12", "@esbuild/linux-loong64": "0.25.12", "@esbuild/linux-mips64el": "0.25.12", "@esbuild/linux-ppc64": "0.25.12", "@esbuild/linux-riscv64": "0.25.12", "@esbuild/linux-s390x": "0.25.12", "@esbuild/linux-x64": "0.25.12", "@esbuild/netbsd-arm64": "0.25.12", "@esbuild/netbsd-x64": "0.25.12", "@esbuild/openbsd-arm64": "0.25.12", "@esbuild/openbsd-x64": "0.25.12", "@esbuild/openharmony-arm64": "0.25.12", "@esbuild/sunos-x64": "0.25.12", "@esbuild/win32-arm64": "0.25.12", "@esbuild/win32-ia32": "0.25.12", "@esbuild/win32-x64": "0.25.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg=="],
|
||||
|
||||
"escape-string-regexp": ["escape-string-regexp@4.0.0", "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="],
|
||||
|
||||
"eslint": ["eslint@10.11.0", "https://registry.npmmirror.com/eslint/-/eslint-10.11.0.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", "@eslint/config-array": "^0.23.5", "@eslint/config-helpers": "^0.7.0", "@eslint/core": "^1.2.1", "@eslint/plugin-kit": "^0.7.3", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "ajv": "^6.14.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^9.1.2", "eslint-visitor-keys": "^5.0.1", "espree": "^11.2.0", "esquery": "^1.7.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "11.1.5 || >11.1.6 <12", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "minimatch": "^10.2.5", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-P7a6UEEqb9G95MYAtqkmsTbVXIYyzIfl6NGOIJk162PaahFxFyeGcrlXYFSiagECg4sEm8IseJdZBKR3rx6MsQ=="],
|
||||
|
||||
"eslint-plugin-vue": ["eslint-plugin-vue@10.11.0", "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-10.11.0.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "natural-compare": "^1.4.0", "nth-check": "^2.1.1", "postcss-selector-parser": "^7.1.4", "semver": "^7.8.5", "xml-name-validator": "^5.0.0" }, "peerDependencies": { "@stylistic/eslint-plugin": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "@typescript-eslint/parser": "^7.0.0 || ^8.0.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "vue-eslint-parser": "^10.3.0" }, "optionalPeers": ["@stylistic/eslint-plugin", "@typescript-eslint/parser"] }, "sha512-fGt38SsaPCZ2FmA3bX/3vOW2qdsPNx0/9x+7Aab6NMX++PhynMtK4LWC4vzXgfQBCqpUAler18H38GA+NBAd0Q=="],
|
||||
|
||||
"eslint-scope": ["eslint-scope@9.1.2", "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-9.1.2.tgz", { "dependencies": { "@types/esrecurse": "^4.3.1", "@types/estree": "^1.0.8", "esrecurse": "^4.3.0", "estraverse": "^5.2.0" } }, "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ=="],
|
||||
|
||||
"eslint-visitor-keys": ["eslint-visitor-keys@5.0.1", "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", {}, "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA=="],
|
||||
|
||||
"espree": ["espree@11.2.0", "https://registry.npmmirror.com/espree/-/espree-11.2.0.tgz", { "dependencies": { "acorn": "^8.16.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^5.0.1" } }, "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw=="],
|
||||
|
||||
"esquery": ["esquery@1.7.0", "https://registry.npmmirror.com/esquery/-/esquery-1.7.0.tgz", { "dependencies": { "estraverse": "^5.1.0" } }, "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g=="],
|
||||
|
||||
"esrecurse": ["esrecurse@4.3.0", "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz", { "dependencies": { "estraverse": "^5.2.0" } }, "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="],
|
||||
|
||||
"estraverse": ["estraverse@5.3.0", "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz", {}, "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="],
|
||||
|
||||
"estree-walker": ["estree-walker@2.0.2", "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="],
|
||||
|
||||
"esutils": ["esutils@2.0.3", "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz", {}, "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="],
|
||||
|
||||
"fast-deep-equal": ["fast-deep-equal@3.1.3", "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="],
|
||||
|
||||
"fast-glob": ["fast-glob@3.3.3", "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.3.tgz", { "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.8" } }, "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg=="],
|
||||
|
||||
"fast-json-stable-stringify": ["fast-json-stable-stringify@2.1.0", "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", {}, "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="],
|
||||
|
||||
"fast-levenshtein": ["fast-levenshtein@2.0.6", "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", {}, "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="],
|
||||
|
||||
"fastq": ["fastq@1.20.3", "https://registry.npmmirror.com/fastq/-/fastq-1.20.3.tgz", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-XKv5nnLs6nLF71NgiKJLIZFLkPyIEuOselLG7ujZnGrRfQK8HpvY+WqKhAJUAdLomwVHErVS4LfxFlPq0/FTAw=="],
|
||||
|
||||
"fdir": ["fdir@6.5.0", "https://registry.npmmirror.com/fdir/-/fdir-6.5.0.tgz", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="],
|
||||
|
||||
"file-entry-cache": ["file-entry-cache@11.1.5", "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-11.1.5.tgz", { "dependencies": { "flat-cache": "^6.1.23" } }, "sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q=="],
|
||||
|
||||
"fill-range": ["fill-range@7.1.1", "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz", { "dependencies": { "to-regex-range": "^5.0.1" } }, "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="],
|
||||
|
||||
"find-up": ["find-up@5.0.0", "https://registry.npmmirror.com/find-up/-/find-up-5.0.0.tgz", { "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="],
|
||||
|
||||
"flat-cache": ["flat-cache@6.1.23", "https://registry.npmmirror.com/flat-cache/-/flat-cache-6.1.23.tgz", { "dependencies": { "cacheable": "^2.5.0", "flatted": "^3.4.2", "hookified": "^1.15.0" } }, "sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA=="],
|
||||
|
||||
"flatted": ["flatted@3.4.4", "https://registry.npmmirror.com/flatted/-/flatted-3.4.4.tgz", {}, "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q=="],
|
||||
|
||||
"fsevents": ["fsevents@2.3.3", "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
|
||||
|
||||
"get-caller-file": ["get-caller-file@2.0.5", "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz", {}, "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="],
|
||||
|
||||
"glob-parent": ["glob-parent@6.0.2", "https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="],
|
||||
|
||||
"graceful-fs": ["graceful-fs@4.2.11", "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="],
|
||||
|
||||
"hashery": ["hashery@1.5.1", "https://registry.npmmirror.com/hashery/-/hashery-1.5.1.tgz", { "dependencies": { "hookified": "^1.15.0" } }, "sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ=="],
|
||||
|
||||
"he": ["he@1.2.0", "https://registry.npmmirror.com/he/-/he-1.2.0.tgz", { "bin": { "he": "bin/he" } }, "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="],
|
||||
|
||||
"hookable": ["hookable@5.5.3", "https://registry.npmmirror.com/hookable/-/hookable-5.5.3.tgz", {}, "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ=="],
|
||||
|
||||
"hookified": ["hookified@1.15.1", "https://registry.npmmirror.com/hookified/-/hookified-1.15.1.tgz", {}, "sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg=="],
|
||||
|
||||
"ignore": ["ignore@5.3.2", "https://registry.npmmirror.com/ignore/-/ignore-5.3.2.tgz", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
|
||||
|
||||
"imurmurhash": ["imurmurhash@0.1.4", "https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz", {}, "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="],
|
||||
|
||||
"is-extglob": ["is-extglob@2.1.1", "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="],
|
||||
|
||||
"is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="],
|
||||
|
||||
"is-glob": ["is-glob@4.0.3", "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz", { "dependencies": { "is-extglob": "^2.1.1" } }, "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="],
|
||||
|
||||
"is-number": ["is-number@7.0.0", "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz", {}, "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="],
|
||||
|
||||
"is-what": ["is-what@5.5.0", "https://registry.npmmirror.com/is-what/-/is-what-5.5.0.tgz", {}, "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw=="],
|
||||
|
||||
"isexe": ["isexe@2.0.0", "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
|
||||
|
||||
"jiti": ["jiti@2.7.0", "https://registry.npmmirror.com/jiti/-/jiti-2.7.0.tgz", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ=="],
|
||||
|
||||
"json-schema-traverse": ["json-schema-traverse@0.4.1", "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],
|
||||
|
||||
"json-stable-stringify-without-jsonify": ["json-stable-stringify-without-jsonify@1.0.1", "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", {}, "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="],
|
||||
|
||||
"keyv": ["keyv@5.6.0", "https://registry.npmmirror.com/keyv/-/keyv-5.6.0.tgz", { "dependencies": { "@keyv/serialize": "^1.1.1" } }, "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw=="],
|
||||
|
||||
"levn": ["levn@0.4.1", "https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz", { "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" } }, "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="],
|
||||
|
||||
"lightningcss": ["lightningcss@1.32.0", "https://registry.npmmirror.com/lightningcss/-/lightningcss-1.32.0.tgz", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-android-arm64": "1.32.0", "lightningcss-darwin-arm64": "1.32.0", "lightningcss-darwin-x64": "1.32.0", "lightningcss-freebsd-x64": "1.32.0", "lightningcss-linux-arm-gnueabihf": "1.32.0", "lightningcss-linux-arm64-gnu": "1.32.0", "lightningcss-linux-arm64-musl": "1.32.0", "lightningcss-linux-x64-gnu": "1.32.0", "lightningcss-linux-x64-musl": "1.32.0", "lightningcss-win32-arm64-msvc": "1.32.0", "lightningcss-win32-x64-msvc": "1.32.0" } }, "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ=="],
|
||||
|
||||
"lightningcss-android-arm64": ["lightningcss-android-arm64@1.32.0", "https://registry.npmmirror.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", { "os": "android", "cpu": "arm64" }, "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg=="],
|
||||
@@ -359,20 +560,44 @@
|
||||
|
||||
"lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.32.0", "https://registry.npmmirror.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", { "os": "win32", "cpu": "x64" }, "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q=="],
|
||||
|
||||
"locate-path": ["locate-path@6.0.0", "https://registry.npmmirror.com/locate-path/-/locate-path-6.0.0.tgz", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="],
|
||||
|
||||
"magic-string": ["magic-string@0.30.21", "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="],
|
||||
|
||||
"minimatch": ["minimatch@9.0.9", "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.9.tgz", { "dependencies": { "brace-expansion": "^2.0.2" } }, "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg=="],
|
||||
"merge2": ["merge2@1.4.1", "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="],
|
||||
|
||||
"micromatch": ["micromatch@4.0.8", "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="],
|
||||
|
||||
"minimatch": ["minimatch@10.2.6", "https://registry.npmmirror.com/minimatch/-/minimatch-10.2.6.tgz", { "dependencies": { "brace-expansion": "^5.0.8" } }, "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A=="],
|
||||
|
||||
"mitt": ["mitt@3.0.1", "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz", {}, "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="],
|
||||
|
||||
"ms": ["ms@2.1.3", "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
|
||||
|
||||
"muggle-string": ["muggle-string@0.4.1", "https://registry.npmmirror.com/muggle-string/-/muggle-string-0.4.1.tgz", {}, "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ=="],
|
||||
|
||||
"nanoid": ["nanoid@3.3.16", "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.16.tgz", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q=="],
|
||||
|
||||
"natural-compare": ["natural-compare@1.4.0", "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz", {}, "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="],
|
||||
|
||||
"nth-check": ["nth-check@2.1.1", "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz", { "dependencies": { "boolbase": "^1.0.0" } }, "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="],
|
||||
|
||||
"ohash": ["ohash@2.0.11", "https://registry.npmmirror.com/ohash/-/ohash-2.0.11.tgz", {}, "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ=="],
|
||||
|
||||
"optionator": ["optionator@0.9.4", "https://registry.npmmirror.com/optionator/-/optionator-0.9.4.tgz", { "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0", "word-wrap": "^1.2.5" } }, "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="],
|
||||
|
||||
"p-limit": ["p-limit@3.1.0", "https://registry.npmmirror.com/p-limit/-/p-limit-3.1.0.tgz", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="],
|
||||
|
||||
"p-locate": ["p-locate@5.0.0", "https://registry.npmmirror.com/p-locate/-/p-locate-5.0.0.tgz", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="],
|
||||
|
||||
"p-try": ["p-try@2.2.0", "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz", {}, "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="],
|
||||
|
||||
"path-browserify": ["path-browserify@1.0.1", "https://registry.npmmirror.com/path-browserify/-/path-browserify-1.0.1.tgz", {}, "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="],
|
||||
|
||||
"path-exists": ["path-exists@4.0.0", "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz", {}, "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="],
|
||||
|
||||
"path-key": ["path-key@3.1.1", "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="],
|
||||
|
||||
"perfect-debounce": ["perfect-debounce@1.0.0", "https://registry.npmmirror.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz", {}, "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA=="],
|
||||
|
||||
"picocolors": ["picocolors@1.1.1", "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="],
|
||||
@@ -381,18 +606,54 @@
|
||||
|
||||
"pinia": ["pinia@3.0.4", "https://registry.npmmirror.com/pinia/-/pinia-3.0.4.tgz", { "dependencies": { "@vue/devtools-api": "^7.7.7" }, "peerDependencies": { "typescript": ">=4.5.0", "vue": "^3.5.11" }, "optionalPeers": ["typescript"] }, "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw=="],
|
||||
|
||||
"pinyin-pro": ["pinyin-pro@3.29.4", "https://registry.npmmirror.com/pinyin-pro/-/pinyin-pro-3.29.4.tgz", {}, "sha512-SPXpDT2cHEy+d26V1RXYMlVzXN42hotFAak1fzyWPi4o2dKXb61UqD4pzxDJHwk6gbv8vQ6EfErd+hYX0Qhzug=="],
|
||||
|
||||
"pngjs": ["pngjs@5.0.0", "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz", {}, "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="],
|
||||
|
||||
"postcss": ["postcss@8.5.19", "https://registry.npmmirror.com/postcss/-/postcss-8.5.19.tgz", { "dependencies": { "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-Mz8SaolMd8nB+G13WkORcxQKHZ/NE4xXevtkJHVuG+guo9/wYKlIMTKAqGdEmYOXR2ijPjTYNHssizdaVSUNdQ=="],
|
||||
|
||||
"postcss-selector-parser": ["postcss-selector-parser@7.1.6", "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-7.1.6.tgz", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-7qASPzhKF2l2KLboRZux8CCTRMdGiV08vWmyKzPz22qZ7ZjQBOeY7rNzNoCLSUiftJ7HUq0GERHmxw/t0dCdMw=="],
|
||||
|
||||
"prelude-ls": ["prelude-ls@1.2.1", "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz", {}, "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="],
|
||||
|
||||
"punycode": ["punycode@2.3.1", "https://registry.npmmirror.com/punycode/-/punycode-2.3.1.tgz", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="],
|
||||
|
||||
"qified": ["qified@0.10.1", "https://registry.npmmirror.com/qified/-/qified-0.10.1.tgz", { "dependencies": { "hookified": "^2.1.1" } }, "sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA=="],
|
||||
|
||||
"qrcode": ["qrcode@1.5.4", "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.4.tgz", { "dependencies": { "dijkstrajs": "^1.0.1", "pngjs": "^5.0.0", "yargs": "^15.3.1" }, "bin": { "qrcode": "bin/qrcode" } }, "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg=="],
|
||||
|
||||
"queue-microtask": ["queue-microtask@1.2.3", "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", {}, "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="],
|
||||
|
||||
"reka-ui": ["reka-ui@2.10.1", "https://registry.npmmirror.com/reka-ui/-/reka-ui-2.10.1.tgz", { "dependencies": { "@floating-ui/dom": "^1.6.13", "@floating-ui/vue": "^1.1.6", "@internationalized/date": "^3.5.0", "@internationalized/number": "^3.5.0", "@tanstack/vue-virtual": "^3.12.0", "@vueuse/core": "^14.1.0", "@vueuse/shared": "^14.1.0", "aria-hidden": "^1.2.4", "defu": "^6.1.5", "ohash": "^2.0.11" }, "peerDependencies": { "vue": ">= 3.4.0" } }, "sha512-drcOQ4rQtDYAcGCsyQBqQg8QQ+H3B+zDaMJU0h8KPEPMa7g9BHu3zcOi4OB39XJSWizceFoNO0Z9tctSGLOXqg=="],
|
||||
|
||||
"require-directory": ["require-directory@2.1.1", "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz", {}, "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="],
|
||||
|
||||
"require-main-filename": ["require-main-filename@2.0.0", "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz", {}, "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="],
|
||||
|
||||
"reusify": ["reusify@1.1.0", "https://registry.npmmirror.com/reusify/-/reusify-1.1.0.tgz", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="],
|
||||
|
||||
"rfdc": ["rfdc@1.4.1", "https://registry.npmmirror.com/rfdc/-/rfdc-1.4.1.tgz", {}, "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA=="],
|
||||
|
||||
"rollup": ["rollup@4.62.2", "https://registry.npmmirror.com/rollup/-/rollup-4.62.2.tgz", { "dependencies": { "@types/estree": "1.0.9" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.62.2", "@rollup/rollup-android-arm64": "4.62.2", "@rollup/rollup-darwin-arm64": "4.62.2", "@rollup/rollup-darwin-x64": "4.62.2", "@rollup/rollup-freebsd-arm64": "4.62.2", "@rollup/rollup-freebsd-x64": "4.62.2", "@rollup/rollup-linux-arm-gnueabihf": "4.62.2", "@rollup/rollup-linux-arm-musleabihf": "4.62.2", "@rollup/rollup-linux-arm64-gnu": "4.62.2", "@rollup/rollup-linux-arm64-musl": "4.62.2", "@rollup/rollup-linux-loong64-gnu": "4.62.2", "@rollup/rollup-linux-loong64-musl": "4.62.2", "@rollup/rollup-linux-ppc64-gnu": "4.62.2", "@rollup/rollup-linux-ppc64-musl": "4.62.2", "@rollup/rollup-linux-riscv64-gnu": "4.62.2", "@rollup/rollup-linux-riscv64-musl": "4.62.2", "@rollup/rollup-linux-s390x-gnu": "4.62.2", "@rollup/rollup-linux-x64-gnu": "4.62.2", "@rollup/rollup-linux-x64-musl": "4.62.2", "@rollup/rollup-openbsd-x64": "4.62.2", "@rollup/rollup-openharmony-arm64": "4.62.2", "@rollup/rollup-win32-arm64-msvc": "4.62.2", "@rollup/rollup-win32-ia32-msvc": "4.62.2", "@rollup/rollup-win32-x64-gnu": "4.62.2", "@rollup/rollup-win32-x64-msvc": "4.62.2", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA=="],
|
||||
|
||||
"run-parallel": ["run-parallel@1.2.0", "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="],
|
||||
|
||||
"semver": ["semver@7.8.5", "https://registry.npmmirror.com/semver/-/semver-7.8.5.tgz", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
|
||||
|
||||
"set-blocking": ["set-blocking@2.0.0", "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz", {}, "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="],
|
||||
|
||||
"shebang-command": ["shebang-command@2.0.0", "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="],
|
||||
|
||||
"shebang-regex": ["shebang-regex@3.0.0", "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="],
|
||||
|
||||
"source-map-js": ["source-map-js@1.2.1", "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz", {}, "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="],
|
||||
|
||||
"speakingurl": ["speakingurl@14.0.1", "https://registry.npmmirror.com/speakingurl/-/speakingurl-14.0.1.tgz", {}, "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ=="],
|
||||
|
||||
"string-width": ["string-width@4.2.3", "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
|
||||
|
||||
"strip-ansi": ["strip-ansi@6.0.1", "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
|
||||
|
||||
"superjson": ["superjson@2.2.6", "https://registry.npmmirror.com/superjson/-/superjson-2.2.6.tgz", { "dependencies": { "copy-anything": "^4" } }, "sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA=="],
|
||||
|
||||
"tailwind-merge": ["tailwind-merge@3.6.0", "https://registry.npmmirror.com/tailwind-merge/-/tailwind-merge-3.6.0.tgz", {}, "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w=="],
|
||||
@@ -403,14 +664,26 @@
|
||||
|
||||
"tinyglobby": ["tinyglobby@0.2.17", "https://registry.npmmirror.com/tinyglobby/-/tinyglobby-0.2.17.tgz", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="],
|
||||
|
||||
"to-regex-range": ["to-regex-range@5.0.1", "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz", { "dependencies": { "is-number": "^7.0.0" } }, "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="],
|
||||
|
||||
"ts-api-utils": ["ts-api-utils@2.5.0", "https://registry.npmmirror.com/ts-api-utils/-/ts-api-utils-2.5.0.tgz", { "peerDependencies": { "typescript": ">=4.8.4" } }, "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA=="],
|
||||
|
||||
"tslib": ["tslib@2.8.1", "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
||||
|
||||
"tw-animate-css": ["tw-animate-css@1.4.0", "https://registry.npmmirror.com/tw-animate-css/-/tw-animate-css-1.4.0.tgz", {}, "sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ=="],
|
||||
|
||||
"type-check": ["type-check@0.4.0", "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="],
|
||||
|
||||
"typescript": ["typescript@5.6.3", "https://registry.npmmirror.com/typescript/-/typescript-5.6.3.tgz", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw=="],
|
||||
|
||||
"typescript-eslint": ["typescript-eslint@8.70.0", "https://registry.npmmirror.com/typescript-eslint/-/typescript-eslint-8.70.0.tgz", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.70.0", "@typescript-eslint/parser": "8.70.0", "@typescript-eslint/typescript-estree": "8.70.0", "@typescript-eslint/utils": "8.70.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-P/W5cz70/cQAuKfY3xwQMWWTV7BvJ0mAQmi+9mBcsVPaBUpd6Ohpa+fECv9rBFrQcig86jAiNBFNWUqnTjr4pw=="],
|
||||
|
||||
"undici-types": ["undici-types@8.3.0", "https://registry.npmmirror.com/undici-types/-/undici-types-8.3.0.tgz", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
|
||||
|
||||
"uri-js": ["uri-js@4.4.1", "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="],
|
||||
|
||||
"util-deprecate": ["util-deprecate@1.0.2", "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="],
|
||||
|
||||
"vite": ["vite@6.4.3", "https://registry.npmmirror.com/vite/-/vite-6.4.3.tgz", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", "picomatch": "^4.0.2", "postcss": "^8.5.3", "rollup": "^4.34.9", "tinyglobby": "^0.2.13" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A=="],
|
||||
|
||||
"vscode-uri": ["vscode-uri@3.1.0", "https://registry.npmmirror.com/vscode-uri/-/vscode-uri-3.1.0.tgz", {}, "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ=="],
|
||||
@@ -421,10 +694,32 @@
|
||||
|
||||
"vue-draggable-plus": ["vue-draggable-plus@0.6.1", "https://registry.npmmirror.com/vue-draggable-plus/-/vue-draggable-plus-0.6.1.tgz", { "dependencies": { "@types/sortablejs": "^1.15.8" }, "peerDependencies": { "@vue/composition-api": "*" }, "optionalPeers": ["@vue/composition-api"] }, "sha512-FbtQ/fuoixiOfTZzG3yoPl4JAo9HJXRHmBQZFB9x2NYCh6pq0TomHf7g5MUmpaDYv+LU2n6BPq2YN9sBO+FbIg=="],
|
||||
|
||||
"vue-eslint-parser": ["vue-eslint-parser@10.4.1", "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-10.4.1.tgz", { "dependencies": { "debug": "^4.4.0", "eslint-scope": "^8.2.0 || ^9.0.0", "eslint-visitor-keys": "^4.2.0 || ^5.0.0", "espree": "^10.3.0 || ^11.0.0", "esquery": "^1.6.0", "semver": "^7.6.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0" } }, "sha512-Gk6gRDj0n/fkRa3C3l0bBheoBckUq/Rs0F/TvMWIS6nzzx67amAViMe9CkNgsP2tXyQONvGiHQESHwFtZ3aYDA=="],
|
||||
|
||||
"vue-sonner": ["vue-sonner@2.0.9", "https://registry.npmmirror.com/vue-sonner/-/vue-sonner-2.0.9.tgz", { "peerDependencies": { "@nuxt/kit": "^4.0.3", "@nuxt/schema": "^4.0.3", "nuxt": "^4.0.3" }, "optionalPeers": ["@nuxt/kit", "@nuxt/schema", "nuxt"] }, "sha512-i6BokNlNDL93fpzNxN/LZSn6D6MzlO+i3qXt6iVZne3x1k7R46d5HlFB4P8tYydhgqOrRbIZEsnRd3kG7qGXyw=="],
|
||||
|
||||
"vue-tsc": ["vue-tsc@2.2.12", "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-2.2.12.tgz", { "dependencies": { "@volar/typescript": "2.4.15", "@vue/language-core": "2.2.12" }, "peerDependencies": { "typescript": ">=5.0.0" }, "bin": { "vue-tsc": "./bin/vue-tsc.js" } }, "sha512-P7OP77b2h/Pmk+lZdJ0YWs+5tJ6J2+uOQPo7tlBnY44QqQSPYvS0qVT4wqDJgwrZaLe47etJLLQRFia71GYITw=="],
|
||||
|
||||
"which": ["which@2.0.2", "https://registry.npmmirror.com/which/-/which-2.0.2.tgz", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="],
|
||||
|
||||
"which-module": ["which-module@2.0.1", "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz", {}, "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="],
|
||||
|
||||
"word-wrap": ["word-wrap@1.2.5", "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz", {}, "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="],
|
||||
|
||||
"wrap-ansi": ["wrap-ansi@6.2.0", "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="],
|
||||
|
||||
"xml-name-validator": ["xml-name-validator@5.0.0", "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz", {}, "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg=="],
|
||||
|
||||
"y18n": ["y18n@4.0.3", "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz", {}, "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="],
|
||||
|
||||
"yargs": ["yargs@15.4.1", "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz", { "dependencies": { "cliui": "^6.0.0", "decamelize": "^1.2.0", "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", "yargs-parser": "^18.1.2" } }, "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="],
|
||||
|
||||
"yargs-parser": ["yargs-parser@18.1.3", "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz", { "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" } }, "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="],
|
||||
|
||||
"yocto-queue": ["yocto-queue@0.1.0", "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
|
||||
|
||||
"@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="],
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.11.2", "https://registry.npmmirror.com/@emnapi/core/-/core-1.11.2.tgz", { "dependencies": { "@emnapi/wasi-threads": "1.2.2", "tslib": "^2.4.0" }, "bundled": true }, "sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA=="],
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.11.2", "https://registry.npmmirror.com/@emnapi/runtime/-/runtime-1.11.2.tgz", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA=="],
|
||||
@@ -437,10 +732,32 @@
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
||||
|
||||
"@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.9", "https://registry.npmmirror.com/ignore/-/ignore-7.0.9.tgz", {}, "sha512-brTTsvFRt5C1gGHtPst/281UjPD5t9fBqbgoMPlVWy11ZLTPfu7HxK4ZYqO9H7o/yC9rSTCI85EaQ4OoY12qYw=="],
|
||||
|
||||
"@vue/language-core/minimatch": ["minimatch@9.0.9", "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.9.tgz", { "dependencies": { "brace-expansion": "^2.0.2" } }, "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg=="],
|
||||
|
||||
"fast-glob/glob-parent": ["glob-parent@5.1.2", "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
|
||||
|
||||
"micromatch/picomatch": ["picomatch@2.3.2", "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.2.tgz", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="],
|
||||
|
||||
"qified/hookified": ["hookified@2.2.0", "https://registry.npmmirror.com/hookified/-/hookified-2.2.0.tgz", {}, "sha512-p/LgFzRN5FeoD3DLS6bkUapeye6E4SI6yJs6KetENd18S+FBthqYq2amJUWpt5z0EQwwHemidjY5OqJGEKm5uA=="],
|
||||
|
||||
"reka-ui/@vueuse/core": ["@vueuse/core@14.3.0", "https://registry.npmmirror.com/@vueuse/core/-/core-14.3.0.tgz", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "14.3.0", "@vueuse/shared": "14.3.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-aHfz47g0ZhMtTVHmIzMVpJy8ePhhOy68GY5bv110+5DVtZ+W7BsOx+m61UNQqfrWyPztIHIanWa3E2tib3NFIw=="],
|
||||
|
||||
"reka-ui/@vueuse/shared": ["@vueuse/shared@14.3.0", "https://registry.npmmirror.com/@vueuse/shared/-/shared-14.3.0.tgz", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-bZpge9eSXwa4ToSiqJ7j6KRwhAsneMFoSz3LMWKQDkqimm3D/tbFlrklrs/IOqC8tEcYmXQZJ6N0UrjhBirVCg=="],
|
||||
|
||||
"yargs/find-up": ["find-up@4.1.0", "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz", { "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" } }, "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="],
|
||||
|
||||
"@vue/language-core/minimatch/brace-expansion": ["brace-expansion@2.1.2", "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.1.2.tgz", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA=="],
|
||||
|
||||
"reka-ui/@vueuse/core/@vueuse/metadata": ["@vueuse/metadata@14.3.0", "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-14.3.0.tgz", {}, "sha512-BwxmbAzwAVF50+MW57GXOUEV61nFBGnlBvrTqj49PqWJu3uw7hdu72ztXeZ33RdZtDY6kO+bfCAE1PCn88Tktw=="],
|
||||
|
||||
"yargs/find-up/locate-path": ["locate-path@5.0.0", "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="],
|
||||
|
||||
"@vue/language-core/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
|
||||
|
||||
"yargs/find-up/locate-path/p-locate": ["p-locate@4.1.0", "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="],
|
||||
|
||||
"yargs/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="],
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
// ESLint 平坦配置 —— 落地 UI_DESIGN_SYSTEM.md 第 5 章的 D 系约束。
|
||||
// 依赖:eslint / eslint-plugin-vue / @vue/eslint-config-typescript(见 package.json devDependencies)
|
||||
// 运行:bun run lint
|
||||
import pluginVue from 'eslint-plugin-vue'
|
||||
import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript'
|
||||
|
||||
export default defineConfigWithVueTs(
|
||||
{
|
||||
ignores: [
|
||||
'dist/**',
|
||||
'node_modules/**',
|
||||
'src-tauri/**',
|
||||
'release_stage/**',
|
||||
'ThingHK/**',
|
||||
],
|
||||
},
|
||||
|
||||
// flat/essential:只保留「防错」规则(v-for key、重复 attr 等),
|
||||
// 不含缩进/引号等格式规则 —— 3183 条里 3038 条是格式噪音,与既有代码风格无关
|
||||
pluginVue.configs['flat/essential'],
|
||||
vueTsConfigs.recommended,
|
||||
|
||||
{
|
||||
rules: {
|
||||
// ---- D2:禁止 Tailwind 原生色阶,必须使用语义 token ----
|
||||
'no-restricted-syntax': [
|
||||
'error',
|
||||
{
|
||||
selector:
|
||||
"Literal[value=/(bg|text|border|ring|fill|stroke)-(slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-[0-9]{2,3}(\\/[0-9]{1,3})?/]",
|
||||
message:
|
||||
'D2 禁止 Tailwind 原生色阶:请使用语义 token(bg-card / text-success-text / border-border 等),见 UI_DESIGN_SYSTEM.md',
|
||||
},
|
||||
{
|
||||
// D9:生产代码禁止外部字体 CDN
|
||||
selector:
|
||||
"Literal[value=/@import\\s+url\\(['\\\"]?https:\\/\\/(fonts\\.googleapis|fonts\\.gstatic)\\./]",
|
||||
message: 'D9 禁止外部字体 CDN:使用系统字体栈',
|
||||
},
|
||||
],
|
||||
|
||||
// ---- 未使用变量:_ 前缀豁免(Pinia action 占位、解构占位等惯例)----
|
||||
'@typescript-eslint/no-unused-vars': [
|
||||
'error',
|
||||
{
|
||||
argsIgnorePattern: '^_',
|
||||
varsIgnorePattern: '^_',
|
||||
caughtErrors: 'none',
|
||||
},
|
||||
],
|
||||
|
||||
// ---- Vue 风格:与既有代码一致 ----
|
||||
'vue/multi-word-component-names': 'off',
|
||||
'vue/max-attributes-per-line': 'off',
|
||||
'vue/singleline-html-element-content-newline': 'off',
|
||||
'vue/html-self-closing': 'off',
|
||||
'vue/attributes-order': 'off',
|
||||
},
|
||||
},
|
||||
|
||||
// .d.ts 声明文件:Vue 官方模板的 ImportMetaEnv 写法使用 {} 与 any,豁免
|
||||
{
|
||||
files: ['**/*.d.ts'],
|
||||
rules: {
|
||||
'@typescript-eslint/no-empty-object-type': 'off',
|
||||
'@typescript-eslint/no-explicit-any': 'off',
|
||||
},
|
||||
},
|
||||
|
||||
// feiniuStore 是飞牛 NAS 的 API 适配层:后端原始结构未在前端定型(字段类型化需对接 Rust 端),
|
||||
// 边界层暂豁免 no-explicit-any;定型后应移除此豁免
|
||||
{
|
||||
files: ['src/stores/feiniuStore.ts'],
|
||||
rules: {
|
||||
'@typescript-eslint/no-explicit-any': 'off',
|
||||
},
|
||||
},
|
||||
|
||||
// xterm 等第三方深色区域如需豁免,在下方追加 overrides
|
||||
)
|
||||
Generated
+2087
-10
File diff suppressed because it is too large.
Load diff
+20
-5
@@ -1,17 +1,20 @@
|
||||
{
|
||||
"name": "thing",
|
||||
"private": true,
|
||||
"version": "26.8.1",
|
||||
"version": "26.9.4",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vue-tsc --noEmit && vite build",
|
||||
"build": "vue-tsc --noEmit && node --max-old-space-size=8192 node_modules/vite/bin/vite.js build",
|
||||
"build:vite": "node --max-old-space-size=8192 node_modules/vite/bin/vite.js build",
|
||||
"typecheck": "vue-tsc --noEmit",
|
||||
"lint": "eslint src",
|
||||
"preview": "vite preview",
|
||||
"test": "node --test src/modules/quickpanel/engine.test.ts src/lib/calc.test.ts",
|
||||
"test": "node --test src/modules/quickpanel/engine.test.ts src/lib/calc.test.ts src/lib/theme.test.ts",
|
||||
"tauri": "tauri"
|
||||
},
|
||||
"dependencies": {
|
||||
"@lucide/vue": "^1.28.0",
|
||||
"@lucide/vue": "^1.48.0",
|
||||
"@tailwindcss/vite": "^4.3.2",
|
||||
"@tauri-apps/api": "^2",
|
||||
"@tauri-apps/plugin-autostart": "~2",
|
||||
@@ -19,11 +22,19 @@
|
||||
"@tauri-apps/plugin-global-shortcut": "^2",
|
||||
"@tauri-apps/plugin-opener": "^2",
|
||||
"@vueuse/core": "^14.4.0",
|
||||
"@xterm/addon-fit": "^0.11.0",
|
||||
"@xterm/addon-search": "^0.16.0",
|
||||
"@xterm/addon-serialize": "^0.14.0",
|
||||
"@xterm/addon-unicode11": "^0.9.0",
|
||||
"@xterm/addon-web-links": "^0.12.0",
|
||||
"@xterm/addon-webgl": "^0.19.0",
|
||||
"@xterm/xterm": "^6.0.0",
|
||||
"class-variance-authority": "^0.7.1",
|
||||
"clsx": "^2.1.1",
|
||||
"pinia": "^3.0.4",
|
||||
"pinyin-pro": "^3.28.2",
|
||||
"reka-ui": "^2.10.1",
|
||||
"qrcode": "^1.5.4",
|
||||
"reka-ui": "^2.10.5",
|
||||
"tailwind-merge": "^3.6.0",
|
||||
"tailwindcss": "^4.3.2",
|
||||
"vue": "^3.5.13",
|
||||
@@ -33,7 +44,11 @@
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "^2",
|
||||
"@types/node": "^26.1.1",
|
||||
"@types/qrcode": "^1.5.6",
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
"@vue/eslint-config-typescript": "^14.9.0",
|
||||
"eslint": "^10.11.0",
|
||||
"eslint-plugin-vue": "^10.11.0",
|
||||
"tw-animate-css": "^1.4.0",
|
||||
"typescript": "~5.6.2",
|
||||
"vite": "^6.0.3",
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
# SMTC full info query script (must run in Windows PowerShell 5.1)
|
||||
# Output: EVERY session (not only GetCurrentSession), full media properties
|
||||
|
||||
Add-Type -AssemblyName System.Runtime.WindowsRuntime -ErrorAction SilentlyContinue
|
||||
|
||||
$null = [Windows.Media.Control.GlobalSystemMediaTransportControlsSessionManager, Windows.Media.Control, ContentType=WindowsRuntime]
|
||||
$null = [Windows.Media.Control.GlobalSystemMediaTransportControlsSessionMediaProperties, Windows.Media.Control, ContentType=WindowsRuntime]
|
||||
$null = [Windows.Storage.Streams.IInputStream, Windows.Storage.Streams, ContentType=WindowsRuntime]
|
||||
|
||||
function Await($WinRtTask, $ResultType) {
|
||||
$asTask = ([System.WindowsRuntimeSystemExtensions].GetMethods() |
|
||||
Where-Object { $_.Name -eq 'AsTask' -and $_.GetParameters().Count -eq 1 -and $_.GetParameters()[0].ParameterType.Name -eq 'IAsyncOperation`1' })[0]
|
||||
$asTaskGeneric = $asTask.MakeGenericMethod($ResultType)
|
||||
$netTask = $asTaskGeneric.Invoke($null, @($WinRtTask))
|
||||
$netTask.Wait(-1) | Out-Null
|
||||
$netTask.Result
|
||||
}
|
||||
|
||||
$mgr = Await ([Windows.Media.Control.GlobalSystemMediaTransportControlsSessionManager]::RequestAsync()) ([Windows.Media.Control.GlobalSystemMediaTransportControlsSessionManager])
|
||||
$current = $mgr.GetCurrentSession()
|
||||
|
||||
# IVectorView 用 Size/GetAt 枚举:foreach 在 PS 5.1 上经常拿不到元素
|
||||
$sessions = New-Object System.Collections.ArrayList
|
||||
try {
|
||||
$raw = $mgr.GetSessions()
|
||||
if ($null -ne $raw) {
|
||||
$n = $raw.Size
|
||||
for ($i = 0; $i -lt $n; $i++) {
|
||||
[void]$sessions.Add($raw.GetAt($i))
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
Write-Host "GetSessions failed: $_" -ForegroundColor Red
|
||||
}
|
||||
|
||||
Write-Host "===== SMTC Sessions ($($sessions.Count)) =====" -ForegroundColor Cyan
|
||||
$currentId = if ($current) { $current.SourceAppUserModelId } else { '' }
|
||||
Write-Host "CurrentSession : $(if ($currentId) { $currentId } else { '(none)' })" -ForegroundColor Yellow
|
||||
Write-Host ""
|
||||
|
||||
if ($sessions.Count -eq 0) {
|
||||
if ($current) { [void]$sessions.Add($current) }
|
||||
else {
|
||||
Write-Host "No SMTC media sessions found." -ForegroundColor Yellow
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
$index = 0
|
||||
foreach ($session in $sessions) {
|
||||
$index++
|
||||
$appId = $session.SourceAppUserModelId
|
||||
$isCurrent = $currentId -and ($appId -eq $currentId)
|
||||
$mark = if ($isCurrent) { " [CURRENT]" } else { "" }
|
||||
|
||||
$props = $null
|
||||
try {
|
||||
$props = Await ($session.TryGetMediaPropertiesAsync()) ([Windows.Media.Control.GlobalSystemMediaTransportControlsSessionMediaProperties])
|
||||
} catch {
|
||||
$props = $null
|
||||
}
|
||||
$playback = $session.GetPlaybackInfo()
|
||||
$timeline = $session.GetTimelineProperties()
|
||||
|
||||
$position = $timeline.Position
|
||||
$duration = $timeline.EndTime - $timeline.StartTime
|
||||
$progress = if ($duration.TotalSeconds -gt 0) { [math]::Round(($position.TotalSeconds / $duration.TotalSeconds) * 100, 1) } else { 0 }
|
||||
|
||||
Write-Host ("----- Session #{0}{1} -----" -f $index, $mark) -ForegroundColor Cyan
|
||||
Write-Host "App ID : $appId"
|
||||
if ($props) {
|
||||
Write-Host "Playback Type : $($props.PlaybackType)"
|
||||
Write-Host "Title : $($props.Title)"
|
||||
Write-Host "Subtitle : $($props.Subtitle)"
|
||||
Write-Host "Artist : $($props.Artist)"
|
||||
Write-Host "AlbumArtist : $($props.AlbumArtist)"
|
||||
Write-Host "AlbumTitle : $($props.AlbumTitle)"
|
||||
Write-Host "TrackNumber : $($props.TrackNumber)"
|
||||
Write-Host "Genres : $($props.Genres -join ', ')"
|
||||
$thumbnail = $props.Thumbnail
|
||||
if ($thumbnail) { Write-Host "Thumbnail : (present)" }
|
||||
else { Write-Host "Thumbnail : No thumbnail" }
|
||||
} else {
|
||||
Write-Host "MediaProperties: (failed to read)"
|
||||
}
|
||||
Write-Host "Playback Status: $($playback.PlaybackStatus)"
|
||||
Write-Host "Progress : $position / $duration ($progress%)"
|
||||
Write-Host ""
|
||||
}
|
||||
|
||||
Write-Host "===================================" -ForegroundColor Cyan
|
||||
+11
-10
@@ -54,17 +54,18 @@ $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)))
|
||||
# UTF-8 安全读写:`Get-Content` 默认按系统 ANSI(如 GBK) 解码,会把本就含中文/乱码的文件二次编码损坏(曾导致
|
||||
# Cargo.toml 的 keyring 依赖行被弄丢)。这里统一用显式 UTF-8 无 BOM 读写,保证逐字节稳定往返。
|
||||
function Set-Utf8Version([string]$Path, [string]$Pattern, [string]$NewVersion) {
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
$content = [System.IO.File]::ReadAllText($Path, $utf8NoBom)
|
||||
$content = $content -replace $Pattern, "`${1}$NewVersion`${2}"
|
||||
[System.IO.File]::WriteAllText($Path, $content, $utf8NoBom)
|
||||
}
|
||||
|
||||
$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)))
|
||||
Set-Utf8Version -Path $tauriConf -Pattern '("version"\s*:\s*")[^"]*(")' -NewVersion $Version
|
||||
Set-Utf8Version -Path $cargoToml -Pattern '(?m)^(version\s*=\s*")[^"]*(")' -NewVersion $Version
|
||||
Set-Utf8Version -Path $pkgJson -Pattern '("version"\s*:\s*")[^"]*(")' -NewVersion $Version
|
||||
Write-Step "版本号已同步:tauri.conf.json / Cargo.toml / package.json"
|
||||
|
||||
# ---------- 2. 构建 ----------
|
||||
|
||||
Generated
+3301
-130
File diff suppressed because it is too large.
Load diff
+172
-4
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "thing"
|
||||
version = "26.8.1"
|
||||
version = "26.9.4"
|
||||
description = "A Tauri App"
|
||||
authors = ["you"]
|
||||
edition = "2021"
|
||||
@@ -24,38 +24,119 @@ tauri-plugin-dialog = "2"
|
||||
tauri-plugin-snap-layout = "1"
|
||||
tauri-plugin-global-shortcut = "2"
|
||||
tauri-plugin-notification = "2"
|
||||
# 翻译引擎抽象:TranslateEngine 需要 Box<dyn> 动态分派(多源在运行期决定),
|
||||
# 原生 async fn in trait 在 dyn 场景下不可用
|
||||
async-trait = "0.1"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
regex = "1"
|
||||
serde_yaml = "0.9"
|
||||
specta = { version = "=2.0.0-rc.25", features = ["derive", "function", "serde_json"] }
|
||||
specta-typescript = "0.0.12"
|
||||
tauri-specta = { version = "=2.0.0-rc.25", features = ["typescript"] }
|
||||
chrono = "0.4"
|
||||
reqwest = { version = "0.12", features = ["json", "stream"] }
|
||||
# blocking:音乐播放引擎在**独立 std 线程**上解码(symphonia 的 MediaSource 是同步
|
||||
# Read+Seek),需要同步 HTTP 客户端去按 Range 拉 NAS 音频流。放在 std 线程上用
|
||||
# blocking 是安全的(在 tokio 运行时线程里用才会 panic)。
|
||||
reqwest = { version = "0.12", features = ["json", "stream", "multipart", "blocking"] }
|
||||
futures-util = "0.3"
|
||||
tokio = { version = "1", features = ["io-util", "time", "rt-multi-thread", "macros", "sync", "fs", "net"] }
|
||||
axum = "0.7"
|
||||
axum = { version = "0.7", features = ["ws"] }
|
||||
url = "2"
|
||||
zip = "2"
|
||||
dirs = "5"
|
||||
# ===== 终端模块 =====
|
||||
# 字符编码转换:老服务器(CentOS 6/7 默认 LANG=zh_CN.GBK)输出 GBK 字节,
|
||||
# 直接按 UTF-8 解码会得到乱码。encoding_rs 是 Firefox 的实现抽出,比 iconv 绑定
|
||||
# 干净(纯 Rust、无 C 依赖),且本项目依赖树里已存在(reqwest → encoding_rs 0.8.35),
|
||||
# 提升为直接依赖不会新增编译单元。
|
||||
encoding_rs = "0.8"
|
||||
# SSH 客户端:纯 Rust + 原生 async,与项目 tokio 运行时契合。
|
||||
# 选 russh 而非 ssh2(libssh2 绑定)的理由见 terminal/ssh/mod.rs 模块注释。
|
||||
# 注意:实施时核实该 crate 已到 0.63.x(规划文档中的 0.5 已过时)。
|
||||
russh = "0.63"
|
||||
# SSH 密钥的生成/解析/加密统一走 `russh::keys::ssh_key` re-export。
|
||||
#
|
||||
# **不要**声明与 russh 钉住版本不同的 `ssh-key`——若声明 0.6 会引入第二个不兼容
|
||||
# 版本,两边的 PrivateKey/PublicKey 无法互转(这是 P0 踩过的坑)。
|
||||
#
|
||||
# 唯一的例外是下面这一行:必须声明**完全相同**的版本号 `=0.7.0-rc.11`。
|
||||
# 原因是 russh 的 `[features]` **没有向 ssh-key 转发 `ppk`**
|
||||
# (只有 dsa / rsa / serde 三个转发项),而 P2 要支持 PuTTY `.ppk` 导入,
|
||||
# 只能由我们自己打开 `ssh-key/ppk`。
|
||||
#
|
||||
# Cargo 会把「russh 的 `=0.7.0-rc.11`」与「这里的 `=0.7.0-rc.11`」**合并为同一个
|
||||
# 依赖节点**(版本要求完全相同,不存在二选一),因此不会产生分叉。
|
||||
# 已用 `cargo tree -i ssh-key` 复核:图中只有 `ssh-key v0.7.0-rc.11` 一个节点。
|
||||
#
|
||||
# 注意:改这里之后必须重跑 `cargo tree -i ssh-key` 确认仍只有一个节点。
|
||||
ssh-key = { version = "=0.7.0-rc.11", default-features = false, features = ["ppk", "encryption", "alloc"] }
|
||||
|
||||
# 系统随机源:ssh-key 0.7 的 `getrandom` feature 默认**未启用**(russh 没开,
|
||||
# 我们上面的 ssh-key 声明也没开),故 `ssh_key::getrandom::SysRng` 不可见。
|
||||
# 这里直接依赖 getrandom 0.4 ——它与 ssh-key 共用同一份 `rand_core 0.10`,
|
||||
# `UnwrapErr(SysRng)` 能直接满足 ssh-key 的 `CryptoRng`/`TryCryptoRng` 约束
|
||||
# (见 terminal/keys.rs 的 sys_rng)。
|
||||
getrandom = "0.4"
|
||||
# SFTP 客户端。**russh 本身不含 SFTP**——只是一个 SSH 传输层,SFTP 协议
|
||||
# (OPEN/READ/WRITE/READDIR 等报文)由独立的 russh-sftp 实现。
|
||||
# 版本配套:russh-sftp 3.0.0 的依赖是 `russh ^0.63.2`,与上面的 0.63 同源,
|
||||
# 共用同一份 russh 实例类型 —— 这一点关键:SFTP 通道必须从**已认证的同一个
|
||||
# Session** 上开(`request_subsystem(true, "sftp")`),跨版本是做不到的。
|
||||
# 另注:3.0.0 把 `russh` 列为 dev-dependency,故不会重复引入第二个 russh。
|
||||
russh-sftp = "3.0"
|
||||
# ConPTY 之外还需要窗口/进程相关 API;Win32_System_Console 为 CreatePseudoConsole 所在 feature
|
||||
# 终端会话并发注册表:读多写少(每次输出批次都查表),分片锁避免各会话 I/O 互相等待
|
||||
dashmap = "6"
|
||||
# 音频标签解析(本地曲库元数据:标题/歌手/专辑/时长/内嵌封面)
|
||||
lofty = "0.22"
|
||||
sysinfo = "0.32"
|
||||
rusqlite = { version = "0.32", features = ["bundled"] }
|
||||
base64 = "0.22"
|
||||
image = { version = "0.25", default-features = false, features = ["png"] }
|
||||
sha2 = "0.10"
|
||||
md-5 = "0.10"
|
||||
hmac = "0.12"
|
||||
aes = "0.8"
|
||||
cbc = "0.1"
|
||||
rsa = { version = "0.9", features = ["pem"] }
|
||||
rand = "0.8"
|
||||
tokio-tungstenite = "0.24"
|
||||
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp"] }
|
||||
walkdir = "2"
|
||||
notify = { version = "6", features = [] }
|
||||
librqbit = "9"
|
||||
bytes = "1"
|
||||
windows-capture = "2.0.1"
|
||||
# 音频解码(纯 Rust)。**默认特性不含 mp3/aac/alac/isomp4**——0.6 起这几项被移出
|
||||
# default,必须显式打开,否则 mp3 与 m4a 直接报「不支持的格式」。
|
||||
# default 已含:flac / wav / ogg / vorbis / pcm / adpcm / mkv + 全部元数据。
|
||||
# 注意:`ape` 只是**元数据**特性(symphonia-metadata/ape),没有 APE 解码器;
|
||||
# 也没有 opus 特性(ogg 里若是 Opus 轨道无法解码)。这两点已与用户确认接受。
|
||||
symphonia = { version = "0.6", features = ["mp3", "aac", "alac", "isomp4"] }
|
||||
# 音频输出。Windows 走 WASAPI:cpal 的共享模式输出带
|
||||
# AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM | SRC_DEFAULT_QUALITY,因此**可以用源采样率
|
||||
# 直接建流**,由 Windows 自己转换到设备混音格式 —— 不需要额外引入重采样库。
|
||||
cpal = "0.18"
|
||||
# HDR 截图说明:windows-capture 的 Windows Graphics Capture 后端在 HDR 显示器上
|
||||
# 可能输出 scRGB / rgba16F 或 HDR10(PQ) 格式的帧,与项目其余截图路径
|
||||
# (GDI BitBlt,sRGB 8bit)色彩空间不一致。capture 层统一转成 sRGB 8bit
|
||||
# 后再交给编码器,否则 HDR 屏上截出的图会整体偏灰 / 过曝。
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
winreg = "0.52"
|
||||
# WebDAV 凭据加密存储(Windows 凭据管理器,DPAPI 保护)
|
||||
keyring = { version = "3", features = ["windows-native"] }
|
||||
raw-window-handle = "0.6"
|
||||
windows-sys = { version = "0.52", features = [
|
||||
"Win32_Networking_WinInet",
|
||||
"Win32_Foundation",
|
||||
"Win32_Globalization",
|
||||
"Win32_Security",
|
||||
"Win32_System_Threading",
|
||||
"Win32_System_Ole",
|
||||
"Win32_System_Memory",
|
||||
"Win32_System_DataExchange",
|
||||
"Win32_System_SystemInformation",
|
||||
"Win32_UI_WindowsAndMessaging",
|
||||
"Win32_UI_Shell",
|
||||
"Win32_UI_HiDpi",
|
||||
@@ -64,8 +145,95 @@ windows-sys = { version = "0.52", features = [
|
||||
"Win32_Graphics_Dwm",
|
||||
"Win32_Storage_Xps",
|
||||
"Win32_Storage_FileSystem",
|
||||
"Win32_Devices_Display",
|
||||
# 终端模块:ConPTY(CreatePseudoConsole / ResizePseudoConsole / ClosePseudoConsole)
|
||||
"Win32_System_Console",
|
||||
# 终端模块:CreatePipe(ConPTY 的输入/输出管道)
|
||||
"Win32_System_Pipes",
|
||||
# 终端模块:ReadFile / CancelIoEx / GetOverlappedResult(ConPTY 输出读取)
|
||||
# 注意:0.52 起 ReadFile 定义在 Storage_FileSystem 但被 Win32_System_IO 特性门控,
|
||||
# 两个特性必须同时开启,否则导入会解析失败。
|
||||
"Win32_System_IO",
|
||||
# 音乐模块「解密」:QQ音乐新版 musicex 的 ekey 不落盘,只能联网取;而
|
||||
# authst 仅存在于 QQMusic.exe 运行期内存里 —— 需要进程枚举(ToolHelp:
|
||||
# CreateToolhelp32Snapshot / Process32FirstW)与跨进程读内存
|
||||
# (Diagnostics::Debug::ReadProcessMemory + System::Memory::VirtualQueryEx)。
|
||||
"Win32_System_Diagnostics_ToolHelp",
|
||||
"Win32_System_Diagnostics_Debug",
|
||||
] }
|
||||
# Explorer ShellWindows COM:用于枚举已打开的资源管理器窗口并取当前路径
|
||||
# (快速面板「用资源管理器打开」联动)。依赖 Win32_System_Com 特性。
|
||||
windows = { version = "0.52", features = [
|
||||
"Win32_Foundation",
|
||||
"Win32_System_Com",
|
||||
"Win32_System_Ole",
|
||||
"Win32_System_Variant",
|
||||
"Win32_UI_Shell",
|
||||
"Win32_UI_WindowsAndMessaging",
|
||||
# 翻译模块:Windows.Media.Ocr 本地识别(WinRT)
|
||||
# Foundation_Collections:OcrResult.Lines / OcrEngine.AvailableRecognizerLanguages 返回 IVectorView
|
||||
# Security_Cryptography:用 CryptographicBuffer 从内存字节构造 IBuffer(不落盘)
|
||||
"Foundation",
|
||||
"Foundation_Collections",
|
||||
"Globalization",
|
||||
"Graphics_Imaging",
|
||||
"Media_Ocr",
|
||||
# 音乐模块:系统媒体传输控件(SMTC)。Windows.Media 提供
|
||||
# SystemMediaTransportControls / DisplayUpdater / MusicDisplayProperties /
|
||||
# TimelineProperties;Win32_System_WinRT 提供桌面应用唯一的取用入口
|
||||
# ISystemMediaTransportControlsInterop::GetForWindow。
|
||||
# 之所以不用前端 navigator.mediaSession 当唯一通道:WebView2 只转发标题/歌手/进度,
|
||||
# 专辑与封面不送达,且会话挂在浏览器进程 AUMID 上只显示「未知应用」。
|
||||
"Media",
|
||||
"Win32_System_WinRT",
|
||||
# 音乐模块·手机遥控:GSMTC 全局会话管理器(Windows.Media.Control),
|
||||
# 枚举/监视/控制系统全部 SMTC 会话(MUSIC_REMOTE_PLAN §3.1)
|
||||
"Media_Control",
|
||||
# 手机遥控·UDP beacon:GetAdaptersAddresses 枚举各网卡 IPv4/广播地址
|
||||
# (多网卡/VPN 场景下定向广播,MUSIC_REMOTE_PLAN §3.3)。
|
||||
# GetAdaptersAddresses 另受 Ndis + WinSock 两个 feature 门控(windows 0.52 源码 cfg)
|
||||
"Win32_NetworkManagement_IpHelper",
|
||||
"Win32_NetworkManagement_Ndis",
|
||||
"Win32_Networking_WinSock",
|
||||
# 手机遥控·P1 系统音量:MMDevice + IAudioEndpointVolume(Endpoints 有独立 feature 门控;
|
||||
# IMMDevice::Activate 另需 Com_StructuredStorage)
|
||||
"Win32_Media_Audio",
|
||||
"Win32_Media_Audio_Endpoints",
|
||||
"Win32_System_Com_StructuredStorage",
|
||||
"Security_Cryptography",
|
||||
# 划词取词的智能路径:UIA 直读焦点元素选区(IUIAutomation / ITextProvider)
|
||||
"Win32_UI_Accessibility",
|
||||
# OCR:CryptographicBuffer / SoftwareBitmap::CreateCopyFromBuffer 的 IBuffer 属于
|
||||
# Windows.Storage.Streams,缺这个 feature 会 E0599 找不到 CreateFromByteArray
|
||||
"Storage_Streams",
|
||||
# HDR 探测:DXGI 的 advanced color 查询用于判断显示器是否处于 HDR / WCG 状态,
|
||||
# 并读取其色域与传递函数(G2084/PQ 表示 HDR10)。截图前据此决定是否做色调映射。
|
||||
# 对应 feature:Win32_Graphics_Dxgi / Win32_Graphics_Dxgi_Common。
|
||||
"Win32_Graphics_Dxgi_Common",
|
||||
"Win32_Graphics_Gdi",
|
||||
] }
|
||||
|
||||
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
||||
tauri-plugin-autostart = "2"
|
||||
|
||||
# ===== 编译配置 =====
|
||||
# dev profile:日常 `tauri dev` 的取舍。
|
||||
# - incremental = true:增量编译,改一行代码只需重编受影响的 crate
|
||||
# - debug = "line-tables-only":只保留行号表,去掉完整 DWARF,交付期
|
||||
# target/ 目录因此从数 GB 降到数百 MB,而 panic 回溯仍能定位到源码行。
|
||||
# 注意:这里没开 opt-level。依赖 crate(尤其 tauri/wry/windows-sys)
|
||||
# 在 opt-level=0 下开销明显;若 dev 下界面卡顿,可只给依赖提优化。
|
||||
|
||||
[profile.dev]
|
||||
incremental = true
|
||||
debug = "line-tables-only"
|
||||
|
||||
# release profile:交付构建。
|
||||
# - strip = true:剥离符号信息,显著缩小产物体积
|
||||
# - lto = true:全程序链接时优化,跨 crate 内联,通常带来 10~20% 性能提升,
|
||||
# 代价是链接时间从秒级升到分钟级。只在 release 构建付出这个代价。
|
||||
# 未开 codegen-units=1:会再压榨约 5% 性能,但编译时间翻倍,不值得。
|
||||
[profile.release]
|
||||
strip = true
|
||||
lto = true
|
||||
|
||||
Whitespace-only changes.
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"
|
||||
]
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
"dialog:default",
|
||||
"core:window:allow-minimize",
|
||||
"core:window:allow-maximize",
|
||||
"core:window:allow-unminimize",
|
||||
"core:window:allow-close",
|
||||
"core:window:allow-toggle-maximize",
|
||||
"core:window:allow-hide",
|
||||
@@ -26,6 +27,9 @@
|
||||
"core:window:allow-set-always-on-top",
|
||||
"core:window:allow-set-skip-taskbar",
|
||||
"core:window:allow-set-decorations",
|
||||
"global-shortcut:allow-register",
|
||||
"global-shortcut:allow-unregister",
|
||||
"global-shortcut:allow-is-registered",
|
||||
"snap-layout:default"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "download-window",
|
||||
"description": "Capability for the per-download one-time window",
|
||||
"windows": ["download-window-*"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-hide",
|
||||
"core:window:allow-show",
|
||||
"core:window:allow-set-focus",
|
||||
"core:window:allow-minimize",
|
||||
"core:window:allow-unminimize",
|
||||
"core:window:allow-set-title",
|
||||
"core:window:allow-set-size",
|
||||
"core:window:allow-start-dragging",
|
||||
"core:window:allow-set-always-on-top",
|
||||
"core:window:allow-set-skip-taskbar",
|
||||
"core:window:allow-set-theme",
|
||||
"core:window:allow-set-effects",
|
||||
"core:window:allow-set-background-color",
|
||||
"core:window:allow-close",
|
||||
"core:event:allow-emit",
|
||||
"core:event:allow-listen",
|
||||
"snap-layout:default"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "file-window",
|
||||
"description": "Capability for the file manager window (singleton, label = file-window). Dual-pane local/SSH browser — needs the same window/event/dialog/opener set as the main window's file page, plus window controls for its self-drawn title bar.",
|
||||
"windows": ["file-window"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-show",
|
||||
"core:window:allow-close",
|
||||
"core:window:allow-minimize",
|
||||
"core:window:allow-maximize",
|
||||
"core:window:allow-toggle-maximize",
|
||||
"core:window:allow-set-focus",
|
||||
"core:window:allow-set-title",
|
||||
"core:window:allow-start-dragging",
|
||||
"core:window:allow-set-theme",
|
||||
"core:window:allow-set-background-color",
|
||||
"core:event:allow-listen",
|
||||
"core:event:allow-emit",
|
||||
"dialog:default",
|
||||
"opener:default",
|
||||
"opener:allow-open-path",
|
||||
"opener:allow-reveal-item-in-dir",
|
||||
"snap-layout:default"
|
||||
]
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "screenshot",
|
||||
"description": "Capability for screenshot overlay, editor and pin windows",
|
||||
"windows": ["screenshot-overlay*", "screenshot-editor-*", "screenshot-pin"],
|
||||
"description": "Capability for screenshot overlay, editor, pin and scroll-control windows",
|
||||
"windows": ["screenshot-overlay*", "screenshot-editor*", "screenshot-pin", "screenshot-scroll-*"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-hide",
|
||||
@@ -18,6 +18,7 @@
|
||||
"core:window:allow-close",
|
||||
"core:event:allow-emit",
|
||||
"core:event:allow-listen",
|
||||
"core:webview:allow-create-webview-window",
|
||||
"dialog:default",
|
||||
"snap-layout:default"
|
||||
]
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "terminal-window",
|
||||
"description": "Capability for detached terminal windows (one session per window, label = terminal-window-<sessionId>)",
|
||||
"windows": ["terminal-window-*"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-show",
|
||||
"core:window:allow-close",
|
||||
"core:window:allow-minimize",
|
||||
"core:window:allow-maximize",
|
||||
"core:window:allow-toggle-maximize",
|
||||
"core:window:allow-set-focus",
|
||||
"core:window:allow-set-title",
|
||||
"core:window:allow-start-dragging",
|
||||
"core:window:allow-set-theme",
|
||||
"core:window:allow-set-background-color",
|
||||
"core:event:allow-listen",
|
||||
"core:event:allow-emit",
|
||||
"opener:default",
|
||||
"opener:allow-open-path",
|
||||
"opener:allow-reveal-item-in-dir",
|
||||
"snap-layout:default"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "translate-popup",
|
||||
"description": "Capability for the non-activating translate popup window",
|
||||
"windows": ["translate-popup"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"core:window:allow-hide",
|
||||
"core:window:allow-show",
|
||||
"core:window:allow-close",
|
||||
"core:window:allow-set-theme",
|
||||
"core:window:allow-set-effects",
|
||||
"core:window:allow-set-background-color",
|
||||
"core:window:allow-start-dragging",
|
||||
"core:event:allow-listen",
|
||||
"core:event:allow-emit",
|
||||
"snap-layout:default"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
//! **临时**端到端验证:对真实 musicex 样本走完整「取密钥 → 解密 → 校验」流程。
|
||||
//!
|
||||
//! 用法(需要 QQ 音乐在运行且已登录):
|
||||
//! ```text
|
||||
//! cargo run --example decrypt_musicex_probe -- "C:\path\to\file.mflac"
|
||||
//! ```
|
||||
//! 验证完即可删除本文件。
|
||||
|
||||
use thing_lib::music::decrypt::probe::{probe_musicex, ProbeOutcome};
|
||||
|
||||
fn main() {
|
||||
let mut args = std::env::args().skip(1);
|
||||
let path = args.next().expect(
|
||||
"用法:decrypt_musicex_probe <文件路径> [输出目录]\n\
|
||||
给了输出目录则会用**生产路径**真正写盘(生成可播放文件)",
|
||||
);
|
||||
let out_dir = args.next();
|
||||
|
||||
match probe_musicex(std::path::Path::new(&path)) {
|
||||
Ok(ProbeOutcome {
|
||||
ekey_len,
|
||||
key_len,
|
||||
raw_key_bytes,
|
||||
cipher_magic,
|
||||
plain_magic,
|
||||
decrypted_bytes,
|
||||
guessed_format,
|
||||
expiration_secs,
|
||||
}) => {
|
||||
println!("=== 成功 ===");
|
||||
println!("ekey 长度 : {ekey_len}");
|
||||
println!("派生密钥长度 : {key_len}");
|
||||
println!(
|
||||
"密钥前 8 字节 : {:02x?}",
|
||||
&raw_key_bytes[..raw_key_bytes.len().min(8)]
|
||||
);
|
||||
println!("密文头 : {:02x?}", cipher_magic);
|
||||
println!("解密后字节数 : {decrypted_bytes}");
|
||||
println!("明文首帧魔数 : {:02x?}", plain_magic);
|
||||
println!("判定格式 : {guessed_format}");
|
||||
println!("ekey 有效期(秒) : {expiration_secs}");
|
||||
if guessed_format == "flac" && plain_magic.starts_with(b"fLaC") {
|
||||
println!("=> 合法 FLAC 头,产物可播");
|
||||
} else {
|
||||
println!("=> 头不合法,需要排查");
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
println!("=== 失败 ===");
|
||||
println!("{e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// 可选:调用**生产路径**真正落盘(验证 decrypt_musicex 本身,而不只是核心算法)
|
||||
if let Some(dir) = out_dir {
|
||||
println!("\n=== 生产路径落盘 ===");
|
||||
match thing_lib::music::decrypt::qq_online::decrypt_musicex(
|
||||
std::path::Path::new(&path),
|
||||
std::path::Path::new(&dir),
|
||||
"QQ音乐",
|
||||
|done, total| {
|
||||
if done == total {
|
||||
println!("进度:{done} 字节(完成)");
|
||||
}
|
||||
},
|
||||
) {
|
||||
Ok(outcome) => {
|
||||
let size = std::fs::metadata(&outcome.output)
|
||||
.map(|m| m.len())
|
||||
.unwrap_or(0);
|
||||
println!("产物 : {}", outcome.output.display());
|
||||
println!("大小 : {size} 字节");
|
||||
println!("格式 : {}", outcome.format);
|
||||
println!("备注 : {}", outcome.note);
|
||||
}
|
||||
Err(e) => {
|
||||
println!("落盘失败:{e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
//! 诊断:枚举全部 GSMTC 会话的时间轴原始值(判断"来源不提供进度"的形态)。
|
||||
//!
|
||||
//! 运行:`cargo run --example gsmtc_dump`
|
||||
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
use windows::Media::Control::GlobalSystemMediaTransportControlsSessionManager;
|
||||
|
||||
fn ticks_to_unix_ms(ticks: i64) -> i64 {
|
||||
ticks / 10_000 - 62_135_596_800_000
|
||||
}
|
||||
|
||||
fn main() -> windows::core::Result<()> {
|
||||
let mgr = GlobalSystemMediaTransportControlsSessionManager::RequestAsync()?.get()?;
|
||||
let sessions = mgr.GetSessions()?;
|
||||
let now_ms = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map(|d| d.as_millis() as i64)
|
||||
.unwrap_or(0);
|
||||
println!("now(unix ms) = {now_ms}");
|
||||
println!("sessions = {}", sessions.Size()?);
|
||||
|
||||
for i in 0..sessions.Size()? {
|
||||
let s = sessions.GetAt(i)?;
|
||||
println!("--- [{}] {}", i, s.SourceAppUserModelId()?);
|
||||
if let Ok(p) = s.TryGetMediaPropertiesAsync()?.get() {
|
||||
println!(
|
||||
" title={:?} artist={:?} album={:?}",
|
||||
p.Title()?,
|
||||
p.Artist()?,
|
||||
p.AlbumTitle()?
|
||||
);
|
||||
}
|
||||
let info = s.GetPlaybackInfo()?;
|
||||
println!(" status={:?}", info.PlaybackStatus()?);
|
||||
if let Ok(c) = info.Controls() {
|
||||
println!(
|
||||
" controls play={} pause={} next={} prev={} seek={}",
|
||||
c.IsPlayEnabled().unwrap_or(false),
|
||||
c.IsPauseEnabled().unwrap_or(false),
|
||||
c.IsNextEnabled().unwrap_or(false),
|
||||
c.IsPreviousEnabled().unwrap_or(false),
|
||||
c.IsPlaybackPositionEnabled().unwrap_or(false)
|
||||
);
|
||||
}
|
||||
let tl = s.GetTimelineProperties()?;
|
||||
let pos = tl.Position()?.Duration;
|
||||
let end = tl.EndTime().map(|t| t.Duration).unwrap_or(-1);
|
||||
let upd = tl.LastUpdatedTime()?.UniversalTime;
|
||||
let upd_ms = ticks_to_unix_ms(upd);
|
||||
println!(
|
||||
" position={}s end={}s lastUpdatedTicks={upd} -> unixMs={upd_ms} (deltaMs={})",
|
||||
pos as f64 / 1e7,
|
||||
end as f64 / 1e7,
|
||||
upd_ms - now_ms
|
||||
);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
//! GSMTC 可用性探测(MUSIC_REMOTE_PLAN §7 P0 第 1 项 / §6 第 1 条)
|
||||
//!
|
||||
//! 关键假设:GSMTC(Windows.Media.Control)在**非打包**桌面应用可用(Windows 10 1809+)。
|
||||
//! 本 example 以普通控制台进程运行(无 package identity),跑通即证明假设成立。
|
||||
//!
|
||||
//! 运行:`cargo run --example gsmtc_probe`
|
||||
//! 建议先在任意播放器(网易云/浏览器/Thing)放一首歌,可看到当前会话的元数据与时间轴。
|
||||
|
||||
use windows::Media::Control::GlobalSystemMediaTransportControlsSessionManager;
|
||||
use windows::core::Result;
|
||||
|
||||
fn main() -> Result<()> {
|
||||
// 1. 取全局会话管理器(失败 = 整个能力需降级,见计划 §3.1 失败策略)
|
||||
let mgr = GlobalSystemMediaTransportControlsSessionManager::RequestAsync()?.get()?;
|
||||
|
||||
// 2. 枚举系统全部 SMTC 会话(注意:0.52 投影里 GetSessions/GetCurrentSession 是同步的)
|
||||
let sessions = mgr.GetSessions()?;
|
||||
println!("[ok] GSMTC 可用(unpackaged),当前会话数: {}", sessions.Size()?);
|
||||
|
||||
// 3. 当前活跃会话的元数据 / 播放状态 / 时间轴
|
||||
// 无会话时 ABI 返回 null → windows-rs 投影为 Err(E_POINTER),按"无会话"处理
|
||||
match mgr.GetCurrentSession() {
|
||||
Ok(cur) => {
|
||||
println!("current: {}", cur.SourceAppUserModelId()?);
|
||||
let p = cur.TryGetMediaPropertiesAsync()?.get()?;
|
||||
println!(" {} - {} | album: {}", p.Artist()?, p.Title()?, p.AlbumTitle()?);
|
||||
println!(" status: {:?}", cur.GetPlaybackInfo()?.PlaybackStatus()?);
|
||||
let tl = cur.GetTimelineProperties()?;
|
||||
println!(
|
||||
" position(ticks): {} | lastUpdated(ticks): {}",
|
||||
tl.Position()?.Duration,
|
||||
tl.LastUpdatedTime()?.UniversalTime
|
||||
);
|
||||
}
|
||||
Err(e) => println!("current session: <none> ({e})(先放一首歌再跑,可看完整元数据)"),
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
//! **临时**校验:用产物解析器确认解密出来的文件是合法音频。
|
||||
//!
|
||||
//! 用法:`cargo run --example verify_audio -- <文件路径>`
|
||||
|
||||
fn main() {
|
||||
let path = std::env::args()
|
||||
.nth(1)
|
||||
.expect("用法:verify_audio <文件路径>");
|
||||
let p = std::path::Path::new(&path);
|
||||
|
||||
let size = std::fs::metadata(p).map(|m| m.len()).unwrap_or(0);
|
||||
println!("文件 : {}", p.display());
|
||||
println!("大小 : {size} 字节");
|
||||
|
||||
// 1) 头部魔数
|
||||
let head = std::fs::read(p).map(|b| b[..16.min(b.len())].to_vec());
|
||||
match head {
|
||||
Ok(h) => println!("首帧 : {:02x?}", h),
|
||||
Err(e) => {
|
||||
println!("读取失败:{e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// 2) 交给项目同款的解析器(lofty):能读出时长与格式才算真合法
|
||||
match lofty::probe::Probe::open(p).and_then(|probe| probe.read()) {
|
||||
Ok(tagged) => {
|
||||
use lofty::file::AudioFile;
|
||||
let props = tagged.properties();
|
||||
println!("时长 : {:?}", props.duration());
|
||||
println!("码率 : {:?}", props.audio_bitrate());
|
||||
println!("采样率 : {:?}", props.sample_rate());
|
||||
println!("声道 : {:?}", props.channels());
|
||||
println!("=> lofty 成功解析,文件合法可播");
|
||||
}
|
||||
Err(e) => {
|
||||
println!("lofty 解析失败:{e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,6 @@ const DEFAULT_CONFIG = {
|
||||
interceptDownload: true,
|
||||
minSize: 0,
|
||||
excludeDomains: [],
|
||||
showNotifications: 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) {
|
||||
const config = await getConfig()
|
||||
if (!config.interceptDownload) return false
|
||||
@@ -374,42 +378,172 @@ async function shouldIntercept(downloadItem) {
|
||||
return true
|
||||
}
|
||||
|
||||
async function handleDownloadCreated(downloadItem) {
|
||||
if (!await shouldIntercept(downloadItem)) return
|
||||
/**
|
||||
* 判断是否为"历史下载"(本次浏览器会话开始之前就存在、浏览器重启/恢复后才重新触发的下载)
|
||||
* 这类下载一律不接管,交给浏览器原生处理,实现"只接管以后的下载,历史都不管"
|
||||
*
|
||||
* 三重判据(任一命中即视为历史下载):
|
||||
* 1. canResume=true:已存在有效的部分文件,说明浏览器在恢复旧下载
|
||||
* 2. 开始时间早于插件首次安装时间
|
||||
* 3. 开始时间早于**本次浏览器会话**起点:浏览器重启时会恢复上次未完成的下载,
|
||||
* 这些下载的 startTime 仍是上次会话的时间,因此一定会落在会话起点之前。
|
||||
* (只靠 1/2 不够:上次会话启动的下载若被浏览器重新排队,canResume 可能为 false,
|
||||
* 而 startTime 又晚于安装时间 —— 这正是"关掉浏览器后莫名多出历史下载"的成因)
|
||||
*/
|
||||
async function isHistoricalDownload(item) {
|
||||
// 1) canResume=true 表示已存在有效的部分文件,说明浏览器在恢复旧下载
|
||||
if (item.canResume) return true
|
||||
|
||||
const start = item.startTime ? new Date(item.startTime).getTime() : 0
|
||||
|
||||
// 2) 开始时间早于插件首次安装时间(浏览器重启后恢复的旧下载会保留原来的开始时间)
|
||||
try {
|
||||
await chrome.downloads.cancel(downloadItem.id)
|
||||
await chrome.downloads.erase({ id: downloadItem.id })
|
||||
const stored = await chrome.storage.local.get('installTime')
|
||||
const installTime = stored.installTime || 0
|
||||
if (installTime > 0 && start > 0 && start < installTime) return true
|
||||
} catch { /* ignore */ }
|
||||
|
||||
const url = downloadItem.finalUrl || downloadItem.url
|
||||
const filename = downloadItem.filename || ''
|
||||
// 3) 开始时间早于本次浏览器会话起点(含 5s 宽限,避免刚启动时误判新下载)
|
||||
const sessionStart = await ensureSessionStart()
|
||||
if (start > 0 && start < sessionStart - RESTORE_GRACE_MS) return true
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
/** 浏览器会话起点(chrome.storage.session 在浏览器关闭后自动清空) */
|
||||
const SESSION_START_KEY = 'sessionStart'
|
||||
/** 会话起点宽限:会话刚建立时新下载的 startTime 可能略早于起点记录时刻 */
|
||||
const RESTORE_GRACE_MS = 5000
|
||||
let sessionStartCache = 0
|
||||
|
||||
/**
|
||||
* 取本次浏览器会话的起点时间戳(首次调用时写入 storage.session)。
|
||||
* 用 storage.session 而非 storage.local 的原因:它随浏览器关闭而清空,
|
||||
* "存在"本身就等价于"本次会话已开始",无需自己判断重启。
|
||||
*/
|
||||
async function ensureSessionStart() {
|
||||
if (sessionStartCache) return sessionStartCache
|
||||
try {
|
||||
const id = await addDownload(url, filename, downloadItem.referrer, '')
|
||||
await notify('已添加到 Thing', `${filename || url}`)
|
||||
} catch (e) {
|
||||
await notify('Thing 添加失败', `${filename || url}\n${e.message}`)
|
||||
try { await chrome.downloads.download({ url }) } catch { /* ignore */ }
|
||||
const s = await chrome.storage.session.get(SESSION_START_KEY)
|
||||
if (s[SESSION_START_KEY]) {
|
||||
sessionStartCache = s[SESSION_START_KEY]
|
||||
return sessionStartCache
|
||||
}
|
||||
} catch { /* ignore */ }
|
||||
sessionStartCache = Date.now()
|
||||
try {
|
||||
await chrome.storage.session.set({ [SESSION_START_KEY]: sessionStartCache })
|
||||
} catch { /* ignore */ }
|
||||
return sessionStartCache
|
||||
}
|
||||
|
||||
/** 已处理过的下载 guid(持久化,浏览器重启后仍能认出同一条下载) */
|
||||
const SEEN_GUIDS_KEY = 'seenDownloadGuids'
|
||||
/** 记录上限:只用于识别"同一条下载被重复通知",不需要长期留存 */
|
||||
const SEEN_GUIDS_MAX = 300
|
||||
let seenGuidsCache = null
|
||||
|
||||
async function loadSeenGuids() {
|
||||
if (seenGuidsCache) return seenGuidsCache
|
||||
try {
|
||||
const s = await chrome.storage.local.get(SEEN_GUIDS_KEY)
|
||||
seenGuidsCache = Array.isArray(s[SEEN_GUIDS_KEY]) ? s[SEEN_GUIDS_KEY] : []
|
||||
} catch {
|
||||
seenGuidsCache = []
|
||||
}
|
||||
return seenGuidsCache
|
||||
}
|
||||
|
||||
/**
|
||||
* 记录 guid 并返回它此前是否已见过。
|
||||
* `true` 表示这条下载我们处理过/见过,本次是重复通知(浏览器恢复旧下载时会复用原 guid),
|
||||
* 必须跳过,否则会把历史下载重新丢进 Thing。
|
||||
*/
|
||||
async function markGuidSeen(guid) {
|
||||
const seen = await loadSeenGuids()
|
||||
if (seen.includes(guid)) return true
|
||||
seen.push(guid)
|
||||
if (seen.length > SEEN_GUIDS_MAX) seen.splice(0, seen.length - SEEN_GUIDS_MAX)
|
||||
seenGuidsCache = seen
|
||||
try {
|
||||
await chrome.storage.local.set({ [SEEN_GUIDS_KEY]: seen })
|
||||
} catch { /* ignore */ }
|
||||
return false
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询引擎是否已有同 URL 的非终态任务(活跃/排队/暂停)
|
||||
* 用于防止同一下载被重复转发、重复下载
|
||||
*/
|
||||
async function hasExistingTask(url) {
|
||||
try {
|
||||
const tasks = await apiRequest('/api/downloads')
|
||||
return tasks.some(t => {
|
||||
const s = t.status
|
||||
if (s === 'complete' || s === 'error') return false
|
||||
return t.url === url
|
||||
})
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 通知 =====
|
||||
async function notify(title, message) {
|
||||
const config = await getConfig()
|
||||
if (!config.showNotifications) return
|
||||
async function handleDownloadCreated(downloadItem) {
|
||||
const url = downloadItem.finalUrl || downloadItem.url
|
||||
|
||||
// 同一条下载只处理一次:浏览器重启后恢复的旧下载会带着原 guid 再次触发 onCreated,
|
||||
// 不拦下来就会把「早已看过/已完成」的下载重新丢进 Thing(表现为莫名弹出历史下载)
|
||||
if (downloadItem.guid && await markGuidSeen(downloadItem.guid)) 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 {
|
||||
await chrome.notifications.create({
|
||||
type: 'basic',
|
||||
iconUrl: 'icons/icon-128.png',
|
||||
title,
|
||||
message
|
||||
})
|
||||
} catch { /* ignore */ }
|
||||
try {
|
||||
await chrome.downloads.cancel(downloadItem.id)
|
||||
await chrome.downloads.erase({ id: downloadItem.id })
|
||||
} catch { /* ignore */ }
|
||||
|
||||
const filename = downloadItem.filename || ''
|
||||
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({
|
||||
id: 'thing-download-link',
|
||||
title: '使用 Thing 下载此链接',
|
||||
@@ -428,10 +562,7 @@ chrome.contextMenus.onClicked.addListener(async (info, tab) => {
|
||||
const filename = url.split('/').pop()?.split('?')[0] || ''
|
||||
try {
|
||||
await addDownload(url, filename, info.pageUrl, '')
|
||||
await notify('已添加到 Thing', `${filename || url}`)
|
||||
} catch (e) {
|
||||
await notify('Thing 添加失败', `${e.message}`)
|
||||
}
|
||||
} catch (e) { /* 忽略:添加失败时不打扰用户 */ }
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"manifest_version": 3,
|
||||
"name": "Thing Extension",
|
||||
"version": "0.2.0",
|
||||
"version": "0.31",
|
||||
"description": "发送浏览器下载到 Thing 下载引擎,嗅探网页资源。",
|
||||
"icons": {
|
||||
"16": "icons/icon-16.png",
|
||||
@@ -11,9 +11,7 @@
|
||||
"permissions": [
|
||||
"downloads",
|
||||
"storage",
|
||||
"notifications",
|
||||
"webRequest",
|
||||
"webNavigation",
|
||||
"contextMenus",
|
||||
"tabs",
|
||||
"scripting"
|
||||
|
||||
@@ -87,11 +87,6 @@
|
||||
<span>启用资源嗅探</span>
|
||||
</label>
|
||||
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" id="showNotifications" />
|
||||
<span>显示桌面通知</span>
|
||||
</label>
|
||||
|
||||
<label class="field">
|
||||
<span>下载最小文件大小(字节,0=全部)</span>
|
||||
<input type="number" id="minSize" min="0" placeholder="0" />
|
||||
|
||||
@@ -12,7 +12,6 @@ const DEFAULT_CONFIG = {
|
||||
interceptDownload: true,
|
||||
minSize: 0,
|
||||
excludeDomains: [],
|
||||
showNotifications: true,
|
||||
sniffEnabled: true,
|
||||
sniffTypes: ['video', 'audio', 'image', 'archive', 'torrent', 'installer'],
|
||||
sniffMaxItems: 200,
|
||||
@@ -57,7 +56,6 @@ function fillForm(config) {
|
||||
$('secret').value = config.secret || ''
|
||||
$('interceptDownload').checked = config.interceptDownload !== false
|
||||
$('sniffEnabled').checked = config.sniffEnabled !== false
|
||||
$('showNotifications').checked = config.showNotifications !== false
|
||||
$('minSize').value = config.minSize || 0
|
||||
$('sniffMinSize').value = config.sniffMinSize ?? DEFAULT_CONFIG.sniffMinSize
|
||||
$('excludeDomains').value = (config.excludeDomains || []).join(',')
|
||||
@@ -69,7 +67,6 @@ function readForm() {
|
||||
secret: $('secret').value.trim(),
|
||||
interceptDownload: $('interceptDownload').checked,
|
||||
sniffEnabled: $('sniffEnabled').checked,
|
||||
showNotifications: $('showNotifications').checked,
|
||||
minSize: parseInt($('minSize').value, 10) || 0,
|
||||
sniffMinSize: parseInt($('sniffMinSize').value, 10) || 0,
|
||||
excludeDomains: $('excludeDomains').value
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,447 @@
|
||||
//! OpenAI 兼容的通用对话客户端(非翻译语义)。
|
||||
//!
|
||||
//! 一套代码覆盖 DeepSeek / OpenAI / Gemini(OpenAI 兼容端点)/ 通义 DashScope /
|
||||
//! Kimi / 智谱 / 豆包 / Mistral / Groq / OpenRouter / 本地 Ollama / LM Studio /
|
||||
//! one-api 等中转——它们都提供 `POST {baseUrl}/chat/completions` 且结构一致。
|
||||
//!
|
||||
//! 与 `translate::engines::ai` 的分工:
|
||||
//! - 本模块:调用方**全量给定 messages**(终端助手等),不含翻译提示词语义;
|
||||
//! - translate 的 AiEngine:流式、视觉、翻译模板、空流自愈等翻译专属逻辑。
|
||||
//!
|
||||
//! 两者共享端点归一、密钥读取(凭据管理器)与 HTTP 错误分类的约定。
|
||||
|
||||
use std::time::Duration;
|
||||
|
||||
use serde::Deserialize;
|
||||
use serde_json::json;
|
||||
|
||||
use super::{
|
||||
provider_api_key, AiErrorKind, AiProviderConfig, AiSettings, DEFAULT_CHAT_TIMEOUT_MS,
|
||||
};
|
||||
|
||||
/// 自检与连通性测试使用的探测文本
|
||||
const PROBE_TEXT: &str = "Hello, world.";
|
||||
|
||||
/// 通用对话请求的结构化错误:**分类 + 可直接展示的中文文案**。
|
||||
///
|
||||
/// 调用方各自取所需:终端助手只要文案([`chat_once`] 直接给 String),
|
||||
/// 设置页的连通性测试还需要分类,用来给「改 Key」「查网络」这类不同的下一步提示。
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ChatError {
|
||||
pub kind: AiErrorKind,
|
||||
pub message: String,
|
||||
}
|
||||
|
||||
impl ChatError {
|
||||
fn new(kind: AiErrorKind, message: impl Into<String>) -> Self {
|
||||
Self {
|
||||
kind,
|
||||
message: message.into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for ChatError {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
f.write_str(&self.message)
|
||||
}
|
||||
}
|
||||
|
||||
/// API 根地址。容错:用户常把完整端点(`.../chat/completions`)粘进来,
|
||||
/// 不剥掉会拼出双重后缀,上游表现为 404。
|
||||
pub fn api_root(cfg: &AiProviderConfig) -> Result<String, ChatError> {
|
||||
let raw = cfg.base_url.trim();
|
||||
if raw.is_empty() {
|
||||
return Err(ChatError::new(
|
||||
AiErrorKind::Config,
|
||||
format!("供应商「{}」尚未配置 Base URL", cfg.name),
|
||||
));
|
||||
}
|
||||
if !(raw.starts_with("http://") || raw.starts_with("https://")) {
|
||||
return Err(ChatError::new(
|
||||
AiErrorKind::Config,
|
||||
format!("Base URL 需以 http:// 或 https:// 开头,当前为「{raw}」"),
|
||||
));
|
||||
}
|
||||
let mut root = raw.trim_end_matches('/').to_string();
|
||||
for suffix in ["/chat/completions", "/completions", "/models"] {
|
||||
if let Some(stripped) = root.strip_suffix(suffix) {
|
||||
root = stripped.trim_end_matches('/').to_string();
|
||||
break;
|
||||
}
|
||||
}
|
||||
Ok(root)
|
||||
}
|
||||
|
||||
pub fn chat_endpoint(cfg: &AiProviderConfig) -> Result<String, ChatError> {
|
||||
Ok(format!("{}/chat/completions", api_root(cfg)?))
|
||||
}
|
||||
|
||||
pub fn models_endpoint(cfg: &AiProviderConfig) -> Result<String, ChatError> {
|
||||
Ok(format!("{}/models", api_root(cfg)?))
|
||||
}
|
||||
|
||||
/// 取本次请求使用的密钥。
|
||||
///
|
||||
/// `override_key` 非空时优先——设置页「检查」允许用**刚填好、还没保存**的 Key 直接验证,
|
||||
/// 省掉「先保存密钥再测试」的来回。它只活在这一次请求里,不入凭据库、不落盘。
|
||||
fn require_key(cfg: &AiProviderConfig, override_key: Option<&str>) -> Result<String, ChatError> {
|
||||
let key = match override_key.map(str::trim).filter(|k| !k.is_empty()) {
|
||||
Some(k) => k.to_string(),
|
||||
None => provider_api_key(&cfg.id),
|
||||
};
|
||||
if key.trim().is_empty() {
|
||||
return Err(ChatError::new(
|
||||
AiErrorKind::Auth,
|
||||
format!(
|
||||
"供应商「{}」尚未配置 API Key,请在主设置 → AI 服务中填写",
|
||||
cfg.name
|
||||
),
|
||||
));
|
||||
}
|
||||
Ok(key)
|
||||
}
|
||||
|
||||
fn require_model(cfg: &AiProviderConfig) -> Result<String, ChatError> {
|
||||
let model = cfg.model.trim();
|
||||
if model.is_empty() {
|
||||
return Err(ChatError::new(
|
||||
AiErrorKind::Config,
|
||||
format!(
|
||||
"供应商「{}」尚未选择模型,可在设置中拉取模型列表后选择",
|
||||
cfg.name
|
||||
),
|
||||
));
|
||||
}
|
||||
Ok(model.to_string())
|
||||
}
|
||||
|
||||
/// 解析请求体公共字段(temperature / max_tokens / extra_body)。
|
||||
fn apply_common_params(body: &mut serde_json::Map<String, serde_json::Value>, cfg: &AiProviderConfig) {
|
||||
body.insert("temperature".into(), json!(cfg.temperature));
|
||||
body.insert("max_tokens".into(), json!(cfg.max_tokens));
|
||||
if let Some(extra) = cfg.extra_body.as_deref().map(str::trim) {
|
||||
if !extra.is_empty() {
|
||||
if let Ok(serde_json::Value::Object(map)) = serde_json::from_str::<serde_json::Value>(extra)
|
||||
{
|
||||
for (k, v) in map {
|
||||
body.insert(k, v);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 按设置选择 HTTP 客户端:开了代理且能解析到 mixed 端口 → 走代理,否则直连。
|
||||
///
|
||||
/// 与翻译模块同一姿态:代理不可用时**静默回退直连**,让请求自己去失败。
|
||||
async fn select_client(settings: &AiSettings, data_dir: &std::path::Path) -> reqwest::Client {
|
||||
let direct = reqwest::Client::builder()
|
||||
.timeout(Duration::from_secs(120))
|
||||
.build()
|
||||
.unwrap_or_else(|_| reqwest::Client::new());
|
||||
if !settings.use_proxy {
|
||||
return direct;
|
||||
}
|
||||
let Ok(raw) = std::fs::read_to_string(data_dir.join("proxy").join("settings.json")) else {
|
||||
return direct;
|
||||
};
|
||||
let Ok(value) = serde_json::from_str::<serde_json::Value>(&raw) else {
|
||||
return direct;
|
||||
};
|
||||
let Some(port) = value.get("mixedPort").and_then(|v| v.as_u64()) else {
|
||||
return direct;
|
||||
};
|
||||
if port == 0 || port > 65535 {
|
||||
return direct;
|
||||
}
|
||||
let proxy_url = format!("http://127.0.0.1:{port}");
|
||||
match reqwest::Proxy::all(&proxy_url).ok().and_then(|p| {
|
||||
reqwest::Client::builder()
|
||||
.timeout(Duration::from_secs(120))
|
||||
.proxy(p)
|
||||
.build()
|
||||
.ok()
|
||||
}) {
|
||||
Some(client) => client,
|
||||
None => direct,
|
||||
}
|
||||
}
|
||||
|
||||
/// 通用对话补全(结构化错误版):消息由调用方全量给定。
|
||||
async fn post_chat(
|
||||
cfg: &AiProviderConfig,
|
||||
messages: Vec<(&str, String)>,
|
||||
api_key_override: Option<&str>,
|
||||
settings: &AiSettings,
|
||||
data_dir: &std::path::Path,
|
||||
) -> Result<String, ChatError> {
|
||||
let key = require_key(cfg, api_key_override)?;
|
||||
let model = require_model(cfg)?;
|
||||
let endpoint = chat_endpoint(cfg)?;
|
||||
|
||||
let mut body = serde_json::Map::new();
|
||||
body.insert("model".into(), json!(model));
|
||||
body.insert("stream".into(), json!(false));
|
||||
body.insert(
|
||||
"messages".into(),
|
||||
json!(messages
|
||||
.into_iter()
|
||||
.map(|(role, content)| json!({ "role": role, "content": content }))
|
||||
.collect::<Vec<_>>()),
|
||||
);
|
||||
apply_common_params(&mut body, cfg);
|
||||
|
||||
let client = select_client(settings, data_dir).await;
|
||||
let resp = client
|
||||
.post(&endpoint)
|
||||
.bearer_auth(&key)
|
||||
.timeout(Duration::from_millis(DEFAULT_CHAT_TIMEOUT_MS))
|
||||
.json(&serde_json::Value::Object(body))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| classify_reqwest(e, &cfg.name))?;
|
||||
|
||||
let status = resp.status();
|
||||
let raw = resp
|
||||
.text()
|
||||
.await
|
||||
.map_err(|e| {
|
||||
ChatError::new(
|
||||
AiErrorKind::Network,
|
||||
format!("读取「{}」响应失败: {e}", cfg.name),
|
||||
)
|
||||
})?;
|
||||
if !status.is_success() {
|
||||
return Err(classify_http(status.as_u16(), &raw, &cfg.name, &model));
|
||||
}
|
||||
|
||||
let parsed: ChatResponse = serde_json::from_str(&raw).map_err(|e| {
|
||||
ChatError::new(
|
||||
AiErrorKind::Parse,
|
||||
format!("「{}」响应不是预期的 JSON: {e}", cfg.name),
|
||||
)
|
||||
})?;
|
||||
if let Some(err) = parsed.error {
|
||||
let msg = err
|
||||
.message
|
||||
.filter(|m| !m.trim().is_empty())
|
||||
.unwrap_or_else(|| "上游返回了错误对象".to_string());
|
||||
return Err(ChatError::new(
|
||||
AiErrorKind::Unknown,
|
||||
format!("「{}」返回错误:{msg}", cfg.name),
|
||||
));
|
||||
}
|
||||
|
||||
parsed
|
||||
.choices
|
||||
.into_iter()
|
||||
.next()
|
||||
.and_then(|c| c.message.content)
|
||||
.map(|s| s.trim().to_string())
|
||||
.filter(|s| !s.is_empty())
|
||||
.ok_or_else(|| {
|
||||
ChatError::new(AiErrorKind::Empty, format!("「{}」返回了空内容", cfg.name))
|
||||
})
|
||||
}
|
||||
|
||||
/// 通用对话补全:消息由调用方全量给定。
|
||||
///
|
||||
/// 只要文案的调用方(终端 AI 助手)走这里;需要错误分类的用 [`test_provider`]。
|
||||
pub async fn chat_once(
|
||||
cfg: &AiProviderConfig,
|
||||
messages: Vec<(&str, String)>,
|
||||
settings: &AiSettings,
|
||||
data_dir: &std::path::Path,
|
||||
) -> Result<String, String> {
|
||||
post_chat(cfg, messages, None, settings, data_dir)
|
||||
.await
|
||||
.map_err(|e| e.message)
|
||||
}
|
||||
|
||||
/// 连通性自检:发一条极短同步请求。
|
||||
///
|
||||
/// `api_key_override` 见 [`require_key`]:设置页「检查」可以带上用户刚填、还没保存的 Key。
|
||||
pub async fn test_provider(
|
||||
cfg: &AiProviderConfig,
|
||||
api_key_override: Option<&str>,
|
||||
settings: &AiSettings,
|
||||
data_dir: &std::path::Path,
|
||||
) -> Result<String, ChatError> {
|
||||
let started = std::time::Instant::now();
|
||||
let text = post_chat(
|
||||
cfg,
|
||||
vec![
|
||||
("system", "You are a connectivity probe. Reply with OK only.".to_string()),
|
||||
("user", PROBE_TEXT.to_string()),
|
||||
],
|
||||
api_key_override,
|
||||
settings,
|
||||
data_dir,
|
||||
)
|
||||
.await?;
|
||||
Ok(format!(
|
||||
"连通正常 · 模型 {} · {}ms · 回显「{}」",
|
||||
cfg.model,
|
||||
started.elapsed().as_millis() as u64,
|
||||
text.chars().take(40).collect::<String>()
|
||||
))
|
||||
}
|
||||
|
||||
/// 拉取上游模型列表(`GET {baseUrl}/models`)。
|
||||
pub async fn list_models(
|
||||
cfg: &AiProviderConfig,
|
||||
settings: &AiSettings,
|
||||
data_dir: &std::path::Path,
|
||||
) -> Result<Vec<String>, String> {
|
||||
list_models_typed(cfg, settings, data_dir)
|
||||
.await
|
||||
.map_err(|e| e.message)
|
||||
}
|
||||
|
||||
async fn list_models_typed(
|
||||
cfg: &AiProviderConfig,
|
||||
settings: &AiSettings,
|
||||
data_dir: &std::path::Path,
|
||||
) -> Result<Vec<String>, ChatError> {
|
||||
let key = require_key(cfg, None)?;
|
||||
let endpoint = models_endpoint(cfg)?;
|
||||
let client = select_client(settings, data_dir).await;
|
||||
let resp = client
|
||||
.get(&endpoint)
|
||||
.bearer_auth(&key)
|
||||
.timeout(Duration::from_millis(15_000))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| classify_reqwest(e, &cfg.name))?;
|
||||
|
||||
let status = resp.status();
|
||||
let raw = resp.text().await.map_err(|e| {
|
||||
ChatError::new(
|
||||
AiErrorKind::Network,
|
||||
format!("读取「{}」模型列表失败: {e}", cfg.name),
|
||||
)
|
||||
})?;
|
||||
if !status.is_success() {
|
||||
return Err(classify_http(
|
||||
status.as_u16(),
|
||||
&raw,
|
||||
&cfg.name,
|
||||
cfg.model.as_str(),
|
||||
));
|
||||
}
|
||||
|
||||
let parsed: ModelsResponse = serde_json::from_str(&raw).map_err(|e| {
|
||||
ChatError::new(
|
||||
AiErrorKind::Parse,
|
||||
format!("「{}」的模型列表无法解析: {e}", cfg.name),
|
||||
)
|
||||
})?;
|
||||
let mut ids: Vec<String> = parsed
|
||||
.data
|
||||
.into_iter()
|
||||
.map(|m| m.id)
|
||||
.filter(|id| !id.trim().is_empty())
|
||||
.collect();
|
||||
ids.sort();
|
||||
ids.dedup();
|
||||
Ok(ids)
|
||||
}
|
||||
|
||||
fn classify_reqwest(e: reqwest::Error, provider: &str) -> ChatError {
|
||||
if e.is_timeout() {
|
||||
return ChatError::new(
|
||||
AiErrorKind::Timeout,
|
||||
format!("请求「{provider}」超时,可在设置中调大超时时间,或检查网络"),
|
||||
);
|
||||
}
|
||||
if e.is_connect() {
|
||||
return ChatError::new(
|
||||
AiErrorKind::Network,
|
||||
format!("无法连接「{provider}」:{e}(若该服务在境外,请检查网络或在 AI 设置中开启代理)"),
|
||||
);
|
||||
}
|
||||
ChatError::new(
|
||||
AiErrorKind::Network,
|
||||
format!("请求「{provider}」失败:{e}"),
|
||||
)
|
||||
}
|
||||
|
||||
fn classify_http(status: u16, body: &str, provider: &str, model: &str) -> ChatError {
|
||||
let snippet = body.trim();
|
||||
let lower = snippet.to_lowercase();
|
||||
match status {
|
||||
401 | 403 => ChatError::new(
|
||||
AiErrorKind::Auth,
|
||||
format!("「{provider}」认证失败(HTTP {status}),请检查 API Key 是否正确、是否有该模型的权限"),
|
||||
),
|
||||
402 => ChatError::new(
|
||||
AiErrorKind::Auth,
|
||||
format!("「{provider}」余额不足或未开通计费(HTTP 402)"),
|
||||
),
|
||||
429 => ChatError::new(
|
||||
AiErrorKind::RateLimit,
|
||||
format!("「{provider}」请求过于频繁(HTTP 429),请稍后重试或降低频率"),
|
||||
),
|
||||
400 | 404 | 422 if lower.contains("model") => ChatError::new(
|
||||
AiErrorKind::Config,
|
||||
format!(
|
||||
"「{provider}」不识别模型「{model}」(HTTP {status}):上游模型名可能已变更,\
|
||||
请在设置中拉取模型列表后重新选择"
|
||||
),
|
||||
),
|
||||
400 | 404 | 422 => ChatError::new(
|
||||
AiErrorKind::Config,
|
||||
format!("「{provider}」拒绝了该请求(HTTP {status})"),
|
||||
),
|
||||
408 | 504 => ChatError::new(
|
||||
AiErrorKind::Timeout,
|
||||
format!("「{provider}」上游超时(HTTP {status})"),
|
||||
),
|
||||
s if (500..600).contains(&s) => ChatError::new(
|
||||
AiErrorKind::Network,
|
||||
format!("「{provider}」服务端错误(HTTP {status}),可稍后重试"),
|
||||
),
|
||||
s => ChatError::new(AiErrorKind::Unknown, format!("「{provider}」返回 HTTP {s}")),
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 响应结构(宽松解析) =====
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct ChatResponse {
|
||||
#[serde(default)]
|
||||
choices: Vec<ChatChoice>,
|
||||
#[serde(default)]
|
||||
error: Option<ApiErrorBody>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct ChatChoice {
|
||||
#[serde(default)]
|
||||
message: ChatMessage,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default, Deserialize)]
|
||||
struct ChatMessage {
|
||||
#[serde(default)]
|
||||
content: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct ApiErrorBody {
|
||||
#[serde(default)]
|
||||
message: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct ModelsResponse {
|
||||
#[serde(default)]
|
||||
data: Vec<ModelEntry>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct ModelEntry {
|
||||
#[serde(default)]
|
||||
id: String,
|
||||
}
|
||||
@@ -0,0 +1,218 @@
|
||||
//! 全局 AI 模块 Tauri 命令层。
|
||||
//!
|
||||
//! 与 translate 命令层同一安全约定:
|
||||
//! - **不存在读取 API Key 明文的命令**。列表只回传「是否已配置」与掩码;
|
||||
//! - 写入走 `ai_secret_set`,删除走 `ai_secret_clear`。
|
||||
|
||||
use serde::{Serialize};
|
||||
use specta::Type;
|
||||
use tauri::State;
|
||||
|
||||
use super::{AiErrorKind, AiManager, AiProviderConfig, AiSettings, AiTestResult};
|
||||
|
||||
/// 供应商前端视图:配置 + 派生状态(密钥是否已配、是否可用)。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct AiProviderView {
|
||||
pub config: AiProviderConfig,
|
||||
pub has_api_key: bool,
|
||||
pub api_key_masked: String,
|
||||
pub ready: bool,
|
||||
pub issue: Option<String>,
|
||||
}
|
||||
|
||||
/// 读取全局 AI 设置。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn ai_get_settings(state: State<'_, AiManager>) -> Result<AiSettings, String> {
|
||||
Ok(state.load_settings())
|
||||
}
|
||||
|
||||
/// 保存全局 AI 设置(整体覆盖;供应商列表以传入为准)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn ai_save_settings(
|
||||
state: State<'_, AiManager>,
|
||||
settings: AiSettings,
|
||||
) -> Result<(), String> {
|
||||
let mut next = settings;
|
||||
for p in &mut next.providers {
|
||||
p.id = p.id.trim().to_string();
|
||||
p.name = p.name.trim().to_string();
|
||||
}
|
||||
next.providers.retain(|p| !p.id.is_empty());
|
||||
next.heal();
|
||||
state.save_settings(&next)
|
||||
}
|
||||
|
||||
/// 列出供应商视图(含密钥状态与可用性),保持配置中的顺序。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn ai_list_providers(state: State<'_, AiManager>) -> Result<Vec<AiProviderView>, String> {
|
||||
let settings = state.load_settings();
|
||||
Ok(settings.providers.iter().map(to_view).collect())
|
||||
}
|
||||
|
||||
/// 新增或更新一个供应商(按 id upsert)。
|
||||
///
|
||||
/// 校验 id:它会进入凭据键(`ai-provider-<id>`),限定为字母/数字/下划线/短横线。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn ai_provider_save(
|
||||
state: State<'_, AiManager>,
|
||||
config: AiProviderConfig,
|
||||
) -> Result<(), String> {
|
||||
let id = config.id.trim().to_string();
|
||||
if id.is_empty() {
|
||||
return Err("供应商标识不能为空".to_string());
|
||||
}
|
||||
if !id
|
||||
.chars()
|
||||
.all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
|
||||
{
|
||||
return Err("供应商标识只能包含字母、数字、下划线和短横线".to_string());
|
||||
}
|
||||
if config.name.trim().is_empty() {
|
||||
return Err("供应商名称不能为空".to_string());
|
||||
}
|
||||
|
||||
let mut settings = state.load_settings();
|
||||
let mut next = config;
|
||||
next.id = id;
|
||||
// 输出/上下文夹到合法档位上限(UI 提供档位,后端再兜一道)
|
||||
next.max_tokens = next.max_tokens.clamp(1, 131_072);
|
||||
next.max_context = next.max_context.clamp(1_024, 1_048_576);
|
||||
if next.max_tokens == 0 {
|
||||
next.max_tokens = super::settings::DEFAULT_MAX_OUTPUT;
|
||||
}
|
||||
if next.max_context < 1_024 {
|
||||
next.max_context = super::settings::DEFAULT_MAX_CONTEXT;
|
||||
}
|
||||
match settings.providers.iter_mut().find(|p| p.id == next.id) {
|
||||
Some(slot) => *slot = next,
|
||||
None => settings.providers.push(next),
|
||||
}
|
||||
// 不按优先级排序:优先级是翻译等模块的场景参数,AI 列表保持添加顺序
|
||||
state.save_settings(&settings)
|
||||
}
|
||||
|
||||
/// 删除供应商(连同它在系统凭据管理器中的密钥)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn ai_provider_delete(state: State<'_, AiManager>, id: String) -> Result<(), String> {
|
||||
let mut settings = state.load_settings();
|
||||
let before = settings.providers.len();
|
||||
settings.providers.retain(|p| p.id != id);
|
||||
if settings.providers.len() == before {
|
||||
return Err(format!("找不到供应商「{id}」"));
|
||||
}
|
||||
if settings.default_provider_id == id {
|
||||
settings.default_provider_id = "auto".to_string();
|
||||
}
|
||||
state.save_settings(&settings)?;
|
||||
if let Err(e) = crate::secrets::secret_delete(&super::provider_secret_key(&id)) {
|
||||
crate::logger::log_error("ai", &format!("删除供应商「{id}」的密钥失败: {e}"));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 写入供应商的 API Key(明文只在此处进入系统凭据管理器,永不回写配置文件)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn ai_secret_set(state: State<'_, AiManager>, id: String, api_key: String) -> Result<(), String> {
|
||||
if state.load_settings().provider(&id).is_none() {
|
||||
return Err(format!("找不到供应商「{id}」"));
|
||||
}
|
||||
let key = super::provider_secret_key(&id);
|
||||
let value = api_key.trim();
|
||||
if value.is_empty() {
|
||||
return crate::secrets::secret_delete(&key);
|
||||
}
|
||||
crate::secrets::secret_write(&key, value)
|
||||
}
|
||||
|
||||
/// 清除供应商的 API Key。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn ai_secret_clear(id: String) -> Result<(), String> {
|
||||
crate::secrets::secret_delete(&super::provider_secret_key(&id))
|
||||
}
|
||||
|
||||
/// 连通性自检:用前端传入的草稿配置测试(**不落盘**)。
|
||||
///
|
||||
/// `api_key` 是可选的「临时密钥」覆盖:设置页允许用户**填好 Key、还没保存**就先检查一次,
|
||||
/// 省掉「先保存再测试」的来回。它只用于这一次请求——不写凭据管理器、不落配置文件,
|
||||
/// 也不会被回传到前端;为空时退回凭据管理器里已保存的密钥。
|
||||
///
|
||||
/// 之所以仍按 `config.id` 取已保存的密钥作为默认值:多数场景(改 Base URL / 换模型后复测)
|
||||
/// 用户并不想重新输入 Key。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn ai_provider_test(
|
||||
state: State<'_, AiManager>,
|
||||
config: AiProviderConfig,
|
||||
api_key: Option<String>,
|
||||
) -> Result<AiTestResult, String> {
|
||||
if config.id.trim().is_empty() || config.name.trim().is_empty() {
|
||||
return Ok(AiTestResult::failure(
|
||||
AiErrorKind::Config,
|
||||
"供应商标识或名称不能为空,请先保存一次".to_string(),
|
||||
0,
|
||||
));
|
||||
}
|
||||
let settings = state.load_settings();
|
||||
let data_dir = state.data_dir().to_path_buf();
|
||||
let started = std::time::Instant::now();
|
||||
let override_key = api_key.as_deref();
|
||||
match super::test_provider(&config, override_key, &settings, &data_dir).await {
|
||||
Ok(message) => Ok(AiTestResult::success(
|
||||
message,
|
||||
started.elapsed().as_millis() as u64,
|
||||
)),
|
||||
Err(e) => Ok(AiTestResult::failure(
|
||||
e.kind,
|
||||
e.message,
|
||||
started.elapsed().as_millis() as u64,
|
||||
)),
|
||||
}
|
||||
}
|
||||
|
||||
/// 拉取上游模型列表(按已保存的 id;密钥/地址取自磁盘上的配置与凭据库)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn ai_provider_models(
|
||||
state: State<'_, AiManager>,
|
||||
id: String,
|
||||
) -> Result<Vec<String>, String> {
|
||||
let settings = state.load_settings();
|
||||
let cfg = settings
|
||||
.provider(&id)
|
||||
.cloned()
|
||||
.ok_or_else(|| format!("找不到供应商「{id}」"))?;
|
||||
let data_dir = state.data_dir().to_path_buf();
|
||||
super::list_models(&cfg, &settings, &data_dir).await
|
||||
}
|
||||
|
||||
/// 构造供应商视图并给出「是否可用」的判断。
|
||||
fn to_view(cfg: &AiProviderConfig) -> AiProviderView {
|
||||
let raw_key = super::provider_api_key(&cfg.id);
|
||||
let has_api_key = !raw_key.trim().is_empty();
|
||||
|
||||
let issue = if cfg.base_url.trim().is_empty() {
|
||||
Some("未配置 Base URL".to_string())
|
||||
} else if cfg.model.trim().is_empty() {
|
||||
Some("未选择模型".to_string())
|
||||
} else if !has_api_key {
|
||||
Some("未配置 API Key".to_string())
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
AiProviderView {
|
||||
config: cfg.clone(),
|
||||
has_api_key,
|
||||
api_key_masked: crate::secrets::mask(&raw_key),
|
||||
ready: issue.is_none() && cfg.enabled,
|
||||
issue,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,172 @@
|
||||
//! 全局 AI 模块:供应商配置 + OpenAI 兼容客户端。
|
||||
//!
|
||||
//! 架构位置(主应用层,不属于任何业务模块):
|
||||
//!
|
||||
//! ```text
|
||||
//! 主设置 → AI 服务卡片
|
||||
//! ↓ Tauri IPC
|
||||
//! commands.rs 命令层(列表 / CRUD / 密钥 / 测连通 / 拉模型)
|
||||
//! ↓
|
||||
//! AiManager(本文件):设置读写 / 凭据键 / 自愈
|
||||
//! ↓
|
||||
//! chat.rs chat_once / test / list_models(OpenAI 兼容)
|
||||
//! ↓ reqwest
|
||||
//! DeepSeek / OpenAI / Gemini / 通义 / Kimi / 智谱 / Ollama …
|
||||
//! ```
|
||||
//!
|
||||
//! 消费方:
|
||||
//! - **翻译模块**:把已加入翻译候选的供应商转换为 TranslateEngineConfig(kind = "ai"),
|
||||
//! 密钥经 [`provider_api_key`] 读取;翻译专属的提示词模板与优先级仍在 translate 设置。
|
||||
//! - **终端 AI 助手**:直接列本模块的供应商并调用 [`chat::chat_once`]。
|
||||
//!
|
||||
//! **依赖方向:只出不进。** 本模块不引用任何业务模块(translate / terminal …)——
|
||||
//! 它们是消费者,我们是被消费者。连「把历史翻译设置里的 AI 引擎搬过来」这类一次性
|
||||
//! 迁移也不在这里:那段代码必然要同时读懂两边,因此归 translate 侧
|
||||
//! (`translate::migrate_legacy_ai_engines`),由 `setup.rs` 在启动时调用一次。
|
||||
//!
|
||||
//! 安全姿态与 translate 一致:**网络只在 Rust 侧发生**;API Key 只进系统凭据管理器
|
||||
//! (键名 `ai-provider-<id>`),不落 `settings.json`、不经前端明文回传。
|
||||
|
||||
mod chat;
|
||||
mod commands;
|
||||
mod settings;
|
||||
mod test_result;
|
||||
|
||||
pub use chat::{chat_once, list_models, test_provider};
|
||||
pub use commands::{
|
||||
ai_get_settings, ai_list_providers, ai_provider_delete, ai_provider_models,
|
||||
ai_provider_save, ai_provider_test, ai_save_settings, ai_secret_clear, ai_secret_set,
|
||||
};
|
||||
pub use settings::{AiProviderConfig, AiSettings, DEFAULT_CHAT_TIMEOUT_MS, DEFAULT_MAX_CONTEXT};
|
||||
pub use test_result::{AiErrorKind, AiTestResult};
|
||||
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::Mutex;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
/// 设置内存缓存有效期(与 translate / music 的 500ms 一致)。
|
||||
const SETTINGS_CACHE_TTL: Duration = Duration::from_millis(500);
|
||||
|
||||
/// 供应商 API Key 的凭据键前缀。
|
||||
const PROVIDER_KEY_PREFIX: &str = "ai-provider-";
|
||||
|
||||
/// 某供应商实例的凭据键。
|
||||
pub fn provider_secret_key(provider_id: &str) -> String {
|
||||
format!("{PROVIDER_KEY_PREFIX}{provider_id}")
|
||||
}
|
||||
|
||||
/// 读取某供应商的 API Key(未配置或读取失败 → 空串)。
|
||||
///
|
||||
/// 只认 `ai-provider-*`。历史上 AI 引擎曾把密钥存在 translate 的 `translate-engine-*`
|
||||
/// 下,那份由一次性迁移复制过来;这里不做回退读取——回退等于让本模块永久依赖
|
||||
/// translate 的键名约定。迁移复制失败时会记日志,用户在设置页重填即可(界面会显示
|
||||
/// 「未配置 API Key」,不会静默走错端点)。
|
||||
pub fn provider_api_key(provider_id: &str) -> String {
|
||||
if provider_id.trim().is_empty() {
|
||||
return String::new();
|
||||
}
|
||||
crate::secrets::read_or_empty(&provider_secret_key(provider_id))
|
||||
}
|
||||
|
||||
/// 写入 AI 设置文件(`{data_dir}/ai/settings.json`,目录不存在时创建)。
|
||||
///
|
||||
/// 除 `AiManager` 外还单独暴露成自由函数:启动阶段的一次性迁移(由 translate 侧发起)
|
||||
/// 需要在 `AiManager` 尚未注册为 State 时写这份文件。
|
||||
pub fn write_settings(data_dir: &Path, settings: &AiSettings) -> Result<(), String> {
|
||||
let root = data_dir.join("ai");
|
||||
std::fs::create_dir_all(&root).map_err(|e| format!("创建 AI 目录失败: {e}"))?;
|
||||
let json =
|
||||
serde_json::to_string_pretty(settings).map_err(|e| format!("序列化 AI 设置失败: {e}"))?;
|
||||
std::fs::write(root.join("settings.json"), json).map_err(|e| format!("写入 AI 设置失败: {e}"))
|
||||
}
|
||||
|
||||
struct SettingsCache {
|
||||
read_at: Instant,
|
||||
settings: AiSettings,
|
||||
}
|
||||
|
||||
/// 全局 AI 管理器(Tauri State)。
|
||||
pub struct AiManager {
|
||||
/// 应用数据目录(与 translate 同级,代理配置也在这一层)
|
||||
data_dir: PathBuf,
|
||||
/// 模块自身目录:{app_data_dir}/ai
|
||||
root: PathBuf,
|
||||
cache: Mutex<Option<SettingsCache>>,
|
||||
}
|
||||
|
||||
impl AiManager {
|
||||
pub fn new(app_data_dir: PathBuf) -> Self {
|
||||
let root = app_data_dir.join("ai");
|
||||
std::fs::create_dir_all(&root).ok();
|
||||
Self {
|
||||
data_dir: app_data_dir,
|
||||
root,
|
||||
cache: Mutex::new(None),
|
||||
}
|
||||
}
|
||||
|
||||
fn settings_path(&self) -> PathBuf {
|
||||
self.root.join("settings.json")
|
||||
}
|
||||
|
||||
/// 应用数据目录(chat 模块解析代理配置用)。
|
||||
pub fn data_dir(&self) -> &Path {
|
||||
&self.data_dir
|
||||
}
|
||||
|
||||
/// 读取设置(带短时缓存;文件缺失时回退默认值;自愈结果落盘)。
|
||||
pub fn load_settings(&self) -> AiSettings {
|
||||
if let Ok(cache) = self.cache.lock() {
|
||||
if let Some(entry) = cache.as_ref() {
|
||||
if entry.read_at.elapsed() < SETTINGS_CACHE_TTL {
|
||||
return entry.settings.clone();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let mut settings = std::fs::read_to_string(self.settings_path())
|
||||
.ok()
|
||||
.and_then(|s| serde_json::from_str::<AiSettings>(&s).ok())
|
||||
.unwrap_or_default();
|
||||
let healed = settings.heal();
|
||||
if let Ok(mut cache) = self.cache.lock() {
|
||||
*cache = Some(SettingsCache {
|
||||
read_at: Instant::now(),
|
||||
settings: settings.clone(),
|
||||
});
|
||||
}
|
||||
if healed {
|
||||
if let Err(e) = self.save_settings(&settings) {
|
||||
crate::logger::log_error("ai", &format!("设置自愈落盘失败: {e}"));
|
||||
}
|
||||
}
|
||||
settings
|
||||
}
|
||||
|
||||
/// 保存设置并刷新缓存。
|
||||
pub fn save_settings(&self, settings: &AiSettings) -> Result<(), String> {
|
||||
write_settings(&self.data_dir, settings)?;
|
||||
if let Ok(mut cache) = self.cache.lock() {
|
||||
*cache = Some(SettingsCache {
|
||||
read_at: Instant::now(),
|
||||
settings: settings.clone(),
|
||||
});
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 同步读取 AI 设置(**不经 AiManager 缓存**,供 translate 等在无 State 时使用)。
|
||||
///
|
||||
/// 调用前应保证一次性迁移已跑过(`setup::init` 里在建 State 之前调用
|
||||
/// `translate::migrate_legacy_ai_engines`);文件缺失时回退默认值并自愈,
|
||||
/// 但不写盘——落盘权在 [`write_settings`] 的调用方。
|
||||
pub fn load_settings_sync(data_dir: &Path) -> AiSettings {
|
||||
let path = data_dir.join("ai").join("settings.json");
|
||||
let mut settings = std::fs::read_to_string(path)
|
||||
.ok()
|
||||
.and_then(|s| serde_json::from_str::<AiSettings>(&s).ok())
|
||||
.unwrap_or_default();
|
||||
settings.heal();
|
||||
settings
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,213 @@
|
||||
//! 全局 AI 供应商配置(主应用设置)。
|
||||
//!
|
||||
//! 持久化位置:`{app_data_dir}/ai/settings.json`。
|
||||
//! 容器级 `#[serde(default)]`:新增字段对旧配置文件向后兼容。
|
||||
//!
|
||||
//! 设计边界(对齐主流桌面 Agent 的「模型/连接」设置):
|
||||
//! - **本模块只管引擎本身**:Base URL、模型、密钥、最大输出、最大上下文等
|
||||
//! 与具体调用场景无关的连接与生成参数。
|
||||
//! - **模块自己的参数留在各模块**:翻译的优先级 / 超时 / 提示词覆盖在
|
||||
//! translate 设置里(`TranslateAiParams`),终端等调用方自带超时与 system prompt。
|
||||
//!
|
||||
//! 安全姿态:**API Key 不在这里**。明文一律进系统凭据管理器,
|
||||
//! 键名约定 `ai-provider-<id>`(见 [`super::provider_secret_key`])。
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
|
||||
/// 通用对话默认超时(毫秒)。供应商级超时已下沉到翻译等模块。
|
||||
pub const DEFAULT_CHAT_TIMEOUT_MS: u64 = 60_000;
|
||||
|
||||
/// 最大输出(completion tokens)默认值与可选档位(上限 128K)。
|
||||
pub const DEFAULT_MAX_OUTPUT: u32 = 8_192;
|
||||
#[allow(dead_code)] // 档位表与前端 AI_PRESETS / Select 选项保持一致,供后续命令校验复用
|
||||
pub const MAX_OUTPUT_OPTIONS: [u32; 6] = [4_096, 8_192, 16_384, 32_768, 65_536, 131_072];
|
||||
|
||||
/// 最大上下文(context window tokens)默认值与可选档位(上限 1M)。
|
||||
pub const DEFAULT_MAX_CONTEXT: u32 = 131_072;
|
||||
#[allow(dead_code)]
|
||||
pub const MAX_CONTEXT_OPTIONS: [u32; 6] =
|
||||
[32_768, 65_536, 131_072, 262_144, 524_288, 1_048_576];
|
||||
|
||||
/// 单个 AI 供应商实例(OpenAI 兼容端点)。
|
||||
///
|
||||
/// 「实例」而非「类型」:同一厂商可配置多份(官方 API 与本地 Ollama 并存)。
|
||||
/// 翻译、终端助手等模块共用连接与生成参数;场景参数(优先级、超时、提示词)
|
||||
/// 由各模块自行维护。
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||
#[serde(rename_all = "camelCase", default)]
|
||||
pub struct AiProviderConfig {
|
||||
/// 实例唯一标识(同时是凭据键的一部分,创建后不建议修改)
|
||||
pub id: String,
|
||||
/// 展示名称
|
||||
pub name: String,
|
||||
/// 预设标识:"deepseek" | "openai" | "gemini" | "qwen" | "kimi" | "zhipu"
|
||||
/// | "doubao" | "mimo" | "mistral" | "groq" | "openrouter" | "siliconflow"
|
||||
/// | "ollama" | "lmstudio" | "custom" …
|
||||
pub preset: String,
|
||||
/// 是否启用(关闭后各模块不再把此供应商当候选)
|
||||
pub enabled: bool,
|
||||
/// API 根地址(末尾可有可无 /,不可含 /chat/completions)
|
||||
pub base_url: String,
|
||||
/// 模型标识
|
||||
pub model: String,
|
||||
/// 采样温度
|
||||
pub temperature: f64,
|
||||
/// 最大输出 tokens(completion 上限,对齐 Agent 常见的「回答长度」)
|
||||
pub max_tokens: u32,
|
||||
/// 最大上下文窗口 tokens(模型可接受的输入+输出规模,供调用方截断与展示)
|
||||
pub max_context: u32,
|
||||
/// 额外请求体字段的 JSON 文本(thinking / enable_thinking 等非标准参数)
|
||||
pub extra_body: Option<String>,
|
||||
/// 是否支持图像输入(多模态能力声明;截图翻译「视觉直传」只发给勾选了此项的供应商)
|
||||
#[serde(default)]
|
||||
pub supports_vision: bool,
|
||||
|
||||
// ===== 旧字段:只读入历史 JSON,迁移后写到 translate.aiParams,不再序列化 =====
|
||||
/// 旧:供应商级优先级(历史键 `priority`)
|
||||
#[serde(default, alias = "priority", skip_serializing)]
|
||||
pub legacy_priority: Option<i32>,
|
||||
/// 旧:供应商级超时(历史键 `timeoutMs`)
|
||||
#[serde(default, alias = "timeoutMs", skip_serializing)]
|
||||
pub legacy_timeout_ms: Option<u64>,
|
||||
/// 旧:翻译 system prompt 覆盖(历史键 `systemPrompt`)
|
||||
#[serde(default, alias = "systemPrompt", skip_serializing)]
|
||||
pub legacy_system_prompt: Option<String>,
|
||||
}
|
||||
|
||||
impl Default for AiProviderConfig {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
id: String::new(),
|
||||
name: String::new(),
|
||||
preset: "custom".to_string(),
|
||||
enabled: true,
|
||||
base_url: String::new(),
|
||||
model: String::new(),
|
||||
temperature: 0.3,
|
||||
max_tokens: DEFAULT_MAX_OUTPUT,
|
||||
max_context: DEFAULT_MAX_CONTEXT,
|
||||
extra_body: None,
|
||||
supports_vision: false,
|
||||
legacy_priority: None,
|
||||
legacy_timeout_ms: None,
|
||||
legacy_system_prompt: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AiProviderConfig {
|
||||
/// 内置 DeepSeek 预设:默认供应商。模型标识取现行名 `deepseek-flash`
|
||||
/// (`deepseek-chat` / `deepseek-reasoner` 已于 2026-07-24 停用)。
|
||||
///
|
||||
/// 其余预设只在前端 `AI_PRESETS`(`src/types/ai.ts`)维护模板;
|
||||
/// 后端不硬编码供应商清单——预设标识只是个字符串,谁来加都行。
|
||||
pub fn deepseek_default() -> Self {
|
||||
Self {
|
||||
id: "deepseek".to_string(),
|
||||
name: "DeepSeek Flash".to_string(),
|
||||
preset: "deepseek".to_string(),
|
||||
enabled: true,
|
||||
base_url: "https://api.deepseek.com".to_string(),
|
||||
model: "deepseek-flash".to_string(),
|
||||
temperature: 0.3,
|
||||
max_tokens: DEFAULT_MAX_OUTPUT,
|
||||
max_context: DEFAULT_MAX_CONTEXT,
|
||||
extra_body: None,
|
||||
supports_vision: false,
|
||||
legacy_priority: None,
|
||||
legacy_timeout_ms: None,
|
||||
legacy_system_prompt: None,
|
||||
}
|
||||
}
|
||||
|
||||
/// 取出旧场景参数(若历史 JSON 带有 priority/timeoutMs/systemPrompt)。
|
||||
pub fn take_legacy(&mut self) -> Option<(i32, u64, String)> {
|
||||
let p = self.legacy_priority.take();
|
||||
let t = self.legacy_timeout_ms.take();
|
||||
let s = self.legacy_system_prompt.take();
|
||||
match (p, t, s) {
|
||||
(None, None, None) => None,
|
||||
(p, t, s) => Some((
|
||||
p.unwrap_or(100),
|
||||
t.unwrap_or(30_000),
|
||||
s.unwrap_or_default(),
|
||||
)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 全局 AI 设置根结构。
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||
#[serde(rename_all = "camelCase", default)]
|
||||
pub struct AiSettings {
|
||||
/// 结构版本号:1 = 含供应商级场景参数;2 = 场景参数下沉到各模块
|
||||
pub version: u32,
|
||||
/// 供应商实例列表
|
||||
pub providers: Vec<AiProviderConfig>,
|
||||
/// 默认供应商 id("auto" 表示不指定;主要给终端等简单消费方)
|
||||
pub default_provider_id: String,
|
||||
/// AI 请求是否走代理模块(mihomo mixed 端口)。
|
||||
/// 默认关闭:DeepSeek 等境内可直连;境外服务由用户显式打开。
|
||||
pub use_proxy: bool,
|
||||
}
|
||||
|
||||
impl Default for AiSettings {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
version: 2,
|
||||
providers: vec![AiProviderConfig::deepseek_default()],
|
||||
default_provider_id: "deepseek".to_string(),
|
||||
use_proxy: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AiSettings {
|
||||
/// 按 id 找供应商实例。
|
||||
pub fn provider(&self, id: &str) -> Option<&AiProviderConfig> {
|
||||
self.providers.iter().find(|p| p.id == id)
|
||||
}
|
||||
|
||||
/// 自愈:列表为空时补回 DeepSeek;默认 id 失效时回落到「自动」;
|
||||
/// 输出/上下文越界时夹回档位上限;版本推进到 2。
|
||||
/// 返回是否发生了变更(由调用方决定落盘)。
|
||||
pub fn heal(&mut self) -> bool {
|
||||
let mut changed = false;
|
||||
if self.providers.is_empty() {
|
||||
self.providers.push(AiProviderConfig::deepseek_default());
|
||||
changed = true;
|
||||
}
|
||||
for p in &mut self.providers {
|
||||
if p.max_tokens == 0 {
|
||||
p.max_tokens = DEFAULT_MAX_OUTPUT;
|
||||
changed = true;
|
||||
}
|
||||
if p.max_context == 0 {
|
||||
p.max_context = DEFAULT_MAX_CONTEXT;
|
||||
changed = true;
|
||||
}
|
||||
if p.max_tokens > 131_072 {
|
||||
p.max_tokens = 131_072;
|
||||
changed = true;
|
||||
}
|
||||
if p.max_context > 1_048_576 {
|
||||
p.max_context = 1_048_576;
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
if self.default_provider_id.trim().is_empty() {
|
||||
self.default_provider_id = "auto".to_string();
|
||||
changed = true;
|
||||
}
|
||||
if self.default_provider_id != "auto" && self.provider(&self.default_provider_id).is_none() {
|
||||
self.default_provider_id = "auto".to_string();
|
||||
changed = true;
|
||||
}
|
||||
if self.version < 2 {
|
||||
self.version = 2;
|
||||
changed = true;
|
||||
}
|
||||
changed
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
//! 连通性自检结果与错误分类(与翻译模块 EngineTestResult 同形,失败也返回 Ok)。
|
||||
|
||||
use serde::Serialize;
|
||||
use specta::Type;
|
||||
|
||||
/// AI 请求的错误分类。
|
||||
///
|
||||
/// **本模块自带一份,不复用 `translate::ErrorKind`**:AI 服务是独立的底座,
|
||||
/// 不反向依赖任何业务模块(否则「谁依赖谁」会随功能增长变得无法收敛)。
|
||||
/// 变体名与 translate 的同名枚举刻意保持一致,前端可以共用一套提示文案;
|
||||
/// 只保留 AI 侧**真会产生的**分类(translate 的 unsupported / captcha 是翻译专属语义)。
|
||||
/// 将来若两者要做共享层,再把这个枚举上提合并。
|
||||
#[derive(Debug, Clone, Copy, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub enum AiErrorKind {
|
||||
/// 配置问题:Base URL / 模型名不对
|
||||
Config,
|
||||
/// 认证问题:API Key 无效、无该模型权限、余额不足
|
||||
Auth,
|
||||
/// 上游限流
|
||||
RateLimit,
|
||||
/// 网络不可达 / 上游服务端错误
|
||||
Network,
|
||||
/// 超时
|
||||
Timeout,
|
||||
/// 响应格式异常
|
||||
Parse,
|
||||
/// 上游返回空内容
|
||||
Empty,
|
||||
/// 其它未分类错误
|
||||
Unknown,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct AiTestResult {
|
||||
pub ok: bool,
|
||||
pub latency_ms: u64,
|
||||
pub message: String,
|
||||
pub error_kind: Option<AiErrorKind>,
|
||||
pub detail: Option<String>,
|
||||
}
|
||||
|
||||
impl AiTestResult {
|
||||
/// 失败结果。`kind` 来自 [`crate::ai::chat::ChatError`]——前端据此给出
|
||||
/// 「改 Key」「查网络」这类不同的下一步提示。
|
||||
pub fn failure(kind: AiErrorKind, message: String, latency_ms: u64) -> Self {
|
||||
Self {
|
||||
ok: false,
|
||||
latency_ms,
|
||||
message,
|
||||
error_kind: Some(kind),
|
||||
detail: None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn success(message: String, latency_ms: u64) -> Self {
|
||||
Self {
|
||||
ok: true,
|
||||
latency_ms,
|
||||
message,
|
||||
error_kind: None,
|
||||
detail: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ use specta::Type;
|
||||
use tauri::{AppHandle, State};
|
||||
|
||||
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};
|
||||
|
||||
#[derive(Serialize, Type)]
|
||||
@@ -95,6 +95,21 @@ pub async fn clipboard_get_item(
|
||||
.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]
|
||||
#[specta::specta]
|
||||
pub async fn clipboard_set_pinned(
|
||||
@@ -162,25 +177,44 @@ pub async fn clipboard_save_settings(
|
||||
app: AppHandle,
|
||||
manager: State<'_, ClipboardManager>,
|
||||
) -> Result<(), String> {
|
||||
let prev_enabled = manager.get_settings().enabled;
|
||||
let prev_shortcut = manager.get_settings().shortcut.clone();
|
||||
let prev = manager.get_settings();
|
||||
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());
|
||||
|
||||
// 监听开关变化时联动启停
|
||||
if settings.enabled && !prev_enabled {
|
||||
manager.start(&app);
|
||||
} else if !settings.enabled && prev_enabled {
|
||||
manager.stop();
|
||||
}
|
||||
// 快捷键变化时重新注册(共享工具模块,原子化 + 冲突检测)
|
||||
if settings.shortcut != prev_shortcut {
|
||||
crate::shortcut::register_shortcut(&app, "剪贴板", &settings.shortcut, |a| {
|
||||
super::popup::show_popup(a)
|
||||
})?;
|
||||
// 新快捷键非空时确保弹窗窗口已预创建
|
||||
if !settings.shortcut.trim().is_empty() {
|
||||
super::popup::ensure_popup_window(&app);
|
||||
}
|
||||
|
||||
// 快捷键改为空字符串(禁用):注销旧快捷键
|
||||
if settings.shortcut.trim().is_empty() && settings.shortcut != prev_shortcut {
|
||||
crate::shortcut::unregister_shortcut(&app, "剪贴板");
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -262,3 +296,52 @@ pub async fn clipboard_paste_to_target(app: AppHandle) -> Result<(), String> {
|
||||
super::popup::paste_to_target(&app);
|
||||
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(())
|
||||
}
|
||||
@@ -12,6 +12,8 @@ use specta::Type;
|
||||
use super::monitor::start_monitor;
|
||||
use super::reader::{write_dib, write_files, write_text};
|
||||
use super::storage::Storage;
|
||||
use super::suppress::SuppressState;
|
||||
use windows_sys::Win32::System::DataExchange::GetClipboardSequenceNumber;
|
||||
|
||||
/// 剪贴板设置(持久化到 clipboard/settings.json)
|
||||
#[derive(Clone, Serialize, Deserialize, Type)]
|
||||
@@ -55,7 +57,9 @@ impl Default for ClipboardSettings {
|
||||
pub struct ClipboardManager {
|
||||
storage: Arc<Storage>,
|
||||
settings: Arc<Mutex<ClipboardSettings>>,
|
||||
suppress: Arc<AtomicBool>,
|
||||
/// 写入抑制状态。由本模块持有(谁启动监听谁负责),但**对其他模块开放**:
|
||||
/// 划词取词会连续改三次剪贴板,同样需要屏蔽,见 `super::suppress`。
|
||||
suppress: Arc<SuppressState>,
|
||||
monitor_stop: Arc<AtomicBool>,
|
||||
monitor_handle: Mutex<Option<JoinHandle<()>>>,
|
||||
settings_path: PathBuf,
|
||||
@@ -73,7 +77,7 @@ impl ClipboardManager {
|
||||
};
|
||||
let settings_path = clip_dir.join("settings.json");
|
||||
let settings = Arc::new(Mutex::new(load_settings(&settings_path)));
|
||||
let suppress = Arc::new(AtomicBool::new(false));
|
||||
let suppress = Arc::new(SuppressState::new());
|
||||
let monitor_stop = Arc::new(AtomicBool::new(true));
|
||||
Self {
|
||||
storage,
|
||||
@@ -139,13 +143,12 @@ impl ClipboardManager {
|
||||
save_settings(&self.settings_path, &s);
|
||||
}
|
||||
|
||||
/// 将某条历史写回剪贴板。写回前置 suppress 标志以避免再次记录。
|
||||
/// 将某条历史写回剪贴板。写回成功后记录剪贴板序列号,供监听跳过自身写入。
|
||||
pub fn copy_back(&self, id: i64) -> Result<(), String> {
|
||||
let (kind, content, blob) = self
|
||||
.storage
|
||||
.get_raw_for_copy(id)
|
||||
.ok_or_else(|| "条目不存在".to_string())?;
|
||||
self.suppress.store(true, Ordering::SeqCst);
|
||||
let ok = match kind.as_str() {
|
||||
"text" => content.as_deref().map(write_text).unwrap_or(false),
|
||||
"image" => blob.as_deref().map(write_dib).unwrap_or(false),
|
||||
@@ -163,10 +166,12 @@ impl ClipboardManager {
|
||||
_ => false,
|
||||
};
|
||||
if ok {
|
||||
// 绑定到写入完成后的剪贴板序列号:仅跳过本次写入产生的记录,
|
||||
// 用户后续复制(序列号不同)不会被误吞。
|
||||
let seq = unsafe { GetClipboardSequenceNumber() };
|
||||
self.suppress.mark_seq(seq);
|
||||
Ok(())
|
||||
} else {
|
||||
// 写入失败也清除 suppress,避免误吞下次复制
|
||||
self.suppress.store(false, Ordering::SeqCst);
|
||||
Err("写回剪贴板失败".into())
|
||||
}
|
||||
}
|
||||
@@ -174,6 +179,20 @@ impl ClipboardManager {
|
||||
pub fn storage(&self) -> &Arc<Storage> {
|
||||
&self.storage
|
||||
}
|
||||
|
||||
/// 写入抑制状态(供划词取词等会改剪贴板的其他模块共享)
|
||||
pub fn suppress(&self) -> Arc<SuppressState> {
|
||||
self.suppress.clone()
|
||||
}
|
||||
|
||||
/// 把**当前**剪贴板序列号登记为「应跳过」。
|
||||
///
|
||||
/// 给其他模块写完剪贴板后调用:它们自己拿不到「写入后」的序列号,
|
||||
/// 但知道「刚刚写完」这件事。把 win32 调用留在这个模块里,
|
||||
/// 别处就不必重复引入 DataExchange。
|
||||
pub fn suppress_current_sequence(&self) {
|
||||
self.suppress.mark_seq(unsafe { GetClipboardSequenceNumber() });
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for ClipboardManager {
|
||||
|
||||
@@ -6,12 +6,16 @@ pub mod monitor;
|
||||
pub mod popup;
|
||||
pub mod reader;
|
||||
pub mod storage;
|
||||
pub mod suppress;
|
||||
|
||||
pub use commands::{
|
||||
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_paste_to_target, clipboard_register_shortcut, clipboard_save_settings, clipboard_search,
|
||||
clipboard_set_pinned, clipboard_show_popup, clipboard_show_window, clipboard_start,
|
||||
clipboard_get_item, clipboard_get_pinned, clipboard_get_settings, clipboard_get_thumb,
|
||||
clipboard_hide_popup, clipboard_hide_preview, clipboard_paste_to_target,
|
||||
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,
|
||||
};
|
||||
pub use manager::ClipboardManager;
|
||||
@@ -1,7 +1,7 @@
|
||||
//! 剪贴板监听线程:基于 GetClipboardSequenceNumber 轮询
|
||||
//!
|
||||
//! 选用轮询而非 AddClipboardFormatListener 消息窗口:实现更简单、无需消息循环,
|
||||
//! 800ms 间隔对剪贴板场景延迟可接受,且 GetClipboardSequenceNumber 不需要 OpenClipboard,开销极小。
|
||||
//! 250ms 间隔兼顾响应速度与开销,且 GetClipboardSequenceNumber 不需要 OpenClipboard,开销极小。
|
||||
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::{Arc, Mutex};
|
||||
@@ -12,21 +12,24 @@ use tauri::{AppHandle, Emitter};
|
||||
|
||||
use super::reader::{read_clipboard, ClipData};
|
||||
use super::storage::{NewItem, Storage};
|
||||
use super::suppress::SuppressState;
|
||||
use windows_sys::Win32::System::DataExchange::GetClipboardSequenceNumber;
|
||||
|
||||
/// 启动监听线程,返回 JoinHandle。
|
||||
/// `suppress` 记录本应用写入剪贴板产生的序列号、以及取词等流程的屏蔽窗口,
|
||||
/// 用于跳过自身写入产生的记录。
|
||||
pub fn start_monitor(
|
||||
storage: Arc<Storage>,
|
||||
app: AppHandle,
|
||||
settings: Arc<Mutex<super::manager::ClipboardSettings>>,
|
||||
suppress: Arc<AtomicBool>,
|
||||
suppress: Arc<SuppressState>,
|
||||
stop: Arc<AtomicBool>,
|
||||
) -> thread::JoinHandle<()> {
|
||||
thread::spawn(move || loop {
|
||||
if stop.load(Ordering::SeqCst) {
|
||||
break;
|
||||
}
|
||||
thread::sleep(Duration::from_millis(800));
|
||||
thread::sleep(Duration::from_millis(250));
|
||||
if stop.load(Ordering::SeqCst) {
|
||||
break;
|
||||
}
|
||||
@@ -40,9 +43,9 @@ pub fn start_monitor(
|
||||
if seq == last {
|
||||
continue;
|
||||
}
|
||||
// 序列号变化,处理一次
|
||||
if suppress.swap(false, Ordering::SeqCst) {
|
||||
// 由本应用 copy_back 触发,跳过记录
|
||||
// 序列号变化,但可能来自本应用:精确记账(copy_back)或屏蔽窗口内(取词流程)。
|
||||
// 判定放在读剪贴板之前,避免为一次注定要丢弃的变化做无谓的读取与解码。
|
||||
if suppress.should_skip(seq) {
|
||||
continue;
|
||||
}
|
||||
let (rec_text, rec_image, rec_files, max_items, max_image_kb, dedup) = {
|
||||
@@ -99,6 +102,7 @@ fn build_text_item(t: &str) -> NewItem {
|
||||
kind: "text".into(),
|
||||
content: Some(t.to_string()),
|
||||
blob: None,
|
||||
thumb: None,
|
||||
preview: make_preview(t, 200),
|
||||
size: t.len() as i64,
|
||||
hash: hash_str(t),
|
||||
@@ -110,6 +114,7 @@ fn build_image_item(dib: &[u8], w: u32, h: u32) -> NewItem {
|
||||
kind: "image".into(),
|
||||
content: None,
|
||||
blob: Some(dib.to_vec()),
|
||||
thumb: super::reader::dib_to_thumbnail(dib, 256),
|
||||
preview: format!("图片 {}×{}", w, h),
|
||||
size: dib.len() as i64,
|
||||
hash: hash_bytes(dib),
|
||||
@@ -132,6 +137,7 @@ fn build_files_item(files: &[String]) -> NewItem {
|
||||
kind: "files".into(),
|
||||
content: Some(content),
|
||||
blob: None,
|
||||
thumb: None,
|
||||
preview,
|
||||
size: files.iter().map(|f| f.len()).sum::<usize>() as i64,
|
||||
hash,
|
||||
|
||||
@@ -10,12 +10,27 @@
|
||||
|
||||
use std::sync::Mutex;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::time::{Duration, Instant};
|
||||
use tauri::{AppHandle, Manager, WebviewUrl, WebviewWindowBuilder, Emitter};
|
||||
use tauri::window::{Effect, EffectsBuilder};
|
||||
|
||||
/// 弹窗窗口标签
|
||||
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 时据此判断是否显示。
|
||||
/// 预创建路径不设置,避免应用启动时弹窗自动弹出。
|
||||
static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false);
|
||||
@@ -24,6 +39,50 @@ static POPUP_PENDING_SHOW: AtomicBool = AtomicBool::new(false);
|
||||
/// 避免窗口重建后仍停留在屏幕外 (-10000, -10000)。
|
||||
static PENDING_POS: Mutex<Option<(f64, f64)>> = Mutex::new(None);
|
||||
|
||||
/// 弹窗当前是否可见(同步单一事实来源)。
|
||||
/// show_preview 用它代替 popup.is_visible():后者在 hide 异步在途时可能返回过期 true,
|
||||
/// 导致"弹窗已隐藏但残留的悬停/键盘请求重新弹出孤立预览窗"。该标志在隐藏路径
|
||||
/// 同步置 false,任何在途请求都会直接拒绝。
|
||||
static POPUP_VISIBLE: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
/// 预览窗当前是否可见(同步标志,与 POPUP_VISIBLE 同理:预览窗以原生
|
||||
/// SW_SHOWNOACTIVATE 显示,Tauri 的 is_visible() 可能与其真实状态不同步,
|
||||
/// 故用该标志代替 is_visible 判断预览交互状态)。
|
||||
static PREVIEW_VISIBLE: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
/// 弹窗因预览交互(光标位于预览窗内)而推迟隐藏的标记:
|
||||
/// 点击预览窗(选择/复制文本、放大图片)时,弹窗会收到 Focused(false),但用户正在
|
||||
/// 预览窗内交互,此时不应隐藏弹窗。置该标记后保持弹窗显示,待用户离开预览窗
|
||||
/// (hide_preview)时再连同弹窗一起隐藏,避免"点击预览即关闭弹窗"导致无法交互。
|
||||
static POPUP_DEFER_HIDE: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
/// 失焦隐藏的宽限期:WebView2 透明窗口在 show 后激活期间焦点可能短暂弹跳
|
||||
/// (与快速面板同因),导致 Focused(false) 紧跟在 show 之后触发并立即隐藏刚显示的弹窗。
|
||||
const SHOW_GRACE: Duration = Duration::from_millis(500);
|
||||
|
||||
/// 最近一次 show 的时间,用于失焦宽限期判断。
|
||||
static LAST_SHOWN: Mutex<Option<Instant>> = Mutex::new(None);
|
||||
|
||||
/// 标记"已发起显示",并记录时间供失焦宽限期使用。
|
||||
fn mark_shown() {
|
||||
if let Ok(mut t) = LAST_SHOWN.lock() {
|
||||
*t = Some(Instant::now());
|
||||
}
|
||||
POPUP_VISIBLE.store(true, Ordering::SeqCst);
|
||||
// 重新显示弹窗时复位推迟隐藏标记(上一轮预览交互的遗留状态不应影响本轮)
|
||||
POPUP_DEFER_HIDE.store(false, Ordering::SeqCst);
|
||||
}
|
||||
|
||||
/// 判断距上次 show 是否仍在宽限期内(是则忽略失焦自动隐藏)。
|
||||
fn within_show_grace() -> bool {
|
||||
LAST_SHOWN
|
||||
.lock()
|
||||
.ok()
|
||||
.and_then(|t| *t)
|
||||
.map(|t| t.elapsed() < SHOW_GRACE)
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
/// 创建弹窗窗口(隐藏状态)并注册失焦监听。
|
||||
/// 位置默认在屏幕外,show_popup 时会重新定位。
|
||||
/// 预创建后首次按快捷键走"窗口已存在"分支直接 show,避免首次创建的时序问题。
|
||||
@@ -54,13 +113,41 @@ fn create_popup_window(app: &AppHandle) {
|
||||
}
|
||||
};
|
||||
|
||||
// 监听窗口失焦:自动隐藏
|
||||
// 监听窗口失焦:自动隐藏(同时隐藏预览窗)
|
||||
let app_handle = app.clone();
|
||||
let win_handle = win.clone();
|
||||
win.on_window_event(move |event| {
|
||||
if let tauri::WindowEvent::Focused(false) = event {
|
||||
let _ = win_handle.hide();
|
||||
let _ = app_handle.emit(crate::constants::events::CLIPBOARD_POPUP_HIDE, ());
|
||||
match event {
|
||||
tauri::WindowEvent::Focused(false) => {
|
||||
// 失焦宽限期: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,
|
||||
}));
|
||||
let _ = win.show();
|
||||
mark_shown();
|
||||
let _ = win.set_focus();
|
||||
// 通知前端刷新数据
|
||||
let _ = app.emit(crate::constants::events::CLIPBOARD_POPUP_SHOW, ());
|
||||
@@ -143,17 +231,27 @@ pub fn show_window(app: &AppHandle) {
|
||||
}));
|
||||
}
|
||||
let _ = win.show();
|
||||
mark_shown();
|
||||
let _ = win.set_focus();
|
||||
// 通知前端刷新数据
|
||||
let _ = app.emit(crate::constants::events::CLIPBOARD_POPUP_SHOW, ());
|
||||
}
|
||||
}
|
||||
|
||||
/// 隐藏弹窗(不销毁,保留复用)
|
||||
/// 隐藏弹窗(不销毁,保留复用),并通知前端清理悬停定时器/预览。
|
||||
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) {
|
||||
let _ = win.hide();
|
||||
}
|
||||
// 通知前端:取消悬停定时器并隐藏预览,避免弹窗隐藏后残留定时器重新弹出预览窗
|
||||
let _ = app.emit(crate::constants::events::CLIPBOARD_POPUP_HIDE, ());
|
||||
}
|
||||
|
||||
/// 隐藏弹窗后延迟模拟 Ctrl+V 粘贴到之前聚焦的窗口。
|
||||
@@ -207,6 +305,465 @@ fn simulate_paste() {
|
||||
// 非 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 || {
|
||||
// 超时兜底的起点:交互锁定解除时重置(那之后按常规模式的 30s 计)
|
||||
let mut start = Instant::now();
|
||||
let mut outside = 0u32;
|
||||
let mut was_down = false;
|
||||
// 交互锁定期间光标停在弹窗内的连续轮数(30ms/轮)
|
||||
let mut back_in_popup = 0u32;
|
||||
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;
|
||||
}
|
||||
// 交互锁定期间光标已回到弹窗内:用户离开预览窗、回到列表继续浏览 ——
|
||||
// 解除锁定,让前端的悬停逻辑重新生效(否则 hide_preview 在锁定期间一律
|
||||
// 被忽略,表现为「鼠标回到弹窗、悬停在不需要预览的条目上,预览窗不关」)。
|
||||
//
|
||||
// 这里**只解除锁定、不 break**:弹窗此刻没有焦点,不会再收到 Focused(false),
|
||||
// 若连看护也退出,它就成了无人负责关闭的残留窗口。继续跑常规模式,
|
||||
// 光标离开弹窗+预览区域约 300ms 后照常关闭。
|
||||
// 连续计数(~210ms)用来排除「弹窗-预览之间的间隙」造成的瞬时误判。
|
||||
if POPUP_INTERACTED.load(Ordering::SeqCst) {
|
||||
if is_cursor_in_popup(&app) {
|
||||
back_in_popup += 1;
|
||||
if back_in_popup >= 7 {
|
||||
POPUP_INTERACTED.store(false, Ordering::SeqCst);
|
||||
back_in_popup = 0;
|
||||
// 兜底超时从「解除锁定」这一刻重新计时
|
||||
start = Instant::now();
|
||||
// 顺势收起预览:用户回到弹窗意味着意图已从「看预览」变回
|
||||
// 「浏览列表」。前端在悬停时发出的那次 hide_preview 落在锁定
|
||||
// 期间、已被忽略,这里补上(否则预览会一直挂到下次悬停)。
|
||||
hide_preview(&app);
|
||||
}
|
||||
} else {
|
||||
back_in_popup = 0;
|
||||
}
|
||||
} else {
|
||||
back_in_popup = 0;
|
||||
}
|
||||
let interacted = POPUP_INTERACTED.load(Ordering::SeqCst);
|
||||
// 超长兜底:避免异常路径下看护线程无限轮询
|
||||
let timeout = if interacted {
|
||||
Duration::from_secs(600)
|
||||
} else {
|
||||
Duration::from_secs(30)
|
||||
};
|
||||
if start.elapsed() > timeout {
|
||||
hide_popup(&app);
|
||||
break;
|
||||
}
|
||||
let cursor_in = is_cursor_in_popup(&app) || is_cursor_in_preview(&app);
|
||||
if interacted {
|
||||
// 交互锁定:左键按下沿发生在弹窗+预览之外 → 点击外部,关闭弹窗+预览。
|
||||
// 按下沿判定(上一轮未按下、本轮按下)配合 30ms 轮询,可捕获常规点击;
|
||||
// 在弹窗/预览内按下后拖出再松开不算外部点击(以按下位置为准)。
|
||||
let down = crate::win32_util::is_left_button_down();
|
||||
if down && !was_down && !cursor_in {
|
||||
hide_popup(&app);
|
||||
break;
|
||||
}
|
||||
was_down = down;
|
||||
} else if cursor_in {
|
||||
outside = 0;
|
||||
} else {
|
||||
outside += 1;
|
||||
// 连续 ~300ms 不在弹窗/预览区域(排除穿越间隙的瞬时状态)才关闭
|
||||
if outside >= 10 {
|
||||
hide_popup(&app);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
POPUP_LEAVE_WATCH.store(false, Ordering::SeqCst);
|
||||
});
|
||||
}
|
||||
|
||||
/// 鼠标当前是否位于弹窗矩形内(弹窗可见且光标在其窗口范围内)。
|
||||
/// 用于 hide_preview 判断"用户是回到弹窗继续浏览,还是离开整个区域"。
|
||||
fn is_cursor_in_popup(app: &AppHandle) -> bool {
|
||||
if !POPUP_VISIBLE.load(Ordering::SeqCst) {
|
||||
return false;
|
||||
}
|
||||
let Some(win) = app.get_webview_window(POPUP_LABEL) else {
|
||||
return false;
|
||||
};
|
||||
let Ok(pos) = win.outer_position() else { return false };
|
||||
let Ok(size) = win.outer_size() else { return false };
|
||||
let Some((cx, cy)) = crate::win32_util::get_cursor_pos() else {
|
||||
return false;
|
||||
};
|
||||
let x = pos.x;
|
||||
let y = pos.y;
|
||||
let w = size.width as i32;
|
||||
let h = size.height as i32;
|
||||
cx >= x && cx <= x + w && cy >= y && cy <= y + h
|
||||
}
|
||||
|
||||
/// 鼠标当前是否位于预览窗矩形内(预览窗可见且光标在其窗口范围内)。
|
||||
/// 用于弹窗失焦时判断是否因预览交互所致,决定是否推迟隐藏弹窗。
|
||||
fn is_cursor_in_preview(app: &AppHandle) -> bool {
|
||||
if !PREVIEW_VISIBLE.load(Ordering::SeqCst) {
|
||||
return false;
|
||||
}
|
||||
let Some(win) = app.get_webview_window(PREVIEW_LABEL) else {
|
||||
return false;
|
||||
};
|
||||
let Ok(pos) = win.outer_position() else { return false };
|
||||
let Ok(size) = win.outer_size() else { return false };
|
||||
let Some((cx, cy)) = crate::win32_util::get_cursor_pos() else {
|
||||
return false;
|
||||
};
|
||||
let x = pos.x;
|
||||
let y = pos.y;
|
||||
let w = size.width as i32;
|
||||
let h = size.height as i32;
|
||||
cx >= x && cx <= x + w && cy >= y && cy <= y + h
|
||||
}
|
||||
|
||||
// ===== 屏幕/光标/DPI 工具已迁移至 crate::win32_util(跨模块共享) =====
|
||||
|
||||
use crate::win32_util::{get_cursor_pos, get_work_area_at_point, get_dpi_for_point};
|
||||
@@ -295,3 +295,29 @@ pub fn dib_to_png(dib: &[u8]) -> Option<Vec<u8>> {
|
||||
.ok()?;
|
||||
Some(buf)
|
||||
}
|
||||
|
||||
/// 生成缩略图 PNG(最长边不超过 max_dim 像素)。
|
||||
/// 小图直接复用 `dib_to_png` 结果;大图降采样后重新编码,供弹窗悬停预览使用。
|
||||
pub fn dib_to_thumbnail(dib: &[u8], max_dim: u32) -> Option<Vec<u8>> {
|
||||
use image::codecs::png::PngEncoder;
|
||||
use image::GenericImageView;
|
||||
use image::ImageEncoder;
|
||||
|
||||
let png = dib_to_png(dib)?;
|
||||
let img = image::load_from_memory(&png).ok()?;
|
||||
let (w, h) = img.dimensions();
|
||||
if w.max(h) <= max_dim {
|
||||
return Some(png); // 小图直接使用,避免重复编码
|
||||
}
|
||||
// 让 image 库在 max_dim×max_dim 边界内自动等比缩放,避免手算 nw/nh 与库内部
|
||||
// resize_dimensions 的取整不一致(如手算 256x10 而库实际输出 250x10),
|
||||
// 否则 write_image 的缓冲区长度断言会失败。
|
||||
let resized = img.resize(max_dim, max_dim, image::imageops::FilterType::Triangle);
|
||||
let (rw, rh) = resized.dimensions();
|
||||
let rgba = resized.to_rgba8();
|
||||
let mut buf = Vec::new();
|
||||
let enc = PngEncoder::new(&mut buf);
|
||||
enc.write_image(rgba.as_raw(), rw, rh, image::ExtendedColorType::Rgba8)
|
||||
.ok()?;
|
||||
Some(buf)
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
//!
|
||||
//! 表结构见 `init_db`。所有方法线程安全(内部 Mutex 包裹 Connection)。
|
||||
|
||||
use base64::Engine as _;
|
||||
use rusqlite::{params, Connection, OptionalExtension};
|
||||
use specta::Type;
|
||||
use std::fs;
|
||||
@@ -38,6 +39,8 @@ pub struct NewItem {
|
||||
pub kind: String,
|
||||
pub content: Option<String>,
|
||||
pub blob: Option<Vec<u8>>,
|
||||
/// 图片缩略图 PNG(仅 image 类型,供弹窗悬停预览)
|
||||
pub thumb: Option<Vec<u8>>,
|
||||
pub preview: String,
|
||||
pub size: i64,
|
||||
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_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。
|
||||
@@ -120,12 +136,13 @@ impl Storage {
|
||||
let now = now_ms();
|
||||
let res = conn.execute(
|
||||
"INSERT INTO clipboard_history
|
||||
(kind, content, blob, preview, size, hash, pinned, pinned_order, created_at)
|
||||
VALUES (?1, ?2, ?3, ?4, ?5, ?6, 0, NULL, ?7)",
|
||||
(kind, content, blob, thumb, preview, size, hash, pinned, pinned_order, created_at)
|
||||
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, 0, NULL, ?8)",
|
||||
params![
|
||||
item.kind,
|
||||
item.content,
|
||||
item.blob.as_deref(),
|
||||
item.thumb.as_deref(),
|
||||
item.preview,
|
||||
item.size,
|
||||
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 转换开销)
|
||||
pub fn get_raw_for_copy(&self, id: i64) -> Option<(String, Option<String>, Option<Vec<u8>>)> {
|
||||
let conn = self.conn.lock().ok()?;
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
//! 剪贴板写入抑制。
|
||||
//!
|
||||
//! 存在的理由:剪贴板监听线程会把**任何**序列号变化录进历史。而应用自身也会写剪贴板
|
||||
//! (copy_back 写回、划词取词时模拟 Ctrl+C 与随后的还原),这些都不该出现在用户的
|
||||
//! 历史里。抑制状态因此必须能被**多个模块**访问,而不是某个模块的私有字段。
|
||||
//!
|
||||
//! 两种机制并存,因为要解决的问题不同:
|
||||
//!
|
||||
//! - **精确抑制(seq)**:只跳过「本应用刚写入的那一次变化」。写入者是我们自己时,
|
||||
//! 写入后的序列号可以立刻读到,于是能精确记账一次;用户随后的复制是另一个序列号,
|
||||
//! 不会被误吞。`copy_back` 用这条。
|
||||
//!
|
||||
//! - **时间窗抑制(burst)**:屏蔽一个区间内的**所有**变化。划词取词要连续动三次剪贴板
|
||||
//! (Ctrl+C 覆盖 → 我们读走 → 还原原文),而监听线程是 250ms 轮询:按序列号逐个记账
|
||||
//! 存在竞态——监听恰好落在我们两次操作之间时,选区文本就被录进历史了。
|
||||
//! 因此取词期间必须整体屏蔽,读完并还原之后再解除。
|
||||
//!
|
||||
//! burst 用**计数**而非布尔:取词流程内部可能再触发一次写入,用布尔会在内层先结束时
|
||||
//! 提前解除屏蔽。配对由 [`SuppressState::burst`] 返回的 RAII 守卫保证,提前 return 也安全。
|
||||
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::sync::Mutex;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct SuppressState {
|
||||
/// 待跳过的序列号(消费一次即清空)
|
||||
seq: Mutex<Option<u32>>,
|
||||
/// 屏蔽窗口嵌套计数
|
||||
burst: AtomicUsize,
|
||||
}
|
||||
|
||||
/// 屏蔽窗口守卫:析构时自动解除,保证与 `begin` 严格配对。
|
||||
pub struct BurstGuard<'a>(&'a SuppressState);
|
||||
|
||||
impl Drop for BurstGuard<'_> {
|
||||
fn drop(&mut self) {
|
||||
self.0.end_burst();
|
||||
}
|
||||
}
|
||||
|
||||
impl SuppressState {
|
||||
pub fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
/// 记账:跳过 `seq` 这一次变化(消费一次)。
|
||||
/// 只记一个序列号即可——本应用的写入是串行的,不会同时积压多次。
|
||||
pub fn mark_seq(&self, seq: u32) {
|
||||
if let Ok(mut guard) = self.seq.lock() {
|
||||
*guard = Some(seq);
|
||||
}
|
||||
}
|
||||
|
||||
/// 开始屏蔽窗口。返回的守卫析构时自动结束,**不要**手动配对 end。
|
||||
pub fn burst(&self) -> BurstGuard<'_> {
|
||||
self.burst.fetch_add(1, Ordering::SeqCst);
|
||||
BurstGuard(self)
|
||||
}
|
||||
|
||||
fn end_burst(&self) {
|
||||
// saturating:异常路径下的多余 end 不应让计数下溢,否则会永久屏蔽
|
||||
let _ = self
|
||||
.burst
|
||||
.fetch_update(Ordering::SeqCst, Ordering::SeqCst, |v| {
|
||||
Some(v.saturating_sub(1))
|
||||
});
|
||||
}
|
||||
|
||||
/// 当前是否处于屏蔽窗口内(供调用方在取词前做提示,不参与判定)
|
||||
pub fn in_burst(&self) -> bool {
|
||||
self.burst.load(Ordering::SeqCst) > 0
|
||||
}
|
||||
|
||||
/// 监听线程询问:这次变化是否应当跳过。
|
||||
/// 命中序列号时**消费**该记账(下次同序列号不再跳过),避免误吞用户后续的复制。
|
||||
pub fn should_skip(&self, seq: u32) -> bool {
|
||||
if self.in_burst() {
|
||||
return true;
|
||||
}
|
||||
let mut guard = match self.seq.lock() {
|
||||
Ok(g) => g,
|
||||
Err(e) => e.into_inner(),
|
||||
};
|
||||
if *guard == Some(seq) {
|
||||
*guard = None;
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn seq_suppression_is_consumed_once() {
|
||||
let s = SuppressState::new();
|
||||
s.mark_seq(7);
|
||||
assert!(s.should_skip(7), "记账的那次应被跳过");
|
||||
assert!(!s.should_skip(7), "同序列号不应被反复跳过");
|
||||
assert!(!s.should_skip(8), "其他序列号不受影响");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn burst_suppresses_everything_until_dropped() {
|
||||
let s = SuppressState::new();
|
||||
{
|
||||
let _guard = s.burst();
|
||||
assert!(s.should_skip(1));
|
||||
assert!(s.should_skip(2));
|
||||
assert!(s.in_burst());
|
||||
}
|
||||
assert!(!s.in_burst());
|
||||
assert!(!s.should_skip(3));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn burst_is_reentrant() {
|
||||
let s = SuppressState::new();
|
||||
let outer = s.burst();
|
||||
{
|
||||
let _inner = s.burst();
|
||||
}
|
||||
// 内层结束不应提前解除外层
|
||||
assert!(s.in_burst());
|
||||
assert!(s.should_skip(9));
|
||||
drop(outer);
|
||||
assert!(!s.in_burst());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn extra_end_does_not_underflow() {
|
||||
let s = SuppressState::new();
|
||||
s.end_burst();
|
||||
s.end_burst();
|
||||
// 下溢会让计数变成极大值从而永久屏蔽,这里确保不会
|
||||
assert!(!s.in_burst());
|
||||
assert!(!s.should_skip(4));
|
||||
}
|
||||
}
|
||||
@@ -12,6 +12,20 @@ pub mod windows {
|
||||
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";
|
||||
/// 取词翻译悬浮窗(由 translate 模块预创建,非激活显示)
|
||||
pub const TRANSLATE_POPUP: &str = "translate-popup";
|
||||
/// 终端独立窗口前缀,实际 label = `${TERMINAL_WINDOW}-<sessionId>`
|
||||
/// 每个终端窗口承载一个会话,脱离主窗口独立存在。
|
||||
pub const TERMINAL_WINDOW: &str = "terminal-window";
|
||||
/// 文件管理器独立窗口。**单例**(label 固定,不含会话 id):
|
||||
/// 它不绑定会话,左右两栏各自选择连接,因此没有「每会话一个窗口」的语义。
|
||||
pub const FILE_WINDOW: &str = "file-window";
|
||||
/// dsh 模块的 Web UI 独立窗口(内容是远端 `http://127.0.0.1:<port>`,
|
||||
/// 因此**不登记 capability**:远端页面不应获得任何 Tauri 权限)。
|
||||
#[allow(dead_code)]
|
||||
pub const DSH_WEB: &str = "dsh-web";
|
||||
}
|
||||
|
||||
/// Tauri 事件名(与前端 constants::EVENTS 对应)
|
||||
@@ -26,9 +40,14 @@ pub mod events {
|
||||
pub const CLIPBOARD_CHANGED: &str = "clipboard-changed";
|
||||
pub const CLIPBOARD_POPUP_SHOW: &str = "clipboard-popup-show";
|
||||
pub const CLIPBOARD_POPUP_HIDE: &str = "clipboard-popup-hide";
|
||||
pub const CLIPBOARD_PREVIEW_SHOW: &str = "clipboard-preview-show";
|
||||
pub const CLIPBOARD_PREVIEW_HIDE: &str = "clipboard-preview-hide";
|
||||
// 快速面板
|
||||
pub const QUICKPANEL_SHOW: &str = "quickpanel-show";
|
||||
pub const QUICKPANEL_HIDE: &str = "quickpanel-hide";
|
||||
pub const QUICKPANEL_EXTRACT_PROGRESS: &str = "quickpanel-extract-progress";
|
||||
/// 文件索引构建完成(闲时自动建立/重建、手动构建),负载为条目数
|
||||
pub const QUICKPANEL_INDEX_UPDATED: &str = "quickpanel-index-updated";
|
||||
// 监控
|
||||
pub const MONITOR_DATA: &str = "monitor-data";
|
||||
pub const MONITOR_NETWORK: &str = "monitor-network";
|
||||
@@ -39,16 +58,80 @@ pub mod events {
|
||||
// OSD 窗口
|
||||
pub const OSD_SYSTEM_UI_ACTIVE: &str = "osd-system-ui-active";
|
||||
pub const OSD_SYSTEM_UI_INACTIVE: &str = "osd-system-ui-inactive";
|
||||
pub const OSD_GAME_ACTIVE: &str = "osd-game-active";
|
||||
pub const OSD_GAME_INACTIVE: &str = "osd-game-inactive";
|
||||
pub const OSD_START_DRAG: &str = "osd-start-drag";
|
||||
pub const OSD_END_DRAG: &str = "osd-end-drag";
|
||||
// 截图
|
||||
pub const SCREENSHOT_SHORTCUT: &str = "screenshot-shortcut";
|
||||
pub const SCREENSHOT_PIN_SHORTCUT: &str = "screenshot-pin-shortcut";
|
||||
/// 滚动截图会话:实时进度 { width, height, auto }
|
||||
pub const SCROLL_PROGRESS: &str = "screenshot-scroll-progress";
|
||||
/// 滚动截图会话:完成并导出
|
||||
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";
|
||||
// 翻译:取词悬浮窗显示(负载见 translate::popup::PopupPayload)/ 隐藏(无负载)
|
||||
pub const TRANSLATE_POPUP_SHOW: &str = "translate-popup-show";
|
||||
pub const TRANSLATE_POPUP_HIDE: &str = "translate-popup-hide";
|
||||
// 翻译:流式输出(负载见 translate::engines::StreamEvent;失败经 start 的 Promise reject,
|
||||
// 已发出 requestId 之后的失败额外走 error 事件兜底)
|
||||
pub const TRANSLATE_STREAM_CHUNK: &str = "translate-stream-chunk";
|
||||
pub const TRANSLATE_STREAM_DONE: &str = "translate-stream-done";
|
||||
pub const TRANSLATE_STREAM_ERROR: &str = "translate-stream-error";
|
||||
// 音乐模块:Python 便携运行时安装进度
|
||||
pub const MUSIC_RUNTIME_INSTALL_PROGRESS: &str = "music-runtime-install-progress";
|
||||
// 终端模块:会话输出批次(负载见 terminal::events::OutputPayload)
|
||||
// 按 8~16ms 窗口聚合,前端用 seq 校验连续性
|
||||
pub const TERMINAL_OUTPUT: &str = "terminal-output";
|
||||
// 终端模块:会话结束(负载见 terminal::events::ExitPayload)
|
||||
pub const TERMINAL_EXIT: &str = "terminal-exit";
|
||||
// 终端模块:会话状态变更(负载为 SessionInfo,前端据此刷新侧栏与标签)
|
||||
pub const TERMINAL_STATE: &str = "terminal-state";
|
||||
// 终端模块:工作目录变化(OSC 7 hook 上报;SFTP 跟随目录依赖此事件)
|
||||
pub const TERMINAL_CWD: &str = "terminal-cwd";
|
||||
// 终端模块:SSH 主机密钥需用户确认(阻塞式交互,握手暂停等待回传)
|
||||
pub const TERMINAL_HOST_KEY_PROMPT: &str = "terminal-host-key-prompt";
|
||||
// 终端模块:请求前端对「关闭仍在运行的会话」二次确认
|
||||
// (P2 起用:P0 的关闭确认在前端 store 内完成,事件通道先占位)
|
||||
#[allow(dead_code)]
|
||||
pub const TERMINAL_CONFIRM_CLOSE: &str = "terminal-confirm-close";
|
||||
// 终端模块:SFTP 传输进度(负载见 terminal::ssh::sftp::TransferProgress)
|
||||
// 节流后发送(约 200ms 一次),前端据此画进度条
|
||||
pub const TERMINAL_TRANSFER_PROGRESS: &str = "terminal-transfer-progress";
|
||||
// 终端模块:设置已保存(无负载)。
|
||||
//
|
||||
// 终端设置存在 Rust 侧,而每个窗口(主窗口 / 终端独立窗口 / 选择窗口)各有
|
||||
// 一份前端副本 —— 没有这个事件,在主窗口改完外观后,已打开的独立窗口会一直
|
||||
// 用旧配色,直到重开窗口。
|
||||
pub const TERMINAL_SETTINGS: &str = "terminal-settings";
|
||||
// 音乐模块:下载任务事件(桥接事件行 → 前端,负载见 bridge.py _emit_event)
|
||||
pub const MUSIC_DOWNLOAD_EVENT: &str = "music-download-event";
|
||||
// 音乐模块:本地解密任务事件(负载见 music::decrypt::DecryptEvent)
|
||||
// 与下载链路同构:命令先回 taskId,进度与逐文件结果都走这个事件。
|
||||
pub const MUSIC_DECRYPT_EVENT: &str = "music-decrypt-event";
|
||||
// 音乐模块:Rust 侧播放引擎(music/audio)。曲目自然播完(缓冲也放完)后发出,无负载
|
||||
pub const MUSIC_AUDIO_ENDED: &str = "music-audio-ended";
|
||||
/// 音乐模块:Rust 侧播放失败(音源打不开 / 解码失败 / 输出设备异常),负载为错误文本
|
||||
pub const MUSIC_AUDIO_ERROR: &str = "music-audio-error";
|
||||
// 后端自动切换节点完成(前端据以刷新节点列表并提示)
|
||||
pub const PROXY_AUTO_SWITCH: &str = "proxy-auto-switch";
|
||||
// 应用更新进度
|
||||
pub const UPDATE_PROGRESS: &str = "update-progress";
|
||||
// 进程与下载
|
||||
pub const PROCESS_STATUS_CHANGED: &str = "process-status-changed";
|
||||
pub const DOWNLOAD_ADDED: &str = "download-added";
|
||||
/// 任务被删除(浏览器扩展通过 HTTP API 删除任务时发出,前端据此刷新任务列表)
|
||||
pub const DOWNLOAD_REMOVED: &str = "download-removed";
|
||||
/// 浏览器扩展通过 HTTP API 新增下载(负载 { id },前端据以为该任务创建专属下载窗口)
|
||||
pub const DOWNLOAD_EXTENSION_ADDED: &str = "download-extension-added";
|
||||
// dsh 模块:安装/下载进度(负载见 dsh::types::DshInstallProgress)
|
||||
pub const DSH_INSTALL_PROGRESS: &str = "dsh-install-progress";
|
||||
// dsh 模块:服务进程状态(负载见 dsh::types::DshServerStatus)
|
||||
pub const DSH_SERVER_STATE: &str = "dsh-server-state";
|
||||
/// dsh 模块:全局快捷键触发「打开独立窗口」(无负载)。
|
||||
/// 窗口由前端创建(它持有带令牌的地址与 label 判重),Rust 侧只负责注册快捷键。
|
||||
pub const DSH_OPEN_WINDOW: &str = "dsh-open-window";
|
||||
}
|
||||
@@ -1,10 +1,11 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use tauri::{AppHandle, State};
|
||||
use tauri::{AppHandle, Manager, State};
|
||||
use tauri_plugin_opener::OpenerExt;
|
||||
|
||||
use super::engine::{CheckUrlResult, DownloadEngine};
|
||||
use super::task::{DownloadTask, DownloaderSettings};
|
||||
use super::torrent::TorrentInfo;
|
||||
|
||||
/// 获取所有任务
|
||||
#[tauri::command]
|
||||
@@ -13,6 +14,20 @@ pub fn downloader_get_tasks(engine: State<'_, DownloadEngine>) -> Vec<DownloadTa
|
||||
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 重复性并探测文件信息(添加下载前调用)
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
@@ -57,8 +72,9 @@ pub async fn downloader_add_task(
|
||||
dir: Option<String>,
|
||||
headers: Option<HashMap<String, String>>,
|
||||
auto_rename: Option<bool>,
|
||||
only_files: Option<Vec<u32>>,
|
||||
) -> 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)
|
||||
}
|
||||
|
||||
/// 取消任务(置为已取消,清空进度并删除下载文件,但保留记录)
|
||||
#[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]
|
||||
#[specta::specta]
|
||||
@@ -141,3 +171,24 @@ pub fn downloader_open_url(app: AppHandle, url: String) -> Result<(), String> {
|
||||
.open_url(url, None::<&str>)
|
||||
.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
@@ -1,47 +1,174 @@
|
||||
use futures_util::StreamExt;
|
||||
use reqwest::Proxy;
|
||||
use reqwest::Client;
|
||||
use std::collections::HashMap;
|
||||
use std::fs::OpenOptions;
|
||||
use std::io::SeekFrom;
|
||||
use std::path::Path;
|
||||
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
||||
use std::sync::Arc;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use tokio::io::{AsyncSeekExt, AsyncWriteExt};
|
||||
use tokio::task::JoinSet;
|
||||
|
||||
use super::rate_limit::RateLimiter;
|
||||
use super::task::{ProbeResult, Segment};
|
||||
|
||||
/// 请求超时:连接 + 响应头必须在 30s 内就绪(分段请求若无超时,
|
||||
/// 服务器挂死时任务将永久卡在 Active,pause→resume 会出现新旧任务并发写同一临时文件)
|
||||
const REQUEST_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30);
|
||||
/// 分块读取停滞超时:30s 内无任何数据视为连接挂死,主动中断(配合取消标志及时退出)
|
||||
const READ_STALL_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30);
|
||||
/// 取消轮询间隔。
|
||||
///
|
||||
/// **这不是下载超时**:下载路径不再因「长时间无数据/无响应头」中断,服务器慢就继续等,
|
||||
/// 只有用户暂停/取消或真正报错才结束。这个 200ms 轮询的唯一作用是让暂停/取消在
|
||||
/// 「连接挂死、`stream.next()` 一直 pending」时也能及时被感知——
|
||||
/// 否则等待 future 永不返回,取消标志就永远读不到。
|
||||
const CANCEL_POLL_INTERVAL: std::time::Duration = std::time::Duration::from_millis(200);
|
||||
|
||||
/// 交互式探测超时(仅用于「添加下载」校验等用户正盯着界面等结果的场景:
|
||||
/// 无限等待等于界面卡死)。真正的下载/后台探测路径不设超时。
|
||||
pub const PROBE_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30);
|
||||
|
||||
/// 等待一个 future 完成,期间每 200ms 检查一次取消标志;**不设超时**。
|
||||
///
|
||||
/// 返回 `Err("已取消")` 表示用户暂停/取消(调用方据此把任务置为 Paused 而非 Error)。
|
||||
async fn wait_cancellable<F>(fut: F, cancel: &AtomicBool) -> Result<F::Output, String>
|
||||
where
|
||||
F: std::future::Future,
|
||||
{
|
||||
tokio::pin!(fut);
|
||||
loop {
|
||||
if cancel.load(Ordering::SeqCst) {
|
||||
return Err("已取消".to_string());
|
||||
}
|
||||
tokio::select! {
|
||||
biased;
|
||||
_ = tokio::time::sleep(CANCEL_POLL_INTERVAL) => continue,
|
||||
out = &mut fut => return Ok(out),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 按需给「发送请求」加超时:`None` 表示不设超时(服务器慢就继续等)。
|
||||
/// `Err(())` 只表示超时,这样调用方能把它与「请求失败」区分开(后者要回退 HEAD)。
|
||||
async fn send_with_optional_timeout(
|
||||
req: reqwest::RequestBuilder,
|
||||
timeout: Option<std::time::Duration>,
|
||||
) -> Result<reqwest::Result<reqwest::Response>, ()> {
|
||||
match timeout {
|
||||
Some(d) => tokio::time::timeout(d, req.send()).await.map_err(|_| ()),
|
||||
None => Ok(req.send().await),
|
||||
}
|
||||
}
|
||||
|
||||
/// HTTP/HTTPS 下载器
|
||||
#[derive(Clone)]
|
||||
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 {
|
||||
pub fn new() -> Self {
|
||||
let client = Client::builder()
|
||||
let direct_client = Client::builder()
|
||||
// 强制直连:即使系统代理已开启,下载也不经过系统代理
|
||||
.no_proxy()
|
||||
.build()
|
||||
.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、文件名)
|
||||
/// 优先用 GET + Range: bytes=0-0(返回 206 + Content-Range),回退到 HEAD
|
||||
/// 优先用 GET + Range: bytes=0-0(返回 206 + Content-Range),回退到 HEAD。
|
||||
/// 代理降级:use_proxy=true 时先走系统代理,失败则回退 no_proxy 直连重试一次。
|
||||
///
|
||||
/// `timeout`:`Some` 用于交互式探测(用户正等界面结果);`None` 表示不设超时
|
||||
/// (后台探测,如更新包下载,服务器慢就继续等)。
|
||||
pub async fn probe(
|
||||
&self,
|
||||
url: &str,
|
||||
headers: &HashMap<String, String>,
|
||||
use_proxy: bool,
|
||||
timeout: Option<std::time::Duration>,
|
||||
) -> Result<ProbeResult, String> {
|
||||
let first = self.client(use_proxy);
|
||||
match self.probe_with_client(&first, url, headers, timeout).await {
|
||||
Ok(r) => return Ok(r),
|
||||
Err(e) if use_proxy => {
|
||||
let direct = self.client(false);
|
||||
self.probe_with_client(&direct, url, headers, timeout)
|
||||
.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>,
|
||||
timeout: Option<std::time::Duration>,
|
||||
) -> Result<ProbeResult, String> {
|
||||
// 先尝试 Range 请求(能同时判断 Accept-Ranges 和获取大小)
|
||||
let mut req = self
|
||||
.client
|
||||
let mut req = client
|
||||
.get(url)
|
||||
.header("Range", "bytes=0-0")
|
||||
.header("User-Agent", "Thing-Download-Engine/1.0");
|
||||
@@ -49,10 +176,14 @@ impl HttpDownloader {
|
||||
req = req.header(k, v);
|
||||
}
|
||||
|
||||
match tokio::time::timeout(REQUEST_TIMEOUT, req.send())
|
||||
.await
|
||||
.map_err(|_| "探测超时(30s 内未收到响应头)".to_string())?
|
||||
{
|
||||
// 先拿到「发送结果」:超时(仅交互式探测会有)直接上抛,
|
||||
// 发送失败则回退 HEAD。注意不能把发送失败也上抛——那会让 HEAD 回退失效。
|
||||
let first = match send_with_optional_timeout(req, timeout).await {
|
||||
Err(()) => return Err("探测超时(未收到响应头)".to_string()),
|
||||
Ok(r) => r,
|
||||
};
|
||||
|
||||
match first {
|
||||
Ok(resp) => {
|
||||
let status = resp.status();
|
||||
let headers_map = resp.headers().clone();
|
||||
@@ -97,13 +228,13 @@ impl HttpDownloader {
|
||||
}
|
||||
Err(_) => {
|
||||
// GET 失败,尝试 HEAD 作为回退
|
||||
let mut head_req = self.client.head(url);
|
||||
let mut head_req = client.head(url);
|
||||
for (k, v) in headers {
|
||||
head_req = head_req.header(k, v);
|
||||
}
|
||||
let resp = tokio::time::timeout(REQUEST_TIMEOUT, head_req.send())
|
||||
let resp = send_with_optional_timeout(head_req, timeout)
|
||||
.await
|
||||
.map_err(|_| "探测超时(HEAD 30s 内未收到响应头)".to_string())?
|
||||
.map_err(|_| "探测超时(HEAD 未收到响应头)".to_string())?
|
||||
.map_err(|e| format!("探测失败(GET 和 HEAD 均失败): {}", e))?;
|
||||
let headers_map = resp.headers().clone();
|
||||
let total_size = headers_map
|
||||
@@ -132,6 +263,7 @@ impl HttpDownloader {
|
||||
/// - `cancel`: 取消标志
|
||||
/// - `progress`: 每个分段的已下载字节(AtomicU64,与 segments 一一对应)
|
||||
/// - `limiter`: 全局限速器
|
||||
/// - `use_proxy`: 是否使用系统代理(false=强制直连)
|
||||
pub async fn download(
|
||||
&self,
|
||||
url: &str,
|
||||
@@ -141,6 +273,37 @@ impl HttpDownloader {
|
||||
cancel: Arc<AtomicBool>,
|
||||
progress: &[Arc<AtomicU64>],
|
||||
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> {
|
||||
let total_size = segments.iter().map(|s| s.len()).sum();
|
||||
|
||||
@@ -167,7 +330,7 @@ impl HttpDownloader {
|
||||
// 单线程下载(不支持 Range 或文件太小)
|
||||
let seg = &segments[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?;
|
||||
return Ok(());
|
||||
}
|
||||
@@ -187,7 +350,7 @@ impl HttpDownloader {
|
||||
.unwrap_or_default();
|
||||
let limiter = limiter.clone();
|
||||
let file_path = file_path.to_path_buf();
|
||||
let client = self.client.clone();
|
||||
let client = client.clone();
|
||||
|
||||
join_set.spawn(async move {
|
||||
download_segment_with_client(
|
||||
@@ -241,9 +404,10 @@ impl HttpDownloader {
|
||||
cancel: Arc<AtomicBool>,
|
||||
progress: Arc<AtomicU64>,
|
||||
limiter: Arc<RateLimiter>,
|
||||
client: &Client,
|
||||
) -> Result<(), String> {
|
||||
download_segment_with_client(
|
||||
&self.client,
|
||||
client,
|
||||
url,
|
||||
headers,
|
||||
seg,
|
||||
@@ -304,9 +468,10 @@ async fn download_segment_with_client(
|
||||
req = req.header(k, v);
|
||||
}
|
||||
|
||||
let resp = tokio::time::timeout(REQUEST_TIMEOUT, req.send())
|
||||
.await
|
||||
.map_err(|_| "请求超时(30s 内未收到响应头)".to_string())?
|
||||
// 等响应头:不设超时(服务器慢就继续等),但期间轮询取消标志,
|
||||
// 保证用户暂停/取消时能立刻中断这次请求。
|
||||
let resp = wait_cancellable(req.send(), &cancel)
|
||||
.await?
|
||||
.map_err(|e| format!("请求失败: {}", e))?;
|
||||
|
||||
let status = resp.status();
|
||||
@@ -336,41 +501,53 @@ async fn download_segment_with_client(
|
||||
return Err("已取消".to_string());
|
||||
}
|
||||
|
||||
// 停滞超时:30s 无数据即中断,确保 cancel 标志能及时被感知(配合代际句柄防并发写)
|
||||
match tokio::time::timeout(READ_STALL_TIMEOUT, stream.next()).await {
|
||||
Ok(Some(Ok(chunk))) => {
|
||||
buf.extend_from_slice(&chunk);
|
||||
// 接收到数据立即更新进度(避免监控周期内进度无变化导致速度显示为 0)
|
||||
local_completed += chunk.len() as u64;
|
||||
progress.store(local_completed, Ordering::Relaxed);
|
||||
// 积累到 64KB 再写入(减少 I/O 次数)
|
||||
if buf.len() >= 64 * 1024 {
|
||||
file.write_all(&buf)
|
||||
.await
|
||||
.map_err(|e| format!("写入文件失败: {}", e))?;
|
||||
// 限速
|
||||
limiter.consume(buf.len() as u64).await;
|
||||
buf.clear();
|
||||
// 读数据:**不做停滞超时**——30s 无数据不代表失败(慢速源、网络抖动很常见),
|
||||
// 只要用户没暂停就继续等。select 里那个 200ms 计时器只负责周期性回到循环头
|
||||
// 读一次取消标志:否则 `stream.next()` 一直 pending 时暂停/取消永远感知不到。
|
||||
tokio::select! {
|
||||
biased;
|
||||
_ = tokio::time::sleep(CANCEL_POLL_INTERVAL) => continue,
|
||||
next = stream.next() => match next {
|
||||
Some(Ok(chunk)) => {
|
||||
buf.extend_from_slice(&chunk);
|
||||
// 接收到数据立即更新进度(避免监控周期内进度无变化导致速度显示为 0)
|
||||
local_completed += chunk.len() as u64;
|
||||
progress.store(local_completed, Ordering::Relaxed);
|
||||
// 积累到 64KB 再写入(减少 I/O 次数)
|
||||
if buf.len() >= 64 * 1024 {
|
||||
file.write_all(&buf)
|
||||
.await
|
||||
.map_err(|e| format!("写入文件失败: {}", e))?;
|
||||
// 限速
|
||||
limiter.consume(buf.len() as u64).await;
|
||||
buf.clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(Some(Err(e))) => {
|
||||
return Err(format!("读取数据失败: {}", e));
|
||||
}
|
||||
Ok(None) => {
|
||||
// 流结束,写入剩余数据
|
||||
if !buf.is_empty() {
|
||||
file.write_all(&buf)
|
||||
.await
|
||||
.map_err(|e| format!("写入文件失败: {}", e))?;
|
||||
// local_completed 和 progress 已在接收 chunk 时更新
|
||||
limiter.consume(buf.len() as u64).await;
|
||||
buf.clear();
|
||||
Some(Err(e)) => {
|
||||
return Err(format!("读取数据失败: {}", e));
|
||||
}
|
||||
break;
|
||||
}
|
||||
Err(_) => {
|
||||
return Err("读取超时(30s 无数据,已中断下载)".to_string());
|
||||
}
|
||||
None => {
|
||||
// 流结束,写入剩余数据
|
||||
if !buf.is_empty() {
|
||||
file.write_all(&buf)
|
||||
.await
|
||||
.map_err(|e| format!("写入文件失败: {}", e))?;
|
||||
// local_completed 和 progress 已在接收 chunk 时更新
|
||||
limiter.consume(buf.len() as u64).await;
|
||||
buf.clear();
|
||||
}
|
||||
// 校验:已知大小的分段若流提前结束(收到的字节数不足分段长度),
|
||||
// 说明服务器提前断开或返回不完整内容,不能标记为完成,否则文件会被截断
|
||||
if !unknown_size && local_completed < seg.len() {
|
||||
return Err(format!(
|
||||
"文件不完整:已接收 {} / {} 字节,服务器提前结束连接",
|
||||
local_completed,
|
||||
seg.len()
|
||||
));
|
||||
}
|
||||
break;
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,10 +5,11 @@ pub mod rate_limit;
|
||||
pub mod server;
|
||||
pub mod storage;
|
||||
pub mod task;
|
||||
pub mod torrent;
|
||||
|
||||
pub use commands::{
|
||||
downloader_add_task, downloader_check_url, downloader_get_extension_info, downloader_get_settings, downloader_get_tasks,
|
||||
downloader_open_dir, downloader_open_url, downloader_pause_task, downloader_remove_task,
|
||||
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_redownload, downloader_remove_task,
|
||||
downloader_resume_task, downloader_save_settings, downloader_status,
|
||||
};
|
||||
pub use engine::DownloadEngine;
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
use std::collections::HashMap;
|
||||
use std::net::SocketAddr;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use axum::{
|
||||
extract::{Path, State},
|
||||
@@ -9,13 +11,25 @@ use axum::{
|
||||
Router,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tauri::{AppHandle, Emitter};
|
||||
|
||||
use super::engine::DownloadEngine;
|
||||
use super::task::DownloadTask;
|
||||
use super::task::{DownloadTask, TaskStatus};
|
||||
|
||||
/// 扩展 HTTP API 服务器
|
||||
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)]
|
||||
struct HealthResponse {
|
||||
ok: bool,
|
||||
@@ -45,14 +59,19 @@ struct ErrorResponse {
|
||||
|
||||
impl ExtensionServer {
|
||||
/// 启动 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 app = Router::new()
|
||||
.route("/health", get(health))
|
||||
.route("/api/downloads", post(create_download).get(list_downloads))
|
||||
.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 {
|
||||
Ok(l) => l,
|
||||
@@ -74,6 +93,9 @@ impl ExtensionServer {
|
||||
struct AppState {
|
||||
engine: DownloadEngine,
|
||||
secret: String,
|
||||
app_handle: AppHandle,
|
||||
/// 最近创建的 URL→任务 id(短窗口去重)
|
||||
recent: Arc<Mutex<HashMap<String, RecentEntry>>>,
|
||||
}
|
||||
|
||||
/// 鉴权检查:如果配置了 secret,校验 Bearer token
|
||||
@@ -108,8 +130,48 @@ async fn create_download(
|
||||
return Err((StatusCode::UNAUTHORIZED, Json(ErrorResponse { error: "未授权".into() })));
|
||||
}
|
||||
|
||||
match state.engine.add_task(req.url, req.filename, req.dir, req.headers, true).await {
|
||||
Ok(id) => Ok(Json(CreateDownloadResponse { id })),
|
||||
// 1. 检查短窗口缓存:同 URL 30s 内已有创建记录,直接返回(拦截浏览器/扩展重试和并发 POST)
|
||||
{
|
||||
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 }))),
|
||||
}
|
||||
}
|
||||
@@ -133,7 +195,11 @@ async fn remove_download(
|
||||
return Err((StatusCode::UNAUTHORIZED, Json(ErrorResponse { error: "未授权".into() })));
|
||||
}
|
||||
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 }))),
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,17 @@ use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
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)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
@@ -16,6 +27,8 @@ pub enum TaskStatus {
|
||||
Complete,
|
||||
/// 错误
|
||||
Error,
|
||||
/// 已取消(用户取消:进度与文件已清除,仅保留记录,只能再次下载)
|
||||
Cancelled,
|
||||
}
|
||||
|
||||
/// 下载分段(多线程 Range 下载 / 断点续传用)
|
||||
@@ -37,24 +50,57 @@ impl Segment {
|
||||
pub fn len(&self) -> u64 {
|
||||
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 {
|
||||
// 未知大小段无法用长度判断是否完成,由流结束(Ok(None))判定;
|
||||
// 若按 len()=1 判断,暂停/恢复后 completed>=1 会误判为已完成,导致文件被截断
|
||||
if self.is_unknown_size() {
|
||||
return false;
|
||||
}
|
||||
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)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DownloadTask {
|
||||
/// 任务 ID(自增 hex 字符串)
|
||||
pub id: String,
|
||||
/// 下载地址
|
||||
/// 下载地址(HTTP URL 或磁力链接)
|
||||
pub url: String,
|
||||
/// 文件名
|
||||
/// 文件名(HTTP:目标文件名;BT:种子名称)
|
||||
pub filename: 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,
|
||||
/// 文件总大小(字节),0=未知
|
||||
@@ -129,6 +175,21 @@ pub struct DownloaderSettings {
|
||||
/// 添加下载前检查重复(URL 或文件名重复时询问)
|
||||
#[serde(default = "default_true")]
|
||||
pub check_duplicate: bool,
|
||||
/// 下载是否使用代理:true=尊重系统代理(mihomo 开启系统代理时经其转发),false=强制直连
|
||||
#[serde(default = "default_true")]
|
||||
pub use_proxy: bool,
|
||||
/// BitTorrent 上传限速 KB/s(0=不限)
|
||||
#[serde(default)]
|
||||
pub bt_upload_limit_kb: u64,
|
||||
/// BitTorrent 下载完成后是否继续做种上传(false=下载完即停止上传)
|
||||
#[serde(default)]
|
||||
pub bt_seed_after_download: bool,
|
||||
/// BitTorrent 监听端口(0=自动选择)
|
||||
#[serde(default)]
|
||||
pub bt_listen_port: u16,
|
||||
/// BitTorrent 使用代理下载:开启后自动使用代理模块(mihomo)的 SOCKS5 端口;代理不可用时降级直连
|
||||
#[serde(default)]
|
||||
pub bt_use_proxy: bool,
|
||||
}
|
||||
|
||||
fn default_max_concurrent() -> u32 {
|
||||
@@ -167,6 +228,11 @@ impl Default for DownloaderSettings {
|
||||
extension_secret: String::new(),
|
||||
delete_files_on_remove: false,
|
||||
check_duplicate: true,
|
||||
use_proxy: true,
|
||||
bt_upload_limit_kb: 0,
|
||||
bt_seed_after_download: false,
|
||||
bt_listen_port: 0,
|
||||
bt_use_proxy: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,477 @@
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::{Arc, Mutex, RwLock};
|
||||
|
||||
// 会话字段专用 tokio 异步互斥(与 std 互斥区分开):
|
||||
// 创建 Session 是 async 操作,必须持锁跨 await,否则"双重检查"在 await 期间失效,
|
||||
// 并发首次添加 BT 任务可能各建一个全局会话,产生孤儿会话与跨会话无效句柄。
|
||||
use tokio::sync::Mutex as AsyncMutex;
|
||||
|
||||
use librqbit::api::TorrentIdOrHash;
|
||||
use librqbit::{AddTorrent, AddTorrentOptions, AddTorrentResponse, ManagedTorrent, Session};
|
||||
|
||||
use super::task::BtFileInfo;
|
||||
|
||||
/// 磁力元数据解析超时(秒):依赖 DHT/tracker 拉取,过短易误报,过长体验差
|
||||
pub(crate) const INSPECT_TIMEOUT_SECS: u64 = 60;
|
||||
|
||||
/// 每日 tracker 同步源(XIU2/TrackersListCollection,官方新域名 cf.trackerslist.com)。
|
||||
/// 注意:GitHub 仓库 raw 路径(raw.githubusercontent.com/...trackers_best.txt)已随项目
|
||||
/// 迁移失效(404),不要再用 GitHub 代理镜像。以下为官方 Cloudflare 分发地址,
|
||||
/// 国内直连通常可达,按顺序尝试、首个成功即用。
|
||||
const TRACKER_SYNC_SOURCES: &[&str] = &[
|
||||
"https://cf.trackerslist.com/best.txt",
|
||||
"https://trackerslist.com/best.txt",
|
||||
"https://cf.trackerslist.com/all.txt",
|
||||
];
|
||||
/// 动态 tracker 持久化文件与同步元数据
|
||||
const TRACKERS_FILE: &str = "bt_trackers.txt";
|
||||
const TRACKERS_META_FILE: &str = "bt_trackers_meta.json";
|
||||
|
||||
/// 常用公共 tracker:磁力链接本身可能只带很少 tracker,追加这些可提升解析成功率。
|
||||
/// 混合 UDP/HTTP(S)/WebSocket,覆盖 UDP 被屏蔽但 HTTP 可用的网络环境。
|
||||
pub const PUBLIC_TRACKERS: &[&str] = &[
|
||||
// UDP
|
||||
"udp://tracker.opentrackr.org:1337/announce",
|
||||
"udp://open.tracker.cl:1337/announce",
|
||||
"udp://tracker.openbittorrent.com:6969/announce",
|
||||
"udp://tracker.torrent.eu.org:451/announce",
|
||||
"udp://open.stealth.si:80/announce",
|
||||
"udp://exodus.desync.com:6969/announce",
|
||||
"udp://tracker.tiny-vps.com:6969/announce",
|
||||
"udp://open.demonii.com:1337/announce",
|
||||
"udp://tracker.moeking.me:6969/announce",
|
||||
"udp://ipv4.tracker.harry.lu:80/announce",
|
||||
"udp://explodie.org:6969/announce",
|
||||
"udp://tracker.birkenfeld.ru:7496/announce",
|
||||
"udp://tracker.pomf.se:80/announce",
|
||||
"udp://tracker.tamersunion.org:6969/announce",
|
||||
"udp://retracker.lanta-net.ru:2710/announce",
|
||||
// HTTP(S)
|
||||
"http://tracker.opentrackr.org:1337/announce",
|
||||
"http://tracker.openbittorrent.com:80/announce",
|
||||
"http://tracker1.itzmx.com:8080/announce",
|
||||
"http://tracker4.itzmx.com:2710/announce",
|
||||
"https://tracker.gbitt.info:443/announce",
|
||||
"https://tracker.nanoha.org:443/announce",
|
||||
"http://tracker.bt4g.com:2095/announce",
|
||||
"http://tracker.gbitt.info:80/announce",
|
||||
];
|
||||
|
||||
/// 种子信息(inspect 解析结果,供命令返回给前端做文件勾选)
|
||||
#[derive(Debug, Clone, serde::Serialize, specta::Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct TorrentInfo {
|
||||
/// 种子名称
|
||||
pub name: String,
|
||||
/// infohash(hex 小写字符串)
|
||||
pub info_hash: String,
|
||||
/// 种子内全部文件总大小(字节)
|
||||
pub total_size: u64,
|
||||
/// 种子内文件列表
|
||||
pub files: Vec<BtFileInfo>,
|
||||
}
|
||||
|
||||
/// BitTorrent 下载器:封装 librqbit 全局会话(多任务共享 DHT / 监听端口 / tracker 缓存)。
|
||||
/// 会话懒创建:只有真正添加 BT 任务时才初始化,避免引擎启动即拉起 BT 内核。
|
||||
#[derive(Clone)]
|
||||
pub struct TorrentDownloader {
|
||||
/// 全局会话(懒创建;tokio 异步互斥保证并发首次添加只创建一个会话)
|
||||
session: Arc<AsyncMutex<Option<Arc<Session>>>>,
|
||||
/// 会话默认输出目录(每个任务用 AddTorrentOptions.output_folder 覆盖)
|
||||
base_dir: PathBuf,
|
||||
/// 上传限速 bytes/s(0=不限),per-torrent 应用
|
||||
upload_limit_bps: Arc<std::sync::atomic::AtomicU64>,
|
||||
/// 监听端口(0=自动)
|
||||
listen_port: Arc<std::sync::atomic::AtomicU16>,
|
||||
/// SOCKS5 代理地址(None=直连;来自代理模块,不可用时降级直连)
|
||||
proxy_addr: Arc<Mutex<Option<String>>>,
|
||||
/// 动态公共 tracker(每日从外部列表同步,叠加到内置列表)
|
||||
dynamic_trackers: Arc<RwLock<Vec<String>>>,
|
||||
}
|
||||
|
||||
impl TorrentDownloader {
|
||||
pub fn new(base_dir: PathBuf) -> Self {
|
||||
Self {
|
||||
session: Arc::new(AsyncMutex::new(None)),
|
||||
base_dir,
|
||||
upload_limit_bps: Arc::new(std::sync::atomic::AtomicU64::new(0)),
|
||||
listen_port: Arc::new(std::sync::atomic::AtomicU16::new(0)),
|
||||
proxy_addr: Arc::new(Mutex::new(None)),
|
||||
dynamic_trackers: Arc::new(RwLock::new(Vec::new())),
|
||||
}
|
||||
}
|
||||
|
||||
/// 更新 BT 专属设置(上传限速 KB/s、监听端口、SOCKS5 代理地址)— 会话创建时生效
|
||||
pub fn set_settings(&self, upload_limit_kb: u64, listen_port: u16, proxy_addr: Option<String>) {
|
||||
self.upload_limit_bps
|
||||
.store(upload_limit_kb.saturating_mul(1024), std::sync::atomic::Ordering::SeqCst);
|
||||
self.listen_port
|
||||
.store(listen_port, std::sync::atomic::Ordering::SeqCst);
|
||||
*self.proxy_addr.lock().unwrap_or_else(|e| e.into_inner()) = proxy_addr;
|
||||
}
|
||||
|
||||
/// 设置动态 tracker(合并去重)
|
||||
pub fn add_dynamic_trackers(&self, list: Vec<String>) {
|
||||
if list.is_empty() {
|
||||
return;
|
||||
}
|
||||
let mut g = self.dynamic_trackers.write().unwrap_or_else(|e| e.into_inner());
|
||||
for t in list {
|
||||
let t = t.trim().to_string();
|
||||
if !t.is_empty() && !g.contains(&t) {
|
||||
g.push(t);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 当前动态 tracker 数量
|
||||
pub fn dynamic_count(&self) -> usize {
|
||||
self.dynamic_trackers.read().unwrap_or_else(|e| e.into_inner()).len()
|
||||
}
|
||||
|
||||
/// 合并内置 + 动态 tracker(去重),供 inspect / add_async 共用
|
||||
fn build_trackers(&self) -> Vec<String> {
|
||||
let dyn_trackers = self.dynamic_trackers.read().unwrap_or_else(|e| e.into_inner()).clone();
|
||||
let mut trackers: Vec<String> = PUBLIC_TRACKERS.iter().map(|s| s.to_string()).collect();
|
||||
for t in dyn_trackers {
|
||||
if !trackers.contains(&t) {
|
||||
trackers.push(t);
|
||||
}
|
||||
}
|
||||
trackers
|
||||
}
|
||||
|
||||
/// 每日同步动态 tracker:读取本地缓存 → 判断今天是否已同步 → 未同步则拉取更新。
|
||||
/// 失败静默降级:保留上次成功的列表。
|
||||
pub async fn sync_dynamic_trackers(&self, data_dir: &Path) {
|
||||
fn parse_list(text: &str) -> Vec<String> {
|
||||
text.lines()
|
||||
.map(|l| l.trim())
|
||||
.filter(|l| l.starts_with("http://") || l.starts_with("https://") || l.starts_with("udp://") || l.starts_with("ws://") || l.starts_with("wss://"))
|
||||
.map(|l| l.to_string())
|
||||
.collect()
|
||||
}
|
||||
let trackers_path = data_dir.join(TRACKERS_FILE);
|
||||
let meta_path = data_dir.join(TRACKERS_META_FILE);
|
||||
let today = chrono::Local::now().format("%Y-%m-%d").to_string();
|
||||
|
||||
// 1. 先加载上次成功保存的列表到内存(覆盖"重启后内存被清空")
|
||||
if let Ok(s) = std::fs::read_to_string(&trackers_path) {
|
||||
self.add_dynamic_trackers(parse_list(&s));
|
||||
}
|
||||
|
||||
// 2. 今天已同步过则不再下载
|
||||
if let Ok(meta) = std::fs::read_to_string(&meta_path) {
|
||||
if let Ok(v) = serde_json::from_str::<serde_json::Value>(&meta) {
|
||||
if v.get("date").and_then(|d| d.as_str()) == Some(&today) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 3. 依次尝试各镜像源(记录每个源的失败原因,便于判断是 DNS 还是连接超时)
|
||||
let client = reqwest::Client::builder()
|
||||
.timeout(std::time::Duration::from_secs(10))
|
||||
.build()
|
||||
.ok();
|
||||
for url in TRACKER_SYNC_SOURCES {
|
||||
let Some(c) = &client else { break };
|
||||
match c.get(*url).send().await {
|
||||
Err(e) => {
|
||||
crate::logger::log_line("download", crate::logger::LogLevel::Debug, &format!("动态 tracker 源不可达 {}: {}", url, e));
|
||||
continue;
|
||||
}
|
||||
Ok(resp) => {
|
||||
let text = match resp.text().await {
|
||||
Ok(t) => t,
|
||||
Err(e) => {
|
||||
crate::logger::log_line("download", crate::logger::LogLevel::Debug, &format!("动态 tracker 源读取失败 {}: {}", url, e));
|
||||
continue;
|
||||
}
|
||||
};
|
||||
let list = parse_list(&text);
|
||||
if list.is_empty() {
|
||||
crate::logger::log_line("download", crate::logger::LogLevel::Debug, &format!("动态 tracker 源返回空列表 {}", url));
|
||||
continue;
|
||||
}
|
||||
// 保存列表与同步元数据
|
||||
let _ = std::fs::write(&trackers_path, format!("{}\n", list.join("\n")));
|
||||
let _ = std::fs::write(&meta_path, serde_json::json!({ "date": today }).to_string());
|
||||
self.add_dynamic_trackers(list);
|
||||
crate::logger::log_info("download", &format!("已同步动态 tracker(共 {} 条)", self.dynamic_count()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
crate::logger::log_warn("download", "动态 tracker 全部同步源不可达,使用上次成功列表或内置列表(不影响磁力解析,公共 tracker 仍会生效)");
|
||||
}
|
||||
|
||||
/// 会话级公共 tracker(HashSet<Url>,供 SessionOptions.trackers 使用)。
|
||||
/// 注意:librqbit 对磁力链接只采用 magnet URL 自带的 tr= 参数,完全忽略
|
||||
/// AddTorrentOptions.trackers(见 librqbit session.rs 的 magnet 分支),导致
|
||||
/// 纯磁力(无自带 tr)解析元数据时 "trackers list is empty"。而会话级
|
||||
/// SessionOptions.trackers 会在 make_peer_rx 中合并进每个种子(含磁力),
|
||||
/// 因此必须放到这里才能让磁力链接真正带上公共 tracker。
|
||||
fn session_trackers(&self) -> std::collections::HashSet<url::Url> {
|
||||
self.build_trackers()
|
||||
.into_iter()
|
||||
.filter_map(|t| url::Url::parse(&t).ok())
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// 获取或创建全局会话。
|
||||
/// 持 tokio 互斥锁覆盖整个构造过程:并发调用在此串行化,
|
||||
/// 先进入者创建并写入,后续者锁内二次检查直接复用(避免多会话竞态)。
|
||||
/// 开启代理时先尝试用代理初始化;失败则降级为直连(记录下来供 add 重试判断)。
|
||||
async fn get_session(&self) -> Result<Arc<Session>, String> {
|
||||
let mut guard = self.session.lock().await;
|
||||
if let Some(s) = guard.as_ref() {
|
||||
return Ok(s.clone());
|
||||
}
|
||||
let _ = std::fs::create_dir_all(&self.base_dir);
|
||||
let port = self.listen_port.load(std::sync::atomic::Ordering::SeqCst);
|
||||
let proxy = self.proxy_addr.lock().unwrap_or_else(|e| e.into_inner()).clone();
|
||||
let connect_opt = proxy.as_ref().map(|p| librqbit::ConnectionOptions { proxy_url: Some(p.clone()), ..Default::default() });
|
||||
let had_proxy = connect_opt.is_some();
|
||||
|
||||
// 构造带代理(若启用)+ 监听端口 + 会话级公共 tracker 的会话选项
|
||||
let mut opts = lib_session_options();
|
||||
opts.trackers = self.session_trackers();
|
||||
if connect_opt.is_some() {
|
||||
opts.connect = connect_opt;
|
||||
}
|
||||
if port > 0 {
|
||||
if let Ok(addr) = format!("0.0.0.0:{}", port).parse::<std::net::SocketAddr>() {
|
||||
opts.listen = Some(librqbit::ListenerOptions {
|
||||
listen_addr: addr,
|
||||
..Default::default()
|
||||
});
|
||||
} else {
|
||||
crate::logger::log_error("download", &format!("BT 监听端口 {} 无效,使用自动端口", port));
|
||||
}
|
||||
}
|
||||
// 尝试创建会话:先按配置(可能带代理),失败且有代理则降级直连重试
|
||||
let s = match Session::new_with_opts(self.base_dir.clone(), opts).await {
|
||||
Ok(s) => s,
|
||||
Err(e) => {
|
||||
if had_proxy {
|
||||
crate::logger::log_error("download", &format!("BT 代理会话初始化失败({}),降级为直连", e));
|
||||
let mut m = lib_session_options();
|
||||
m.trackers = self.session_trackers();
|
||||
if port > 0 {
|
||||
if let Ok(addr) = format!("0.0.0.0:{}", port).parse::<std::net::SocketAddr>() {
|
||||
m.listen = Some(librqbit::ListenerOptions { listen_addr: addr, ..Default::default() });
|
||||
}
|
||||
}
|
||||
Session::new_with_opts(self.base_dir.clone(), m).await.map_err(|e2| format!("初始化 BitTorrent 会话失败: {}", e2))?
|
||||
} else {
|
||||
return Err(format!("初始化 BitTorrent 会话失败: {}", e));
|
||||
}
|
||||
}
|
||||
};
|
||||
*guard = Some(s.clone());
|
||||
Ok(s)
|
||||
}
|
||||
|
||||
/// 解析磁力链 / 本地 .torrent 文件,返回种子信息(不开始下载)。
|
||||
/// list_only 模式:仅获取元数据,不加入会话,因此不影响后续真正添加。
|
||||
/// 磁力元数据依赖 DHT/tracker 拉取,无超时会永久等待,故加超时。
|
||||
pub async fn inspect(&self, input: &str) -> Result<TorrentInfo, String> {
|
||||
let session = self.get_session().await?;
|
||||
let trackers = self.build_trackers();
|
||||
// 磁力:需从网络拉取元数据,可能较慢(取决于种子热度与网络连通性);
|
||||
// 本地 .torrent / http(s) .torrent URL:元数据在文件内,from_cli_argument 会读取/下载并解析
|
||||
let add = AddTorrent::from_cli_argument(input).map_err(|e| format!("无效的种子输入: {}", e))?;
|
||||
let add_fut = session.add_torrent(
|
||||
add,
|
||||
Some(AddTorrentOptions {
|
||||
list_only: true,
|
||||
trackers: Some(trackers),
|
||||
..Default::default()
|
||||
}),
|
||||
);
|
||||
let resp = tokio::time::timeout(std::time::Duration::from_secs(INSPECT_TIMEOUT_SECS), add_fut)
|
||||
.await
|
||||
.map_err(|_| "解析磁力元数据超时:未能从 DHT/Tracker 获取种子信息,请确认种子有做种源或网络可直连 BT".to_string())?
|
||||
.map_err(|e| format!("解析种子失败: {}", e))?;
|
||||
|
||||
let AddTorrentResponse::ListOnly(lo) = resp else {
|
||||
return Err("该链接未返回有效的种子元数据".to_string());
|
||||
};
|
||||
|
||||
let info = lo.info.info();
|
||||
let name = info
|
||||
.name
|
||||
.as_ref()
|
||||
.map(|b| String::from_utf8_lossy(b.as_ref()).into_owned())
|
||||
.or_else(|| lo.info.name().map(|c| c.to_string()))
|
||||
.unwrap_or_else(|| "未命名种子".to_string());
|
||||
|
||||
let mut files = Vec::new();
|
||||
let mut total_size = 0u64;
|
||||
if let Some(fs) = &info.files {
|
||||
for (i, f) in fs.iter().enumerate() {
|
||||
let path = f
|
||||
.path
|
||||
.iter()
|
||||
.map(|p| String::from_utf8_lossy(p.as_ref()).into_owned())
|
||||
.collect::<Vec<_>>()
|
||||
.join("/");
|
||||
files.push(BtFileInfo {
|
||||
index: i as u32,
|
||||
path,
|
||||
size: f.length,
|
||||
});
|
||||
total_size += f.length;
|
||||
}
|
||||
} else if let Some(len) = info.length {
|
||||
// 单文件种子
|
||||
files.push(BtFileInfo {
|
||||
index: 0,
|
||||
path: name.clone(),
|
||||
size: len,
|
||||
});
|
||||
total_size = len;
|
||||
}
|
||||
|
||||
Ok(TorrentInfo {
|
||||
name,
|
||||
info_hash: hex_encode(&lo.info_hash.0),
|
||||
total_size,
|
||||
files,
|
||||
})
|
||||
}
|
||||
|
||||
/// 异步添加种子:立即返回句柄(不等待元数据),由调用方后台解析。
|
||||
/// 附加公共 tracker 提升磁力元数据解析成功率;上传限速 per-torrent 应用。
|
||||
pub async fn add_async(
|
||||
&self,
|
||||
input: &str,
|
||||
output_dir: &str,
|
||||
) -> Result<(usize, Arc<ManagedTorrent>), String> {
|
||||
let session = self.get_session().await?;
|
||||
std::fs::create_dir_all(output_dir).map_err(|e| format!("创建下载目录失败: {}", e))?;
|
||||
let up = self.upload_limit_bps.load(std::sync::atomic::Ordering::SeqCst);
|
||||
let upload_bps = std::num::NonZeroU32::new(up.min(u32::MAX as u64) as u32);
|
||||
let trackers = self.build_trackers();
|
||||
let opts = AddTorrentOptions {
|
||||
paused: true,
|
||||
output_folder: Some(output_dir.to_string()),
|
||||
overwrite: true,
|
||||
trackers: Some(trackers),
|
||||
ratelimits: librqbit::limits::LimitsConfig {
|
||||
upload_bps,
|
||||
download_bps: None,
|
||||
},
|
||||
..Default::default()
|
||||
};
|
||||
let add = AddTorrent::from_cli_argument(input).map_err(|e| format!("无效的种子输入: {}", e))?;
|
||||
let resp = session
|
||||
.add_torrent(add, Some(opts))
|
||||
.await
|
||||
.map_err(|e| format!("添加种子失败: {}", e))?;
|
||||
match resp {
|
||||
AddTorrentResponse::Added(id, handle) => Ok((id, handle)),
|
||||
AddTorrentResponse::AlreadyManaged(id, handle) => Ok((id, handle)),
|
||||
_ => Err("种子已存在或元数据无效".to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
/// 等待种子元数据初始化就绪(磁力需要从网络拉取,带超时)
|
||||
pub async fn wait_initialized(&self, handle: &Arc<ManagedTorrent>) -> Result<(), String> {
|
||||
tokio::time::timeout(
|
||||
std::time::Duration::from_secs(INSPECT_TIMEOUT_SECS),
|
||||
handle.wait_until_initialized(),
|
||||
)
|
||||
.await
|
||||
.map_err(|_| "解析磁力元数据超时:未能从 DHT/Tracker 获取种子信息,请确认种子有做种源或网络可直连 BT".to_string())?
|
||||
.map_err(|e| format!("获取种子元数据失败: {}", e))
|
||||
}
|
||||
|
||||
/// 设置要下载的种子文件子集(用户文件勾选;传全部索引则全选)
|
||||
pub async fn set_only_files(&self, handle: &Arc<ManagedTorrent>, files: &[u32]) -> Result<(), String> {
|
||||
let session = self.get_session().await?;
|
||||
let set: std::collections::HashSet<usize> = files.iter().map(|&i| i as usize).collect();
|
||||
session
|
||||
.update_only_files(handle, &set)
|
||||
.await
|
||||
.map_err(|e| format!("设置下载文件失败: {}", e))
|
||||
}
|
||||
|
||||
/// 读取句柄当前进度:返回 (已下载字节, 总字节, 每文件已下载字节)
|
||||
/// `file_progress` 与种子文件一一对应,供前端详情页展示单文件进度。
|
||||
pub fn progress_full(handle: &Arc<ManagedTorrent>) -> (u64, u64, Vec<u64>) {
|
||||
let s = handle.stats();
|
||||
(s.progress_bytes, s.total_bytes, s.file_progress.clone())
|
||||
}
|
||||
|
||||
/// 暂停种子(下载中的连接会停止,已下载片段保留,可继续)
|
||||
pub async fn pause(&self, handle: &Arc<ManagedTorrent>) -> Result<(), String> {
|
||||
let session = self.get_session().await?;
|
||||
session
|
||||
.pause(handle)
|
||||
.await
|
||||
.map_err(|e| format!("暂停种子失败: {}", e))
|
||||
}
|
||||
|
||||
/// 继续种子(幂等):恢复已暂停的种子。
|
||||
/// 若种子本已处于 Live(例如 select_bt_files 的 set_only_files 内部已恢复过、
|
||||
/// 或暂停期间被其他逻辑恢复),直接视为成功,避免 librqbit 报 "torrent is already live"
|
||||
/// 而导致 pause→resume 链路被误判为失败。
|
||||
pub async fn unpause(&self, handle: &Arc<ManagedTorrent>) -> Result<(), String> {
|
||||
let session = self.get_session().await?;
|
||||
match handle.stats().state {
|
||||
librqbit::TorrentStatsState::Live => Ok(()),
|
||||
librqbit::TorrentStatsState::Error => Err("种子处于错误状态,无法继续".to_string()),
|
||||
librqbit::TorrentStatsState::Paused
|
||||
| librqbit::TorrentStatsState::Initializing { .. } => session
|
||||
.unpause(handle)
|
||||
.await
|
||||
.map_err(|e| format!("继续种子失败: {}", e)),
|
||||
}
|
||||
}
|
||||
|
||||
/// 删除种子(info_hash 为 hex 字符串;delete_files 是否同时删除已下载文件)
|
||||
pub async fn delete(&self, info_hash: &str, delete_files: bool) -> Result<(), String> {
|
||||
let session = self.get_session().await?;
|
||||
let id = TorrentIdOrHash::parse(info_hash)
|
||||
.map_err(|_| format!("无效的 infohash: {}", info_hash))?;
|
||||
session
|
||||
.delete(id, delete_files)
|
||||
.await
|
||||
.map_err(|e| format!("删除种子失败: {}", e))
|
||||
}
|
||||
|
||||
/// 读取句柄当前下载进度 (已下载字节, 总字节)
|
||||
pub fn progress(handle: &Arc<ManagedTorrent>) -> (u64, u64) {
|
||||
let s = handle.stats();
|
||||
(s.progress_bytes, s.total_bytes)
|
||||
}
|
||||
|
||||
/// 停止全局会话(应用退出时调用)
|
||||
pub async fn stop(&self) {
|
||||
let session = {
|
||||
let mut guard = self.session.lock().await;
|
||||
guard.take()
|
||||
};
|
||||
if let Some(s) = session {
|
||||
let _ = s.stop().await;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 字节数组转小写十六进制字符串(librqbit 的 Id 未实现 Display)
|
||||
pub(crate) fn hex_encode(bytes: &[u8]) -> String {
|
||||
const HEX: &[u8; 16] = b"0123456789abcdef";
|
||||
let mut out = String::with_capacity(bytes.len() * 2);
|
||||
for &b in bytes {
|
||||
out.push(HEX[(b >> 4) as usize] as char);
|
||||
out.push(HEX[(b & 0x0f) as usize] as char);
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// 默认会话选项(后续如需新增 DHT/缓存等可在此统一配置)
|
||||
fn lib_session_options() -> librqbit::SessionOptions {
|
||||
librqbit::SessionOptions::default()
|
||||
}
|
||||
@@ -0,0 +1,253 @@
|
||||
//! AI 装载:把主设置(AI 服务)里的供应商映射进 dsh 的 `$DSH_HOME/settings.yaml`,
|
||||
//! 并在启动服务时以环境变量注入 API Key。
|
||||
//!
|
||||
//! 安全姿态(对齐 `crate::ai` 与 `crate::secrets`):**密钥不落盘**。
|
||||
//! settings.yaml 里只写 `apiKeyEnv`(环境变量名),明文由
|
||||
//! [`crate::ai::provider_api_key`] 从系统凭据管理器读出后随子进程环境注入。
|
||||
//!
|
||||
//! 合并规则:只替换 `llm-pi-ai.providers` 下本模块管理的 `thing-*` 键与
|
||||
//! `agent-default-model`,用户自己写的其它段落(profile patch / 第三方插件配置)
|
||||
//! 原样保留;写盘前把旧文件备份为 `settings.yaml.bak`。
|
||||
|
||||
use serde_yaml::{Mapping, Value};
|
||||
use tauri::AppHandle;
|
||||
|
||||
use super::types::{DshAiPreview, DshAiProvider};
|
||||
use super::DshManager;
|
||||
|
||||
/// 本模块写入 settings.yaml 的供应商键前缀。
|
||||
const PROVIDER_PREFIX: &str = "thing-";
|
||||
/// `llm-pi-ai` 段名(dsh 的通用 OpenAI 兼容提供方插件)。
|
||||
const LLM_SECTION: &str = "llm-pi-ai";
|
||||
/// 默认模型段名。
|
||||
const DEFAULT_MODEL_SECTION: &str = "agent-default-model";
|
||||
|
||||
impl DshManager {
|
||||
/// dsh 侧供应商键(`thing-<id>`,只保留小写字母数字与短横线)。
|
||||
fn dsh_provider_id(id: &str) -> String {
|
||||
let sanitized: String = id
|
||||
.trim()
|
||||
.to_lowercase()
|
||||
.chars()
|
||||
.map(|c| if c.is_ascii_alphanumeric() { c } else { '-' })
|
||||
.collect();
|
||||
format!("{PROVIDER_PREFIX}{sanitized}")
|
||||
}
|
||||
|
||||
/// 环境变量名(`THING_AI_<ID>_KEY`)。
|
||||
fn env_name(id: &str) -> String {
|
||||
let sanitized: String = id
|
||||
.trim()
|
||||
.to_uppercase()
|
||||
.chars()
|
||||
.map(|c| if c.is_ascii_alphanumeric() { c } else { '_' })
|
||||
.collect();
|
||||
format!("THING_AI_{sanitized}_KEY")
|
||||
}
|
||||
|
||||
/// settings.yaml 路径(`$DSH_HOME/settings.yaml`)。
|
||||
pub fn dsh_settings_path(&self) -> std::path::PathBuf {
|
||||
self.home_dir().join("settings.yaml")
|
||||
}
|
||||
|
||||
/// 当前将被映射的供应商列表(enabled 且 baseUrl 非空)。
|
||||
pub fn ai_providers(&self) -> Vec<DshAiProvider> {
|
||||
let settings = crate::ai::AiManager::load_settings_sync(&self.data_dir);
|
||||
settings
|
||||
.providers
|
||||
.iter()
|
||||
.filter(|p| p.enabled && !p.base_url.trim().is_empty() && !p.model.trim().is_empty())
|
||||
.map(|p| DshAiProvider {
|
||||
id: p.id.clone(),
|
||||
name: p.name.clone(),
|
||||
env_name: Self::env_name(&p.id),
|
||||
base_url: p.base_url.clone(),
|
||||
model: p.model.clone(),
|
||||
has_key: !crate::ai::provider_api_key(&p.id).is_empty(),
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// 构造本模块管理的配置片段(`llm-pi-ai.providers` + `agent-default-model`)。
|
||||
fn build_patch(&self) -> (Mapping, Value, Option<String>, Option<String>) {
|
||||
let settings = crate::ai::AiManager::load_settings_sync(&self.data_dir);
|
||||
let mut providers = Mapping::new();
|
||||
let mut default_pair: Option<(String, String)> = None;
|
||||
let wanted = self.load_settings().provider_id;
|
||||
|
||||
for p in settings.providers.iter() {
|
||||
if !p.enabled || p.base_url.trim().is_empty() || p.model.trim().is_empty() {
|
||||
continue;
|
||||
}
|
||||
let dsh_id = Self::dsh_provider_id(&p.id);
|
||||
let mut entry = Mapping::new();
|
||||
entry.insert(
|
||||
Value::String("displayName".into()),
|
||||
Value::String(if p.name.trim().is_empty() {
|
||||
p.id.clone()
|
||||
} else {
|
||||
p.name.clone()
|
||||
}),
|
||||
);
|
||||
entry.insert(
|
||||
Value::String("api".into()),
|
||||
Value::String("openai-completions".into()),
|
||||
);
|
||||
entry.insert(
|
||||
Value::String("baseURL".into()),
|
||||
Value::String(p.base_url.trim().trim_end_matches('/').to_string()),
|
||||
);
|
||||
entry.insert(
|
||||
Value::String("apiKeyEnv".into()),
|
||||
Value::String(Self::env_name(&p.id)),
|
||||
);
|
||||
// 模型目录:当前模型 + 常见上下文窗口(字段名以 dsh 的 catalog 为准,
|
||||
// 这里只写最稳定的 id/name,避免写错字段导致 dsh 拒绝配置)
|
||||
let mut model = Mapping::new();
|
||||
model.insert(Value::String("id".into()), Value::String(p.model.clone()));
|
||||
model.insert(Value::String("name".into()), Value::String(p.model.clone()));
|
||||
entry.insert(
|
||||
Value::String("models".into()),
|
||||
Value::Sequence(vec![Value::Mapping(model)]),
|
||||
);
|
||||
providers.insert(Value::String(dsh_id.clone()), Value::Mapping(entry));
|
||||
|
||||
let is_wanted = p.id == wanted || (wanted.is_empty() && default_pair.is_none());
|
||||
if is_wanted {
|
||||
default_pair = Some((dsh_id, p.model.clone()));
|
||||
}
|
||||
}
|
||||
|
||||
let default_value = match &default_pair {
|
||||
Some((provider, model)) => {
|
||||
let mut m = Mapping::new();
|
||||
m.insert(Value::String("provider".into()), Value::String(provider.clone()));
|
||||
m.insert(Value::String("model".into()), Value::String(model.clone()));
|
||||
Value::Mapping(m)
|
||||
}
|
||||
None => Value::Null,
|
||||
};
|
||||
let default_provider = default_pair.as_ref().map(|(p, _)| p.clone());
|
||||
let default_model = default_pair.map(|(_, m)| m);
|
||||
(providers, default_value, default_provider, default_model)
|
||||
}
|
||||
|
||||
/// 预览将要写入的 YAML(不含明文密钥)。
|
||||
pub fn ai_preview(&self) -> DshAiPreview {
|
||||
let (providers, default_value, default_provider, default_model) = self.build_patch();
|
||||
let mut root = Mapping::new();
|
||||
if !default_value.is_null() {
|
||||
root.insert(Value::String(DEFAULT_MODEL_SECTION.into()), default_value);
|
||||
}
|
||||
let mut llm = Mapping::new();
|
||||
llm.insert(Value::String("providers".into()), Value::Mapping(providers));
|
||||
root.insert(Value::String(LLM_SECTION.into()), Value::Mapping(llm));
|
||||
|
||||
let yaml = serde_yaml::to_string(&Value::Mapping(root))
|
||||
.unwrap_or_else(|e| format!("# 生成预览失败: {e}"));
|
||||
DshAiPreview {
|
||||
yaml,
|
||||
providers: self.ai_providers(),
|
||||
default_provider,
|
||||
default_model,
|
||||
settings_path: self.dsh_settings_path().to_string_lossy().to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// 生成/合并 `$DSH_HOME/settings.yaml`(写盘前备份旧文件)。
|
||||
pub fn ai_sync(&self, _app: &AppHandle) -> Result<(), String> {
|
||||
let (providers, default_value, _, _) = self.build_patch();
|
||||
let path = self.dsh_settings_path();
|
||||
if let Some(parent) = path.parent() {
|
||||
std::fs::create_dir_all(parent).map_err(|e| format!("创建 $DSH_HOME 失败: {e}"))?;
|
||||
}
|
||||
|
||||
// 读现有文档(缺失/非映射时用空映射起步)
|
||||
let existing = std::fs::read_to_string(&path).ok();
|
||||
let mut doc = existing
|
||||
.as_deref()
|
||||
.and_then(|t| serde_yaml::from_str::<Value>(t).ok())
|
||||
.filter(|v| v.is_mapping())
|
||||
.unwrap_or_else(|| Value::Mapping(Mapping::new()));
|
||||
let root = doc.as_mapping_mut().ok_or_else(|| "settings.yaml 结构非法".to_string())?;
|
||||
|
||||
// 备份
|
||||
if existing.is_some() {
|
||||
std::fs::write(path.with_extension("yaml.bak"), existing.as_deref().unwrap_or_default())
|
||||
.map_err(|e| format!("备份 settings.yaml 失败: {e}"))?;
|
||||
}
|
||||
|
||||
// llm-pi-ai.providers:只替换本模块管理的 thing-* 键
|
||||
let llm_key = Value::String(LLM_SECTION.into());
|
||||
let llm_entry = root
|
||||
.entry(llm_key)
|
||||
.or_insert_with(|| Value::Mapping(Mapping::new()));
|
||||
if !llm_entry.is_mapping() {
|
||||
*llm_entry = Value::Mapping(Mapping::new());
|
||||
}
|
||||
let llm_map = llm_entry.as_mapping_mut().expect("已保证为映射");
|
||||
let providers_key = Value::String("providers".into());
|
||||
let providers_entry = llm_map
|
||||
.entry(providers_key)
|
||||
.or_insert_with(|| Value::Mapping(Mapping::new()));
|
||||
if !providers_entry.is_mapping() {
|
||||
*providers_entry = Value::Mapping(Mapping::new());
|
||||
}
|
||||
let providers_map = providers_entry.as_mapping_mut().expect("已保证为映射");
|
||||
// 先清掉上一次由本模块写入的键(用户自建的其它键保留)
|
||||
let stale: Vec<Value> = providers_map
|
||||
.keys()
|
||||
.filter(|k| {
|
||||
k.as_str()
|
||||
.map(|s| s.starts_with(PROVIDER_PREFIX))
|
||||
.unwrap_or(false)
|
||||
})
|
||||
.cloned()
|
||||
.collect();
|
||||
for key in stale {
|
||||
providers_map.remove(&key);
|
||||
}
|
||||
for (key, value) in providers.iter() {
|
||||
providers_map.insert(key.clone(), value.clone());
|
||||
}
|
||||
|
||||
// agent-default-model
|
||||
if default_value.is_null() {
|
||||
root.remove(&Value::String(DEFAULT_MODEL_SECTION.into()));
|
||||
} else {
|
||||
root.insert(Value::String(DEFAULT_MODEL_SECTION.into()), default_value);
|
||||
}
|
||||
|
||||
let text = serde_yaml::to_string(&doc).map_err(|e| format!("序列化 settings.yaml 失败: {e}"))?;
|
||||
std::fs::write(&path, text).map_err(|e| format!("写入 settings.yaml 失败: {e}"))?;
|
||||
crate::logger::log_info(
|
||||
"dsh",
|
||||
&format!("已同步 AI 供应商到 {}", path.display()),
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 启动服务时注入的环境变量(供应商密钥 + DeepSeek 官方变量兜底)。
|
||||
pub fn ai_env_vars(&self) -> Vec<(String, String)> {
|
||||
let settings = crate::ai::AiManager::load_settings_sync(&self.data_dir);
|
||||
let mut vars: Vec<(String, String)> = Vec::new();
|
||||
for p in settings.providers.iter() {
|
||||
if !p.enabled || p.base_url.trim().is_empty() || p.model.trim().is_empty() {
|
||||
continue;
|
||||
}
|
||||
let key = crate::ai::provider_api_key(&p.id);
|
||||
if key.is_empty() {
|
||||
continue;
|
||||
}
|
||||
vars.push((Self::env_name(&p.id), key.clone()));
|
||||
// DeepSeek 官方通道:dsh 内置 provider 直接读 DEEPSEEK_API_KEY
|
||||
let is_deepseek = p.id.eq_ignore_ascii_case("deepseek")
|
||||
|| p.preset.eq_ignore_ascii_case("deepseek")
|
||||
|| p.base_url.contains("api.deepseek.com");
|
||||
if is_deepseek {
|
||||
vars.push(("DEEPSEEK_API_KEY".into(), key));
|
||||
}
|
||||
}
|
||||
vars
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,232 @@
|
||||
//! dsh 模块的 Tauri 命令层。
|
||||
//!
|
||||
//! 前端统一经 `@/lib/bindings` 的 `commands.dsh*` 调用。
|
||||
//! 进度事件 `dsh-install-progress`、状态事件 `dsh-server-state` 见
|
||||
//! `crate::constants::events`(与 `src/lib/constants.ts` 的 `EVENTS` 对应)。
|
||||
|
||||
use tauri::Manager;
|
||||
use tauri::{AppHandle, State};
|
||||
use tauri_plugin_opener::OpenerExt;
|
||||
|
||||
use super::types::{
|
||||
DshAiPreview, DshEnvStatus, DshInstallStatus, DshNpmRegistryInfo, DshServerStatus, DshSettings,
|
||||
DshUpdateInfo, NodeStatus,
|
||||
};
|
||||
use super::DshManager;
|
||||
|
||||
/// 环境总览:Node / dsh / 服务状态 + 模块设置(模块首屏一次拿全)。
|
||||
///
|
||||
/// 声明为 `async`:Tauri 的**同步**命令在主线程执行,而本命令要跑
|
||||
/// `node --version` 子进程探测,放主线程会造成界面卡顿。
|
||||
/// (async 命令带 `State<'_>` 引用参数时必须返回 `Result`,故这里包一层 Ok。)
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_env_status(state: State<'_, DshManager>) -> Result<DshEnvStatus, String> {
|
||||
Ok(DshEnvStatus {
|
||||
node: state.node_status(),
|
||||
dsh: state.install_status(),
|
||||
server: state.server_status(),
|
||||
settings: state.load_settings(),
|
||||
})
|
||||
}
|
||||
|
||||
/// 重新探测 Node(系统 PATH + 托管目录)。同样因执行 `node --version` 而用 async。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_node_detect(state: State<'_, DshManager>) -> Result<NodeStatus, String> {
|
||||
Ok(state.node_status())
|
||||
}
|
||||
|
||||
/// 下载并安装便携 Node(`version` 为空 = 自动取满足要求的最新版)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_node_install(
|
||||
app: AppHandle,
|
||||
state: State<'_, DshManager>,
|
||||
version: Option<String>,
|
||||
) -> Result<NodeStatus, String> {
|
||||
state.node_install(&app, version).await
|
||||
}
|
||||
|
||||
/// 安装 dsh(`version` 为空 = latest)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_install(
|
||||
app: AppHandle,
|
||||
state: State<'_, DshManager>,
|
||||
version: Option<String>,
|
||||
) -> Result<DshInstallStatus, String> {
|
||||
state.install(&app, version).await
|
||||
}
|
||||
|
||||
/// 更新 dsh 到 latest(更新前停止服务,避免文件被占用)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_update(
|
||||
app: AppHandle,
|
||||
state: State<'_, DshManager>,
|
||||
) -> Result<DshInstallStatus, String> {
|
||||
state.stop_server(&app);
|
||||
state.install(&app, None).await
|
||||
}
|
||||
|
||||
/// 卸载 dsh(停止服务并删除包目录;保留设置与 $DSH_HOME)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_uninstall(app: AppHandle, state: State<'_, DshManager>) -> Result<(), String> {
|
||||
state.uninstall(&app)
|
||||
}
|
||||
|
||||
/// 取消进行中的下载 / 安装。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_cancel_install(state: State<'_, DshManager>) {
|
||||
state.request_cancel();
|
||||
}
|
||||
|
||||
/// 查询 npm 上的可用版本。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_check_update(state: State<'_, DshManager>) -> Result<DshUpdateInfo, String> {
|
||||
state.check_update().await
|
||||
}
|
||||
|
||||
/// 读取「本次安装实际使用的 npm 源」及其来源。
|
||||
///
|
||||
/// 设置为空时 npm 会用自己配置链里的源(含系统 Node 的 `~/.npmrc`),
|
||||
/// 这里把解析结果回给前端展示,让用户能看出「到底走的是哪个源」。
|
||||
/// async:内部要跑 `node <npm-cli.js> config get registry` 子进程。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_npm_registry_info(
|
||||
state: State<'_, DshManager>,
|
||||
) -> Result<DshNpmRegistryInfo, String> {
|
||||
Ok(state.npm_registry_info())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_get_settings(state: State<'_, DshManager>) -> DshSettings {
|
||||
state.load_settings()
|
||||
}
|
||||
|
||||
/// 保存设置(即时生效;端口等改动在下次启动服务时生效)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_save_settings(
|
||||
state: State<'_, DshManager>,
|
||||
settings: DshSettings,
|
||||
) -> Result<DshSettings, String> {
|
||||
state.save_settings(settings)
|
||||
}
|
||||
|
||||
/// 启动 dsh Web 服务。async:内部要 spawn 子进程 + 读凭据 + 写 settings.yaml,
|
||||
/// 同步命令会在主线程执行从而卡住界面。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_start(app: AppHandle, state: State<'_, DshManager>) -> Result<DshServerStatus, String> {
|
||||
state.start_server(&app)
|
||||
}
|
||||
|
||||
/// 停止 dsh Web 服务。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_stop(app: AppHandle, state: State<'_, DshManager>) -> Result<DshServerStatus, String> {
|
||||
state.stop_server(&app);
|
||||
Ok(state.server_status())
|
||||
}
|
||||
|
||||
/// 重启 dsh Web 服务。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_restart(app: AppHandle, state: State<'_, DshManager>) -> Result<DshServerStatus, String> {
|
||||
state.stop_server(&app);
|
||||
// Windows 上端口释放有延迟,稍等再起,避免 bind 预检误判占用
|
||||
// (用异步 sleep:同步命令在主线程执行,阻塞 500ms 会冻界面)
|
||||
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
|
||||
state.start_server(&app)
|
||||
}
|
||||
|
||||
/// 预览将写入 `$DSH_HOME/settings.yaml` 的内容(不含明文密钥)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_ai_preview(state: State<'_, DshManager>) -> DshAiPreview {
|
||||
state.ai_preview()
|
||||
}
|
||||
|
||||
/// 执行 AI 配置同步(合并写入 settings.yaml,写前备份)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_ai_sync(app: AppHandle, state: State<'_, DshManager>) -> Result<DshAiPreview, String> {
|
||||
state.ai_sync(&app)?;
|
||||
Ok(state.ai_preview())
|
||||
}
|
||||
|
||||
/// 读取服务日志尾部。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_log_tail(state: State<'_, DshManager>, lines: u32) -> String {
|
||||
state.log_tail(lines as usize)
|
||||
}
|
||||
|
||||
/// 读取 dsh 安装输出(npm 的 stdout/stderr 尾部)。
|
||||
///
|
||||
/// 只存在内存里(每次安装开始时清空),供「安装引导 → dsh 本体」页临时展示,
|
||||
/// **不写应用日志、不落盘**。前端在安装进行中轮询这个命令。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_install_log(state: State<'_, DshManager>) -> String {
|
||||
state.install_log()
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_log_clear(state: State<'_, DshManager>) {
|
||||
state.clear_log();
|
||||
}
|
||||
|
||||
/// 在资源管理器中打开 dsh 模块目录。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_open_dir(app: AppHandle, state: State<'_, DshManager>) -> Result<(), String> {
|
||||
app.opener()
|
||||
.open_path(state.root().to_string_lossy().to_string(), None::<&str>)
|
||||
.map_err(|e| format!("打开目录失败: {e}"))
|
||||
}
|
||||
|
||||
/// 注册(或切换)「打开 dsh 独立窗口」全局快捷键;传空字符串则注销。
|
||||
///
|
||||
/// 按下时只 emit `dsh-open-window` 事件,**窗口由前端创建**:前端才持有带令牌的
|
||||
/// 启动地址,也能用 label 判重复用已开窗口(与截图模块「快捷键 → 事件 → 前端开窗」同构)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_register_shortcut(app: AppHandle, shortcut: String) -> Result<(), String> {
|
||||
crate::shortcut::register_shortcut(&app, "dsh", &shortcut, |a| {
|
||||
use tauri::Emitter;
|
||||
let _ = a.emit(crate::constants::events::DSH_OPEN_WINDOW, ());
|
||||
})
|
||||
}
|
||||
|
||||
/// 注销「打开 dsh 独立窗口」全局快捷键。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_unregister_shortcut(app: AppHandle) -> Result<(), String> {
|
||||
crate::shortcut::unregister_shortcut(&app, "dsh");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 供 `setup.rs` 在应用启动时按设置自启服务。
|
||||
pub fn autostart_if_enabled(app: &AppHandle) {
|
||||
let manager = app.state::<DshManager>();
|
||||
let settings = manager.load_settings();
|
||||
if !settings.auto_start {
|
||||
return;
|
||||
}
|
||||
if !manager.install_status().installed {
|
||||
crate::logger::log_warn("dsh", "设置了自动启动,但 dsh 尚未安装,跳过");
|
||||
return;
|
||||
}
|
||||
if let Err(e) = manager.start_server(app) {
|
||||
crate::logger::log_warn("dsh", &format!("自动启动 dsh 服务失败: {e}"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,397 @@
|
||||
//! dsh 本体的安装 / 更新 / 卸载与版本查询。
|
||||
//!
|
||||
//! 安装方式:用当前解析出的 Node 自带的 npm,把 `@deepseek-ai/dsh` 装进模块目录
|
||||
//! (`npm install --prefix {app_data}/dsh`)。好处是版本可锁、可配镜像源、可复用
|
||||
//! 已下载的依赖,且启动时直接 `node <bin 入口>`,不依赖 PATH 上的全局 shim。
|
||||
//!
|
||||
//! npm 调用形态:`node <npm-cli.js> install ...`(不走 npm.cmd,理由见 `node.rs`)。
|
||||
|
||||
use std::io::{BufRead, BufReader};
|
||||
use std::path::PathBuf;
|
||||
use std::sync::atomic::Ordering;
|
||||
use std::sync::Arc;
|
||||
|
||||
use tauri::{AppHandle, Emitter};
|
||||
|
||||
use super::node::NODE_CANCELLED;
|
||||
use super::types::{DshInstallProgress, DshInstallStatus, DshNpmRegistryInfo, DshUpdateInfo, DSH_PACKAGE};
|
||||
use super::DshManager;
|
||||
|
||||
impl DshManager {
|
||||
/// dsh 包目录
|
||||
fn package_dir(&self) -> PathBuf {
|
||||
self.install_root()
|
||||
.join("node_modules")
|
||||
.join("@deepseek-ai")
|
||||
.join("dsh")
|
||||
}
|
||||
|
||||
/// 已安装版本(读 package.json,不起进程)
|
||||
pub fn installed_version(&self) -> Option<String> {
|
||||
let text = std::fs::read_to_string(self.package_dir().join("package.json")).ok()?;
|
||||
let value: serde_json::Value = serde_json::from_str(&text).ok()?;
|
||||
value
|
||||
.get("version")
|
||||
.and_then(|v| v.as_str())
|
||||
.map(|s| s.to_string())
|
||||
}
|
||||
|
||||
/// dsh bin 入口(`package.json` 的 `bin.dsh`),启动服务时直接 `node <入口>`。
|
||||
pub fn bin_entry(&self) -> Option<PathBuf> {
|
||||
let dir = self.package_dir();
|
||||
let text = std::fs::read_to_string(dir.join("package.json")).ok()?;
|
||||
let value: serde_json::Value = serde_json::from_str(&text).ok()?;
|
||||
let rel = match value.get("bin") {
|
||||
Some(serde_json::Value::String(s)) => s.clone(),
|
||||
Some(serde_json::Value::Object(map)) => map.get("dsh")?.as_str()?.to_string(),
|
||||
_ => return None,
|
||||
};
|
||||
let entry = dir.join(rel);
|
||||
entry.exists().then_some(entry)
|
||||
}
|
||||
|
||||
/// 安装状态
|
||||
pub fn install_status(&self) -> DshInstallStatus {
|
||||
let version = self.installed_version();
|
||||
let entry = self.bin_entry();
|
||||
DshInstallStatus {
|
||||
installed: version.is_some() && entry.is_some(),
|
||||
version,
|
||||
entry: entry.map(|p| p.to_string_lossy().to_string()),
|
||||
dir: self.install_root().to_string_lossy().to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// 模块设置里**显式**填写的 npm 源(空 = 未指定,交给 npm 自己解析)。
|
||||
///
|
||||
/// 与 [`Self::npm_registry_info`] 的区别:这里只认模块设置。安装时只在
|
||||
/// 显式填写的情况下才传 `--registry`,其余情况让 npm 走自己的配置链
|
||||
/// (环境变量 > 安装目录 `.npmrc` > 用户 `~/.npmrc` > 内置),
|
||||
/// 这样「系统 node 以前配过的镜像」会被自动沿用。
|
||||
fn registry_setting(&self) -> String {
|
||||
self.load_settings()
|
||||
.npm_registry
|
||||
.trim()
|
||||
.trim_end_matches('/')
|
||||
.to_string()
|
||||
}
|
||||
|
||||
/// npm 自身解析出的源(`node <npm-cli.js> config get registry`)。
|
||||
///
|
||||
/// 未检测到 Node/npm、或 npm 执行失败时为 None。cwd 取安装目录——
|
||||
/// npm 的「项目级配置」来自 cwd 下的 `.npmrc`,要与真实安装保持一致。
|
||||
pub fn npm_config_registry(&self) -> Option<String> {
|
||||
let env = self.resolve_node_env()?;
|
||||
let npm = env.npm?;
|
||||
let mut cmd = std::process::Command::new(&env.node_exe);
|
||||
cmd.arg(&npm).args(["config", "get", "registry"]);
|
||||
// 安装目录可能还没创建(首次安装):退回模块目录,保证能起来
|
||||
let install_root = self.install_root();
|
||||
cmd.current_dir(if install_root.exists() {
|
||||
install_root
|
||||
} else {
|
||||
self.root.clone()
|
||||
});
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.stdin(std::process::Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
let out = cmd.output().ok()?;
|
||||
if !out.status.success() {
|
||||
return None;
|
||||
}
|
||||
let text = String::from_utf8_lossy(&out.stdout);
|
||||
text.lines()
|
||||
.map(|l| l.trim())
|
||||
.find(|l| !l.is_empty())
|
||||
.map(|l| l.trim_end_matches('/').to_string())
|
||||
}
|
||||
|
||||
/// 本次安装/查询实际使用的源 + 来源(供 UI 展示与快捷切换)。
|
||||
pub fn npm_registry_info(&self) -> DshNpmRegistryInfo {
|
||||
let setting = self.registry_setting();
|
||||
let npm_registry = self.npm_config_registry();
|
||||
let (effective, source) = if !setting.is_empty() {
|
||||
(setting.clone(), "setting")
|
||||
} else if let Some(npm) = npm_registry.as_ref() {
|
||||
(npm.clone(), "npm")
|
||||
} else {
|
||||
("https://registry.npmjs.org".to_string(), "fallback")
|
||||
};
|
||||
DshNpmRegistryInfo {
|
||||
effective,
|
||||
source: source.to_string(),
|
||||
npm_registry,
|
||||
setting,
|
||||
}
|
||||
}
|
||||
|
||||
/// 版本查询(reqwest)用的源:与安装保持一致(设置 → npm 配置 → 官方源)。
|
||||
///
|
||||
/// 之前这里在设置为空时硬编码官方源,导致「安装走国内镜像、检查更新却直连
|
||||
/// npmjs.org」的不一致。
|
||||
fn registry_for_query(&self) -> String {
|
||||
self.npm_registry_info().effective
|
||||
}
|
||||
|
||||
/// 查询 npm 上的可用版本(`dist-tags.latest` + 版本列表)。
|
||||
pub async fn check_update(&self) -> Result<DshUpdateInfo, String> {
|
||||
let url = format!("{}/{DSH_PACKAGE}", self.registry_for_query());
|
||||
let resp = self
|
||||
.http_client(30)
|
||||
.get(&url)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("查询 npm 版本失败: {e}"))?;
|
||||
if !resp.status().is_success() {
|
||||
return Err(format!("查询 npm 版本失败: HTTP {}", resp.status().as_u16()));
|
||||
}
|
||||
let value: serde_json::Value = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| format!("解析 npm 响应失败: {e}"))?;
|
||||
|
||||
let latest = value
|
||||
.get("dist-tags")
|
||||
.and_then(|t| t.get("latest"))
|
||||
.and_then(|v| v.as_str())
|
||||
.ok_or_else(|| "npm 响应缺少 dist-tags.latest".to_string())?
|
||||
.to_string();
|
||||
|
||||
let mut versions: Vec<String> = value
|
||||
.get("versions")
|
||||
.and_then(|v| v.as_object())
|
||||
.map(|m| m.keys().cloned().collect())
|
||||
.unwrap_or_default();
|
||||
// 取尾部若干(近似按发布顺序),再反转成最新在前
|
||||
if versions.len() > 20 {
|
||||
versions = versions.split_off(versions.len() - 20);
|
||||
}
|
||||
versions.reverse();
|
||||
|
||||
let current = self.installed_version();
|
||||
Ok(DshUpdateInfo {
|
||||
has_update: current.as_deref() != Some(latest.as_str()),
|
||||
current,
|
||||
latest,
|
||||
versions,
|
||||
})
|
||||
}
|
||||
|
||||
/// 安装 / 更新 dsh(`version` 为空 = 装 latest)。
|
||||
pub async fn install(&self, app: &AppHandle, version: Option<String>) -> Result<DshInstallStatus, String> {
|
||||
self.cancel.store(false, Ordering::SeqCst);
|
||||
// 每次安装开始清空上一次的输出缓冲
|
||||
self.clear_install_log();
|
||||
let result = self.install_inner(app, version).await;
|
||||
self.cancel.store(false, Ordering::SeqCst);
|
||||
if let Err(ref e) = result {
|
||||
if e != NODE_CANCELLED {
|
||||
self.push_install_log(&format!("[错误] {e}"));
|
||||
self.emit_progress(app, "error", 0, 0, None, e);
|
||||
}
|
||||
}
|
||||
result
|
||||
}
|
||||
|
||||
async fn install_inner(&self, app: &AppHandle, version: Option<String>) -> Result<DshInstallStatus, String> {
|
||||
let env = self
|
||||
.resolve_node_env()
|
||||
.ok_or_else(|| "未找到可用的 Node,请先完成第 1 步".to_string())?;
|
||||
if !super::satisfies_node_requirement(&env.version) {
|
||||
return Err(format!(
|
||||
"当前 Node {} 不满足 dsh 要求({}),请先安装合规的 Node",
|
||||
env.version,
|
||||
super::NODE_REQUIRED
|
||||
));
|
||||
}
|
||||
let npm = env
|
||||
.npm
|
||||
.clone()
|
||||
.ok_or_else(|| "未找到 npm(Node 分发中缺少 npm-cli.js)".to_string())?;
|
||||
|
||||
let spec = version
|
||||
.as_deref()
|
||||
.map(|v| v.trim())
|
||||
.filter(|v| !v.is_empty())
|
||||
.map(|v| format!("{DSH_PACKAGE}@{v}"))
|
||||
.unwrap_or_else(|| DSH_PACKAGE.to_string());
|
||||
|
||||
let install_dir = self.install_root();
|
||||
// npm 的 prefix 目录不存在时由 npm 自己创建;这里先建一次,避免
|
||||
// 自定义到新盘符目录时 npm 因父级缺失报 ENOENT
|
||||
std::fs::create_dir_all(&install_dir)
|
||||
.map_err(|e| format!("创建安装目录失败({}): {e}", install_dir.display()))?;
|
||||
let mut args: Vec<String> = vec![
|
||||
npm.to_string_lossy().to_string(),
|
||||
"install".into(),
|
||||
"--prefix".into(),
|
||||
install_dir.to_string_lossy().to_string(),
|
||||
spec.clone(),
|
||||
"--no-fund".into(),
|
||||
"--no-audit".into(),
|
||||
"--loglevel".into(),
|
||||
"info".into(),
|
||||
];
|
||||
let registry = self.registry_setting();
|
||||
if !registry.is_empty() {
|
||||
// 只在显式指定时才覆盖 npm 自己的配置链
|
||||
args.push("--registry".into());
|
||||
args.push(registry);
|
||||
}
|
||||
|
||||
self.emit_progress(
|
||||
app,
|
||||
"installing",
|
||||
0,
|
||||
0,
|
||||
None,
|
||||
&format!("正在安装 {spec}(依赖较多,请稍候)..."),
|
||||
);
|
||||
|
||||
// npm 不输出百分比:percent 恒为 0(前端按不确定进度展示),
|
||||
// message 跟随 npm 自身的汇总行(`added N packages` 等)更新。
|
||||
//
|
||||
// 逐行输出**只进内存缓冲**(安装引导页临时展示),不写应用日志:
|
||||
// npm 的 72 个依赖会刷出上千行,进应用日志只会淹没真正的运行日志。
|
||||
let progress_app = app.clone();
|
||||
let install_ring = self.install_ring_handle();
|
||||
let on_line = Arc::new(move |line: &str| {
|
||||
super::push_bounded(&install_ring, super::INSTALL_RING_CAPACITY, line);
|
||||
let trimmed = line.trim();
|
||||
if trimmed.starts_with("added ")
|
||||
|| trimmed.starts_with("changed ")
|
||||
|| trimmed.starts_with("removed ")
|
||||
|| trimmed.starts_with("up to date")
|
||||
{
|
||||
let _ = progress_app.emit(
|
||||
crate::constants::events::DSH_INSTALL_PROGRESS,
|
||||
DshInstallProgress {
|
||||
stage: "installing".into(),
|
||||
percent: 0,
|
||||
downloaded_bytes: 0,
|
||||
total_bytes: None,
|
||||
message: trimmed.to_string(),
|
||||
},
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
let node_exe = env.node_exe.clone();
|
||||
let pid_ref = self.install_pid.clone();
|
||||
let result = tauri::async_runtime::spawn_blocking(move || {
|
||||
run_npm(node_exe, args, install_dir, pid_ref, on_line)
|
||||
})
|
||||
.await
|
||||
.map_err(|e| format!("安装任务执行失败: {e}"))?;
|
||||
self.install_pid.store(0, Ordering::SeqCst);
|
||||
|
||||
if self.cancel.load(Ordering::SeqCst) {
|
||||
return Err(NODE_CANCELLED.into());
|
||||
}
|
||||
result?;
|
||||
|
||||
let status = self.install_status();
|
||||
if !status.installed {
|
||||
return Err("npm 安装结束,但未找到 dsh 入口(请查看日志)".into());
|
||||
}
|
||||
self.emit_progress(
|
||||
app,
|
||||
"done",
|
||||
100,
|
||||
0,
|
||||
None,
|
||||
&format!(
|
||||
"dsh {} 安装完成",
|
||||
status.version.as_deref().unwrap_or("unknown")
|
||||
),
|
||||
);
|
||||
crate::logger::log_info(
|
||||
"dsh",
|
||||
&format!(
|
||||
"dsh 安装完成: {}",
|
||||
status.version.as_deref().unwrap_or("unknown")
|
||||
),
|
||||
);
|
||||
Ok(status)
|
||||
}
|
||||
|
||||
/// 卸载 dsh:停止服务并删除包目录(保留设置与 $DSH_HOME)。
|
||||
pub fn uninstall(&self, app: &AppHandle) -> Result<(), String> {
|
||||
self.stop_server(app);
|
||||
let dir = self.package_dir();
|
||||
if dir.exists() {
|
||||
std::fs::remove_dir_all(&dir).map_err(|e| format!("删除 dsh 目录失败: {e}"))?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// 同步执行 npm(阻塞线程内),逐行读输出交给 `on_line`;pid 记录供取消时 taskkill。
|
||||
fn run_npm(
|
||||
node_exe: PathBuf,
|
||||
args: Vec<String>,
|
||||
cwd: PathBuf,
|
||||
pid_ref: Arc<std::sync::atomic::AtomicU64>,
|
||||
on_line: Arc<dyn Fn(&str) + Send + Sync>,
|
||||
) -> Result<(), String> {
|
||||
let mut cmd = std::process::Command::new(&node_exe);
|
||||
cmd.args(&args);
|
||||
cmd.current_dir(&cwd);
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::piped())
|
||||
.stdin(std::process::Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
|
||||
let mut child = cmd
|
||||
.spawn()
|
||||
.map_err(|e| format!("启动 npm 失败({}): {e}", node_exe.display()))?;
|
||||
let pid = child.id();
|
||||
pid_ref.store(pid as u64, Ordering::SeqCst);
|
||||
|
||||
let stdout = child.stdout.take();
|
||||
let stderr = child.stderr.take();
|
||||
|
||||
// 末 40 行留作失败时的错误摘要
|
||||
let tail = Arc::new(std::sync::Mutex::new(Vec::<String>::new()));
|
||||
let mut handles = Vec::new();
|
||||
let pipes: [Option<Box<dyn std::io::Read + Send>>; 2] = [
|
||||
stdout.map(|p| Box::new(p) as Box<dyn std::io::Read + Send>),
|
||||
stderr.map(|p| Box::new(p) as Box<dyn std::io::Read + Send>),
|
||||
];
|
||||
for pipe in pipes.into_iter().flatten() {
|
||||
let on_line = on_line.clone();
|
||||
let tail = tail.clone();
|
||||
handles.push(std::thread::spawn(move || {
|
||||
let reader = BufReader::new(pipe);
|
||||
for line in reader.lines().map_while(Result::ok) {
|
||||
on_line(&line);
|
||||
if let Ok(mut t) = tail.lock() {
|
||||
if t.len() >= 40 {
|
||||
t.remove(0);
|
||||
}
|
||||
t.push(line);
|
||||
}
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
let status = child.wait();
|
||||
for h in handles {
|
||||
let _ = h.join();
|
||||
}
|
||||
pid_ref.store(0, Ordering::SeqCst);
|
||||
|
||||
let status = status.map_err(|e| format!("等待 npm 结束失败: {e}"))?;
|
||||
if status.success() {
|
||||
return Ok(());
|
||||
}
|
||||
let text = tail.lock().map(|t| t.join("\n")).unwrap_or_default();
|
||||
let chars: Vec<char> = text.chars().collect();
|
||||
let skip = chars.len().saturating_sub(800);
|
||||
Err(format!(
|
||||
"npm 退出码 {}: {}",
|
||||
status.code().unwrap_or(-1),
|
||||
chars[skip..].iter().collect::<String>()
|
||||
))
|
||||
}
|
||||
@@ -0,0 +1,484 @@
|
||||
//! dsh 模块(DeepSeek Harness 外壳)。
|
||||
//!
|
||||
//! 模块定位:为 DeepSeek Harness(npm 包 `@deepseek-ai/dsh`)做安装、更新与
|
||||
//! 生命周期管理,并把主设置里的 AI 供应商(含 DeepSeek API Key)装载给 dsh。
|
||||
//! 模块页不内嵌浏览器,dsh 的 Web UI 通过独立窗口 / 系统浏览器打开。
|
||||
//!
|
||||
//! 目录布局(`{app_data_dir}/dsh`):
|
||||
//! ```text
|
||||
//! settings.json 模块自身设置(版本号 + 自愈)
|
||||
//! node/ 便携 Node(仅系统 Node 不可用时)
|
||||
//! node_modules/ @deepseek-ai/dsh 本地安装(npm --prefix)
|
||||
//! home/ $DSH_HOME(settings.yaml / profiles / 会话)
|
||||
//! workspace/ 默认工作区(dsh 进程的启动目录)
|
||||
//! logs/web.log dsh 服务输出
|
||||
//! ```
|
||||
//!
|
||||
//! 安全姿态:模块设置不含任何密钥;API Key 只在 spawn 子进程时以环境变量注入
|
||||
//! (明文来自系统凭据管理器,见 [`crate::secrets`]),不写 dsh 的
|
||||
//! `.credentials.yaml`、不落日志、不过前端。
|
||||
|
||||
mod ai_sync;
|
||||
mod commands;
|
||||
mod install;
|
||||
mod node;
|
||||
mod server;
|
||||
mod types;
|
||||
|
||||
pub use commands::{
|
||||
dsh_ai_preview, dsh_ai_sync, dsh_cancel_install, dsh_check_update, dsh_env_status,
|
||||
dsh_get_settings, dsh_install, dsh_install_log, dsh_log_clear, dsh_log_tail,
|
||||
dsh_node_detect, dsh_node_install, dsh_npm_registry_info, dsh_open_dir,
|
||||
dsh_register_shortcut, dsh_restart, dsh_save_settings, dsh_start, dsh_stop,
|
||||
dsh_uninstall, dsh_unregister_shortcut, dsh_update,
|
||||
};
|
||||
pub use commands::autostart_if_enabled;
|
||||
// 仅重导出模块自身与子模块会经 `super::` 用到的类型(其余由各子模块直接从 types 取)
|
||||
pub use types::{DshInstallProgress, DshSettings, NODE_REQUIRED};
|
||||
|
||||
use std::collections::VecDeque;
|
||||
use std::path::PathBuf;
|
||||
use std::process::Child;
|
||||
use std::sync::atomic::{AtomicBool, AtomicU64};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use tauri::AppHandle;
|
||||
|
||||
/// 设置内存缓存有效期(与其他模块的 500ms 一致)。
|
||||
const SETTINGS_CACHE_TTL: Duration = Duration::from_millis(500);
|
||||
/// 日志环形缓冲保留的最大行数(供「日志」页签快速读取)。
|
||||
const LOG_RING_CAPACITY: usize = 500;
|
||||
/// 安装输出缓冲保留的最大行数(npm 输出较啰嗦,只留最近一段)。
|
||||
const INSTALL_RING_CAPACITY: usize = 200;
|
||||
|
||||
/// 服务进程条目(自管 stdio,不走 ProcessManager)。
|
||||
pub(crate) struct ServerEntry {
|
||||
pub child: Child,
|
||||
pub pid: u32,
|
||||
pub port: u16,
|
||||
/// 启动时间(unix 秒)
|
||||
pub started_at: i64,
|
||||
}
|
||||
|
||||
struct SettingsCacheEntry {
|
||||
read_at: Instant,
|
||||
settings: DshSettings,
|
||||
}
|
||||
|
||||
/// 解析出的 Node 运行环境。
|
||||
pub(crate) struct NodeEnv {
|
||||
/// system | managed
|
||||
pub source: &'static str,
|
||||
pub node_exe: PathBuf,
|
||||
/// npm 入口(`node_modules/npm/bin/npm-cli.js`,用 `node <此路径>` 调用)
|
||||
pub npm: Option<PathBuf>,
|
||||
pub version: String,
|
||||
}
|
||||
|
||||
/// dsh 模块管理器(Tauri State)。
|
||||
pub struct DshManager {
|
||||
/// 应用数据目录(`{app_data_dir}`)
|
||||
data_dir: PathBuf,
|
||||
/// 模块根目录(`{app_data_dir}/dsh`)
|
||||
root: PathBuf,
|
||||
settings_cache: Mutex<Option<SettingsCacheEntry>>,
|
||||
/// 安装/下载取消标志
|
||||
cancel: Arc<AtomicBool>,
|
||||
/// 安装子进程 pid(取消时 taskkill /T)
|
||||
install_pid: Arc<AtomicU64>,
|
||||
/// 服务进程
|
||||
server: Mutex<Option<ServerEntry>>,
|
||||
/// 启动串行化锁(防并发双开)
|
||||
start_lock: Mutex<()>,
|
||||
/// HTTP 就绪标志
|
||||
ready: Arc<AtomicBool>,
|
||||
/// 本次进程的「带 token 启动地址」(从 dsh stdout 抓取)。
|
||||
/// dsh web 的浏览器鉴权靠它首次访问换取 cookie,没它就只会拿到 401。
|
||||
launch_url: Arc<Mutex<Option<String>>>,
|
||||
/// 最近一次启动错误(端口占用 / 进程立即退出)
|
||||
server_error: Mutex<Option<String>>,
|
||||
/// 日志环形缓冲
|
||||
log_ring: Arc<Mutex<VecDeque<String>>>,
|
||||
/// 安装(npm)输出缓冲:只在模块页临时展示,**不落应用日志、不落盘**
|
||||
install_ring: Arc<Mutex<VecDeque<String>>>,
|
||||
}
|
||||
|
||||
impl DshManager {
|
||||
pub fn new(app_data_dir: PathBuf) -> Self {
|
||||
let root = app_data_dir.join("dsh");
|
||||
for d in ["node", "logs", "home", "workspace"] {
|
||||
std::fs::create_dir_all(root.join(d)).ok();
|
||||
}
|
||||
Self {
|
||||
data_dir: app_data_dir,
|
||||
root,
|
||||
settings_cache: Mutex::new(None),
|
||||
cancel: Arc::new(AtomicBool::new(false)),
|
||||
install_pid: Arc::new(AtomicU64::new(0)),
|
||||
server: Mutex::new(None),
|
||||
start_lock: Mutex::new(()),
|
||||
ready: Arc::new(AtomicBool::new(false)),
|
||||
launch_url: Arc::new(Mutex::new(None)),
|
||||
server_error: Mutex::new(None),
|
||||
log_ring: Arc::new(Mutex::new(VecDeque::with_capacity(LOG_RING_CAPACITY))),
|
||||
install_ring: Arc::new(Mutex::new(VecDeque::with_capacity(INSTALL_RING_CAPACITY))),
|
||||
}
|
||||
}
|
||||
|
||||
/// 模块根目录(「在文件夹中打开」用)
|
||||
pub fn root(&self) -> &PathBuf {
|
||||
&self.root
|
||||
}
|
||||
|
||||
/// 便携 Node 目录
|
||||
pub fn node_dir(&self) -> PathBuf {
|
||||
self.root.join("node")
|
||||
}
|
||||
|
||||
/// dsh 本体的安装根目录(npm `--prefix` 目标)。
|
||||
///
|
||||
/// 设置留空 = 模块目录。自定义时**只有 dsh 本体与它的 node_modules 跟随**,
|
||||
/// 便携 Node / `$DSH_HOME` / 日志 / 模块设置仍留在应用数据目录——自定义路径
|
||||
/// 若被移动或卸载,至少配置与日志还读得到,排障不会失联。
|
||||
pub fn install_root(&self) -> PathBuf {
|
||||
let raw = self.load_settings().install_dir;
|
||||
let raw = raw.trim();
|
||||
if raw.is_empty() {
|
||||
self.root.clone()
|
||||
} else {
|
||||
PathBuf::from(raw)
|
||||
}
|
||||
}
|
||||
|
||||
/// `$DSH_HOME`
|
||||
pub fn home_dir(&self) -> PathBuf {
|
||||
let settings = self.load_settings();
|
||||
if settings.dsh_home_mode == "user" {
|
||||
dirs::home_dir()
|
||||
.map(|h| h.join(".dsh"))
|
||||
.unwrap_or_else(|| self.root.join("home"))
|
||||
} else {
|
||||
self.root.join("home")
|
||||
}
|
||||
}
|
||||
|
||||
/// dsh 进程的启动目录(工作区)
|
||||
pub fn workspace_dir(&self) -> PathBuf {
|
||||
let settings = self.load_settings();
|
||||
let raw = settings.workspace.trim();
|
||||
let dir = if raw.is_empty() {
|
||||
self.root.join("workspace")
|
||||
} else {
|
||||
PathBuf::from(raw)
|
||||
};
|
||||
std::fs::create_dir_all(&dir).ok();
|
||||
dir
|
||||
}
|
||||
|
||||
pub fn log_path(&self) -> PathBuf {
|
||||
self.root.join("logs").join("web.log")
|
||||
}
|
||||
|
||||
pub fn settings_path(&self) -> PathBuf {
|
||||
self.root.join("settings.json")
|
||||
}
|
||||
|
||||
// ---------- 设置 ----------
|
||||
|
||||
pub fn load_settings(&self) -> DshSettings {
|
||||
if let Ok(cache) = self.settings_cache.lock() {
|
||||
if let Some(entry) = cache.as_ref() {
|
||||
if entry.read_at.elapsed() < SETTINGS_CACHE_TTL {
|
||||
return entry.settings.clone();
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut settings = std::fs::read_to_string(self.settings_path())
|
||||
.ok()
|
||||
.and_then(|t| serde_json::from_str::<DshSettings>(&t).ok())
|
||||
.unwrap_or_default();
|
||||
let changed = settings.heal();
|
||||
if changed {
|
||||
self.write_settings(&settings).ok();
|
||||
}
|
||||
if let Ok(mut cache) = self.settings_cache.lock() {
|
||||
*cache = Some(SettingsCacheEntry {
|
||||
read_at: Instant::now(),
|
||||
settings: settings.clone(),
|
||||
});
|
||||
}
|
||||
settings
|
||||
}
|
||||
|
||||
pub fn save_settings(&self, mut settings: DshSettings) -> Result<DshSettings, String> {
|
||||
// 自定义安装目录必须是绝对路径:npm 的 --prefix 用相对路径会落到
|
||||
// 进程当前目录(开发期即仓库根目录),这种"看起来生效其实装错地方"最难排查
|
||||
let custom = settings.install_dir.trim();
|
||||
if !custom.is_empty() && !std::path::Path::new(custom).is_absolute() {
|
||||
return Err("dsh 安装目录必须是绝对路径(如 D:/Thing/dsh)".to_string());
|
||||
}
|
||||
settings.heal();
|
||||
self.write_settings(&settings)?;
|
||||
if let Ok(mut cache) = self.settings_cache.lock() {
|
||||
*cache = Some(SettingsCacheEntry {
|
||||
read_at: Instant::now(),
|
||||
settings: settings.clone(),
|
||||
});
|
||||
}
|
||||
Ok(settings)
|
||||
}
|
||||
|
||||
fn write_settings(&self, settings: &DshSettings) -> Result<(), String> {
|
||||
let json = serde_json::to_string_pretty(settings)
|
||||
.map_err(|e| format!("序列化 dsh 设置失败: {e}"))?;
|
||||
std::fs::write(self.settings_path(), json).map_err(|e| format!("写入 dsh 设置失败: {e}"))
|
||||
}
|
||||
|
||||
// ---------- 日志 ----------
|
||||
|
||||
/// 追加一行到环形缓冲 + 落盘(服务输出走这里)。
|
||||
pub(crate) fn push_log(&self, line: &str) {
|
||||
push_log_shared(&self.log_ring, &self.log_path(), line);
|
||||
}
|
||||
|
||||
/// 读取日志:优先环形缓冲;为空时回落到文件尾部。
|
||||
pub fn log_tail(&self, lines: usize) -> String {
|
||||
let lines = lines.clamp(1, LOG_RING_CAPACITY);
|
||||
if let Ok(ring) = self.log_ring.lock() {
|
||||
if !ring.is_empty() {
|
||||
let skip = ring.len().saturating_sub(lines);
|
||||
return ring
|
||||
.iter()
|
||||
.skip(skip)
|
||||
.cloned()
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n");
|
||||
}
|
||||
}
|
||||
let text = std::fs::read_to_string(self.log_path()).unwrap_or_default();
|
||||
let all: Vec<&str> = text.lines().collect();
|
||||
let skip = all.len().saturating_sub(lines);
|
||||
all[skip..].join("\n")
|
||||
}
|
||||
|
||||
pub fn clear_log(&self) {
|
||||
if let Ok(mut ring) = self.log_ring.lock() {
|
||||
ring.clear();
|
||||
}
|
||||
std::fs::write(self.log_path(), b"").ok();
|
||||
}
|
||||
|
||||
// ---------- 安装输出(仅内存,供安装引导页临时展示) ----------
|
||||
|
||||
/// 追加一行安装输出(已过滤疑似密钥)。
|
||||
pub(crate) fn push_install_log(&self, line: &str) {
|
||||
push_bounded(&self.install_ring, INSTALL_RING_CAPACITY, line);
|
||||
}
|
||||
|
||||
/// 读取当前安装输出(每次安装开始时清空)。
|
||||
pub fn install_log(&self) -> String {
|
||||
self.install_ring
|
||||
.lock()
|
||||
.map(|r| r.iter().cloned().collect::<Vec<_>>().join("\n"))
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
pub(crate) fn clear_install_log(&self) {
|
||||
if let Ok(mut ring) = self.install_ring.lock() {
|
||||
ring.clear();
|
||||
}
|
||||
}
|
||||
|
||||
/// 安装输出缓冲句柄(阻塞线程内的 on_line 闭包持有;'static 需要)。
|
||||
pub(crate) fn install_ring_handle(
|
||||
&self,
|
||||
) -> Arc<Mutex<VecDeque<String>>> {
|
||||
self.install_ring.clone()
|
||||
}
|
||||
|
||||
// ---------- 代理 ----------
|
||||
|
||||
/// 按设置解析代理地址(mihomo mixed 端口)。返回 None 表示直连。
|
||||
///
|
||||
/// 只读代理模块设置文件里的 mixedPort,并用一次 300ms TCP 探测确认内核在线;
|
||||
/// 内核没起来时静默直连(与 download_engine / translate 的降级姿态一致)。
|
||||
pub(crate) fn proxy_url(&self) -> Option<String> {
|
||||
if !self.load_settings().use_proxy {
|
||||
return None;
|
||||
}
|
||||
let text = std::fs::read_to_string(self.data_dir.join("proxy").join("settings.json")).ok()?;
|
||||
let value: serde_json::Value = serde_json::from_str(&text).ok()?;
|
||||
let port = value.get("mixedPort").and_then(|v| v.as_u64())?;
|
||||
if port == 0 || port > u16::MAX as u64 {
|
||||
return None;
|
||||
}
|
||||
let port = port as u16;
|
||||
let addr = std::net::SocketAddr::from(([127, 0, 0, 1], port));
|
||||
if std::net::TcpStream::connect_timeout(&addr, Duration::from_millis(300)).is_err() {
|
||||
return None;
|
||||
}
|
||||
Some(format!("http://127.0.0.1:{port}"))
|
||||
}
|
||||
|
||||
// ---------- 事件 ----------
|
||||
|
||||
/// 推送安装/下载进度(stage: download | extracting | installing | done | error)。
|
||||
pub(crate) fn emit_progress(
|
||||
&self,
|
||||
app: &AppHandle,
|
||||
stage: &str,
|
||||
percent: u8,
|
||||
downloaded_bytes: u64,
|
||||
total_bytes: Option<u64>,
|
||||
message: &str,
|
||||
) {
|
||||
use tauri::Emitter;
|
||||
let _ = app.emit(
|
||||
crate::constants::events::DSH_INSTALL_PROGRESS,
|
||||
DshInstallProgress {
|
||||
stage: stage.into(),
|
||||
percent,
|
||||
downloaded_bytes,
|
||||
total_bytes,
|
||||
message: message.into(),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/// 推送服务状态(启动/停止/就绪变化时)。
|
||||
pub(crate) fn emit_server_state(&self, app: &AppHandle) {
|
||||
use tauri::Emitter;
|
||||
let status = self.server_status();
|
||||
let _ = app.emit(crate::constants::events::DSH_SERVER_STATE, status);
|
||||
}
|
||||
|
||||
/// 构造 reqwest 客户端:按代理设置决定是否走 mihomo。
|
||||
pub(crate) fn http_client(&self, timeout_secs: u64) -> reqwest::Client {
|
||||
let mut builder = reqwest::Client::builder()
|
||||
.user_agent("thing-app")
|
||||
.timeout(Duration::from_secs(timeout_secs));
|
||||
if let Some(proxy) = self.proxy_url() {
|
||||
if let Ok(p) = reqwest::Proxy::all(&proxy) {
|
||||
builder = builder.proxy(p);
|
||||
}
|
||||
}
|
||||
builder.build().unwrap_or_else(|_| reqwest::Client::new())
|
||||
}
|
||||
}
|
||||
|
||||
/// 过滤日志行里的疑似密钥(`sk-` 形态)与 URL 里的会话令牌。
|
||||
pub(crate) fn sanitize_log_line(line: &str) -> String {
|
||||
let line = mask_token_in_url(line);
|
||||
let mut out = String::with_capacity(line.len());
|
||||
for token in line.split_inclusive(char::is_whitespace) {
|
||||
let trimmed = token.trim_end();
|
||||
if trimmed.starts_with("sk-") && trimmed.len() > 12 {
|
||||
out.push_str("sk-***");
|
||||
out.push_str(&token[trimmed.len()..]);
|
||||
} else {
|
||||
out.push_str(token);
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// 掩码 URL 里的 `token=` 取值(`?token=xxx` → `?token=***`)。
|
||||
///
|
||||
/// dsh web 的浏览器会话令牌等同于「对该 loopback 服务(能执行代码)的完全访问权」,
|
||||
/// 不该落进应用日志与 logs/web.log;真正的带令牌地址经 IPC 单独给前端使用。
|
||||
fn mask_token_in_url(line: &str) -> String {
|
||||
const NEEDLE: &str = "token=";
|
||||
let mut out = String::with_capacity(line.len());
|
||||
let mut cursor = 0usize;
|
||||
while let Some(rel) = line[cursor..].find(NEEDLE) {
|
||||
let start = cursor + rel + NEEDLE.len();
|
||||
out.push_str(&line[cursor..start]);
|
||||
let after = &line[start..];
|
||||
let end = after
|
||||
.find(|c: char| c.is_whitespace() || matches!(c, ')' | ',' | '"' | '\'' | '&'))
|
||||
.unwrap_or(after.len());
|
||||
out.push_str("***");
|
||||
cursor = start + end;
|
||||
}
|
||||
out.push_str(&line[cursor..]);
|
||||
out
|
||||
}
|
||||
|
||||
/// 从 dsh 输出行里解析「带 token 的启动地址」。
|
||||
///
|
||||
/// `dsh web` 就绪后会打印(见 dsh-web-app 的 announceReady):
|
||||
/// `dsh web: http://127.0.0.1:3080/?token=<随机令牌> (LAN: http://<lan>:3080/?token=<...>)`
|
||||
///
|
||||
/// 浏览器鉴权靠这个地址首次访问换取签名 cookie(dsh-client-connection 的 BrowserAuth);
|
||||
/// 令牌是**每次进程随机生成**的,无法推导,只能从输出里取。
|
||||
/// 取第一个(loopback)地址,忽略随后的 LAN 地址。
|
||||
pub(crate) fn parse_launch_url(line: &str) -> Option<String> {
|
||||
let start = line.find("http://").or_else(|| line.find("https://"))?;
|
||||
let rest = &line[start..];
|
||||
let end = rest.find(char::is_whitespace).unwrap_or(rest.len());
|
||||
let url = rest[..end].trim_end_matches(|c: char| c == ')' || c == ',');
|
||||
url.contains("token=").then(|| url.to_string())
|
||||
}
|
||||
|
||||
/// 共享的日志写入(服务 stdout/stderr reader 线程与探测线程用)。
|
||||
///
|
||||
/// reader 线程拿不到 `&DshManager`(需要 'static),因此把环形缓冲与日志路径
|
||||
/// 单独传进来。
|
||||
pub(crate) fn push_log_shared(
|
||||
ring: &Arc<Mutex<VecDeque<String>>>,
|
||||
log_path: &PathBuf,
|
||||
line: &str,
|
||||
) {
|
||||
let line = push_bounded(ring, LOG_RING_CAPACITY, line);
|
||||
if let Ok(mut f) = std::fs::OpenOptions::new()
|
||||
.create(true)
|
||||
.append(true)
|
||||
.open(log_path)
|
||||
{
|
||||
use std::io::Write;
|
||||
let _ = writeln!(f, "{line}");
|
||||
}
|
||||
}
|
||||
|
||||
/// 有界环形缓冲追加(**不落盘**),返回写入后的文本。
|
||||
///
|
||||
/// 安装输出走这里:只要内存,不写应用日志、不写文件——用户明确要求安装日志
|
||||
/// 仅在安装引导页临时展示(npm 输出啰嗦,进应用日志只会淹没真正的运行日志)。
|
||||
pub(crate) fn push_bounded(
|
||||
ring: &Arc<Mutex<VecDeque<String>>>,
|
||||
capacity: usize,
|
||||
line: &str,
|
||||
) -> String {
|
||||
let line = sanitize_log_line(line);
|
||||
if let Ok(mut r) = ring.lock() {
|
||||
if r.len() >= capacity {
|
||||
r.pop_front();
|
||||
}
|
||||
r.push_back(line.clone());
|
||||
}
|
||||
line
|
||||
}
|
||||
|
||||
/// 解析 "v24.9.0" / "24.9.0" → (24, 9, 0)
|
||||
pub(crate) fn parse_version(raw: &str) -> Option<(u32, u32, u32)> {
|
||||
let cleaned = raw.trim().trim_start_matches('v');
|
||||
let core = cleaned.split('-').next().unwrap_or(cleaned);
|
||||
let mut it = core.split('.');
|
||||
let major = it.next()?.parse::<u32>().ok()?;
|
||||
let minor = it.next().unwrap_or("0").parse::<u32>().ok()?;
|
||||
let patch = it.next().unwrap_or("0").parse::<u32>().ok()?;
|
||||
Some((major, minor, patch))
|
||||
}
|
||||
|
||||
/// 是否满足 dsh 的要求:`^22.19.0 || >=24.0.0`
|
||||
pub(crate) fn satisfies_node_requirement(raw: &str) -> bool {
|
||||
let Some((major, minor, patch)) = parse_version(raw) else {
|
||||
return false;
|
||||
};
|
||||
match major {
|
||||
22 => (minor, patch) >= (19, 0),
|
||||
24.. => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,399 @@
|
||||
//! Node 运行环境:探测系统 Node / 下载并解压便携 Node。
|
||||
//!
|
||||
//! dsh 要求 Node `^22.19.0 || >=24.0.0`。策略(用户已确认):
|
||||
//! 优先复用 PATH 上的系统 Node,版本不满足或缺失时才下载官方便携版到
|
||||
//! `{app_data}/dsh/node`(官方 zip 内含 npm/npx,因此托管 Node 自带 npm)。
|
||||
|
||||
use std::fs;
|
||||
use std::io::{Read, Write};
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
use futures_util::StreamExt;
|
||||
use tauri::AppHandle;
|
||||
|
||||
use super::types::{NodeStatus, NODE_REQUIRED};
|
||||
use super::{satisfies_node_requirement, DshManager, NodeEnv};
|
||||
|
||||
/// 用户取消时返回的错误信息(前端静默处理,不弹错误 toast)。
|
||||
pub(crate) const NODE_CANCELLED: &str = "已取消";
|
||||
|
||||
impl DshManager {
|
||||
/// 系统 PATH 上的 node.exe
|
||||
pub fn system_node(&self) -> Option<PathBuf> {
|
||||
which_node()
|
||||
}
|
||||
|
||||
/// 托管便携 Node 的 node.exe
|
||||
pub fn managed_node(&self) -> Option<PathBuf> {
|
||||
let exe = self.node_dir().join(if cfg!(windows) { "node.exe" } else { "bin/node" });
|
||||
exe.exists().then_some(exe)
|
||||
}
|
||||
|
||||
/// 解析实际使用的 Node 环境(按 nodeSource 设置)。
|
||||
pub fn resolve_node_env(&self) -> Option<NodeEnv> {
|
||||
let settings = self.load_settings();
|
||||
let system = self.system_node();
|
||||
let managed = self.managed_node();
|
||||
|
||||
let system_ok = system
|
||||
.as_ref()
|
||||
.and_then(|p| node_version(p))
|
||||
.map(|v| satisfies_node_requirement(&v))
|
||||
.unwrap_or(false);
|
||||
|
||||
// 选定 (是否托管, 可执行文件)
|
||||
let chosen: Option<(bool, PathBuf)> = match settings.node_source.as_str() {
|
||||
"system" => system.map(|p| (false, p)),
|
||||
"managed" => managed.map(|p| (true, p)),
|
||||
// auto:系统满足即复用,否则回落托管;两者都没有时退回系统 Node 仅用于展示版本
|
||||
_ => {
|
||||
if system_ok {
|
||||
system.map(|p| (false, p))
|
||||
} else {
|
||||
managed
|
||||
.map(|p| (true, p))
|
||||
.or_else(|| system.map(|p| (false, p)))
|
||||
}
|
||||
}
|
||||
};
|
||||
let (is_managed, exe) = chosen?;
|
||||
|
||||
let version = node_version(&exe).unwrap_or_default();
|
||||
let npm = npm_cli_js(&exe);
|
||||
Some(NodeEnv {
|
||||
source: if is_managed { "managed" } else { "system" },
|
||||
node_exe: exe,
|
||||
npm,
|
||||
version,
|
||||
})
|
||||
}
|
||||
|
||||
/// 当前 Node 状态(供 UI 首屏展示)。
|
||||
pub fn node_status(&self) -> NodeStatus {
|
||||
match self.resolve_node_env() {
|
||||
Some(env) => {
|
||||
let satisfies = satisfies_node_requirement(&env.version);
|
||||
NodeStatus {
|
||||
source: if env.source == "managed" { "managed".into() } else { "system".into() },
|
||||
path: Some(env.node_exe.to_string_lossy().to_string()),
|
||||
version: Some(env.version),
|
||||
satisfies,
|
||||
required: NODE_REQUIRED.into(),
|
||||
}
|
||||
}
|
||||
None => NodeStatus {
|
||||
source: "none".into(),
|
||||
path: None,
|
||||
version: None,
|
||||
satisfies: false,
|
||||
required: NODE_REQUIRED.into(),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/// 下载并安装便携 Node(进度经 `dsh-install-progress` 推送)。
|
||||
///
|
||||
/// `version` 为空时自动解析满足要求的最新版本(优先 LTS)。
|
||||
pub async fn node_install(&self, app: &AppHandle, version: Option<String>) -> Result<NodeStatus, String> {
|
||||
if !cfg!(windows) {
|
||||
return Err("便携 Node 安装仅支持 Windows,请改用系统 Node(nodeSource = system)".into());
|
||||
}
|
||||
self.cancel.store(false, Ordering::SeqCst);
|
||||
let result = self.node_install_inner(app, version).await;
|
||||
self.cancel.store(false, Ordering::SeqCst);
|
||||
if let Err(ref e) = result {
|
||||
if e != NODE_CANCELLED {
|
||||
self.emit_progress(app, "error", 0, 0, None, e);
|
||||
}
|
||||
}
|
||||
result
|
||||
}
|
||||
|
||||
async fn node_install_inner(&self, app: &AppHandle, version: Option<String>) -> Result<NodeStatus, String> {
|
||||
let base = self.node_mirror_base();
|
||||
let version = match version.filter(|v| !v.trim().is_empty()) {
|
||||
Some(v) => normalize_version(&v),
|
||||
None => {
|
||||
self.emit_progress(app, "download", 0, 0, None, "正在解析 Node 版本...");
|
||||
let requested = self.load_settings().managed_node_version;
|
||||
if requested.trim().is_empty() {
|
||||
self.resolve_latest_node_version(&base).await?
|
||||
} else {
|
||||
normalize_version(&requested)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let arch = platform_arch();
|
||||
let url = format!("{base}/{version}/node-{version}-{arch}.zip");
|
||||
let zip_path = self.node_dir().join("node-download.zip");
|
||||
self.emit_progress(
|
||||
app,
|
||||
"download",
|
||||
1,
|
||||
0,
|
||||
None,
|
||||
&format!("正在下载 Node {version}..."),
|
||||
);
|
||||
self.download_to_file(app, &url, &zip_path, "正在下载 Node").await?;
|
||||
|
||||
if self.cancel.load(Ordering::SeqCst) {
|
||||
let _ = fs::remove_file(&zip_path);
|
||||
return Err(NODE_CANCELLED.into());
|
||||
}
|
||||
|
||||
// 解压:官方 zip 顶层是 node-vX-win-x64/,剥掉这一层直接落到 node/
|
||||
self.emit_progress(app, "extracting", 92, 0, None, "正在解压...");
|
||||
let dest = self.node_dir();
|
||||
if dest.exists() {
|
||||
fs::remove_dir_all(&dest).map_err(|e| format!("清理旧 Node 目录失败: {e}"))?;
|
||||
}
|
||||
fs::create_dir_all(&dest).map_err(|e| format!("创建 Node 目录失败: {e}"))?;
|
||||
if let Err(e) = extract_zip_strip_top(&zip_path, &dest) {
|
||||
let _ = fs::remove_file(&zip_path);
|
||||
return Err(format!("解压 Node 失败: {e}"));
|
||||
}
|
||||
let _ = fs::remove_file(&zip_path);
|
||||
|
||||
let exe = dest.join("node.exe");
|
||||
if !exe.exists() {
|
||||
return Err("解压后未找到 node.exe".into());
|
||||
}
|
||||
let actual = node_version(&exe).unwrap_or(version.clone());
|
||||
self.emit_progress(app, "done", 100, 0, None, &format!("Node {actual} 安装完成"));
|
||||
crate::logger::log_info("dsh", &format!("便携 Node 安装完成: {actual} ({})", exe.display()));
|
||||
Ok(self.node_status())
|
||||
}
|
||||
|
||||
/// 托管 Node 的镜像基址(`{base}/{version}/node-{version}-win-x64.zip`)。
|
||||
fn node_mirror_base(&self) -> String {
|
||||
let mirror = self.load_settings().node_mirror;
|
||||
let mirror = mirror.trim().trim_end_matches('/');
|
||||
if mirror.is_empty() {
|
||||
"https://nodejs.org/dist".to_string()
|
||||
} else {
|
||||
mirror.to_string()
|
||||
}
|
||||
}
|
||||
|
||||
/// 解析满足要求的最新 Node 版本(优先 LTS)。
|
||||
async fn resolve_latest_node_version(&self, base: &str) -> Result<String, String> {
|
||||
let url = format!("{base}/index.json");
|
||||
let resp = self
|
||||
.http_client(30)
|
||||
.get(&url)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("获取 Node 版本列表失败: {e}"))?;
|
||||
if !resp.status().is_success() {
|
||||
return Err(format!("获取 Node 版本列表失败: HTTP {}", resp.status().as_u16()));
|
||||
}
|
||||
let list: Vec<serde_json::Value> = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| format!("解析 Node 版本列表失败: {e}"))?;
|
||||
|
||||
let mut latest_lts: Option<(u32, u32, u32, String)> = None;
|
||||
let mut latest_any: Option<(u32, u32, u32, String)> = None;
|
||||
for item in list {
|
||||
let Some(version) = item.get("version").and_then(|v| v.as_str()) else {
|
||||
continue;
|
||||
};
|
||||
if !satisfies_node_requirement(version) {
|
||||
continue;
|
||||
}
|
||||
let Some(parsed) = super::parse_version(version) else {
|
||||
continue;
|
||||
};
|
||||
let is_lts = item.get("lts").map(|l| !l.is_null() && l != false).unwrap_or(false);
|
||||
if latest_any.as_ref().map(|(maj, min, pat, _)| (parsed.0, parsed.1, parsed.2) > (*maj, *min, *pat)).unwrap_or(true) {
|
||||
latest_any = Some((parsed.0, parsed.1, parsed.2, version.to_string()));
|
||||
}
|
||||
if is_lts
|
||||
&& latest_lts
|
||||
.as_ref()
|
||||
.map(|(maj, min, pat, _)| (parsed.0, parsed.1, parsed.2) > (*maj, *min, *pat))
|
||||
.unwrap_or(true)
|
||||
{
|
||||
latest_lts = Some((parsed.0, parsed.1, parsed.2, version.to_string()));
|
||||
}
|
||||
}
|
||||
latest_lts
|
||||
.or(latest_any)
|
||||
.map(|(_, _, _, v)| v)
|
||||
.ok_or_else(|| "未找到满足 dsh 要求的 Node 版本".to_string())
|
||||
}
|
||||
|
||||
/// 流式下载到文件(带取消 + 进度事件,percent 0-90)。
|
||||
pub(crate) async fn download_to_file(
|
||||
&self,
|
||||
app: &AppHandle,
|
||||
url: &str,
|
||||
dest: &Path,
|
||||
label: &str,
|
||||
) -> Result<(), String> {
|
||||
let resp = self
|
||||
.http_client(1800)
|
||||
.get(url)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("请求下载失败({url}): {e}"))?;
|
||||
let status = resp.status();
|
||||
if !status.is_success() {
|
||||
return Err(format!("下载返回 HTTP {}", status.as_u16()));
|
||||
}
|
||||
let total = resp.content_length();
|
||||
let mut file = fs::File::create(dest).map_err(|e| format!("创建文件失败: {e}"))?;
|
||||
let mut stream = resp.bytes_stream();
|
||||
let mut downloaded: u64 = 0;
|
||||
let mut last_percent: u8 = 0;
|
||||
while let Some(chunk) = stream.next().await {
|
||||
if self.cancel.load(Ordering::SeqCst) {
|
||||
drop(file);
|
||||
fs::remove_file(dest).ok();
|
||||
return Err(NODE_CANCELLED.into());
|
||||
}
|
||||
let chunk = chunk.map_err(|e| format!("下载中断: {e}"))?;
|
||||
file.write_all(&chunk).map_err(|e| format!("写入文件失败: {e}"))?;
|
||||
downloaded += chunk.len() as u64;
|
||||
let percent = total
|
||||
.filter(|t| *t > 0)
|
||||
.map(|t| ((downloaded as f64 / t as f64) * 90.0) as u8)
|
||||
.unwrap_or(0)
|
||||
.min(90);
|
||||
if percent >= last_percent + 1 {
|
||||
last_percent = percent;
|
||||
self.emit_progress(
|
||||
app,
|
||||
"download",
|
||||
percent,
|
||||
downloaded,
|
||||
total,
|
||||
&format!("{label} {:.1} MB", downloaded as f64 / 1048576.0),
|
||||
);
|
||||
}
|
||||
}
|
||||
file.flush().ok();
|
||||
self.emit_progress(app, "download", 90, downloaded, total, "下载完成");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 请求取消(下载 / 安装 / 解压均轮询此标志)。
|
||||
pub(crate) fn request_cancel(&self) {
|
||||
self.cancel.store(true, Ordering::SeqCst);
|
||||
let pid = self.install_pid.load(Ordering::SeqCst);
|
||||
if pid > 0 {
|
||||
taskkill_tree(pid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 官方分发包的平台标识(Windows x64 / arm64)。
|
||||
fn platform_arch() -> &'static str {
|
||||
match std::env::consts::ARCH {
|
||||
"aarch64" => "win-arm64",
|
||||
_ => "win-x64",
|
||||
}
|
||||
}
|
||||
|
||||
/// PATH 上查找 node 可执行文件。
|
||||
fn which_node() -> Option<PathBuf> {
|
||||
let name = if cfg!(windows) { "node.exe" } else { "node" };
|
||||
let path_var = std::env::var_os("PATH")?;
|
||||
for dir in std::env::split_paths(&path_var) {
|
||||
let candidate = dir.join(name);
|
||||
if candidate.is_file() {
|
||||
return Some(candidate);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// 取 node 目录下的 npm 入口(`node_modules/npm/bin/npm-cli.js`)。
|
||||
///
|
||||
/// 直接 `node npm-cli.js` 而不是 `npm.cmd`:`.cmd` 在 Windows 上无法被
|
||||
/// CreateProcess 直接执行(需经 `cmd /C`,而 cmd 的引号规则易踩坑),
|
||||
/// 且批处理 shim 会多出一层进程影响取消时的进程树清理。
|
||||
fn npm_cli_js(node_exe: &Path) -> Option<PathBuf> {
|
||||
let dir = node_exe.parent()?;
|
||||
let candidates = [
|
||||
dir.join("node_modules").join("npm").join("bin").join("npm-cli.js"),
|
||||
dir.join("lib").join("node_modules").join("npm").join("bin").join("npm-cli.js"),
|
||||
];
|
||||
candidates.into_iter().find(|p| p.is_file())
|
||||
}
|
||||
|
||||
/// 执行 `node --version` 取版本号。
|
||||
fn node_version(node_exe: &Path) -> Option<String> {
|
||||
let mut cmd = std::process::Command::new(node_exe);
|
||||
cmd.arg("--version");
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.stdin(std::process::Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
let out = cmd.output().ok()?;
|
||||
if !out.status.success() {
|
||||
return None;
|
||||
}
|
||||
let text = String::from_utf8_lossy(&out.stdout).trim().to_string();
|
||||
(!text.is_empty()).then_some(text)
|
||||
}
|
||||
|
||||
/// 规范化版本号:补上 `v` 前缀。
|
||||
fn normalize_version(raw: &str) -> String {
|
||||
let t = raw.trim();
|
||||
if t.starts_with('v') {
|
||||
t.to_string()
|
||||
} else {
|
||||
format!("v{t}")
|
||||
}
|
||||
}
|
||||
|
||||
/// 解压 zip 并剥掉顶层目录(Node 官方分发包顶层是 `node-vX-win-x64/`)。
|
||||
pub(crate) fn extract_zip_strip_top(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 Some(name) = entry.enclosed_name() else {
|
||||
continue;
|
||||
};
|
||||
// 剥掉第一层目录;顶层目录条目本身(只有一个组件)跳过
|
||||
let mut comps = name.components();
|
||||
comps.next();
|
||||
let rel: PathBuf = comps.map(|c| c.as_os_str()).collect();
|
||||
if rel.as_os_str().is_empty() {
|
||||
continue;
|
||||
}
|
||||
let outpath = dest.join(&rel);
|
||||
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(())
|
||||
}
|
||||
|
||||
/// 强杀进程树(安装子进程取消用)。
|
||||
pub(crate) fn taskkill_tree(pid: u64) {
|
||||
let mut cmd = std::process::Command::new("taskkill");
|
||||
cmd.args(["/F", "/T", "/PID", &pid.to_string()])
|
||||
.stdout(std::process::Stdio::null())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.stdin(std::process::Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
let _ = cmd.status();
|
||||
}
|
||||
@@ -0,0 +1,316 @@
|
||||
//! dsh 服务进程生命周期:spawn(自管 stdio)→ 就绪探测 → 日志落盘 → 停止。
|
||||
//!
|
||||
//! 进程形态参照 `music/bridge.rs` 的长驻子进程:stdout/stderr 各起一个 reader 线程,
|
||||
//! 逐行写入日志环形缓冲与 `logs/web.log`;子进程加入 Job Object,应用退出时由
|
||||
//! 系统自动回收。启动命令为 `node <dsh bin 入口> web --port <端口> --no-open`:
|
||||
//! `--no-open` 让 dsh 不要自己弹出系统浏览器(由本模块的按钮决定何时打开)。
|
||||
|
||||
use std::io::{BufRead, BufReader, Read, Write};
|
||||
use std::net::{SocketAddr, TcpListener, TcpStream};
|
||||
use std::process::{Command, Stdio};
|
||||
use std::sync::atomic::Ordering;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use tauri::AppHandle;
|
||||
|
||||
use super::types::DshServerStatus;
|
||||
use super::{DshManager, ServerEntry};
|
||||
|
||||
/// 就绪探测总时长上限。
|
||||
const READY_TIMEOUT: Duration = Duration::from_secs(60);
|
||||
|
||||
impl DshManager {
|
||||
/// 进程是否存活。
|
||||
fn server_running(&self) -> bool {
|
||||
let mut guard = match self.server.lock() {
|
||||
Ok(g) => g,
|
||||
Err(_) => return false,
|
||||
};
|
||||
match guard.as_mut() {
|
||||
Some(entry) => entry
|
||||
.child
|
||||
.try_wait()
|
||||
.ok()
|
||||
.map(|w| w.is_none())
|
||||
.unwrap_or(false),
|
||||
None => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// 当前服务状态。
|
||||
pub fn server_status(&self) -> DshServerStatus {
|
||||
let running = self.server_running();
|
||||
// 运行中一律用**进程实际使用的端口**(设置可能在启动后被改过,
|
||||
// 此时 UI 展示的地址必须仍是真正监听的那个)
|
||||
let entry = self
|
||||
.server
|
||||
.lock()
|
||||
.ok()
|
||||
.and_then(|g| g.as_ref().map(|e| (e.pid, e.port, e.started_at)));
|
||||
let (pid, port, started_at) = match (running, entry) {
|
||||
(true, Some((pid, port, started_at))) => (Some(pid), port, Some(started_at)),
|
||||
_ => (None, self.load_settings().port, None),
|
||||
};
|
||||
DshServerStatus {
|
||||
running,
|
||||
ready: running && self.ready.load(Ordering::SeqCst),
|
||||
pid,
|
||||
port,
|
||||
url: format!("http://127.0.0.1:{port}"),
|
||||
launch_url: if running {
|
||||
self.launch_url.lock().ok().and_then(|g| g.clone())
|
||||
} else {
|
||||
None
|
||||
},
|
||||
started_at,
|
||||
error: self.server_error.lock().ok().and_then(|g| g.clone()),
|
||||
}
|
||||
}
|
||||
|
||||
/// 启动 dsh Web 服务(幂等:已在运行直接返回当前状态)。
|
||||
pub fn start_server(&self, app: &AppHandle) -> Result<DshServerStatus, String> {
|
||||
if self.server_running() {
|
||||
return Ok(self.server_status());
|
||||
}
|
||||
let _guard = self.start_lock.lock().map_err(|e| e.to_string())?;
|
||||
if self.server_running() {
|
||||
return Ok(self.server_status());
|
||||
}
|
||||
// 清理可能残留的旧条目
|
||||
if let Ok(mut g) = self.server.lock() {
|
||||
g.take();
|
||||
}
|
||||
self.ready.store(false, Ordering::SeqCst);
|
||||
if let Ok(mut g) = self.server_error.lock() {
|
||||
*g = None;
|
||||
}
|
||||
// 上一进程的令牌必须清掉:沿用旧令牌会让新进程的首次访问仍然 401
|
||||
if let Ok(mut g) = self.launch_url.lock() {
|
||||
*g = None;
|
||||
}
|
||||
|
||||
let settings = self.load_settings();
|
||||
let port = settings.port;
|
||||
let env = self
|
||||
.resolve_node_env()
|
||||
.ok_or_else(|| "未找到可用的 Node,请先完成环境安装".to_string())?;
|
||||
if !super::satisfies_node_requirement(&env.version) {
|
||||
return Err(format!(
|
||||
"当前 Node {} 不满足 dsh 要求({})",
|
||||
env.version,
|
||||
super::NODE_REQUIRED
|
||||
));
|
||||
}
|
||||
let entry = self
|
||||
.bin_entry()
|
||||
.ok_or_else(|| "未安装 dsh,请先完成安装".to_string())?;
|
||||
|
||||
// 端口预检:dsh 自身在端口占用时的报错不够直观,这里提前给出可读错误
|
||||
if let Err(e) = TcpListener::bind(SocketAddr::from(([127, 0, 0, 1], port))) {
|
||||
let msg = format!("端口 {port} 不可用({e}),请在配置中更换端口");
|
||||
self.set_server_error(&msg);
|
||||
return Err(msg);
|
||||
}
|
||||
|
||||
// 同步 AI 供应商配置(写 settings.yaml + 收集环境变量)
|
||||
if settings.ai_sync {
|
||||
if let Err(e) = self.ai_sync(app) {
|
||||
// 同步失败不阻塞启动,只记日志(用户可在 dsh 内手动配置)
|
||||
crate::logger::log_warn("dsh", &format!("AI 配置同步失败(继续启动): {e}"));
|
||||
}
|
||||
}
|
||||
let env_vars = self.ai_env_vars();
|
||||
|
||||
let mut cmd = Command::new(&env.node_exe);
|
||||
cmd.arg(&entry)
|
||||
.arg("web")
|
||||
.arg("--port")
|
||||
.arg(port.to_string())
|
||||
.arg("--no-open");
|
||||
cmd.current_dir(self.workspace_dir());
|
||||
cmd.env("DSH_HOME", self.home_dir());
|
||||
for (key, value) in env_vars {
|
||||
cmd.env(key, value);
|
||||
}
|
||||
cmd.stdout(Stdio::piped())
|
||||
.stderr(Stdio::piped())
|
||||
.stdin(Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
|
||||
let mut child = cmd.spawn().map_err(|e| {
|
||||
let msg = format!("启动 dsh 失败({}): {e}", env.node_exe.display());
|
||||
self.set_server_error(&msg);
|
||||
msg
|
||||
})?;
|
||||
let pid = child.id();
|
||||
crate::process_manager::assign_to_job(&child);
|
||||
|
||||
let stdout = child.stdout.take();
|
||||
let stderr = child.stderr.take();
|
||||
if let Ok(mut g) = self.server.lock() {
|
||||
*g = Some(ServerEntry {
|
||||
child,
|
||||
pid,
|
||||
port,
|
||||
started_at: chrono::Utc::now().timestamp(),
|
||||
});
|
||||
}
|
||||
|
||||
// 输出 → 日志。stdout 额外承担「抓取带令牌启动地址」的职责:
|
||||
// dsh 就绪后打印 `dsh web: http://127.0.0.1:<port>/?token=<令牌>`,
|
||||
// 浏览器鉴权靠这个地址换 cookie(我们传了 --no-open,没别人替它换)。
|
||||
let ring = self.log_ring_handle();
|
||||
let log_path = self.log_path();
|
||||
if let Some(out) = stdout {
|
||||
spawn_stdout_reader(out, ring.clone(), log_path.clone(), self.launch_url.clone(), app.clone());
|
||||
}
|
||||
if let Some(err) = stderr {
|
||||
spawn_log_reader(err, ring, log_path);
|
||||
}
|
||||
|
||||
crate::logger::log_info(
|
||||
"dsh",
|
||||
&format!("dsh 服务已启动 (pid: {pid}, 端口: {port})"),
|
||||
);
|
||||
self.emit_server_state(app);
|
||||
|
||||
// 就绪探测(后台线程,不阻塞启动返回)
|
||||
self.spawn_ready_probe(app.clone(), port);
|
||||
Ok(self.server_status())
|
||||
}
|
||||
|
||||
/// 停止 dsh 服务(kill 快速返回,wait 移到后台线程)。
|
||||
pub fn stop_server(&self, app: &AppHandle) {
|
||||
let entry = self.server.lock().ok().and_then(|mut g| g.take());
|
||||
self.ready.store(false, Ordering::SeqCst);
|
||||
if let Ok(mut g) = self.launch_url.lock() {
|
||||
*g = None;
|
||||
}
|
||||
if let Some(mut entry) = entry {
|
||||
// 先杀进程树(dsh 可能派生子进程),再关本进程句柄
|
||||
super::node::taskkill_tree(entry.pid as u64);
|
||||
let _ = entry.child.kill();
|
||||
std::thread::spawn(move || {
|
||||
let _ = entry.child.wait();
|
||||
});
|
||||
crate::logger::log_info("dsh", &format!("dsh 服务已停止 (pid: {})", entry.pid));
|
||||
}
|
||||
self.emit_server_state(app);
|
||||
}
|
||||
|
||||
fn set_server_error(&self, message: &str) {
|
||||
if let Ok(mut g) = self.server_error.lock() {
|
||||
*g = Some(message.to_string());
|
||||
}
|
||||
}
|
||||
|
||||
/// 就绪探测:轮询 HTTP,成功置 ready;进程提前退出则记录错误原因。
|
||||
fn spawn_ready_probe(&self, app: AppHandle, port: u16) {
|
||||
std::thread::spawn(move || {
|
||||
use tauri::Manager;
|
||||
let deadline = Instant::now() + READY_TIMEOUT;
|
||||
loop {
|
||||
{
|
||||
let manager = app.state::<DshManager>();
|
||||
if http_probe(port) {
|
||||
manager.ready.store(true, Ordering::SeqCst);
|
||||
manager.emit_server_state(&app);
|
||||
return;
|
||||
}
|
||||
if !manager.server_running() {
|
||||
// 进程已退出:不必等到超时
|
||||
let line = "dsh 服务进程已退出,未能就绪(详见日志)".to_string();
|
||||
manager.push_log(&line);
|
||||
manager.set_server_error(&line);
|
||||
crate::logger::log_warn("dsh", &line);
|
||||
manager.emit_server_state(&app);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if Instant::now() >= deadline {
|
||||
break;
|
||||
}
|
||||
std::thread::sleep(Duration::from_millis(500));
|
||||
}
|
||||
let manager = app.state::<DshManager>();
|
||||
manager.emit_server_state(&app);
|
||||
});
|
||||
}
|
||||
|
||||
/// 日志环形缓冲句柄(reader/探测线程持有)。
|
||||
pub(crate) fn log_ring_handle(&self) -> std::sync::Arc<std::sync::Mutex<std::collections::VecDeque<String>>> {
|
||||
self.log_ring.clone()
|
||||
}
|
||||
}
|
||||
|
||||
/// 起一个 reader 线程把子进程输出逐行写进日志(stdout 与 stderr 类型不同,故泛型化)。
|
||||
fn spawn_log_reader<R: Read + Send + 'static>(
|
||||
pipe: R,
|
||||
ring: std::sync::Arc<std::sync::Mutex<std::collections::VecDeque<String>>>,
|
||||
log_path: std::path::PathBuf,
|
||||
) {
|
||||
std::thread::spawn(move || {
|
||||
let reader = BufReader::new(pipe);
|
||||
for line in reader.lines().map_while(Result::ok) {
|
||||
super::push_log_shared(&ring, &log_path, &line);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// stdout reader:写日志之外,还从 `dsh web: ...?token=<令牌>` 行里抓取启动地址。
|
||||
///
|
||||
/// 抓到后置入 `launch_url` 并推送状态事件,前端据此启用「独立窗口 / 浏览器打开」。
|
||||
/// 注意锁的粒度:先算好是否需要通知再释放锁——`emit_server_state` 会读
|
||||
/// `launch_url`,持锁调用会自锁。
|
||||
fn spawn_stdout_reader<R: Read + Send + 'static>(
|
||||
pipe: R,
|
||||
ring: std::sync::Arc<std::sync::Mutex<std::collections::VecDeque<String>>>,
|
||||
log_path: std::path::PathBuf,
|
||||
launch_url: std::sync::Arc<std::sync::Mutex<Option<String>>>,
|
||||
app: tauri::AppHandle,
|
||||
) {
|
||||
std::thread::spawn(move || {
|
||||
let reader = BufReader::new(pipe);
|
||||
for line in reader.lines().map_while(Result::ok) {
|
||||
// 先解析原文(落日志时 token 会被掩码)
|
||||
let parsed = super::parse_launch_url(&line);
|
||||
if let Some(url) = parsed {
|
||||
let changed = match launch_url.lock() {
|
||||
Ok(mut slot) => {
|
||||
let changed = slot.as_deref() != Some(url.as_str());
|
||||
if changed {
|
||||
*slot = Some(url);
|
||||
}
|
||||
changed
|
||||
}
|
||||
Err(_) => false,
|
||||
};
|
||||
if changed {
|
||||
use tauri::Manager;
|
||||
if let Some(manager) = app.try_state::<DshManager>() {
|
||||
manager.emit_server_state(&app);
|
||||
}
|
||||
}
|
||||
}
|
||||
super::push_log_shared(&ring, &log_path, &line);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// 极简 HTTP 探测:TCP 连上并收到以 `HTTP/` 开头的响应即视为就绪。
|
||||
fn http_probe(port: u16) -> bool {
|
||||
let addr = SocketAddr::from(([127, 0, 0, 1], port));
|
||||
let Ok(mut stream) = TcpStream::connect_timeout(&addr, Duration::from_millis(500)) else {
|
||||
return false;
|
||||
};
|
||||
let _ = stream.set_read_timeout(Some(Duration::from_millis(800)));
|
||||
let req = format!("GET / HTTP/1.1\r\nHost: 127.0.0.1:{port}\r\nConnection: close\r\n\r\n");
|
||||
if stream.write_all(req.as_bytes()).is_err() {
|
||||
return false;
|
||||
}
|
||||
let mut buf = [0u8; 16];
|
||||
match stream.read(&mut buf) {
|
||||
Ok(n) if n >= 5 => &buf[..5] == b"HTTP/",
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,239 @@
|
||||
//! dsh 模块(DeepSeek Harness 外壳)的数据类型。
|
||||
//!
|
||||
//! 全部走 specta 导出到 `src/lib/bindings.ts`,字段 camelCase。
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
|
||||
/// dsh 对 Node 的版本要求(`^22.19.0 || >=24.0.0`)。
|
||||
pub const NODE_REQUIRED: &str = "^22.19.0 || >=24.0.0";
|
||||
/// dsh npm 包名。
|
||||
pub const DSH_PACKAGE: &str = "@deepseek-ai/dsh";
|
||||
/// 默认 Web UI 端口。
|
||||
pub const DEFAULT_PORT: u16 = 3080;
|
||||
/// 默认「打开独立窗口」全局快捷键(与 quickpanel/截图等同为全局快捷键,格式见
|
||||
/// `keyboard-types` 的 `Modifiers+Code`:修饰键名大小写不敏感,数字键名即 `5`)。
|
||||
pub const DEFAULT_SHORTCUT: &str = "Alt+D";
|
||||
|
||||
/// 模块设置(`{app_data}/dsh/settings.json`)。
|
||||
///
|
||||
/// 独立文件,**不写** `thing_app_settings`(appStore 的 SETTINGS_VERSION 迁移会清空用户设置)。
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||
#[serde(rename_all = "camelCase", default)]
|
||||
pub struct DshSettings {
|
||||
/// 结构版本号;变更时按版本校正字段
|
||||
pub version: u32,
|
||||
/// Node 来源偏好:auto(系统优先,缺失回落托管)| system | managed
|
||||
pub node_source: String,
|
||||
/// 指定下载的 Node 版本(空 = 自动取满足要求的最新版)
|
||||
pub managed_node_version: String,
|
||||
/// Node 分发包镜像前缀(空 = 官方 nodejs.org;国内可用 npmmirror)
|
||||
pub node_mirror: String,
|
||||
/// npm registry(空 = 官方源)
|
||||
pub npm_registry: String,
|
||||
/// 下载 Node / npm 安装是否走代理模块(mihomo mixed 端口)
|
||||
pub use_proxy: bool,
|
||||
/// Web UI 端口(dsh 的 `--port` 参数)
|
||||
pub port: u16,
|
||||
/// 应用启动时自动拉起 dsh 服务
|
||||
pub auto_start: bool,
|
||||
/// 全局快捷键:打开 dsh Web 独立窗口(空 = 未启用)
|
||||
pub shortcut: String,
|
||||
/// $DSH_HOME 模式:managed({app_data}/dsh/home)| user(~/.dsh)
|
||||
pub dsh_home_mode: String,
|
||||
/// 工作区目录(空 = {app_data}/dsh/workspace),即 dsh 进程的启动目录
|
||||
pub workspace: String,
|
||||
/// dsh 本体的安装目录(npm `--prefix` 目标,即 node_modules 所在位置)。
|
||||
/// 空 = {app_data}/dsh。
|
||||
/// 只有 dsh 本体与它的 node_modules 跟随此设置;便携 Node、$DSH_HOME、
|
||||
/// 日志与模块设置仍固定在应用数据目录,避免自定义路径失效时连配置都读不到。
|
||||
pub install_dir: String,
|
||||
/// 映射为 dsh 默认模型的 Thing AI 供应商 id
|
||||
pub provider_id: String,
|
||||
/// 启动前自动同步 settings.yaml
|
||||
pub ai_sync: bool,
|
||||
}
|
||||
|
||||
impl Default for DshSettings {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
version: 1,
|
||||
node_source: "auto".into(),
|
||||
managed_node_version: String::new(),
|
||||
node_mirror: String::new(),
|
||||
npm_registry: String::new(),
|
||||
use_proxy: true,
|
||||
port: DEFAULT_PORT,
|
||||
auto_start: false,
|
||||
shortcut: DEFAULT_SHORTCUT.into(),
|
||||
dsh_home_mode: "managed".into(),
|
||||
workspace: String::new(),
|
||||
install_dir: String::new(),
|
||||
provider_id: "deepseek".into(),
|
||||
ai_sync: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl DshSettings {
|
||||
/// 自愈:非法/越界字段夹回默认;版本推进。返回是否发生变更。
|
||||
pub fn heal(&mut self) -> bool {
|
||||
let mut changed = false;
|
||||
if !matches!(self.node_source.as_str(), "auto" | "system" | "managed") {
|
||||
self.node_source = "auto".into();
|
||||
changed = true;
|
||||
}
|
||||
if !matches!(self.dsh_home_mode.as_str(), "managed" | "user") {
|
||||
self.dsh_home_mode = "managed".into();
|
||||
changed = true;
|
||||
}
|
||||
if self.port == 0 {
|
||||
self.port = DEFAULT_PORT;
|
||||
changed = true;
|
||||
}
|
||||
if self.version < 1 {
|
||||
self.version = 1;
|
||||
changed = true;
|
||||
}
|
||||
// v1 → v2:默认「打开独立窗口」快捷键从 Ctrl+5 改为 Alt+D。
|
||||
// 仍等于旧默认值 = 用户没改过,直接迁移;改过(或清空禁用)的原样保留 ——
|
||||
// 版本号已推进,之后即使再改回旧键位也不会被改写(同 translate 的 heal 约定)。
|
||||
if self.version < 2 {
|
||||
if self.shortcut.trim().eq_ignore_ascii_case("ctrl+5") {
|
||||
self.shortcut = DEFAULT_SHORTCUT.to_string();
|
||||
}
|
||||
self.version = 2;
|
||||
changed = true;
|
||||
}
|
||||
changed
|
||||
}
|
||||
}
|
||||
|
||||
/// Node 运行环境状态。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct NodeStatus {
|
||||
/// system | managed | none
|
||||
pub source: String,
|
||||
/// node.exe 路径
|
||||
pub path: Option<String>,
|
||||
/// 版本号(如 v24.9.0)
|
||||
pub version: Option<String>,
|
||||
/// 是否满足 dsh 的版本要求
|
||||
pub satisfies: bool,
|
||||
/// 版本要求文案(供 UI 展示)
|
||||
pub required: String,
|
||||
}
|
||||
|
||||
/// dsh 本体安装状态。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshInstallStatus {
|
||||
pub installed: bool,
|
||||
pub version: Option<String>,
|
||||
/// bin 入口(dist/bin.js 绝对路径)
|
||||
pub entry: Option<String>,
|
||||
/// 安装目录
|
||||
pub dir: String,
|
||||
}
|
||||
|
||||
/// dsh 服务进程状态。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshServerStatus {
|
||||
/// 进程存活
|
||||
pub running: bool,
|
||||
/// HTTP 端口已可访问
|
||||
pub ready: bool,
|
||||
pub pid: Option<u32>,
|
||||
pub port: u16,
|
||||
/// 规范地址(不含令牌,用于界面展示)
|
||||
pub url: String,
|
||||
/// 带令牌的启动地址(**用于打开界面**)。
|
||||
///
|
||||
/// dsh web 的浏览器鉴权是「进程级随机令牌 → 首次访问换 cookie」:
|
||||
/// 直接访问 [`Self::url`] 只会拿到 401。令牌每次启动都不同,只能从
|
||||
/// dsh 的输出里抓取,因此进程刚起来时这里可能为 None(等它打印)。
|
||||
pub launch_url: Option<String>,
|
||||
/// 启动时间(unix 秒)
|
||||
pub started_at: Option<i64>,
|
||||
/// 启动失败原因(端口占用 / 进程立即退出等)
|
||||
pub error: Option<String>,
|
||||
}
|
||||
|
||||
/// 模块首屏环境总览。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshEnvStatus {
|
||||
pub node: NodeStatus,
|
||||
pub dsh: DshInstallStatus,
|
||||
pub server: DshServerStatus,
|
||||
pub settings: DshSettings,
|
||||
}
|
||||
|
||||
/// 安装/下载进度事件载荷(与 kernel/music 同构)。
|
||||
/// stage: download | extracting | installing | done | error
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshInstallProgress {
|
||||
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,
|
||||
}
|
||||
|
||||
/// dsh 版本更新信息。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshUpdateInfo {
|
||||
pub current: Option<String>,
|
||||
pub latest: String,
|
||||
pub has_update: bool,
|
||||
/// 可选版本(倒序,最多 20 个)
|
||||
pub versions: Vec<String>,
|
||||
}
|
||||
|
||||
/// npm 源信息(安装引导页展示「本次实际用哪个源」并提供快捷切换)。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshNpmRegistryInfo {
|
||||
/// 本次安装/查询实际会使用的源(已去掉末尾 `/`)
|
||||
pub effective: String,
|
||||
/// effective 的来源:setting(模块设置显式指定)| npm(npm 自身配置链)| fallback(默认官方源)
|
||||
pub source: String,
|
||||
/// npm 自身解析出的源(环境变量 > 安装目录 .npmrc > 用户 ~/.npmrc > 内置),
|
||||
/// 未检测到 Node/npm 时为 None
|
||||
pub npm_registry: Option<String>,
|
||||
/// 模块设置里显式填写的值(空 = 未指定,交给 npm 解析)
|
||||
pub setting: String,
|
||||
}
|
||||
|
||||
/// AI 供应商映射结果(预览用,不含明文密钥)。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshAiProvider {
|
||||
/// Thing 侧供应商 id
|
||||
pub id: String,
|
||||
pub name: String,
|
||||
/// 写入 settings.yaml 的 apiKeyEnv 变量名
|
||||
pub env_name: String,
|
||||
pub base_url: String,
|
||||
pub model: String,
|
||||
/// 凭据管理器中是否已配置密钥
|
||||
pub has_key: bool,
|
||||
}
|
||||
|
||||
/// settings.yaml 同步预览。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshAiPreview {
|
||||
/// 将被写入的 YAML 文本(密钥位置只有环境变量名)
|
||||
pub yaml: String,
|
||||
pub providers: Vec<DshAiProvider>,
|
||||
pub default_provider: Option<String>,
|
||||
pub default_model: Option<String>,
|
||||
pub settings_path: String,
|
||||
}
|
||||
+538
-66
@@ -1,49 +1,90 @@
|
||||
use tauri::Manager;
|
||||
|
||||
mod ai;
|
||||
mod clipboard;
|
||||
mod constants;
|
||||
mod download_engine;
|
||||
mod dsh;
|
||||
mod logger;
|
||||
mod mihomo_manager;
|
||||
mod monitor_kernel;
|
||||
pub mod music;
|
||||
mod network_monitor;
|
||||
mod osd_window;
|
||||
mod process_manager;
|
||||
mod quickpanel;
|
||||
mod screenshot;
|
||||
mod secrets;
|
||||
mod setup;
|
||||
mod shortcut;
|
||||
mod snap_fix;
|
||||
mod terminal;
|
||||
mod translate;
|
||||
mod tray_menu;
|
||||
mod updater;
|
||||
mod win32_util;
|
||||
|
||||
use ai::{
|
||||
ai_get_settings, ai_list_providers, ai_provider_delete, ai_provider_models,
|
||||
ai_provider_save, ai_provider_test, ai_save_settings, ai_secret_clear, ai_secret_set,
|
||||
};
|
||||
use download_engine::{
|
||||
DownloadEngine,
|
||||
downloader_add_task, downloader_check_url, downloader_get_extension_info, downloader_get_settings, downloader_get_tasks,
|
||||
downloader_open_dir, downloader_open_url, downloader_pause_task, downloader_remove_task,
|
||||
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_redownload, downloader_remove_task,
|
||||
downloader_resume_task, downloader_save_settings, downloader_status,
|
||||
};
|
||||
use logger::{
|
||||
log_clear, log_info_state, log_list, log_message,
|
||||
};
|
||||
use mihomo_manager::{
|
||||
proxy_activate_profile, proxy_check_kernel_update, proxy_clear_system_proxy, proxy_close_connection, 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_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop,
|
||||
proxy_test_delay, proxy_update_kernel, proxy_update_profile, proxy_version, MihomoManager,
|
||||
proxy_activate_profile, proxy_apply_kernel_update, proxy_cancel_kernel_install, proxy_check_kernel_update, proxy_clear_system_proxy,
|
||||
proxy_close_connection, proxy_confirm_install, proxy_delete_profile, proxy_get_connections, proxy_get_proxies, proxy_get_settings, proxy_get_system_proxy,
|
||||
proxy_import_profile, proxy_kernel_info, proxy_patch_configs, proxy_restart, proxy_save_settings,
|
||||
proxy_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop, proxy_traffic,
|
||||
proxy_test_delay, proxy_update_profile, proxy_version, MihomoManager,
|
||||
};
|
||||
use monitor_kernel::{
|
||||
monitor_elevate_self, monitor_get_auto_start, monitor_get_elevate_on_launch,
|
||||
monitor_get_hardware_config, monitor_get_snapshot, monitor_get_status, monitor_kernel_info,
|
||||
monitor_set_auto_start, monitor_set_elevate_on_launch, monitor_set_hardware_config,
|
||||
monitor_start, monitor_start_elevated, monitor_status, monitor_stop, MonitorKernel,
|
||||
monitor_repair_pawnio, monitor_set_auto_start, monitor_set_elevate_on_launch,
|
||||
monitor_set_hardware_config, monitor_start, monitor_start_elevated, monitor_status, monitor_stop,
|
||||
MonitorKernel,
|
||||
};
|
||||
use music::{
|
||||
feiniu_activate_connection, feiniu_cache_clear, feiniu_cache_fetch, feiniu_cache_status,
|
||||
feiniu_delete_connection, feiniu_delete_local, feiniu_fnconnect_resolve, feiniu_get_config,
|
||||
feiniu_list_connections, feiniu_list_audio_files, feiniu_list_tracks, feiniu_login,
|
||||
feiniu_logout, feiniu_lyric,
|
||||
feiniu_media_prefix, feiniu_save_connection, feiniu_scan_local, feiniu_test_connection,
|
||||
music_audio_play, music_audio_seek, music_audio_set_playing, music_audio_set_volume,
|
||||
music_audio_state, music_audio_stop,
|
||||
music_cancel_runtime_install, music_decrypt_cancel, music_decrypt_qq_status,
|
||||
music_decrypt_run, music_decrypt_scan,
|
||||
music_download, music_download_cancel, music_env_status,
|
||||
music_get_settings, music_get_sources, music_install_runtime, music_parse_playlist, music_ping,
|
||||
music_resolve, music_save_settings, music_search, music_secret_get, music_secret_set,
|
||||
music_smtc_clear, music_smtc_update_metadata, music_smtc_update_playback_state,
|
||||
music_smtc_update_position,
|
||||
music_stop_bridge, music_update_musicdl, webdav_delete, webdav_get_secret,
|
||||
webdav_save_secret, webdav_test,
|
||||
webdav_upload, remote_cancel_pairing, remote_get_config, remote_list_devices,
|
||||
remote_publish_queue, remote_revoke_device, remote_set_enabled, remote_start_pairing,
|
||||
remote_status,
|
||||
AudioEngine, MusicManager, RemoteManager, SmtcController, SmtcMetaCache,
|
||||
};
|
||||
use network_monitor::network_status;
|
||||
use dsh::{
|
||||
dsh_ai_preview, dsh_ai_sync, dsh_cancel_install, dsh_check_update, dsh_env_status,
|
||||
dsh_get_settings, dsh_install, dsh_install_log, dsh_log_clear, dsh_log_tail,
|
||||
dsh_node_detect, dsh_node_install, dsh_npm_registry_info, dsh_open_dir,
|
||||
dsh_register_shortcut, dsh_restart, dsh_save_settings, dsh_start, dsh_stop,
|
||||
dsh_uninstall, dsh_unregister_shortcut, dsh_update,
|
||||
};
|
||||
use osd_window::{
|
||||
osd_apply_overlay_style, osd_begin_drag, osd_set_click_through, osd_set_topmost,
|
||||
osd_start_drag_watch, osd_start_topmost_watch, osd_stop_watch,
|
||||
osd_apply_overlay_style, osd_begin_drag, osd_set_bounds, osd_set_click_through,
|
||||
osd_set_topmost, osd_start_drag_watch, osd_start_game_watch, osd_start_topmost_watch,
|
||||
osd_stop_watch,
|
||||
};
|
||||
use process_manager::{
|
||||
process_all_status, process_start, process_status,
|
||||
@@ -51,34 +92,98 @@ use process_manager::{
|
||||
};
|
||||
use screenshot::commands::{
|
||||
screenshot_capture_fullscreen, screenshot_capture_window, screenshot_clear_fullscreen,
|
||||
screenshot_compose_copy, screenshot_copy_image, screenshot_crop_copy_stored,
|
||||
screenshot_crop_stored, screenshot_cursor_pos, screenshot_delete_cache,
|
||||
screenshot_disable_transitions, screenshot_enum_windows, screenshot_fullscreen_png,
|
||||
screenshot_get_editor_image, screenshot_get_fullscreen_bmp, screenshot_load_cache,
|
||||
screenshot_register_pin_shortcut, screenshot_register_shortcut, screenshot_save_cache,
|
||||
screenshot_save_png, screenshot_set_editor_image, screenshot_unregister_pin_shortcut,
|
||||
screenshot_unregister_shortcut, screenshot_window_from_point,
|
||||
screenshot_compose_copy, screenshot_compose_png, screenshot_copy_image,
|
||||
screenshot_crop_copy_stored, screenshot_crop_stored, screenshot_cursor_pos,
|
||||
screenshot_delete_cache, screenshot_disable_transitions, screenshot_enum_windows,
|
||||
screenshot_fullscreen_png, screenshot_get_fullscreen_bmp, screenshot_load_cache,
|
||||
screenshot_load_cache_raw, screenshot_pick_list, screenshot_register_pin_shortcut,
|
||||
screenshot_register_shortcut,
|
||||
screenshot_save_cache, screenshot_save_png, screenshot_scroll_capture,
|
||||
screenshot_scroll_cancel, screenshot_scroll_finish, screenshot_scroll_start,
|
||||
screenshot_set_scroll_hole, screenshot_show_overlay, screenshot_take_editor_image_raw,
|
||||
screenshot_unregister_pin_shortcut, screenshot_unregister_shortcut,
|
||||
};
|
||||
use clipboard::{
|
||||
ClipboardManager,
|
||||
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_paste_to_target, clipboard_register_shortcut, clipboard_save_settings, clipboard_search,
|
||||
clipboard_set_pinned, clipboard_show_popup, clipboard_show_window, clipboard_start,
|
||||
clipboard_get_item, clipboard_get_pinned, clipboard_get_settings, clipboard_get_thumb,
|
||||
clipboard_hide_popup, clipboard_hide_preview, clipboard_paste_to_target,
|
||||
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,
|
||||
};
|
||||
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_get_special_locations, quickpanel_hide_popup, quickpanel_init_file_index,
|
||||
quickpanel_lock_screen, quickpanel_open_file, quickpanel_open_special,
|
||||
quickpanel_register_shortcut, quickpanel_reveal_in_explorer, quickpanel_run_custom_command,
|
||||
quickpanel_run_system_command, quickpanel_save_settings, quickpanel_scan_apps,
|
||||
quickpanel_search_files, quickpanel_show_popup, quickpanel_show_window,
|
||||
quickpanel_unregister_shortcut,
|
||||
quickpanel_list_archives, quickpanel_list_dir, quickpanel_lock_screen, quickpanel_open_file,
|
||||
quickpanel_open_special, quickpanel_preview_rename, quickpanel_register_shortcut,
|
||||
quickpanel_reveal_in_explorer, quickpanel_run_custom_command, quickpanel_run_system_command,
|
||||
quickpanel_save_settings, quickpanel_scan_apps, quickpanel_search_files, quickpanel_show_popup,
|
||||
quickpanel_show_window, quickpanel_unregister_shortcut, quickpanel_focus_main_window,
|
||||
};
|
||||
use tray_menu::{tray_menu_action, tray_menu_hide, tray_menu_ready};
|
||||
use updater::{app_version, update_check, update_install, update_thinghk};
|
||||
use terminal::commands::{
|
||||
terminal_attach_session, terminal_clear_known_hosts, terminal_clear_session,
|
||||
terminal_close_session, terminal_confirm_host_key, terminal_default_cwd, terminal_delete_host,
|
||||
terminal_delete_key, terminal_delete_shell, terminal_detach_session,
|
||||
terminal_export_known_hosts, terminal_forget_host, terminal_generate_key,
|
||||
terminal_get_settings, terminal_import_key, terminal_import_known_hosts,
|
||||
terminal_import_ssh_config, terminal_key_public, terminal_list_hosts,
|
||||
terminal_list_known_hosts, terminal_list_keys, terminal_list_sessions,
|
||||
terminal_list_shells, terminal_new_host_id, terminal_open_local,
|
||||
terminal_open_ssh, terminal_open_local_path, terminal_reveal_local_path,
|
||||
terminal_refresh_shells, terminal_rename_key, terminal_rename_session,
|
||||
terminal_resize, terminal_save_appearance, terminal_save_host, terminal_save_layout,
|
||||
terminal_save_security, terminal_save_selection, terminal_save_settings,
|
||||
terminal_save_shell, terminal_save_shortcuts, terminal_send_key, terminal_session_alive,
|
||||
terminal_session_cwd, terminal_session_cwd_value, terminal_set_host_password,
|
||||
terminal_set_encoding,
|
||||
terminal_set_key_passphrase,
|
||||
terminal_set_last_shell, terminal_test_shell, terminal_write,
|
||||
// SFTP 文件管理(P1)
|
||||
terminal_sftp_close, terminal_sftp_delete, terminal_sftp_download, terminal_sftp_is_open,
|
||||
terminal_sftp_list, terminal_sftp_mkdir, terminal_sftp_open, terminal_sftp_parent,
|
||||
terminal_sftp_read_link, terminal_sftp_relay, terminal_sftp_rename, terminal_sftp_upload,
|
||||
terminal_file_window_open,
|
||||
// 本地文件系统(面板本地栏)
|
||||
terminal_local_delete, terminal_local_list, terminal_local_mkdir, terminal_local_rename,
|
||||
// 命令片段(P1)
|
||||
terminal_delete_snippet, terminal_list_snippets, terminal_render_snippet,
|
||||
terminal_restore_default_snippets, terminal_run_snippet, terminal_save_snippet,
|
||||
// 命令历史(P1)
|
||||
terminal_history_clear, terminal_history_delete, terminal_history_query,
|
||||
terminal_history_run, terminal_history_sources, terminal_history_toggle_favorite,
|
||||
// 端口转发(P2)
|
||||
terminal_add_forward, terminal_list_forwards, terminal_remove_forward,
|
||||
// 会话日志(P2)
|
||||
terminal_log_path, terminal_toggle_logging,
|
||||
// 主机配置同步(P2)
|
||||
terminal_export_hosts, terminal_import_hosts,
|
||||
// 会话模板(P2)
|
||||
terminal_delete_template, terminal_save_template,
|
||||
// AI 命令助手(P2)
|
||||
terminal_ai_engines, terminal_ai_suggest,
|
||||
};
|
||||
use terminal::TerminalManager;
|
||||
use translate::{
|
||||
translate_abort, translate_ai_engine_remove, translate_ai_params_save, translate_apply_shortcuts,
|
||||
translate_copy_text, translate_engine_delete, translate_engine_models, translate_engine_save,
|
||||
translate_engine_test_config, translate_engines_list, translate_get_settings,
|
||||
translate_history_clear, translate_history_delete, translate_history_list,
|
||||
translate_history_set_favorited, translate_ocr_languages, translate_paste_back,
|
||||
translate_popup_edit_mode, translate_popup_hide, translate_popup_prefs_set,
|
||||
translate_popup_ready, translate_popup_resize, translate_popup_set_pinned,
|
||||
translate_preview_popup, translate_run, translate_save_settings, translate_screenshot_region,
|
||||
translate_secret_clear, translate_secret_set, translate_stream_start,
|
||||
};
|
||||
use updater::{
|
||||
app_version, update_check, update_install, update_thinghk_apply, update_thinghk_cancel,
|
||||
update_thinghk_confirm, ThinghkUpdateState,
|
||||
};
|
||||
|
||||
#[tauri::command]
|
||||
fn quit_app(app: tauri::AppHandle) {
|
||||
@@ -87,11 +192,16 @@ fn quit_app(app: tauri::AppHandle) {
|
||||
}
|
||||
|
||||
/// 导出 tauri-specta 生成的 TypeScript 类型与命令绑定(仅 debug 构建,开发时自动刷新)。
|
||||
/// 覆盖 proxy / quickpanel / clipboard / download_engine / screenshot 五个模块;
|
||||
/// 覆盖 proxy / quickpanel / clipboard / download_engine / screenshot / translate 等模块;
|
||||
/// 豁免清单(返回 serde_json::Value 或 tauri::ipc::Response/Request,specta 无法生成):
|
||||
/// proxy_version / proxy_get_proxies / proxy_get_connections / proxy_patch_configs、
|
||||
/// downloader_status / downloader_get_extension_info、
|
||||
/// screenshot_get_fullscreen_bmp(返回 ipc::Response)/ screenshot_compose_copy(接收 ipc::Request)。
|
||||
/// screenshot_get_fullscreen_bmp(返回 ipc::Response)/ screenshot_compose_copy(接收 ipc::Request)、
|
||||
/// music_ping / music_get_sources / music_search(返回 serde_json::Value)。
|
||||
///
|
||||
/// 注意:export 结果写入 `../src/lib/bindings.ts`,因此**新增模块的命令后需至少以 debug
|
||||
/// 构建运行一次**,前端才能用 `commands.xxx` 拿到类型。在此之前前端若需调用,
|
||||
/// 只能退回原生 `invoke`(返回类型需自行声明)。
|
||||
#[cfg(debug_assertions)]
|
||||
fn export_bindings() {
|
||||
use specta_typescript::Typescript;
|
||||
@@ -103,15 +213,16 @@ fn export_bindings() {
|
||||
// 生成命令失败时直接 throw,与原生 invoke 一致,前端无需解包 helper
|
||||
.error_handling(ErrorHandlingMode::Throw)
|
||||
.commands(collect_commands![
|
||||
// 应用更新(4)
|
||||
app_version, update_check, update_install, update_thinghk,
|
||||
// 应用更新(6)
|
||||
app_version, update_check, update_install, update_thinghk_apply,
|
||||
update_thinghk_confirm, update_thinghk_cancel,
|
||||
// proxy(20)
|
||||
proxy_activate_profile, proxy_check_kernel_update, proxy_clear_system_proxy,
|
||||
proxy_close_connection, proxy_delete_profile, proxy_get_settings,
|
||||
proxy_get_system_proxy, proxy_import_profile, proxy_install_kernel,
|
||||
proxy_kernel_info, proxy_restart, proxy_save_settings,
|
||||
proxy_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop,
|
||||
proxy_test_delay, proxy_update_kernel, proxy_update_profile,
|
||||
proxy_activate_profile, proxy_apply_kernel_update, proxy_cancel_kernel_install, proxy_check_kernel_update, proxy_clear_system_proxy,
|
||||
proxy_close_connection, proxy_confirm_install, proxy_delete_profile, proxy_get_settings,
|
||||
proxy_get_system_proxy, proxy_import_profile, proxy_kernel_info,
|
||||
proxy_restart, proxy_save_settings,
|
||||
proxy_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop, proxy_traffic,
|
||||
proxy_test_delay, proxy_update_profile,
|
||||
// quickpanel(22)
|
||||
quickpanel_get_settings, quickpanel_save_settings, quickpanel_register_shortcut,
|
||||
quickpanel_unregister_shortcut, quickpanel_show_popup, quickpanel_hide_popup,
|
||||
@@ -120,27 +231,99 @@ fn export_bindings() {
|
||||
quickpanel_scan_apps, quickpanel_get_app_icon, quickpanel_clear_app_icon_cache,
|
||||
quickpanel_reveal_in_explorer, quickpanel_open_file, quickpanel_get_special_locations,
|
||||
quickpanel_open_special, quickpanel_delete_file, quickpanel_run_custom_command,
|
||||
quickpanel_run_system_command,
|
||||
// clipboard(20)
|
||||
quickpanel_run_system_command, quickpanel_list_archives, quickpanel_list_dir,
|
||||
quickpanel_batch_extract, quickpanel_preview_rename, quickpanel_apply_rename,
|
||||
quickpanel_delete_files, quickpanel_focus_main_window,
|
||||
// clipboard(23)
|
||||
clipboard_get_history, clipboard_get_pinned, clipboard_search, clipboard_get_item,
|
||||
clipboard_set_pinned, clipboard_delete, clipboard_clear, clipboard_copy_back,
|
||||
clipboard_count, clipboard_get_settings, clipboard_save_settings, clipboard_status,
|
||||
clipboard_start, clipboard_stop, clipboard_register_shortcut,
|
||||
clipboard_get_thumb, clipboard_set_pinned, clipboard_delete, clipboard_clear,
|
||||
clipboard_copy_back, clipboard_count, clipboard_get_settings, clipboard_save_settings,
|
||||
clipboard_status, clipboard_start, clipboard_stop, clipboard_register_shortcut,
|
||||
clipboard_unregister_shortcut, clipboard_show_popup, clipboard_hide_popup,
|
||||
clipboard_show_window, clipboard_paste_to_target,
|
||||
clipboard_show_window, clipboard_paste_to_target, clipboard_show_preview,
|
||||
clipboard_hide_preview, clipboard_resize_preview, clipboard_reveal_preview,
|
||||
clipboard_preview_interacted,
|
||||
// download_engine(10,豁免 2)
|
||||
downloader_get_tasks, downloader_check_url, downloader_add_task, downloader_pause_task,
|
||||
downloader_resume_task, downloader_remove_task, downloader_get_settings,
|
||||
downloader_save_settings, downloader_open_dir, downloader_open_url,
|
||||
// screenshot(21,豁免 2:get_fullscreen_bmp 返回 ipc::Response、compose_copy 接收 ipc::Request)
|
||||
screenshot_disable_transitions, screenshot_register_shortcut,
|
||||
downloader_resume_task, downloader_cancel_task, downloader_redownload, downloader_remove_task, downloader_get_settings,
|
||||
downloader_save_settings, downloader_open_dir, downloader_open_url, downloader_focus_window, downloader_inspect, downloader_select_bt_files,
|
||||
// music(6,豁免 3:music_ping / music_get_sources / music_search 返回 serde_json::Value)
|
||||
music_env_status, music_install_runtime, music_cancel_runtime_install,
|
||||
music_stop_bridge, music_get_settings, music_save_settings,
|
||||
// music 播放引擎(Rust 侧播放,取代前端 <audio>)
|
||||
music_audio_play, music_audio_set_playing, music_audio_seek, music_audio_stop,
|
||||
music_audio_set_volume, music_audio_state,
|
||||
// music 手机互联(remote,8)
|
||||
remote_get_config, remote_set_enabled, remote_status, remote_start_pairing,
|
||||
remote_cancel_pairing, remote_list_devices, remote_revoke_device,
|
||||
remote_publish_queue,
|
||||
// music 本地解密(「解密」页签)
|
||||
music_decrypt_run, music_decrypt_cancel, music_decrypt_scan, music_decrypt_qq_status,
|
||||
// screenshot(23,豁免 3:get_fullscreen_bmp / take_editor_image_raw 返回 ipc::Response、
|
||||
// compose_copy / compose_png 接收 ipc::Request)
|
||||
screenshot_disable_transitions, screenshot_show_overlay, screenshot_register_shortcut,
|
||||
screenshot_unregister_shortcut, screenshot_register_pin_shortcut,
|
||||
screenshot_unregister_pin_shortcut, screenshot_capture_fullscreen,
|
||||
screenshot_fullscreen_png, screenshot_clear_fullscreen, screenshot_crop_stored,
|
||||
screenshot_crop_copy_stored, screenshot_window_from_point, screenshot_cursor_pos,
|
||||
screenshot_enum_windows, screenshot_capture_window, screenshot_set_editor_image,
|
||||
screenshot_get_editor_image, screenshot_copy_image, screenshot_save_png,
|
||||
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_set_scroll_hole,
|
||||
screenshot_copy_image, screenshot_save_png,
|
||||
screenshot_save_cache, screenshot_load_cache, screenshot_delete_cache,
|
||||
// ai(9)
|
||||
ai_get_settings, ai_save_settings, ai_list_providers, ai_provider_save,
|
||||
ai_provider_delete, ai_secret_set, ai_secret_clear, ai_provider_test,
|
||||
ai_provider_models,
|
||||
// translate(20)
|
||||
translate_get_settings, translate_save_settings, translate_apply_shortcuts,
|
||||
translate_engines_list, translate_engine_save, translate_engine_delete,
|
||||
translate_secret_set, translate_secret_clear, translate_engine_test_config,
|
||||
translate_engine_models, translate_run, translate_copy_text,
|
||||
translate_preview_popup, translate_popup_ready, translate_popup_hide,
|
||||
translate_popup_edit_mode, translate_popup_set_pinned, translate_popup_prefs_set,
|
||||
translate_popup_resize, translate_screenshot_region, translate_ocr_languages,
|
||||
translate_history_list, translate_history_delete, translate_history_clear,
|
||||
translate_history_set_favorited,
|
||||
translate_stream_start, translate_abort, translate_paste_back,
|
||||
translate_ai_params_save, translate_ai_engine_remove,
|
||||
// terminal(41:39 业务 + key_public / new_host_id 两个辅助)
|
||||
terminal_get_settings, terminal_save_settings, terminal_save_appearance,
|
||||
terminal_save_layout, terminal_save_selection, terminal_save_security,
|
||||
terminal_save_shortcuts,
|
||||
terminal_list_shells, terminal_refresh_shells, terminal_save_shell,
|
||||
terminal_delete_shell, terminal_set_last_shell, terminal_test_shell,
|
||||
terminal_default_cwd,
|
||||
terminal_open_local, terminal_open_ssh, terminal_list_sessions,
|
||||
terminal_close_session, terminal_write, terminal_resize, terminal_rename_session,
|
||||
terminal_detach_session, terminal_attach_session, terminal_session_cwd,
|
||||
terminal_send_key, terminal_clear_session, terminal_session_alive,
|
||||
terminal_set_encoding,
|
||||
terminal_list_hosts, terminal_save_host, terminal_delete_host,
|
||||
terminal_set_host_password, terminal_import_ssh_config,
|
||||
terminal_list_keys, terminal_generate_key, terminal_import_key,
|
||||
terminal_delete_key, terminal_rename_key, terminal_set_key_passphrase,
|
||||
terminal_key_public, terminal_new_host_id,
|
||||
terminal_list_known_hosts, terminal_forget_host, terminal_clear_known_hosts,
|
||||
terminal_export_known_hosts, terminal_import_known_hosts,
|
||||
terminal_confirm_host_key,
|
||||
// 命令历史(6 个)
|
||||
//
|
||||
// 注意:这 6 个命令**必须与 `run()` 里那份 `collect_commands!` 同时登记**。
|
||||
// 只登记其中一处不会报错:漏了这里 = 运行时能调但 `bindings.ts` 里没有类型;
|
||||
// 漏了那边 = 有类型但调用失败。两种都是「编译/启动全绿但功能静默不可用」。
|
||||
terminal_history_query, terminal_history_sources,
|
||||
terminal_history_toggle_favorite, terminal_history_delete,
|
||||
terminal_history_clear, terminal_history_run,
|
||||
// AI 命令助手(P2)——与 `run()` 里那份保持一致,否则 bindings.ts 缺类型
|
||||
terminal_ai_engines, terminal_ai_suggest,
|
||||
// dsh(22)——与 `run()` 里那份保持一致,否则 bindings.ts 缺类型
|
||||
dsh_env_status, dsh_node_detect, dsh_node_install, dsh_install, dsh_update,
|
||||
dsh_uninstall, dsh_cancel_install, dsh_check_update, dsh_npm_registry_info,
|
||||
dsh_get_settings, dsh_save_settings, dsh_register_shortcut,
|
||||
dsh_unregister_shortcut, dsh_start, dsh_stop, dsh_restart,
|
||||
dsh_ai_preview, dsh_ai_sync, dsh_log_tail, dsh_install_log, dsh_log_clear,
|
||||
dsh_open_dir,
|
||||
])
|
||||
.export(Typescript::default(), "../src/lib/bindings.ts")
|
||||
.expect("failed to export bindings");
|
||||
@@ -151,12 +334,20 @@ pub fn run() {
|
||||
#[cfg(debug_assertions)]
|
||||
export_bindings();
|
||||
|
||||
// 必须在创建任何窗口之前:让系统按 AUMID 认出本应用(系统媒体面板/任务栏据此显示
|
||||
// 应用名与图标,否则只显示「未知应用」)。取值与安装包写进开始菜单快捷方式的
|
||||
// AppUserModelID 一致,即 Tauri 的 identifier。
|
||||
// (Chromium 自带媒体会话的压制:环境变量与 additionalBrowserArgs 两条路都已实测
|
||||
// 不可用,详见 music/smtc.rs 的模块注释。)
|
||||
#[cfg(windows)]
|
||||
win32_util::set_app_user_model_id("thing.lfeng.me");
|
||||
|
||||
tauri::Builder::default()
|
||||
.plugin(tauri_plugin_autostart::Builder::new().build())
|
||||
.plugin(tauri_plugin_opener::init())
|
||||
.plugin(tauri_plugin_dialog::init())
|
||||
// 截图快捷键改由 screenshot::shortcut::register_shortcut(on_shortcut)按需注册,
|
||||
// 支持自定义;默认 Ctrl+Alt+A 由前端 store 启动时注册
|
||||
// 支持自定义;默认 F3 由前端 store 启动时注册
|
||||
.plugin(tauri_plugin_global_shortcut::Builder::new().build())
|
||||
.plugin(tauri_plugin_notification::init())
|
||||
.plugin(
|
||||
@@ -165,12 +356,22 @@ pub fn run() {
|
||||
.build()
|
||||
)
|
||||
.manage(ProcessManager::new())
|
||||
.manage(ThinghkUpdateState::new())
|
||||
.manage(SmtcController::new())
|
||||
// Rust 侧播放引擎(取代前端 <audio>,见 music/audio 模块注释)
|
||||
.manage(AudioEngine::new())
|
||||
// 手机互联:遥控状态容器(MUSIC_REMOTE_PLAN §5.1 平级 manage)+
|
||||
// SMTC 元数据兜底缓存(remote/glsmtc §5.2 聚合用)
|
||||
.manage(RemoteManager::new())
|
||||
.manage(SmtcMetaCache::default())
|
||||
.invoke_handler(tauri::generate_handler![
|
||||
quit_app,
|
||||
app_version,
|
||||
update_check,
|
||||
update_install,
|
||||
update_thinghk,
|
||||
update_thinghk_apply,
|
||||
update_thinghk_confirm,
|
||||
update_thinghk_cancel,
|
||||
process_start,
|
||||
process_stop,
|
||||
process_status,
|
||||
@@ -184,11 +385,13 @@ pub fn run() {
|
||||
proxy_save_settings,
|
||||
proxy_kernel_info,
|
||||
proxy_check_kernel_update,
|
||||
proxy_update_kernel,
|
||||
proxy_install_kernel,
|
||||
proxy_apply_kernel_update,
|
||||
proxy_cancel_kernel_install,
|
||||
proxy_confirm_install,
|
||||
proxy_status,
|
||||
proxy_start,
|
||||
proxy_stop,
|
||||
proxy_traffic,
|
||||
proxy_restart,
|
||||
proxy_version,
|
||||
proxy_get_proxies,
|
||||
@@ -211,6 +414,7 @@ pub fn run() {
|
||||
monitor_elevate_self,
|
||||
monitor_stop,
|
||||
monitor_get_status,
|
||||
monitor_repair_pawnio,
|
||||
monitor_get_snapshot,
|
||||
monitor_get_elevate_on_launch,
|
||||
monitor_set_elevate_on_launch,
|
||||
@@ -218,19 +422,85 @@ pub fn run() {
|
||||
monitor_set_auto_start,
|
||||
monitor_get_hardware_config,
|
||||
monitor_set_hardware_config,
|
||||
music_env_status,
|
||||
music_install_runtime,
|
||||
music_cancel_runtime_install,
|
||||
music_update_musicdl,
|
||||
music_ping,
|
||||
music_stop_bridge,
|
||||
music_get_sources,
|
||||
music_search,
|
||||
music_parse_playlist,
|
||||
music_resolve,
|
||||
music_get_settings,
|
||||
music_save_settings,
|
||||
music_download,
|
||||
music_download_cancel,
|
||||
feiniu_list_connections,
|
||||
feiniu_save_connection,
|
||||
feiniu_delete_connection,
|
||||
feiniu_activate_connection,
|
||||
feiniu_test_connection,
|
||||
feiniu_login,
|
||||
feiniu_logout,
|
||||
feiniu_get_config,
|
||||
feiniu_list_tracks,
|
||||
feiniu_lyric,
|
||||
feiniu_media_prefix,
|
||||
feiniu_scan_local,
|
||||
feiniu_list_audio_files,
|
||||
feiniu_cache_status,
|
||||
feiniu_cache_clear,
|
||||
feiniu_cache_fetch,
|
||||
feiniu_fnconnect_resolve,
|
||||
music_smtc_update_metadata,
|
||||
music_smtc_update_position,
|
||||
music_smtc_update_playback_state,
|
||||
music_smtc_clear,
|
||||
music_audio_play,
|
||||
music_audio_set_playing,
|
||||
music_audio_seek,
|
||||
music_audio_stop,
|
||||
music_audio_set_volume,
|
||||
music_audio_state,
|
||||
remote_get_config,
|
||||
remote_set_enabled,
|
||||
remote_status,
|
||||
remote_start_pairing,
|
||||
remote_cancel_pairing,
|
||||
remote_list_devices,
|
||||
remote_revoke_device,
|
||||
remote_publish_queue,
|
||||
webdav_test,
|
||||
webdav_upload,
|
||||
webdav_delete,
|
||||
webdav_get_secret,
|
||||
webdav_save_secret,
|
||||
music_secret_get,
|
||||
music_secret_set,
|
||||
// 音乐模块:本地解密(「解密」页签)
|
||||
music_decrypt_run,
|
||||
music_decrypt_cancel,
|
||||
music_decrypt_scan,
|
||||
music_decrypt_qq_status,
|
||||
feiniu_delete_local,
|
||||
network_status,
|
||||
osd_apply_overlay_style,
|
||||
osd_begin_drag,
|
||||
osd_set_bounds,
|
||||
osd_set_click_through,
|
||||
osd_set_topmost,
|
||||
osd_start_drag_watch,
|
||||
osd_start_topmost_watch,
|
||||
osd_start_game_watch,
|
||||
osd_stop_watch,
|
||||
downloader_get_tasks,
|
||||
downloader_add_task,
|
||||
downloader_check_url,
|
||||
downloader_pause_task,
|
||||
downloader_resume_task,
|
||||
downloader_cancel_task,
|
||||
downloader_redownload,
|
||||
downloader_remove_task,
|
||||
downloader_get_settings,
|
||||
downloader_save_settings,
|
||||
@@ -238,10 +508,14 @@ pub fn run() {
|
||||
downloader_get_extension_info,
|
||||
downloader_open_dir,
|
||||
downloader_open_url,
|
||||
downloader_focus_window,
|
||||
downloader_inspect,
|
||||
downloader_select_bt_files,
|
||||
clipboard_get_history,
|
||||
clipboard_get_pinned,
|
||||
clipboard_search,
|
||||
clipboard_get_item,
|
||||
clipboard_get_thumb,
|
||||
clipboard_set_pinned,
|
||||
clipboard_delete,
|
||||
clipboard_clear,
|
||||
@@ -258,6 +532,11 @@ pub fn run() {
|
||||
clipboard_show_window,
|
||||
clipboard_hide_popup,
|
||||
clipboard_paste_to_target,
|
||||
clipboard_show_preview,
|
||||
clipboard_hide_preview,
|
||||
clipboard_resize_preview,
|
||||
clipboard_reveal_preview,
|
||||
clipboard_preview_interacted,
|
||||
quickpanel_get_settings,
|
||||
quickpanel_save_settings,
|
||||
quickpanel_register_shortcut,
|
||||
@@ -276,10 +555,17 @@ pub fn run() {
|
||||
quickpanel_reveal_in_explorer,
|
||||
quickpanel_open_file,
|
||||
quickpanel_delete_file,
|
||||
quickpanel_delete_files,
|
||||
quickpanel_run_custom_command,
|
||||
quickpanel_run_system_command,
|
||||
quickpanel_get_special_locations,
|
||||
quickpanel_open_special,
|
||||
quickpanel_list_archives,
|
||||
quickpanel_list_dir,
|
||||
quickpanel_batch_extract,
|
||||
quickpanel_preview_rename,
|
||||
quickpanel_apply_rename,
|
||||
quickpanel_focus_main_window,
|
||||
tray_menu_action,
|
||||
tray_menu_hide,
|
||||
tray_menu_ready,
|
||||
@@ -290,29 +576,203 @@ pub fn run() {
|
||||
screenshot_clear_fullscreen,
|
||||
screenshot_crop_stored,
|
||||
screenshot_crop_copy_stored,
|
||||
screenshot_window_from_point,
|
||||
screenshot_pick_list,
|
||||
screenshot_show_overlay,
|
||||
screenshot_cursor_pos,
|
||||
screenshot_enum_windows,
|
||||
screenshot_capture_window,
|
||||
screenshot_set_editor_image,
|
||||
screenshot_get_editor_image,
|
||||
screenshot_scroll_capture,
|
||||
screenshot_scroll_cancel,
|
||||
screenshot_scroll_finish,
|
||||
screenshot_scroll_start,
|
||||
screenshot_set_scroll_hole,
|
||||
screenshot_take_editor_image_raw,
|
||||
screenshot_copy_image,
|
||||
screenshot_save_png,
|
||||
screenshot_save_cache,
|
||||
screenshot_load_cache,
|
||||
screenshot_load_cache_raw,
|
||||
screenshot_delete_cache,
|
||||
screenshot_register_shortcut,
|
||||
screenshot_unregister_shortcut,
|
||||
screenshot_register_pin_shortcut,
|
||||
screenshot_unregister_pin_shortcut,
|
||||
screenshot_disable_transitions,
|
||||
screenshot_compose_copy
|
||||
screenshot_compose_copy,
|
||||
screenshot_compose_png,
|
||||
translate_get_settings,
|
||||
translate_save_settings,
|
||||
translate_apply_shortcuts,
|
||||
translate_engines_list,
|
||||
translate_engine_save,
|
||||
translate_engine_delete,
|
||||
translate_secret_set,
|
||||
translate_secret_clear,
|
||||
translate_engine_test_config,
|
||||
translate_engine_models,
|
||||
translate_run,
|
||||
translate_copy_text,
|
||||
translate_preview_popup,
|
||||
translate_popup_ready,
|
||||
translate_popup_hide,
|
||||
translate_popup_edit_mode,
|
||||
translate_popup_set_pinned,
|
||||
translate_popup_prefs_set,
|
||||
translate_popup_resize,
|
||||
translate_screenshot_region,
|
||||
translate_ocr_languages,
|
||||
translate_history_list,
|
||||
translate_history_delete,
|
||||
translate_history_clear,
|
||||
translate_history_set_favorited,
|
||||
translate_stream_start,
|
||||
translate_abort,
|
||||
translate_paste_back,
|
||||
translate_ai_params_save,
|
||||
translate_ai_engine_remove,
|
||||
ai_get_settings,
|
||||
ai_save_settings,
|
||||
ai_list_providers,
|
||||
ai_provider_save,
|
||||
ai_provider_delete,
|
||||
ai_secret_set,
|
||||
ai_secret_clear,
|
||||
ai_provider_test,
|
||||
ai_provider_models,
|
||||
terminal_get_settings,
|
||||
terminal_save_settings,
|
||||
terminal_save_appearance,
|
||||
terminal_save_layout,
|
||||
terminal_save_selection,
|
||||
terminal_save_security,
|
||||
terminal_save_shortcuts,
|
||||
terminal_list_shells,
|
||||
terminal_refresh_shells,
|
||||
terminal_save_shell,
|
||||
terminal_delete_shell,
|
||||
terminal_set_last_shell,
|
||||
terminal_test_shell,
|
||||
terminal_default_cwd,
|
||||
terminal_open_local,
|
||||
terminal_open_ssh,
|
||||
terminal_list_sessions,
|
||||
terminal_close_session,
|
||||
terminal_write,
|
||||
terminal_resize,
|
||||
terminal_rename_session,
|
||||
terminal_detach_session,
|
||||
terminal_attach_session,
|
||||
terminal_session_cwd,
|
||||
terminal_set_encoding,
|
||||
terminal_send_key,
|
||||
terminal_clear_session,
|
||||
terminal_session_alive,
|
||||
terminal_list_hosts,
|
||||
terminal_save_host,
|
||||
terminal_delete_host,
|
||||
terminal_set_host_password,
|
||||
terminal_import_ssh_config,
|
||||
terminal_list_keys,
|
||||
terminal_generate_key,
|
||||
terminal_import_key,
|
||||
terminal_delete_key,
|
||||
terminal_rename_key,
|
||||
terminal_set_key_passphrase,
|
||||
terminal_key_public,
|
||||
terminal_new_host_id,
|
||||
terminal_list_known_hosts,
|
||||
terminal_forget_host,
|
||||
terminal_clear_known_hosts,
|
||||
terminal_export_known_hosts,
|
||||
terminal_import_known_hosts,
|
||||
terminal_confirm_host_key,
|
||||
// SFTP 文件管理(P1)
|
||||
terminal_sftp_is_open,
|
||||
terminal_sftp_open,
|
||||
terminal_sftp_close,
|
||||
terminal_sftp_list,
|
||||
terminal_sftp_parent,
|
||||
terminal_sftp_read_link,
|
||||
terminal_sftp_mkdir,
|
||||
terminal_sftp_delete,
|
||||
terminal_sftp_rename,
|
||||
terminal_sftp_upload,
|
||||
terminal_sftp_relay,
|
||||
terminal_sftp_download,
|
||||
terminal_session_cwd_value,
|
||||
// 文件窗口(单例)
|
||||
terminal_file_window_open,
|
||||
// 本地文件操作(SFTP 面板的「打开 / 在资源管理器中显示」)
|
||||
terminal_open_local_path,
|
||||
terminal_reveal_local_path,
|
||||
// 本地文件系统(面板本地栏的浏览与增删改)
|
||||
terminal_local_list,
|
||||
terminal_local_mkdir,
|
||||
terminal_local_rename,
|
||||
terminal_local_delete,
|
||||
// 命令片段(P1)
|
||||
terminal_list_snippets,
|
||||
terminal_save_snippet,
|
||||
terminal_delete_snippet,
|
||||
terminal_render_snippet,
|
||||
terminal_run_snippet,
|
||||
terminal_restore_default_snippets,
|
||||
// 命令历史(P1)
|
||||
terminal_history_query,
|
||||
terminal_history_sources,
|
||||
terminal_history_toggle_favorite,
|
||||
terminal_history_delete,
|
||||
terminal_history_clear,
|
||||
terminal_history_run,
|
||||
// 端口转发(P2)
|
||||
terminal_add_forward,
|
||||
terminal_list_forwards,
|
||||
terminal_remove_forward,
|
||||
// 会话日志(P2)
|
||||
terminal_log_path,
|
||||
terminal_toggle_logging,
|
||||
// 主机配置同步(P2)
|
||||
terminal_export_hosts,
|
||||
terminal_import_hosts,
|
||||
// 会话模板(P2)
|
||||
terminal_delete_template,
|
||||
terminal_save_template,
|
||||
// AI 命令助手(P2)
|
||||
terminal_ai_engines,
|
||||
terminal_ai_suggest,
|
||||
// dsh(22)
|
||||
dsh_env_status,
|
||||
dsh_node_detect,
|
||||
dsh_node_install,
|
||||
dsh_install,
|
||||
dsh_update,
|
||||
dsh_uninstall,
|
||||
dsh_cancel_install,
|
||||
dsh_check_update,
|
||||
dsh_npm_registry_info,
|
||||
dsh_get_settings,
|
||||
dsh_save_settings,
|
||||
dsh_register_shortcut,
|
||||
dsh_unregister_shortcut,
|
||||
dsh_start,
|
||||
dsh_stop,
|
||||
dsh_restart,
|
||||
dsh_ai_preview,
|
||||
dsh_ai_sync,
|
||||
dsh_log_tail,
|
||||
dsh_install_log,
|
||||
dsh_log_clear,
|
||||
dsh_open_dir
|
||||
])
|
||||
.setup(setup::init)
|
||||
.on_window_event(|window, event| {
|
||||
if let tauri::WindowEvent::CloseRequested { api, .. } = event {
|
||||
window.hide().ok();
|
||||
api.prevent_close();
|
||||
// 仅主窗口拦截关闭(隐藏到托盘)。其他窗口(截图编辑器/OSD 等)
|
||||
// 调用 close() 是真实销毁语义,全局拦截会导致隐藏窗口累积泄漏。
|
||||
if window.label() == constants::windows::MAIN {
|
||||
if let tauri::WindowEvent::CloseRequested { api, .. } = event {
|
||||
window.hide().ok();
|
||||
api.prevent_close();
|
||||
}
|
||||
}
|
||||
})
|
||||
.build(tauri::generate_context!())
|
||||
@@ -327,16 +787,28 @@ pub fn run() {
|
||||
}
|
||||
if let Some(monitor) = app.try_state::<MonitorKernel>() {
|
||||
// cleanup_on_exit 是 async;在事件循环回调中直接 block_on 有 panic 风险且阻塞退出,
|
||||
// 放到独立 OS 线程执行并限时等待(与托盘旧实现同模式)。
|
||||
// 放到独立 OS 线程执行并通过 channel 限时等待 3s,超时放弃等待直接退出
|
||||
// (进程终止时 OS 回收残留资源),避免清理挂起导致退出卡死。
|
||||
let app_clone = app.clone();
|
||||
let monitor_clone = monitor.inner().clone();
|
||||
let (tx, rx) = std::sync::mpsc::channel::<()>();
|
||||
std::thread::spawn(move || {
|
||||
tauri::async_runtime::block_on(async move {
|
||||
monitor_clone.cleanup_on_exit(&app_clone).await;
|
||||
});
|
||||
})
|
||||
.join()
|
||||
.ok();
|
||||
let _ = tx.send(());
|
||||
});
|
||||
let _ = rx.recv_timeout(std::time::Duration::from_secs(3));
|
||||
}
|
||||
if let Some(music) = app.try_state::<MusicManager>() {
|
||||
// 停止音乐桥接进程(kill 快速返回,wait 在后台线程完成)
|
||||
music.cleanup_on_exit();
|
||||
}
|
||||
if let Some(term) = app.try_state::<TerminalManager>() {
|
||||
// 关闭全部终端会话。**不等待**:ConPTY 的 ClosePseudoConsole 会
|
||||
// 阻塞到所有句柄关闭,退出路径上等待会卡死(会话侧已把关闭动作
|
||||
// 放进后台线程,进程终止时 OS 回收剩余资源)。
|
||||
term.cleanup_on_exit();
|
||||
}
|
||||
if let Some(clip) = app.try_state::<ClipboardManager>() {
|
||||
clip.stop();
|
||||
|
||||
@@ -2,5 +2,14 @@
|
||||
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
||||
|
||||
fn main() {
|
||||
// WebView2 的浏览器参数这里不设置。
|
||||
//
|
||||
// 为关掉 Chromium 自带媒体会话(SMTC)而注入浏览器参数的两条路都已实测不可用,
|
||||
// 详见 music/smtc.rs 的模块注释:
|
||||
// 1) `WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS` 环境变量——本应用支持永久提权,
|
||||
// 而提权进程下 WebView2 会忽略所有 WEBVIEW2_* 变量(微软文档明确说明);
|
||||
// 2) tauri.conf.json 的 `additionalBrowserArgs`——参数只加在主窗口上,与其余弹窗
|
||||
// 的参数不一致却共用同一个 EBWebView 用户数据目录,结果是托盘菜单/截图等窗口
|
||||
// 的页面永远不执行 JS,彻底唤不出。
|
||||
thing_lib::run()
|
||||
}
|
||||
@@ -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()
|
||||
}
|
||||
@@ -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::{
|
||||
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]
|
||||
#[specta::specta]
|
||||
@@ -41,25 +49,33 @@ pub async fn proxy_check_kernel_update(
|
||||
state.check_kernel_update().await
|
||||
}
|
||||
|
||||
/// 取消内核下载/安装(设置取消标志,下载循环轮询后中止)
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn proxy_update_kernel(
|
||||
state: State<'_, MihomoManager>,
|
||||
app: AppHandle,
|
||||
mirror_prefix: Option<String>,
|
||||
) -> Result<KernelInfo, String> {
|
||||
state.install_kernel(&app, mirror_prefix.unwrap_or_default()).await
|
||||
pub fn proxy_cancel_kernel_install(state: State<'_, MihomoManager>) -> Result<(), String> {
|
||||
state.cancel_kernel_install();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 首次安装内核(与 update_kernel 共用 install_kernel 实现,语义独立便于前端区分场景)
|
||||
/// 前端确认 mihomo 已停止,唤醒等待中的安装流程继续解压替换。
|
||||
/// (下载阶段允许 mihomo 运行以便走系统代理,解压替换前必须停止 mihomo,否则 exe 被占用)
|
||||
#[tauri::command]
|
||||
#[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>,
|
||||
app: AppHandle,
|
||||
mirror_prefix: Option<String>,
|
||||
zip_path: 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]
|
||||
@@ -87,12 +103,19 @@ pub fn proxy_start(
|
||||
app: AppHandle,
|
||||
) -> Result<ProcessInfo, String> {
|
||||
let params = state.prepare_for_start(&app)?;
|
||||
pm.start(params)
|
||||
let info = pm.start(params)?;
|
||||
// 手动启动也遵循「启动时自动开启系统代理」设置
|
||||
state.apply_auto_system_proxy();
|
||||
Ok(info)
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
#[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")
|
||||
}
|
||||
|
||||
@@ -110,8 +133,65 @@ pub async fn proxy_restart(
|
||||
})
|
||||
.await
|
||||
.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]
|
||||
@@ -158,6 +238,14 @@ pub async fn proxy_get_connections(
|
||||
state.get_connections().await
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn proxy_traffic(
|
||||
state: State<'_, MihomoManager>,
|
||||
) -> Result<TrafficSnapshot, String> {
|
||||
state.traffic_snapshot().await
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn proxy_close_connection(
|
||||
@@ -220,7 +308,12 @@ pub fn proxy_activate_profile(
|
||||
#[specta::specta]
|
||||
pub fn proxy_set_system_proxy(
|
||||
state: State<'_, MihomoManager>,
|
||||
pm: State<'_, ProcessManager>,
|
||||
) -> Result<(), String> {
|
||||
// 停机时禁止开启系统代理:否则系统代理指向已停止的端口,会导致所有网络请求失败
|
||||
if !mihomo_running(&pm) {
|
||||
return Err("mihomo 未运行,无法开启系统代理".into());
|
||||
}
|
||||
let settings = state.load_settings();
|
||||
let addr = format!("127.0.0.1:{}", settings.mixed_port);
|
||||
set_system_proxy_windows(&addr)?;
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
//! 内核(mihomo.exe)安装 / 更新 / 版本查询。
|
||||
//! 子模块通过 `impl super::MihomoManager` 为管理器追加方法,可访问父模块私有字段。
|
||||
|
||||
use futures_util::StreamExt;
|
||||
use std::fs;
|
||||
use std::io::{Read, Write};
|
||||
use std::path::PathBuf;
|
||||
use std::sync::atomic::Ordering;
|
||||
use tauri::{AppHandle, Emitter, Manager};
|
||||
|
||||
use crate::constants::events::KERNEL_INSTALL_PROGRESS;
|
||||
use super::{InstallProgress, KernelInfo, KernelUpdateInfo, MihomoManager};
|
||||
|
||||
/// 用户主动取消下载的标记错误信息(前端据此静默处理,不弹错误 toast)
|
||||
const KERNEL_CANCELLED: &str = "下载已取消";
|
||||
|
||||
impl MihomoManager {
|
||||
// ---------- 内核 ----------
|
||||
pub fn kernel_info(&self) -> KernelInfo {
|
||||
@@ -203,57 +206,15 @@ impl MihomoManager {
|
||||
}
|
||||
}
|
||||
|
||||
/// 下载并安装内核(首次安装与更新共用此方法)
|
||||
/// - mirror_prefix: 用户选择的镜像源前缀(空串=直连 GitHub)
|
||||
/// - 流式下载:实时推送下载进度到前端
|
||||
/// - zip crate 解压:替代 PowerShell,避免执行策略问题
|
||||
/// - 备份旧内核:替换前备份为 .bak
|
||||
/// 任何阶段失败都会 emit error 事件,避免前端进度卡在初始状态
|
||||
pub async fn install_kernel(&self, app: &AppHandle, mirror_prefix: String) -> Result<KernelInfo, String> {
|
||||
let result = self.install_kernel_inner(app, mirror_prefix).await;
|
||||
/// 应用内核更新:下载阶段已由下载模块完成,本方法仅做 need_stop → 解压 → 替换。
|
||||
/// zip_path: 下载模块下载完成的 zip 文件路径。
|
||||
/// 任何阶段失败都会 emit error 事件,避免前端进度卡住。
|
||||
pub async fn apply_kernel_update(&self, app: &AppHandle, zip_path: PathBuf) -> Result<KernelInfo, String> {
|
||||
self.kernel_cancel.store(false, Ordering::SeqCst);
|
||||
let _ = self.kernel_cancel_tx.send(false);
|
||||
let result = self.apply_kernel_inner(app, zip_path).await;
|
||||
if let Err(ref e) = result {
|
||||
let _ = app.emit(
|
||||
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);
|
||||
if e != KERNEL_CANCELLED {
|
||||
let _ = app.emit(
|
||||
KERNEL_INSTALL_PROGRESS,
|
||||
InstallProgress {
|
||||
@@ -261,11 +222,50 @@ impl MihomoManager {
|
||||
percent: 0,
|
||||
downloaded_bytes: 0,
|
||||
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 文件
|
||||
// mihomo zip 内的 exe 名字通常与 zip 同名(如 mihomo-windows-amd64-v3-v1.19.13.exe),
|
||||
// 不是固定的 mihomo.exe,所以查找唯一的 .exe 文件即可
|
||||
let new_exe = self
|
||||
.find_exe_in_dir(&extract_dir)
|
||||
.ok_or_else(|| "解压后未找到任何 .exe 文件".to_string())?;
|
||||
@@ -313,7 +311,7 @@ impl MihomoManager {
|
||||
percent: 96,
|
||||
downloaded_bytes: 0,
|
||||
total_bytes: None,
|
||||
message: "正在安装...".into(),
|
||||
message: "正在替换内核...".into(),
|
||||
},
|
||||
);
|
||||
let kernel = self.kernel_path();
|
||||
@@ -345,57 +343,6 @@ impl MihomoManager {
|
||||
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 执行策略问题)
|
||||
fn extract_zip(&self, zip_path: &PathBuf, dest: &PathBuf) -> Result<(), String> {
|
||||
let file = fs::File::open(zip_path).map_err(|e| format!("打开 zip 失败: {}", e))?;
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
//! - [`system_proxy`]:Windows 系统代理开关
|
||||
//! - [`commands`]:Tauri 命令层
|
||||
|
||||
mod autoswitch;
|
||||
mod commands;
|
||||
mod kernel;
|
||||
mod profiles;
|
||||
@@ -13,22 +14,24 @@ mod pseudo;
|
||||
mod system_proxy;
|
||||
mod types;
|
||||
|
||||
pub use autoswitch::{pick_best, start_auto_switch_loop};
|
||||
pub use pseudo::is_pseudo_node;
|
||||
pub use system_proxy::get_system_proxy_windows;
|
||||
pub use types::{InstallProgress, KernelInfo, KernelUpdateInfo, ProfileMeta, ProxySettings, ProxyStatus};
|
||||
pub use types::{InstallProgress, KernelInfo, KernelUpdateInfo, ProfileMeta, ProxySettings, ProxyStatus, TrafficSnapshot};
|
||||
pub use commands::{
|
||||
proxy_activate_profile, proxy_check_kernel_update, proxy_clear_system_proxy, proxy_close_connection,
|
||||
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_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop,
|
||||
proxy_test_delay, proxy_update_kernel, proxy_update_profile, proxy_version,
|
||||
proxy_activate_profile, proxy_apply_kernel_update, proxy_cancel_kernel_install, proxy_check_kernel_update, proxy_clear_system_proxy,
|
||||
proxy_close_connection, proxy_confirm_install, proxy_delete_profile, proxy_get_connections, proxy_get_proxies,
|
||||
proxy_get_settings, proxy_get_system_proxy, proxy_import_profile, proxy_kernel_info, proxy_traffic,
|
||||
proxy_patch_configs, proxy_restart, proxy_save_settings, proxy_select_proxy, proxy_set_system_proxy,
|
||||
proxy_start, proxy_status, proxy_stop, proxy_test_delay, proxy_update_profile, proxy_version,
|
||||
};
|
||||
|
||||
use reqwest::Client;
|
||||
use serde_yaml::Value as YamlValue;
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Mutex;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::{Duration, Instant};
|
||||
use tauri::AppHandle;
|
||||
|
||||
@@ -42,10 +45,29 @@ struct SettingsCacheEntry {
|
||||
settings: ProxySettings,
|
||||
}
|
||||
|
||||
/// 流量速率差分基线:记录上次采样的会话总量与时刻,用于计算实时速率
|
||||
struct TrafficBaseline {
|
||||
download_total: u64,
|
||||
upload_total: u64,
|
||||
at: Instant,
|
||||
}
|
||||
|
||||
pub struct MihomoManager {
|
||||
root: PathBuf,
|
||||
client: Client,
|
||||
settings_cache: Mutex<Option<SettingsCacheEntry>>,
|
||||
/// 流量速率差分基线:记录上次采样总量与时刻,由两次 /connections 总量差异计算实时速率
|
||||
traffic_baseline: Mutex<Option<TrafficBaseline>>,
|
||||
/// 内核安装/更新的取消标志(前端「停止下载」置位,下载循环轮询后中止)
|
||||
kernel_cancel: Arc<AtomicBool>,
|
||||
/// 取消唤醒通道:让停滞在流式读取(stream.next 最多等 30s)中的下载立即感知取消,
|
||||
/// 否则旧任务会残留最长 30s,期间可能与新任务并发写临时文件/互相重置取消标志
|
||||
kernel_cancel_tx: tokio::sync::watch::Sender<bool>,
|
||||
/// 下载完成后解压替换前的确认通道:mihomo 运行时下载不受影响,但解压替换前
|
||||
/// 必须等前端确认已停止 mihomo(否则 exe 文件被占用)。前端确认后通过
|
||||
/// proxy_confirm_install 命令发送信号唤醒等待。
|
||||
/// 用 std Mutex 而非 tokio Mutex:锁只短暂存取 sender,不跨 await 持有。
|
||||
install_confirm: std::sync::Mutex<Option<tokio::sync::oneshot::Sender<()>>>,
|
||||
}
|
||||
|
||||
impl MihomoManager {
|
||||
@@ -62,6 +84,24 @@ impl MihomoManager {
|
||||
.build()
|
||||
.unwrap_or_else(|_| Client::new()),
|
||||
settings_cache: Mutex::new(None),
|
||||
traffic_baseline: Mutex::new(None),
|
||||
kernel_cancel: Arc::new(AtomicBool::new(false)),
|
||||
kernel_cancel_tx: tokio::sync::watch::channel(false).0,
|
||||
install_confirm: std::sync::Mutex::new(None),
|
||||
}
|
||||
}
|
||||
|
||||
/// 请求取消内核安装/更新(由 proxy_cancel_kernel_install 命令调用)
|
||||
pub fn cancel_kernel_install(&self) {
|
||||
self.kernel_cancel.store(true, Ordering::SeqCst);
|
||||
// 唤醒停滞的流式下载循环,使其立即中止而不是等 30s 超时
|
||||
let _ = self.kernel_cancel_tx.send(true);
|
||||
}
|
||||
|
||||
/// 前端确认 mihomo 已停止,唤醒等待中的安装流程继续解压替换(由 proxy_confirm_install 命令调用)
|
||||
pub fn confirm_install(&self) {
|
||||
if let Some(tx) = self.install_confirm.lock().unwrap().take() {
|
||||
let _ = tx.send(());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -274,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 和系统代理
|
||||
pub fn auto_start_on_launch(&self, app: &AppHandle, pm: &ProcessManager) {
|
||||
let settings = self.load_settings();
|
||||
@@ -284,13 +347,9 @@ impl MihomoManager {
|
||||
Ok(params) => {
|
||||
if let Err(e) = pm.start(params) {
|
||||
crate::logger::log_error("mihomo", &format!("自动启动失败: {}", e));
|
||||
} else if settings.auto_system_proxy {
|
||||
// 启动成功后开启系统代理
|
||||
let addr = format!("127.0.0.1:{}", settings.mixed_port);
|
||||
let _ = system_proxy::set_system_proxy_windows(&addr);
|
||||
let mut s = settings;
|
||||
s.system_proxy = true;
|
||||
let _ = self.save_settings(&s);
|
||||
} else {
|
||||
// 启动成功后按「启动时自动开启系统代理」设置决定是否开启系统代理
|
||||
self.apply_auto_system_proxy();
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
@@ -408,6 +467,48 @@ impl MihomoManager {
|
||||
self.api_get("/connections").await
|
||||
}
|
||||
|
||||
/// 拉取 /connections 并计算实时流量快照。
|
||||
/// 速率由两次采样的会话总量差分得出;mihomo 重启导致总量回退时自动重置基线。
|
||||
pub async fn traffic_snapshot(&self) -> Result<TrafficSnapshot, String> {
|
||||
let conns = self.get_connections().await?;
|
||||
let upload_total = conns["uploadTotal"].as_u64().unwrap_or(0);
|
||||
let download_total = conns["downloadTotal"].as_u64().unwrap_or(0);
|
||||
let active_connections = conns["connections"].as_array().map(|a| a.len()).unwrap_or(0);
|
||||
|
||||
let (upload_speed, download_speed) = {
|
||||
let base = self.traffic_baseline.lock().unwrap();
|
||||
match base.as_ref() {
|
||||
// 正常差分:总量单调递增才计算速率
|
||||
Some(b) if upload_total >= b.upload_total && download_total >= b.download_total => {
|
||||
let dt = b.at.elapsed().as_secs_f64();
|
||||
if dt > 0.0 {
|
||||
let up = ((upload_total - b.upload_total) as f64 / dt).max(0.0) as u64;
|
||||
let down = ((download_total - b.download_total) as f64 / dt).max(0.0) as u64;
|
||||
(up, down)
|
||||
} else {
|
||||
(0, 0)
|
||||
}
|
||||
}
|
||||
// 无基线或总量回退(mihomo 重启):本帧速率为 0,下方重置基线
|
||||
_ => (0, 0),
|
||||
}
|
||||
};
|
||||
|
||||
*self.traffic_baseline.lock().unwrap() = Some(TrafficBaseline {
|
||||
download_total,
|
||||
upload_total,
|
||||
at: Instant::now(),
|
||||
});
|
||||
|
||||
Ok(TrafficSnapshot {
|
||||
download_total,
|
||||
upload_total,
|
||||
download_speed,
|
||||
upload_speed,
|
||||
active_connections,
|
||||
})
|
||||
}
|
||||
|
||||
pub async fn close_connection(&self, id: &str) -> Result<(), String> {
|
||||
self.api_request(
|
||||
reqwest::Method::DELETE,
|
||||
|
||||
@@ -124,6 +124,22 @@ pub struct ProxyStatus {
|
||||
pub restart_count: u32,
|
||||
}
|
||||
|
||||
/// 实时流量快照(由 /connections 的会话总量差分得出实时速率)
|
||||
#[derive(Serialize, Clone, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct TrafficSnapshot {
|
||||
/// 本次会话累计下载字节数
|
||||
pub download_total: u64,
|
||||
/// 本次会话累计上传字节数
|
||||
pub upload_total: u64,
|
||||
/// 实时下载速率(字节/秒)
|
||||
pub download_speed: u64,
|
||||
/// 实时上传速率(字节/秒)
|
||||
pub upload_speed: u64,
|
||||
/// 当前活跃连接数
|
||||
pub active_connections: usize,
|
||||
}
|
||||
|
||||
/// 内核安装进度事件载荷
|
||||
/// - stage: downloading | extracting | replacing | done | error
|
||||
/// - percent: 0-100(无 total_bytes 时为 0,前端按 downloadedBytes 显示)
|
||||
|
||||
@@ -228,6 +228,8 @@ pub fn check_and_relaunch_if_needed(app_data_dir: &std::path::Path) -> bool {
|
||||
pub struct KernelStatus {
|
||||
pub ready: bool,
|
||||
pub is_admin: bool,
|
||||
/// PawnIO 驱动是否已安装;旧版内核无此字段,Option 兼容
|
||||
pub pawn_io_installed: Option<bool>,
|
||||
pub uptime_ms: f64,
|
||||
pub group_count: u32,
|
||||
pub sensor_count: u32,
|
||||
@@ -370,7 +372,9 @@ impl MonitorKernel {
|
||||
self.root.join("hardware-config.json")
|
||||
}
|
||||
|
||||
/// 确保内核就位:若 cores/ 无内核或版本过期(源文件较新),从资源目录复制
|
||||
/// 确保内核就位:若 cores/ 无内核或版本过期(源文件较新),从资源目录复制。
|
||||
/// 同时把 PawnIO_setup.exe(可选资源)复制过去——内核提权启动时会静默安装它,
|
||||
/// 作为 WinRing0 被系统/杀软拦截时读取温度/频率的替代驱动。
|
||||
pub fn prepare_kernel(&self, app: &AppHandle) -> Result<MonitorKernelInfo, String> {
|
||||
let kernel = self.kernel_path();
|
||||
if let Ok(src) = app.path().resolve("binaries/ThingHK.exe", BaseDirectory::Resource) {
|
||||
@@ -385,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 {
|
||||
path: kernel.to_string_lossy().to_string(),
|
||||
exists: kernel.exists(),
|
||||
@@ -489,12 +511,20 @@ impl MonitorKernel {
|
||||
Ok(resp) if resp.status().is_success() => {
|
||||
match resp.json::<KernelStatus>().await {
|
||||
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(
|
||||
crate::constants::events::MONITOR_READY,
|
||||
serde_json::json!({
|
||||
"isAdmin": s.is_admin,
|
||||
"sensorCount": s.sensor_count,
|
||||
"providers": s.providers,
|
||||
"pawnIoInstalled": s.pawn_io_installed,
|
||||
}),
|
||||
);
|
||||
return Ok(());
|
||||
@@ -988,6 +1018,52 @@ pub async fn monitor_get_status(state: tauri::State<'_, MonitorKernel>) -> Resul
|
||||
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]
|
||||
pub async fn monitor_get_snapshot(state: tauri::State<'_, MonitorKernel>) -> Result<SensorSnapshot, String> {
|
||||
state.get_snapshot().await
|
||||
|
||||
@@ -0,0 +1,500 @@
|
||||
//! Rust 侧音频播放引擎:解码 + 输出都在后端完成,前端只发命令、读状态。
|
||||
//!
|
||||
//! # 为什么要搬到 Rust(而不是继续用前端 `<audio>`)
|
||||
//!
|
||||
//! 前端播放时,Chromium 会为播放中的媒体元素自动注册一条系统媒体会话(SMTC),
|
||||
//! 与 [`super::smtc`] 投递的原生会话并行 → Windows 媒体面板出现两条「媒体」。
|
||||
//! 能关掉它的浏览器参数(`--disable-features=MediaSessionService`)会把本应用的
|
||||
//! 其他 WebView 窗口一起弄死(见 smtc 模块注释),前端 `navigator.mediaSession`
|
||||
//! 空桩又拦不住浏览器侧的注册。**主窗口只要不再持有 `<audio>`,就没有会话可注册**,
|
||||
//! 于是不需要任何浏览器参数,其他窗口也恢复原状。
|
||||
//!
|
||||
//! # 线程模型
|
||||
//!
|
||||
//! - **调用方线程**(Tauri 命令):只做控制(play / pause / seek / stop / 音量)与状态查询,
|
||||
//! 全部是原子操作或往通道发一条消息,绝不等待。
|
||||
//! - **播放线程**(每个会话一条 std 线程):打开音源、探测格式、建输出流、解码填缓冲。
|
||||
//! `cpal::Stream` 不是 `Send`,必须由它自己创建并持有,因此它随会话生灭。
|
||||
//! - **音频回调线程**(cpal 内部):只做「出队 → 乘增益 → 转格式」,见 [`super::output`]。
|
||||
//!
|
||||
//! # 会话隔离
|
||||
//!
|
||||
//! [`Shared`] 是**每个会话一份**的:切歌时先把旧会话静音(立刻生效),再建新会话。
|
||||
//! 若共用一份共享状态,旧线程还在写、新线程已经在读,会出现「两首歌混在一起」。
|
||||
//!
|
||||
//! # 暂停/定位的实现取舍
|
||||
//!
|
||||
//! 暂停**不清空缓冲**、也不停输出流,只让回调输出静音(见 output::fill):这样恢复播放
|
||||
//! 是瞬时的,且不会因为反复启停声卡产生爆音。
|
||||
//! 定位则清空缓冲并让解码器重新定位,位置计数同步跳到目标点。
|
||||
|
||||
use std::collections::VecDeque;
|
||||
use std::sync::atomic::{AtomicBool, AtomicU16, AtomicU32, AtomicU64, Ordering};
|
||||
use std::sync::mpsc::{self, Receiver, Sender, TryRecvError};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::thread::{self, JoinHandle};
|
||||
use std::time::Duration;
|
||||
|
||||
use serde::Serialize;
|
||||
use specta::Type;
|
||||
use symphonia::core::codecs::audio::AudioDecoderOptions;
|
||||
use symphonia::core::errors::Error as SymphoniaError;
|
||||
use symphonia::core::formats::{FormatOptions, FormatReader, SeekMode, SeekTo, TrackType};
|
||||
use symphonia::core::formats::probe::Hint;
|
||||
use symphonia::core::io::MediaSourceStream;
|
||||
use symphonia::core::meta::MetadataOptions;
|
||||
use symphonia::core::units::Time;
|
||||
use tauri::{AppHandle, Emitter};
|
||||
|
||||
use super::{output, source};
|
||||
|
||||
/// 播放缓冲上限(秒)。
|
||||
///
|
||||
/// 太小:解码抖动(网络流尤其)会来不及补数据 → 断音;
|
||||
/// 太大:定位时要丢弃更多已解码数据,拖进度条的反应变慢。2 秒是这两者间的常见折中。
|
||||
const BUFFER_SECONDS: f64 = 2.0;
|
||||
|
||||
/// 栈上临时帧数组的容量上限(源声道数超过它时多出的声道被忽略)。
|
||||
const MAX_CHANNELS: usize = 8;
|
||||
|
||||
/// 单个会话的共享状态:解码线程写、音频回调读写、命令线程只读写原子量。
|
||||
pub(crate) struct Shared {
|
||||
/// 交错 f32 样本队列(生产 = 解码线程,消费 = 音频回调)
|
||||
pub buf: Mutex<VecDeque<f32>>,
|
||||
/// 已播放帧数:**播放位置以它为准**(只有音频回调会自增,定位时由解码线程重置)
|
||||
pub frames_played: AtomicU64,
|
||||
/// 源采样率(Hz)
|
||||
pub rate: AtomicU32,
|
||||
/// 源声道数
|
||||
pub src_channels: AtomicU16,
|
||||
/// 设备输出声道数([`output::build`] 写入)
|
||||
pub out_channels: AtomicU16,
|
||||
/// 是否处于播放态(false = 回调输出静音且不消费队列)
|
||||
pub playing: AtomicBool,
|
||||
pub muted: AtomicBool,
|
||||
/// 目标音量(f32 的位表示)
|
||||
pub volume: AtomicU32,
|
||||
/// 当前增益(f32 的位表示;音量斜坡用,只有回调写)
|
||||
pub gain: AtomicU32,
|
||||
/// 已到达流末尾
|
||||
pub finished: AtomicBool,
|
||||
/// 输出流报错(设备被拔/被独占/驱动异常)
|
||||
pub failed: AtomicBool,
|
||||
}
|
||||
|
||||
impl Shared {
|
||||
fn new(volume: f32, muted: bool) -> Self {
|
||||
Self {
|
||||
buf: Mutex::new(VecDeque::new()),
|
||||
frames_played: AtomicU64::new(0),
|
||||
rate: AtomicU32::new(0),
|
||||
src_channels: AtomicU16::new(0),
|
||||
out_channels: AtomicU16::new(0),
|
||||
playing: AtomicBool::new(true),
|
||||
muted: AtomicBool::new(muted),
|
||||
volume: AtomicU32::new(volume.to_bits()),
|
||||
// 起始增益等于目标音量:避免起播瞬间从 0 拉起来产生的淡入延迟
|
||||
gain: AtomicU32::new(volume.to_bits()),
|
||||
finished: AtomicBool::new(false),
|
||||
failed: AtomicBool::new(false),
|
||||
}
|
||||
}
|
||||
|
||||
fn queue_len(&self) -> usize {
|
||||
self.buf.lock().unwrap_or_else(|e| e.into_inner()).len()
|
||||
}
|
||||
}
|
||||
|
||||
/// 播放线程收到的控制消息。音量/静音/暂停走原子量,不进通道(不必串到解码线程)。
|
||||
enum Control {
|
||||
/// 定位到指定秒(精确定位由解码线程负责)
|
||||
Seek(f64),
|
||||
/// 结束会话(线程随即退出并丢弃输出流)
|
||||
Stop,
|
||||
}
|
||||
|
||||
/// 一次播放会话的句柄。
|
||||
struct Session {
|
||||
shared: Arc<Shared>,
|
||||
ctrl: Sender<Control>,
|
||||
/// 播放线程句柄:**故意不 join**(见 `stop_current` 的说明),唯一作用是与会话
|
||||
/// 同生共死 —— 会话 Arc 释放时它一起被丢弃,丢弃即 detach,线程收到 Stop 后
|
||||
/// 自行收尾并释放输出流。因为从不解绑/join,此字段除「持有」外没有任何读取。
|
||||
#[allow(dead_code)]
|
||||
handle: JoinHandle<()>,
|
||||
}
|
||||
|
||||
/// 播放状态快照(返回前端)。进度用**拉取**而不是每帧推送:
|
||||
/// 高频 emit 既费 IPC,又会在拖动进度条时和本地状态打架。
|
||||
#[derive(Serialize, Clone, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct AudioState {
|
||||
/// 是否存在有效会话(false = 已停止/无曲目)
|
||||
pub active: bool,
|
||||
pub playing: bool,
|
||||
/// 当前播放位置(秒)
|
||||
pub position_sec: f64,
|
||||
/// 已解码待播的秒数
|
||||
pub buffered_sec: f64,
|
||||
/// 源采样率(Hz),0 = 尚未探测出来
|
||||
pub sample_rate: u32,
|
||||
pub finished: bool,
|
||||
pub failed: bool,
|
||||
}
|
||||
|
||||
/// 音频引擎:持有当前会话,并保留跨曲目生效的音量/静音。
|
||||
pub struct AudioEngine {
|
||||
/// 用 Arc 装:命令线程要能拿到会话去改状态,而结束会话时要能把它整体摘掉
|
||||
session: Mutex<Option<Arc<Session>>>,
|
||||
/// 音量与静音在切歌后沿用(用户在播放器或设置里调过之后不该被重置)
|
||||
volume: AtomicU32,
|
||||
muted: AtomicBool,
|
||||
}
|
||||
|
||||
impl AudioEngine {
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
session: Mutex::new(None),
|
||||
volume: AtomicU32::new(1.0f32.to_bits()),
|
||||
muted: AtomicBool::new(false),
|
||||
}
|
||||
}
|
||||
|
||||
/// 开始播放一个音源。
|
||||
///
|
||||
/// `spec` 为本地绝对路径或流地址([`source::open`] 按 scheme 判定);
|
||||
/// `start_sec` 用于「退出时的进度」续播。旧会话会先被静音并结束。
|
||||
pub fn play(&self, app: &AppHandle, spec: String, start_sec: f64) -> Result<(), String> {
|
||||
self.stop_current();
|
||||
|
||||
let shared = Arc::new(Shared::new(
|
||||
f32::from_bits(self.volume.load(Ordering::Relaxed)),
|
||||
self.muted.load(Ordering::Relaxed),
|
||||
));
|
||||
let (ctrl_tx, ctrl_rx) = mpsc::channel();
|
||||
let thread_shared = shared.clone();
|
||||
let thread_app = app.clone();
|
||||
|
||||
let handle = thread::Builder::new()
|
||||
.name("music-audio".to_string())
|
||||
.spawn(move || {
|
||||
if let Err(e) = run_session(&thread_shared, &ctrl_rx, &thread_app, &spec, start_sec) {
|
||||
crate::logger::log_error("music-audio", &format!("播放失败({spec}): {e}"));
|
||||
let _ = thread_app.emit(crate::constants::events::MUSIC_AUDIO_ERROR, e);
|
||||
}
|
||||
})
|
||||
.map_err(|e| format!("创建播放线程失败: {e}"))?;
|
||||
|
||||
*self.session.lock().unwrap_or_else(|e| e.into_inner()) = Some(Arc::new(Session {
|
||||
shared,
|
||||
ctrl: ctrl_tx,
|
||||
handle,
|
||||
}));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 暂停/恢复。走原子量,不进通道,因此是瞬时生效的。
|
||||
pub fn set_playing(&self, playing: bool) {
|
||||
if let Some(s) = self.current() {
|
||||
s.shared.playing.store(playing, Ordering::SeqCst);
|
||||
}
|
||||
}
|
||||
|
||||
/// 定位到指定秒。
|
||||
pub fn seek(&self, sec: f64) {
|
||||
if let Some(s) = self.current() {
|
||||
let _ = s.ctrl.send(Control::Seek(sec));
|
||||
}
|
||||
}
|
||||
|
||||
/// 停止播放并释放设备。
|
||||
pub fn stop(&self) {
|
||||
self.stop_current();
|
||||
}
|
||||
|
||||
/// 设置音量与静音。目标值立即写入(回调在本块内斜坡过去,无爆音),
|
||||
/// 同时记在引擎上供下一首沿用。
|
||||
pub fn set_volume(&self, volume: f32, muted: bool) {
|
||||
let volume = volume.clamp(0.0, 1.0);
|
||||
self.volume.store(volume.to_bits(), Ordering::Relaxed);
|
||||
self.muted.store(muted, Ordering::Relaxed);
|
||||
if let Some(s) = self.current() {
|
||||
s.shared.volume.store(volume.to_bits(), Ordering::Relaxed);
|
||||
s.shared.muted.store(muted, Ordering::Relaxed);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn state(&self) -> AudioState {
|
||||
let Some(s) = self.current() else {
|
||||
return AudioState {
|
||||
active: false,
|
||||
playing: false,
|
||||
position_sec: 0.0,
|
||||
buffered_sec: 0.0,
|
||||
sample_rate: 0,
|
||||
finished: false,
|
||||
failed: false,
|
||||
};
|
||||
};
|
||||
let rate = s.shared.rate.load(Ordering::Relaxed).max(1);
|
||||
let ch = s.shared.src_channels.load(Ordering::Relaxed).max(1) as usize;
|
||||
let frames = s.shared.frames_played.load(Ordering::Relaxed);
|
||||
let queued = s.shared.queue_len();
|
||||
AudioState {
|
||||
active: true,
|
||||
playing: s.shared.playing.load(Ordering::Relaxed),
|
||||
position_sec: frames as f64 / rate as f64,
|
||||
buffered_sec: queued as f64 / (rate as f64 * ch as f64),
|
||||
sample_rate: s.shared.rate.load(Ordering::Relaxed),
|
||||
finished: s.shared.finished.load(Ordering::Relaxed),
|
||||
failed: s.shared.failed.load(Ordering::Relaxed),
|
||||
}
|
||||
}
|
||||
|
||||
fn current(&self) -> Option<Arc<Session>> {
|
||||
self.session
|
||||
.lock()
|
||||
.unwrap_or_else(|e| e.into_inner())
|
||||
.clone()
|
||||
}
|
||||
|
||||
/// 结束当前会话:**先静音**(立刻生效,避免它继续出声),再通知线程退出。
|
||||
///
|
||||
/// 只把会话从引擎里摘掉、不 join:调用方常在 Tauri 命令线程上,join 会把它卡住
|
||||
/// 最长一个缓冲周期;线程收到 Stop 后自己收尾并丢弃输出流。会话 Arc 在这里
|
||||
/// 释放后,JoinHandle 也随之丢弃,等于与线程解绑(detach),不会阻塞任何人。
|
||||
fn stop_current(&self) {
|
||||
let old = self.session.lock().unwrap_or_else(|e| e.into_inner()).take();
|
||||
if let Some(old) = old {
|
||||
old.shared.playing.store(false, Ordering::SeqCst);
|
||||
// 让「已到末尾正在等缓冲放完」的等待立即退出,否则它要睡到自然结束
|
||||
old.shared.finished.store(true, Ordering::SeqCst);
|
||||
let _ = old.ctrl.send(Control::Stop);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for AudioEngine {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
/// 播放线程主体:探测 → 建流 → 解码填缓冲,直到播完 / 被停止 / 出错。
|
||||
fn run_session(
|
||||
shared: &Arc<Shared>,
|
||||
ctrl: &Receiver<Control>,
|
||||
app: &AppHandle,
|
||||
spec: &str,
|
||||
start_sec: f64,
|
||||
) -> Result<(), String> {
|
||||
// ---------- 1) 打开音源并探测格式 ----------
|
||||
let media_source = source::open(spec)?;
|
||||
let mss = MediaSourceStream::new(media_source, Default::default());
|
||||
|
||||
// 扩展名能给探测器省不少事(本地文件尤其明显),流地址没有扩展名也无妨
|
||||
let mut hint = Hint::new();
|
||||
if let Some(ext) = extension_of(spec) {
|
||||
hint.with_extension(&ext);
|
||||
}
|
||||
|
||||
let mut format = symphonia::default::get_probe()
|
||||
.probe(
|
||||
&hint,
|
||||
mss,
|
||||
FormatOptions::default(),
|
||||
MetadataOptions::default(),
|
||||
)
|
||||
.map_err(|e| format!("不支持的音频格式: {e}"))?;
|
||||
|
||||
let track = format
|
||||
.default_track(TrackType::Audio)
|
||||
.ok_or_else(|| "音频里没有可解码的轨道".to_string())?;
|
||||
let params = track
|
||||
.codec_params
|
||||
.as_ref()
|
||||
.and_then(|p| p.audio())
|
||||
.ok_or_else(|| "音频轨道缺少编码参数".to_string())?;
|
||||
// 采样率缺失时按 44.1k 兜底:宁可位置显示略有偏差,也不能让整首播不出来
|
||||
let rate = params.sample_rate.unwrap_or(44100).max(1);
|
||||
let src_ch = params
|
||||
.channels
|
||||
.as_ref()
|
||||
.map(|c| c.count())
|
||||
.unwrap_or(2)
|
||||
.clamp(1, MAX_CHANNELS);
|
||||
let mut decoder = symphonia::default::get_codecs()
|
||||
.make_audio_decoder(params, &AudioDecoderOptions::default())
|
||||
.map_err(|e| format!("不支持的音频编码: {e}"))?;
|
||||
let track_id = track.id;
|
||||
|
||||
shared.rate.store(rate, Ordering::SeqCst);
|
||||
shared.src_channels.store(src_ch as u16, Ordering::SeqCst);
|
||||
|
||||
// ---------- 2) 处理起始定位 ----------
|
||||
let start_frames = (start_sec.max(0.0) * rate as f64).round() as u64;
|
||||
shared.frames_played.store(start_frames, Ordering::SeqCst);
|
||||
let mut produced = start_frames;
|
||||
if start_sec > 0.0 {
|
||||
seek_format(&mut *format, track_id, start_sec).map_err(|e| format!("续播定位失败: {e}"))?;
|
||||
decoder.reset();
|
||||
}
|
||||
|
||||
// ---------- 3) 建输出流 ----------
|
||||
// 必须在**本线程**创建(cpal::Stream 不是 Send),并持有到会话结束
|
||||
let _stream = output::build(shared)?;
|
||||
|
||||
// ---------- 4) 解码循环 ----------
|
||||
let cap_samples = (rate as f64 * src_ch as f64 * BUFFER_SECONDS) as usize;
|
||||
let mut samples: Vec<f32> = Vec::new();
|
||||
let mut eof = false;
|
||||
|
||||
loop {
|
||||
// 控制消息优先:停止要让线程尽快退出、定位要让缓冲尽快换内容
|
||||
match ctrl.try_recv() {
|
||||
Ok(Control::Stop) | Err(TryRecvError::Disconnected) => return Ok(()),
|
||||
Ok(Control::Seek(sec)) => {
|
||||
let target = sec.max(0.0);
|
||||
// 顺序很关键:**先清缓冲、把位置计数挪到目标,再去定位**。
|
||||
//
|
||||
// 外网连 NAS 时 `format.seek()` 要等一次网络往返(几百毫秒到数秒)。
|
||||
// 若等它返回再改状态,这段时间里旧缓冲还在出声、帧计数也还在往前走,
|
||||
// 前端拉到的仍是旧位置 —— 表现就是「拖完进度条先闪回原处,再跳到目标」。
|
||||
// 先清后定位 = 立刻静音 + 位置立刻到位,网络到了再从目标点出声。
|
||||
let prev_frames = shared.frames_played.load(Ordering::SeqCst);
|
||||
let frames = (target * rate as f64).round() as u64;
|
||||
shared.buf.lock().unwrap_or_else(|e| e.into_inner()).clear();
|
||||
shared.frames_played.store(frames, Ordering::SeqCst);
|
||||
produced = frames;
|
||||
match seek_format(&mut *format, track_id, target) {
|
||||
Ok(()) => {
|
||||
decoder.reset();
|
||||
eof = false;
|
||||
}
|
||||
Err(e) => {
|
||||
// 定位失败:位置计数必须还原,否则界面会停在一个根本没播到的地方。
|
||||
// 缓冲已被清空,解码会从原位置继续,所以还原计数是对的。
|
||||
shared.frames_played.store(prev_frames, Ordering::SeqCst);
|
||||
produced = prev_frames;
|
||||
crate::logger::log_warn(
|
||||
"music-audio",
|
||||
&format!("定位失败({target}s): {e}"),
|
||||
);
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
Err(TryRecvError::Empty) => {}
|
||||
}
|
||||
|
||||
if shared.failed.load(Ordering::Relaxed) {
|
||||
return Err("音频输出设备异常(已断开或被其他程序独占)".to_string());
|
||||
}
|
||||
|
||||
// 末尾:等缓冲真正放完再报结束,否则会把还没播完的一两秒当成播完
|
||||
if eof {
|
||||
if shared.frames_played.load(Ordering::Relaxed) >= produced {
|
||||
shared.finished.store(true, Ordering::SeqCst);
|
||||
// 播完就不该再显示「播放中」:状态查询据此立刻回到暂停态,
|
||||
// 前端在收到事件、切下一首之前不会看到一个假的播放中状态。
|
||||
shared.playing.store(false, Ordering::SeqCst);
|
||||
let _ = app.emit(crate::constants::events::MUSIC_AUDIO_ENDED, ());
|
||||
return Ok(());
|
||||
}
|
||||
thread::sleep(Duration::from_millis(20));
|
||||
continue;
|
||||
}
|
||||
|
||||
// 暂停时不继续填缓冲(否则一会就堆到上限,白占内存)
|
||||
if !shared.playing.load(Ordering::Relaxed) {
|
||||
thread::sleep(Duration::from_millis(10));
|
||||
continue;
|
||||
}
|
||||
if shared.queue_len() >= cap_samples {
|
||||
thread::sleep(Duration::from_millis(5));
|
||||
continue;
|
||||
}
|
||||
|
||||
let packet = match format.next_packet() {
|
||||
Ok(Some(p)) => p,
|
||||
// 正常读完:源读到 EOF 时读写器返回 None
|
||||
Ok(None) => {
|
||||
eof = true;
|
||||
continue;
|
||||
}
|
||||
// 轨道表变化(链式 OGG 物理流):按结束处理
|
||||
Err(SymphoniaError::ResetRequired) => {
|
||||
eof = true;
|
||||
continue;
|
||||
}
|
||||
// 文件被截断导致的提前结束:当播完处理,不弹错误
|
||||
Err(SymphoniaError::IoError(ref e))
|
||||
if e.kind() == std::io::ErrorKind::UnexpectedEof =>
|
||||
{
|
||||
eof = true;
|
||||
continue;
|
||||
}
|
||||
// 其余 IO 错误**不能**当结束:那会把「网络断了 / 读超时」伪装成
|
||||
// 「这首歌播完了」,前端随即自动切下一首,用户只会觉得莫名跳歌。
|
||||
// 正常读完走的是 Ok(None),所以这里一律按失败上报(前端会弹错误)。
|
||||
Err(e) => return Err(format!("读取音频流失败: {e}")),
|
||||
};
|
||||
if packet.track_id != track_id {
|
||||
continue;
|
||||
}
|
||||
|
||||
match decoder.decode(&packet) {
|
||||
Ok(audio) => {
|
||||
let n = audio.samples_interleaved();
|
||||
if n == 0 {
|
||||
continue;
|
||||
}
|
||||
samples.resize(n, 0.0);
|
||||
audio.copy_to_slice_interleaved(&mut samples);
|
||||
|
||||
let frames = (samples.len() / src_ch) as u64;
|
||||
shared
|
||||
.buf
|
||||
.lock()
|
||||
.unwrap_or_else(|e| e.into_inner())
|
||||
.extend(samples.iter().copied());
|
||||
produced = produced.saturating_add(frames);
|
||||
}
|
||||
// 坏包跳过:单包解不出来不该让整首断掉
|
||||
Err(SymphoniaError::DecodeError(_)) | Err(SymphoniaError::IoError(_)) => {}
|
||||
Err(e) => return Err(format!("解码失败: {e}")),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 让容器定位到指定秒(精确模式:容器会把定位点之后、目标之前的帧解出来丢弃)。
|
||||
///
|
||||
/// `Time` 的字段是私有的,只能走 `try_new(秒, 纳秒)`;把亚秒部分用纳秒传进去,
|
||||
/// 拖进度条才能落到毫秒级而不是整秒。
|
||||
fn seek_format(format: &mut dyn FormatReader, track_id: u32, sec: f64) -> Result<(), String> {
|
||||
let sec = sec.max(0.0);
|
||||
let whole = sec.floor();
|
||||
let nanos = (((sec - whole) * 1e9).round() as i64).clamp(0, 999_999_999) as u32;
|
||||
let time = Time::try_new(whole as i64, nanos).ok_or_else(|| "定位时间非法".to_string())?;
|
||||
format
|
||||
.seek(
|
||||
SeekMode::Accurate,
|
||||
SeekTo::Time {
|
||||
time,
|
||||
track_id: Some(track_id),
|
||||
},
|
||||
)
|
||||
.map(|_| ())
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
/// 从路径/URL 里取扩展名(用于探测提示)。带 query 的流地址要先把 query 去掉。
|
||||
fn extension_of(spec: &str) -> Option<String> {
|
||||
let path = spec.split(['?', '#']).next().unwrap_or(spec);
|
||||
let name = path.rsplit(['/', '\\']).next().unwrap_or(path);
|
||||
let ext = name.rsplit_once('.')?.1;
|
||||
if ext.is_empty() || ext.len() > 5 || !ext.chars().all(|c| c.is_ascii_alphanumeric()) {
|
||||
return None;
|
||||
}
|
||||
Some(ext.to_ascii_lowercase())
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
//! Rust 侧音乐播放:解码与输出全在后端,前端只发命令、读状态。
|
||||
//!
|
||||
//! 模块分工:
|
||||
//! - [`engine`]:会话生命周期、线程模型、播放/暂停/定位/音量的对外接口与状态快照
|
||||
//! - [`source`]:音源字节流(本地文件 / 飞牛流代理,支持 Range 定位)
|
||||
//! - [`output`]:cpal 输出流与音频回调(含声道映射、音量斜坡)
|
||||
//!
|
||||
//! 命令层只做参数转发,不含业务逻辑;状态查询走**拉取**而非高频事件推送。
|
||||
|
||||
mod engine;
|
||||
mod output;
|
||||
mod source;
|
||||
|
||||
pub use engine::{AudioEngine, AudioState};
|
||||
|
||||
use tauri::{AppHandle, State};
|
||||
|
||||
/// 开始播放一个音源。
|
||||
///
|
||||
/// `source`:本地绝对路径,或飞牛流地址(形如
|
||||
/// `http://127.0.0.1:<port>/feiniu/stream?guid=...`,由前端按当前连接拼好 ——
|
||||
/// 鉴权留在原有代理里,引擎不重复实现)。
|
||||
/// `startSec`:起播位置,用于「恢复上次退出时的进度」。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_audio_play(
|
||||
app: AppHandle,
|
||||
engine: State<'_, AudioEngine>,
|
||||
source: String,
|
||||
start_sec: f64,
|
||||
) -> Result<(), String> {
|
||||
engine.play(&app, source, start_sec)
|
||||
}
|
||||
|
||||
/// 暂停 / 恢复。瞬时生效(只改一个原子标志)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_audio_set_playing(engine: State<'_, AudioEngine>, playing: bool) {
|
||||
engine.set_playing(playing);
|
||||
}
|
||||
|
||||
/// 定位到指定秒。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_audio_seek(engine: State<'_, AudioEngine>, sec: f64) {
|
||||
engine.seek(sec);
|
||||
}
|
||||
|
||||
/// 停止播放并释放音频设备。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_audio_stop(engine: State<'_, AudioEngine>) {
|
||||
engine.stop();
|
||||
}
|
||||
|
||||
/// 设置音量与静音(跨曲目沿用)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_audio_set_volume(engine: State<'_, AudioEngine>, volume: f32, muted: bool) {
|
||||
engine.set_volume(volume, muted);
|
||||
}
|
||||
|
||||
/// 读取播放状态快照(位置/缓冲/采样率/是否失败)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_audio_state(engine: State<'_, AudioEngine>) -> AudioState {
|
||||
engine.state()
|
||||
}
|
||||
@@ -0,0 +1,175 @@
|
||||
//! cpal 输出流:把缓冲里的交错 f32 样本按设备格式喂给声卡。
|
||||
//!
|
||||
//! # 采样率策略(关系到音质)
|
||||
//!
|
||||
//! cpal 的 WASAPI **共享模式**输出带 `AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM |
|
||||
//! AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY`,因此**可以用源采样率直接建流**,
|
||||
//! 由 Windows 自己转换到设备混音格式。这样做的两个好处:
|
||||
//!
|
||||
//! 1. 不必自己引入重采样器,也就不会临时用一版质量不明的 SRC 把音质拉低;
|
||||
//! 2. 与现状(WebView2 内部同样把音频交给共享模式输出)**同级**,不构成退步。
|
||||
//!
|
||||
//! 后续要做 bit-perfect(独占模式)时,只需把这里换成独占模式的 `IAudioClient`
|
||||
//! 初始化:源采样率直出、绕过 Windows 混音器,届时**必须**要求源采样率与设备一致,
|
||||
//! 否则要自己做高质量重采样。
|
||||
//!
|
||||
//! # 线程归属
|
||||
//!
|
||||
//! `cpal::Stream` 在 Windows 上不是 `Send`,**必须**在创建它的线程上持有与丢弃。
|
||||
//! 因此本模块只提供 [`build`],由播放线程调用并把返回的流保存在自己内部。
|
||||
|
||||
use std::sync::atomic::Ordering;
|
||||
use std::sync::Arc;
|
||||
|
||||
use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
|
||||
|
||||
use super::engine::Shared;
|
||||
|
||||
/// 建立输出流并立即启动。**必须在播放线程上调用**(见模块注释的线程归属说明)。
|
||||
pub fn build(shared: &Arc<Shared>) -> Result<cpal::Stream, String> {
|
||||
let host = cpal::default_host();
|
||||
let device = host
|
||||
.default_output_device()
|
||||
.ok_or_else(|| "没有可用的默认音频输出设备".to_string())?;
|
||||
let supported = device
|
||||
.default_output_config()
|
||||
.map_err(|e| format!("读取默认输出配置失败: {e}"))?;
|
||||
|
||||
let sample_format = supported.sample_format();
|
||||
let out_channels = supported.channels();
|
||||
let rate = shared.rate.load(Ordering::Relaxed);
|
||||
|
||||
shared.out_channels.store(out_channels, Ordering::Relaxed);
|
||||
|
||||
// 声道数用**设备**的(AUTOCONVERTPCM 只保证采样率可任意,声道布局仍按设备来),
|
||||
// 采样率用**源**的。解码出来的样本在 fill() 里做声道映射。
|
||||
let config = cpal::StreamConfig {
|
||||
channels: out_channels,
|
||||
sample_rate: rate.into(),
|
||||
buffer_size: cpal::BufferSize::Default,
|
||||
};
|
||||
|
||||
let stream = match sample_format {
|
||||
cpal::SampleFormat::F32 => build_typed::<f32>(&device, config, shared.clone()),
|
||||
cpal::SampleFormat::I16 => build_typed::<i16>(&device, config, shared.clone()),
|
||||
cpal::SampleFormat::I32 => build_typed::<i32>(&device, config, shared.clone()),
|
||||
cpal::SampleFormat::U16 => build_typed::<u16>(&device, config, shared.clone()),
|
||||
other => Err(format!("不支持的输出采样格式: {other:?}")),
|
||||
}?;
|
||||
|
||||
stream
|
||||
.play()
|
||||
.map_err(|e| format!("启动音频输出失败: {e}"))?;
|
||||
Ok(stream)
|
||||
}
|
||||
|
||||
/// 按设备默认采样格式建流,回调里统一用 f32 计算、再转成设备格式输出。
|
||||
fn build_typed<T>(
|
||||
device: &cpal::Device,
|
||||
config: cpal::StreamConfig,
|
||||
shared: Arc<Shared>,
|
||||
) -> Result<cpal::Stream, String>
|
||||
where
|
||||
T: cpal::SizedSample + cpal::FromSample<f32>,
|
||||
{
|
||||
let err_shared = shared.clone();
|
||||
device
|
||||
.build_output_stream(
|
||||
config,
|
||||
move |data: &mut [T], _| fill(data, &shared),
|
||||
move |e| {
|
||||
// 设备被拔掉 / 被独占 / 驱动异常:只记日志并把会话标记为失败,
|
||||
// 由引擎把错误转成前端提示。这里**不能** panic —— 它在音频线程上。
|
||||
crate::logger::log_error("music-audio", &format!("音频输出流错误: {e}"));
|
||||
err_shared.failed.store(true, Ordering::Relaxed);
|
||||
},
|
||||
None,
|
||||
)
|
||||
.map_err(|e| format!("创建音频输出流失败: {e}"))
|
||||
}
|
||||
|
||||
/// 音频回调:把队列里的交错样本搬进设备缓冲。
|
||||
///
|
||||
/// 全程只做「出队 + 乘增益 + 转格式」,不加锁以外的任何分配/系统调用,
|
||||
/// 以免在实时线程上引入不可控的延迟(会直接表现为爆音)。
|
||||
fn fill<T>(data: &mut [T], shared: &Shared)
|
||||
where
|
||||
T: cpal::SizedSample + cpal::FromSample<f32>,
|
||||
{
|
||||
let out_ch = shared.out_channels.load(Ordering::Relaxed) as usize;
|
||||
let src_ch = shared.src_channels.load(Ordering::Relaxed) as usize;
|
||||
|
||||
// 尚未确定声道数(刚起会话)或异常值:先输出静音,不能除零
|
||||
if out_ch == 0 || src_ch == 0 {
|
||||
for s in data.iter_mut() {
|
||||
*s = T::from_sample(0.0);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// 暂停:输出静音但**不消费队列**,恢复播放时数据不丢
|
||||
if !shared.playing.load(Ordering::Relaxed) {
|
||||
for s in data.iter_mut() {
|
||||
*s = T::from_sample(0.0);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
let target = if shared.muted.load(Ordering::Relaxed) {
|
||||
0.0
|
||||
} else {
|
||||
f32::from_bits(shared.volume.load(Ordering::Relaxed))
|
||||
};
|
||||
let mut gain = f32::from_bits(shared.gain.load(Ordering::Relaxed));
|
||||
|
||||
let frames = data.len() / out_ch;
|
||||
// 音量在本块内线性走到目标值:拖动音量滑块/切静音时不会有台阶式的爆音。
|
||||
let step = if frames > 0 {
|
||||
(target - gain) / frames as f32
|
||||
} else {
|
||||
0.0
|
||||
};
|
||||
|
||||
let mut consumed: u64 = 0;
|
||||
{
|
||||
let mut queue = shared.buf.lock().unwrap_or_else(|e| e.into_inner());
|
||||
for f in 0..frames {
|
||||
gain += step;
|
||||
let base = f * out_ch;
|
||||
|
||||
// 一帧源数据 = src_ch 个样本;不足一帧(解码没跟上)就整帧输出静音
|
||||
let mut src = [0f32; 8];
|
||||
let has_frame = queue.len() >= src_ch;
|
||||
if has_frame {
|
||||
for slot in src.iter_mut().take(src_ch.min(8)) {
|
||||
*slot = queue.pop_front().unwrap_or(0.0);
|
||||
}
|
||||
consumed += 1;
|
||||
}
|
||||
|
||||
for c in 0..out_ch {
|
||||
let v = if !has_frame {
|
||||
0.0
|
||||
} else if out_ch == 1 && src_ch > 1 {
|
||||
// 多声道 → 单声道:取平均,避免只留左声道
|
||||
let n = src_ch.min(8);
|
||||
src[..n].iter().sum::<f32>() / n as f32
|
||||
} else if src_ch == 1 {
|
||||
// 单声道 → 任意声道数:复制
|
||||
src[0]
|
||||
} else if c < src_ch.min(8) {
|
||||
src[c]
|
||||
} else {
|
||||
// 源声道数少于设备声道数:多出来的声道填静音
|
||||
0.0
|
||||
};
|
||||
data[base + c] = T::from_sample(v * gain);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if consumed > 0 {
|
||||
shared.frames_played.fetch_add(consumed, Ordering::Relaxed);
|
||||
}
|
||||
shared.gain.store(gain.to_bits(), Ordering::Relaxed);
|
||||
}
|
||||
@@ -0,0 +1,179 @@
|
||||
//! 音频字节源:给 symphonia 提供同步的 [`MediaSource`](`Read` + `Seek`)。
|
||||
//!
|
||||
//! 两类来源:
|
||||
//! - **本地文件**:直接交给 `std::fs::File`(symphonia 已为它实现 `MediaSource`)。
|
||||
//! - **飞牛流**:复用**现有的本地流代理** `http://127.0.0.1:<port>/feiniu/stream?guid=...`。
|
||||
//! 代理已经处理好登录态 / Cookie / 安全码 / Range 透传,这里只按 Range 拉取即可。
|
||||
//!
|
||||
//! 为什么走本地代理而不让引擎直连 NAS:鉴权(连接选择、token、安全码)全在代理里,
|
||||
//! 复制一份到引擎会立刻产生两套会漂移的逻辑;代理就在 localhost,额外一跳代价可忽略。
|
||||
//!
|
||||
//! # 为什么是同步 I/O
|
||||
//!
|
||||
//! `MediaSource` 要求 `Read + Seek`,即同步接口。整个播放线程是**独立的 std 线程**
|
||||
//! (不是 tokio 运行时线程),因此这里用 `reqwest::blocking` 是安全的;若在 tokio
|
||||
//! 运行时线程上调用会 panic,这一点在改动线程归属时必须留意。
|
||||
|
||||
use std::io::{self, Read, Seek, SeekFrom};
|
||||
use std::time::Duration;
|
||||
|
||||
use symphonia::core::io::MediaSource;
|
||||
|
||||
/// NAS 流的超时策略:只在**连接**阶段设超时。
|
||||
///
|
||||
/// 音频是长时间连续读,一旦给整请求设 timeout,会在播到中途时被掐断(表现为
|
||||
/// 「播一半突然断流」);而不设连接超时又会在服务器无响应时永久挂住播放线程。
|
||||
///
|
||||
/// # 已知限制:读阶段的卡死不设上限
|
||||
///
|
||||
/// 想给「连接建立后数据不再来」也加个上限,但 reqwest 的 `read_timeout` 只在**异步**
|
||||
/// builder 上(blocking 侧没有),而总 timeout 又会掐断长音频。因此链路彻底卡死时
|
||||
/// 解码线程会停在那次读上(界面表现为一直加载),要等 TCP 自身超时才会报错。
|
||||
/// 真要兜住它,得在会话上加一个「位置长时间不前进」的看门狗,或让 HttpSource 自己能
|
||||
/// 被从外部关闭 —— 目前没做。
|
||||
const CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
|
||||
|
||||
/// 按规格打开字节源:`http(s)://` 走网络协议,其余一律按本地文件路径处理。
|
||||
pub fn open(spec: &str) -> Result<Box<dyn MediaSource>, String> {
|
||||
if spec.starts_with("http://") || spec.starts_with("https://") {
|
||||
Ok(Box::new(HttpSource::new(spec)?))
|
||||
} else {
|
||||
let file = std::fs::File::open(spec).map_err(|e| format!("打开本地音频失败({spec}): {e}"))?;
|
||||
Ok(Box::new(file))
|
||||
}
|
||||
}
|
||||
|
||||
/// 走 HTTP 的流式音源,支持按 `Range` 定位。
|
||||
pub struct HttpSource {
|
||||
url: String,
|
||||
client: reqwest::blocking::Client,
|
||||
/// 已建立的响应体。定位后置空,下次读取时按新位置重新发 Range 请求。
|
||||
body: Option<reqwest::blocking::Response>,
|
||||
/// 当前读取位置(字节)
|
||||
pos: u64,
|
||||
/// 总字节数(服务端给出 Content-Range / Content-Length 时才有)
|
||||
len: Option<u64>,
|
||||
/// 服务端是否支持 Range。不支持时无法定位,引擎会退化为「只能从头顺序播」。
|
||||
range_ok: bool,
|
||||
}
|
||||
|
||||
impl HttpSource {
|
||||
fn new(url: &str) -> Result<Self, String> {
|
||||
let client = reqwest::blocking::Client::builder()
|
||||
.connect_timeout(CONNECT_TIMEOUT)
|
||||
.timeout(None)
|
||||
.build()
|
||||
.map_err(|e| format!("创建音频 HTTP 客户端失败: {e}"))?;
|
||||
|
||||
// 探测总长度与 Range 支持:只取 0-0 一个字节。
|
||||
// 支持 Range 时服务端回 `206 Partial Content` + `Content-Range: bytes 0-0/<total>`;
|
||||
// 不支持则回 `200` + `Content-Length`。两种情况都能拿到总长度。
|
||||
let probe = client
|
||||
.get(url)
|
||||
.header(reqwest::header::RANGE, "bytes=0-0")
|
||||
.send()
|
||||
.map_err(|e| format!("音频源探测失败: {e}"))?;
|
||||
|
||||
let status = probe.status();
|
||||
if !status.is_success() {
|
||||
return Err(format!("音频源探测失败: HTTP {status}"));
|
||||
}
|
||||
let range_ok = status == reqwest::StatusCode::PARTIAL_CONTENT
|
||||
|| probe
|
||||
.headers()
|
||||
.get(reqwest::header::ACCEPT_RANGES)
|
||||
.is_some();
|
||||
let len = parse_content_range_total(&probe)
|
||||
.or_else(|| probe.content_length().map(|n| n.max(1)));
|
||||
|
||||
Ok(Self {
|
||||
url: url.to_string(),
|
||||
client,
|
||||
body: None,
|
||||
pos: 0,
|
||||
len,
|
||||
range_ok,
|
||||
})
|
||||
}
|
||||
|
||||
/// 打开(或按当前 `pos` 重开)响应体。
|
||||
fn ensure_body(&mut self) -> io::Result<()> {
|
||||
if self.body.is_some() {
|
||||
return Ok(());
|
||||
}
|
||||
let mut req = self.client.get(&self.url);
|
||||
if self.pos > 0 {
|
||||
if !self.range_ok {
|
||||
return Err(io::Error::new(
|
||||
io::ErrorKind::Unsupported,
|
||||
"音频源不支持 Range,无法定位",
|
||||
));
|
||||
}
|
||||
req = req.header(reqwest::header::RANGE, format!("bytes={}-", self.pos));
|
||||
}
|
||||
let resp = req.send().map_err(to_io_err)?;
|
||||
if !resp.status().is_success() {
|
||||
return Err(io::Error::new(
|
||||
io::ErrorKind::Other,
|
||||
format!("音频流请求失败: HTTP {}", resp.status()),
|
||||
));
|
||||
}
|
||||
self.body = Some(resp);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl Read for HttpSource {
|
||||
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
|
||||
self.ensure_body()?;
|
||||
let body = self.body.as_mut().expect("ensure_body 已建立响应体");
|
||||
let n = body.read(buf)?;
|
||||
self.pos += n as u64;
|
||||
Ok(n)
|
||||
}
|
||||
}
|
||||
|
||||
impl Seek for HttpSource {
|
||||
fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
|
||||
let target = match pos {
|
||||
SeekFrom::Start(p) => p,
|
||||
SeekFrom::End(off) => {
|
||||
let len = self.len.ok_or_else(|| {
|
||||
io::Error::new(io::ErrorKind::Unsupported, "总长度未知,无法从末尾定位")
|
||||
})?;
|
||||
(len as i64 + off).max(0) as u64
|
||||
}
|
||||
SeekFrom::Current(off) => (self.pos as i64 + off).max(0) as u64,
|
||||
};
|
||||
// 丢弃当前响应体,下次读取按新位置重发 Range —— 这样定位既不需要缓存整段音频,
|
||||
// 也不会把已读过的字节再拉一遍。
|
||||
self.body = None;
|
||||
self.pos = target;
|
||||
Ok(target)
|
||||
}
|
||||
}
|
||||
|
||||
impl MediaSource for HttpSource {
|
||||
fn is_seekable(&self) -> bool {
|
||||
self.range_ok
|
||||
}
|
||||
|
||||
fn byte_len(&self) -> Option<u64> {
|
||||
self.len
|
||||
}
|
||||
}
|
||||
|
||||
/// 解析 `Content-Range: bytes 0-0/12345` 里的总长度。
|
||||
fn parse_content_range_total(resp: &reqwest::blocking::Response) -> Option<u64> {
|
||||
let raw = resp.headers().get(reqwest::header::CONTENT_RANGE)?.to_str().ok()?;
|
||||
let total = raw.rsplit('/').next()?.trim();
|
||||
if total == "*" {
|
||||
return None;
|
||||
}
|
||||
total.parse::<u64>().ok()
|
||||
}
|
||||
|
||||
/// reqwest 的 `Error` → `io::Error`(symphonia 只认 io 错误)。
|
||||
fn to_io_err(e: reqwest::Error) -> io::Error {
|
||||
io::Error::new(io::ErrorKind::Other, e.to_string())
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,262 @@
|
||||
//! 桥接进程生命周期:spawn(stdio JSON-Lines 协议)→ 请求分发 → 事件转发 → 停止。
|
||||
//! 子模块通过 `impl super::MusicManager` 追加方法。
|
||||
//!
|
||||
//! 协议(与 bridge.py 对应):
|
||||
//! 请求 `{"id":1,"method":"ping","params":{}}`
|
||||
//! 响应 `{"id":1,"ok":true,"result":{...}}` 或 `{"id":1,"ok":false,"error":"..."}`
|
||||
//! 无 id 的事件行 `{"event":"download","type":"progress",...}` 由 reader 线程
|
||||
//! 原样转发为 Tauri 事件 `music-download-event`(见 constants::events)。
|
||||
|
||||
use std::io::{BufRead, BufReader, Write};
|
||||
use std::process::{Command, Stdio};
|
||||
use tauri::Emitter;
|
||||
|
||||
use super::{BridgeEntry, MusicManager, PythonEnv};
|
||||
|
||||
/// 桥接脚本源码(内置,运行时写出到 {root}/bridge.py,避免资源目录配置)
|
||||
const BRIDGE_SCRIPT: &str = include_str!("bridge.py");
|
||||
|
||||
/// 桥接请求错误分类:决定是否允许重启桥接进程重试。
|
||||
/// 应用层错误与超时绝不能触发重启——重启会杀掉正在进行的下载任务。
|
||||
pub(crate) enum BridgeError {
|
||||
/// 传输层错误(进程退出/管道损坏/写入失败/通道关闭)→ 可重启重试
|
||||
Transport(String),
|
||||
/// 应用层错误(桥接正常响应 ok:false)→ 不重启
|
||||
App(String),
|
||||
/// 响应超时 → 不重启(进程可能只是忙,如正在执行长耗时搜索)
|
||||
Timeout(String),
|
||||
}
|
||||
|
||||
impl BridgeError {
|
||||
fn into_message(self) -> String {
|
||||
match self {
|
||||
BridgeError::Transport(m) | BridgeError::App(m) | BridgeError::Timeout(m) => m,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl MusicManager {
|
||||
/// 桥接进程是否在运行(存在且未退出)
|
||||
pub fn bridge_running(&self) -> bool {
|
||||
let mut guard = match self.bridge.lock() {
|
||||
Ok(g) => g,
|
||||
Err(_) => return false,
|
||||
};
|
||||
match guard.as_mut() {
|
||||
Some(entry) => entry.child.try_wait().ok().map(|w| w.is_none()).unwrap_or(false),
|
||||
None => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// 确保桥接进程已启动(已启动则直接返回;并发调用由 start_lock 串行化)
|
||||
pub fn ensure_bridge(&self) -> Result<(), String> {
|
||||
if self.bridge_running() {
|
||||
return Ok(());
|
||||
}
|
||||
let _guard = self.start_lock().lock().map_err(|e| e.to_string())?;
|
||||
// 二次检查(等待锁期间可能已被其他调用方启动)
|
||||
if self.bridge_running() {
|
||||
return Ok(());
|
||||
}
|
||||
// 清理可能残留的旧条目
|
||||
self.bridge.lock().map_err(|e| e.to_string())?.take();
|
||||
let python = self.resolve_python()?;
|
||||
self.spawn_bridge(&python)
|
||||
}
|
||||
|
||||
/// 启动桥接进程:stdin/stdout 管道直连,stderr 写入 runtime/bridge_stderr.log
|
||||
fn spawn_bridge(&self, python: &PythonEnv) -> Result<(), String> {
|
||||
let script = self.bridge_script_path();
|
||||
// 每次启动前重写脚本,保证与当前版本一致(内容固定,成本极低)
|
||||
std::fs::write(&script, BRIDGE_SCRIPT).map_err(|e| format!("写出桥接脚本失败: {}", e))?;
|
||||
|
||||
let stderr_log = self.runtime_dir().join("bridge_stderr.log");
|
||||
let stderr_file = std::fs::File::create(&stderr_log).map_err(|e| e.to_string())?;
|
||||
|
||||
let mut cmd = Command::new(&python.exe);
|
||||
cmd.arg(&script);
|
||||
cmd.stdin(Stdio::piped())
|
||||
.stdout(Stdio::piped())
|
||||
.stderr(Stdio::from(stderr_file));
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
// cwd 统一设为模块根目录:musicdl 会在 cwd 落 search_results.pkl 等缓存文件,
|
||||
// 不设置时(系统 Python)会污染应用工作目录(开发期为仓库根目录)
|
||||
if let Some(parent) = script.parent() {
|
||||
cmd.current_dir(parent);
|
||||
}
|
||||
|
||||
let mut child = cmd
|
||||
.spawn()
|
||||
.map_err(|e| format!("启动桥接进程失败 (python: {}): {}", python.exe.display(), e))?;
|
||||
crate::process_manager::assign_to_job(&child);
|
||||
|
||||
let stdin = child.stdin.take().ok_or_else(|| "无法获取桥接 stdin".to_string())?;
|
||||
let stdout = child.stdout.take().ok_or_else(|| "无法获取桥接 stdout".to_string())?;
|
||||
|
||||
*self.bridge.lock().map_err(|e| e.to_string())? = Some(BridgeEntry { child, stdin });
|
||||
|
||||
// 启动 stdout reader 线程:按行读取,按 id 分发到 pending;无 id 的事件行转发到前端
|
||||
let pending = self.pending.clone();
|
||||
let app = self.app_handle();
|
||||
std::thread::spawn(move || {
|
||||
let reader = BufReader::new(stdout);
|
||||
for line in reader.lines() {
|
||||
let Ok(line) = line else { break };
|
||||
let Ok(v) = serde_json::from_str::<serde_json::Value>(&line) else {
|
||||
crate::logger::log_warn("music-bridge", &format!("无法解析 stdout: {}", line));
|
||||
continue;
|
||||
};
|
||||
if let Some(id) = v.get("id").and_then(|i| i.as_u64()) {
|
||||
if let Some(tx) = pending.lock().ok().and_then(|mut m| m.remove(&id)) {
|
||||
let _ = tx.send(v);
|
||||
}
|
||||
} else if v.get("event").is_some() {
|
||||
// 事件行(下载进度等):原样转发给前端
|
||||
if let Some(app) = app.as_ref() {
|
||||
let _ = app.emit(crate::constants::events::MUSIC_DOWNLOAD_EVENT, &v);
|
||||
}
|
||||
} else {
|
||||
// 其他无 id 行仅记日志
|
||||
crate::logger::log_info("music-bridge", &line);
|
||||
}
|
||||
}
|
||||
crate::logger::log_info("music-bridge", "stdout 已关闭,reader 线程退出");
|
||||
});
|
||||
|
||||
crate::logger::log_info(
|
||||
"music-bridge",
|
||||
&format!("桥接进程已启动 (python: {})", python.exe.display()),
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 停止桥接进程:kill 快速返回,wait 移到后台线程;所有 pending 请求置为失败
|
||||
pub fn stop_bridge(&self) {
|
||||
let entry = self.bridge.lock().ok().and_then(|mut b| b.take());
|
||||
if let Some(mut entry) = entry {
|
||||
let _ = entry.child.kill();
|
||||
// drop stdin/stdout 关闭管道端,reader 线程读到 EOF 退出
|
||||
drop(entry.stdin);
|
||||
std::thread::spawn(move || {
|
||||
let _ = entry.child.wait();
|
||||
});
|
||||
crate::logger::log_info("music-bridge", "桥接进程已停止");
|
||||
}
|
||||
// 通知前端:活动中的下载任务应标记为中断
|
||||
if let Some(app) = self.app_handle() {
|
||||
let _ = app.emit(
|
||||
crate::constants::events::MUSIC_DOWNLOAD_EVENT,
|
||||
serde_json::json!({ "event": "download", "type": "bridge-stopped" }),
|
||||
);
|
||||
}
|
||||
// 唤醒所有等待中的请求(以 Null 表示已中止)
|
||||
if let Ok(mut map) = self.pending.lock() {
|
||||
for (_, tx) in map.drain() {
|
||||
let _ = tx.send(serde_json::Value::Null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 发送一条请求并等待响应(默认 5s 超时)。传输层错误时自动重启重试一次。
|
||||
pub async fn request(
|
||||
&self,
|
||||
method: &str,
|
||||
params: serde_json::Value,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
self.request_with_timeout(method, params, std::time::Duration::from_secs(5))
|
||||
.await
|
||||
}
|
||||
|
||||
/// 发送一条请求并等待响应(自定义超时,供 search 等长耗时操作使用)。
|
||||
/// 仅传输层错误(进程退出/管道损坏)会重启桥接并重试一次;
|
||||
/// 应用层错误(桥接返回 ok:false)与超时不重启——重启会误杀正在下载的任务。
|
||||
pub async fn request_with_timeout(
|
||||
&self,
|
||||
method: &str,
|
||||
params: serde_json::Value,
|
||||
timeout: std::time::Duration,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
self.ensure_bridge()?;
|
||||
match self.request_inner(method, params.clone(), timeout).await {
|
||||
Ok(v) => Ok(v),
|
||||
Err(BridgeError::Transport(_)) => {
|
||||
// 一次重启机会(进程可能已退出/管道损坏)
|
||||
self.stop_bridge();
|
||||
self.ensure_bridge()?;
|
||||
self.request_inner(method, params, timeout)
|
||||
.await
|
||||
.map_err(BridgeError::into_message)
|
||||
}
|
||||
Err(e) => Err(e.into_message()),
|
||||
}
|
||||
}
|
||||
|
||||
async fn request_inner(
|
||||
&self,
|
||||
method: &str,
|
||||
params: serde_json::Value,
|
||||
timeout: std::time::Duration,
|
||||
) -> Result<serde_json::Value, BridgeError> {
|
||||
let id = self.next_id.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
|
||||
let (tx, rx) = tokio::sync::oneshot::channel::<serde_json::Value>();
|
||||
self.pending
|
||||
.lock()
|
||||
.map_err(|e| BridgeError::Transport(e.to_string()))?
|
||||
.insert(id, tx);
|
||||
|
||||
// 写入 stdin(同步函数,MutexGuard 在返回时释放,避免跨 await 持有非 Send 值)
|
||||
self.write_request(id, method, ¶ms)
|
||||
.map_err(BridgeError::Transport)?;
|
||||
|
||||
let v = tokio::time::timeout(timeout, rx)
|
||||
.await
|
||||
.map_err(|_| BridgeError::Timeout("桥接响应超时".to_string()))?
|
||||
.map_err(|_| BridgeError::Transport("桥接响应通道已关闭".to_string()))?;
|
||||
|
||||
// 停止桥接时发送 Null 表示中止
|
||||
if v.is_null() {
|
||||
return Err(BridgeError::Transport("桥接进程已停止".into()));
|
||||
}
|
||||
if v.get("ok").and_then(|o| o.as_bool()).unwrap_or(false) {
|
||||
Ok(v.get("result").cloned().unwrap_or(serde_json::Value::Null))
|
||||
} else {
|
||||
Err(BridgeError::App(
|
||||
v.get("error")
|
||||
.and_then(|e| e.as_str())
|
||||
.unwrap_or("桥接返回未知错误")
|
||||
.to_string(),
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
/// 写入一条请求到桥接 stdin(同步;进程已退出 / 管道损坏时返回错误)
|
||||
fn write_request(&self, id: u64, method: &str, params: &serde_json::Value) -> Result<(), String> {
|
||||
let line = format!(
|
||||
"{{\"id\":{},\"method\":{},\"params\":{}}}\n",
|
||||
id,
|
||||
serde_json::to_string(method).map_err(|e| e.to_string())?,
|
||||
params
|
||||
);
|
||||
let mut guard = self.bridge.lock().map_err(|e| e.to_string())?;
|
||||
let Some(entry) = guard.as_mut() else {
|
||||
return Err("桥接进程未启动".into());
|
||||
};
|
||||
// 进程已退出 → 立即失败,交给外层重启
|
||||
if entry.child.try_wait().map_err(|e| e.to_string())?.is_some() {
|
||||
return Err("桥接进程已退出".into());
|
||||
}
|
||||
entry
|
||||
.stdin
|
||||
.write_all(line.as_bytes())
|
||||
.map_err(|e| format!("写入桥接 stdin 失败: {}", e))?;
|
||||
entry.stdin.flush().map_err(|e| format!("刷新桥接 stdin 失败: {}", e))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// ping 桥接进程(P0 环境层连通性验证)
|
||||
pub async fn ping(&self) -> Result<serde_json::Value, String> {
|
||||
let v = self.request("ping", serde_json::Value::Null).await?;
|
||||
crate::logger::log_info("music-bridge", &format!("ping 成功: {}", v));
|
||||
Ok(v)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,730 @@
|
||||
//! 音乐模块 Tauri 命令层。
|
||||
|
||||
use serde_json::json;
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
use tauri::{AppHandle, State};
|
||||
|
||||
use super::{
|
||||
normalize_base_url, resolve_base_url, extract_fn_id, FeiniuConnection, MusicEnvStatus,
|
||||
MusicManager, MusicSettings,
|
||||
};
|
||||
|
||||
/// 查询环境状态(Python / musicdl / FFmpeg / 桥接进程),设置页「环境检查」面板调用。
|
||||
/// 异步命令:子进程探测在阻塞线程池执行,避免冻结主线程/UI。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn music_env_status(state: State<'_, MusicManager>) -> Result<MusicEnvStatus, String> {
|
||||
state.env_status().await
|
||||
}
|
||||
|
||||
/// 安装便携 Python + musicdl(幂等),全程推送 music-runtime-install-progress 事件
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn music_install_runtime(
|
||||
state: State<'_, MusicManager>,
|
||||
app: AppHandle,
|
||||
) -> Result<MusicEnvStatus, String> {
|
||||
state.install_runtime(&app).await?;
|
||||
Ok(state.env_status().await?)
|
||||
}
|
||||
|
||||
/// 取消便携运行时安装/下载
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_cancel_runtime_install(state: State<'_, MusicManager>) -> Result<(), String> {
|
||||
state.cancel();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 把 musicdl 对齐到本应用锁定的版本(`force = true` 表示强制重装)。
|
||||
///
|
||||
/// 与「安装便携版」的区别:安装的闸门是「能否 import」,所以版本不一致时它什么都不做;
|
||||
/// 更新则是显式对齐到 `MUSICDL_VERSION`。**只升到锁定版本,不升 PyPI 最新版**
|
||||
/// (bridge.py 的 monkey patch 与 musicdl 版本强耦合,见 `update_musicdl` 的说明)。
|
||||
///
|
||||
/// 成功后顺手停掉桥接进程:它可能已经 import 了旧版 musicdl 并缓存了 MusicClient,
|
||||
/// 不重启就会继续用旧代码跑。下一次搜索/下载会自动拉起新进程。
|
||||
///
|
||||
/// 返回更新后的环境状态,前端一次往返即可刷新面板。
|
||||
#[tauri::command]
|
||||
pub async fn music_update_musicdl(
|
||||
state: State<'_, MusicManager>,
|
||||
app: AppHandle,
|
||||
force: Option<bool>,
|
||||
) -> Result<MusicEnvStatus, String> {
|
||||
state.update_musicdl(&app, force.unwrap_or(false)).await?;
|
||||
state.stop_bridge();
|
||||
state.env_status().await
|
||||
}
|
||||
|
||||
/// ping 桥接进程(未启动则自动拉起),返回 {"version","python"};
|
||||
/// 返回 Value 且未标注 specta:前端直接按 JSON 使用
|
||||
#[tauri::command]
|
||||
pub async fn music_ping(state: State<'_, MusicManager>) -> Result<serde_json::Value, String> {
|
||||
state.ping().await
|
||||
}
|
||||
|
||||
/// 停止桥接进程
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_stop_bridge(state: State<'_, MusicManager>) -> Result<(), String> {
|
||||
state.stop_bridge();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 列出 musicdl 已注册的全部搜索源(客户端名);返回 Value,未标注 specta
|
||||
#[tauri::command]
|
||||
pub async fn music_get_sources(state: State<'_, MusicManager>) -> Result<serde_json::Value, String> {
|
||||
state.request("get_sources", serde_json::Value::Null).await
|
||||
}
|
||||
|
||||
/// 多源搜索(最长 90s)。sources 为空时桥接使用默认 3 个大陆源;返回 Value,未标注 specta
|
||||
#[tauri::command]
|
||||
pub async fn music_search(
|
||||
state: State<'_, MusicManager>,
|
||||
keyword: String,
|
||||
sources: Option<Vec<String>>,
|
||||
proxy_url: Option<String>,
|
||||
qq_cookie: Option<String>,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
// proxy_url 为空串表示「明确不走代理」(桥接侧会强制直连、屏蔽系统代理);
|
||||
// qq_cookie 为空表示游客身份(桥接侧不注入 Cookie)
|
||||
let params = serde_json::json!({
|
||||
"keyword": keyword,
|
||||
"sources": sources.unwrap_or_default(),
|
||||
"proxy": proxy_url.unwrap_or_default(),
|
||||
"cookies": qq_cookie.unwrap_or_default(),
|
||||
});
|
||||
state
|
||||
.request_with_timeout("search", params, std::time::Duration::from_secs(90))
|
||||
.await
|
||||
}
|
||||
|
||||
/// 解析歌单链接(网易云/QQ 等),返回歌曲列表;返回 Value,未标注 specta
|
||||
#[tauri::command]
|
||||
pub async fn music_parse_playlist(
|
||||
state: State<'_, MusicManager>,
|
||||
url: String,
|
||||
sources: Option<Vec<String>>,
|
||||
proxy_url: Option<String>,
|
||||
qq_cookie: Option<String>,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let params = serde_json::json!({
|
||||
"url": url,
|
||||
"sources": sources.unwrap_or_default(),
|
||||
"proxy": proxy_url.unwrap_or_default(),
|
||||
"cookies": qq_cookie.unwrap_or_default(),
|
||||
});
|
||||
state
|
||||
.request_with_timeout("parse_playlist", params, std::time::Duration::from_secs(90))
|
||||
.await
|
||||
}
|
||||
|
||||
/// 读取音乐模块设置
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_get_settings(state: State<'_, MusicManager>) -> MusicSettings {
|
||||
state.load_settings()
|
||||
}
|
||||
|
||||
/// 保存音乐模块设置(立即生效)
|
||||
///
|
||||
/// 飞牛音乐**连接相关字段一律以磁盘为准**,不接受前端传值:
|
||||
/// 连接列表 / 激活连接 / 旧版单连接字段只由 `feiniu_save_connection`、
|
||||
/// `feiniu_activate_connection`、`feiniu_delete_connection`、`feiniu_login`
|
||||
/// 等专用命令维护。
|
||||
///
|
||||
/// 原因:前端 `musicStore` 只在 init 时读一次整份设置并长期复用快照,
|
||||
/// 若允许它整份回写,删除连接后任意一次设置保存(哪怕是切页触发的)
|
||||
/// 都会把已删除的连接从旧快照里写回来。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_save_settings(
|
||||
state: State<'_, MusicManager>,
|
||||
settings: MusicSettings,
|
||||
) -> Result<(), String> {
|
||||
let persisted = state.load_settings();
|
||||
let mut next = settings;
|
||||
next.feiniu_connections = persisted.feiniu_connections;
|
||||
next.feiniu_active_id = persisted.feiniu_active_id;
|
||||
next.feiniu_base_url = persisted.feiniu_base_url;
|
||||
next.feiniu_token = persisted.feiniu_token;
|
||||
next.feiniu_username = persisted.feiniu_username;
|
||||
next.feiniu_device_id = persisted.feiniu_device_id;
|
||||
next.feiniu_access_code = persisted.feiniu_access_code;
|
||||
state.save_settings(&next)
|
||||
}
|
||||
|
||||
/// 解析歌曲真实下载链接(懒解析:搜索只取元数据,试听/下载前调用)。
|
||||
/// song(单曲)或 songs(批量)二选一;返回 Value,未标注 specta。
|
||||
#[tauri::command]
|
||||
pub async fn music_resolve(
|
||||
state: State<'_, MusicManager>,
|
||||
song: Option<serde_json::Value>,
|
||||
songs: Option<Vec<serde_json::Value>>,
|
||||
quality: Option<String>,
|
||||
proxy_url: Option<String>,
|
||||
qq_cookie: Option<String>,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let mut list: Vec<serde_json::Value> = songs.unwrap_or_default();
|
||||
if let Some(s) = song {
|
||||
list.insert(0, s);
|
||||
}
|
||||
if list.is_empty() {
|
||||
return Err("未提供歌曲".into());
|
||||
}
|
||||
let params = serde_json::json!({
|
||||
"songs": list,
|
||||
"quality": quality.unwrap_or_default(),
|
||||
"proxy": proxy_url.unwrap_or_default(),
|
||||
"cookies": qq_cookie.unwrap_or_default(),
|
||||
});
|
||||
state
|
||||
.request_with_timeout("resolve", params, std::time::Duration::from_secs(180))
|
||||
.await
|
||||
}
|
||||
|
||||
/// 启动下载任务(桥接后台工作池执行,立即返回 taskId;进度经 music-download-event 推送)。
|
||||
/// songs 为搜索结果的歌曲 dict(桥接端用 SongInfo.fromdict 重建)。
|
||||
/// 返回 Value,未标注 specta。
|
||||
#[tauri::command]
|
||||
pub async fn music_download(
|
||||
state: State<'_, MusicManager>,
|
||||
task_id: String,
|
||||
songs: Vec<serde_json::Value>,
|
||||
savedir: String,
|
||||
lyric: Option<bool>,
|
||||
cover: Option<bool>,
|
||||
proxy_url: Option<String>,
|
||||
max_concurrent: Option<u32>,
|
||||
quality: Option<String>,
|
||||
qq_cookie: Option<String>,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
if songs.is_empty() {
|
||||
return Err("未选择任何歌曲".into());
|
||||
}
|
||||
let params = serde_json::json!({
|
||||
"taskId": task_id,
|
||||
"songs": songs,
|
||||
"savedir": savedir,
|
||||
"lyric": lyric.unwrap_or(true),
|
||||
"cover": cover.unwrap_or(true),
|
||||
"proxy": proxy_url.unwrap_or_default(),
|
||||
"maxConcurrent": max_concurrent.unwrap_or(1).clamp(1, 16),
|
||||
"quality": quality.unwrap_or_default(),
|
||||
"cookies": qq_cookie.unwrap_or_default(),
|
||||
});
|
||||
state
|
||||
.request_with_timeout("download", params, std::time::Duration::from_secs(15))
|
||||
.await
|
||||
}
|
||||
|
||||
/// 取消下载任务(队列级:正在下载的歌曲会完成,其余标记取消)
|
||||
#[tauri::command]
|
||||
pub async fn music_download_cancel(
|
||||
state: State<'_, MusicManager>,
|
||||
task_id: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
state
|
||||
.request("cancel", serde_json::json!({ "taskId": task_id }))
|
||||
.await
|
||||
}
|
||||
|
||||
// ============ 飞牛音乐(NAS)客户端(多连接) ============
|
||||
// 全部命令返回 serde_json::Value、不加 specta:前端用裸 invoke,映射在 feiniuStore。
|
||||
|
||||
/// 连接列表 + 激活 id。返回 `{ activeId, list: [{id,name,kind,baseUrl,username,loggedIn,accessCode,insecure}] }`。
|
||||
/// `loggedIn` 的权威是系统凭据管理器里的 token(结构体字段只在凭据库不可用降级时才有值)。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_list_connections(state: State<'_, MusicManager>) -> Result<serde_json::Value, String> {
|
||||
let s = state.load_settings();
|
||||
let list: Vec<_> = s
|
||||
.feiniu_connections
|
||||
.iter()
|
||||
.map(|c| {
|
||||
json!({
|
||||
"id": c.id,
|
||||
"name": c.name,
|
||||
"kind": c.kind,
|
||||
"baseUrl": c.base_url,
|
||||
"username": c.username,
|
||||
"loggedIn": !c.token.is_empty() || crate::music::secrets::has_feiniu_token(&c.id),
|
||||
"accessCode": c.access_code,
|
||||
"insecure": c.insecure,
|
||||
"fnId": c.fn_id,
|
||||
"relay": c.relay,
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
Ok(json!({ "activeId": s.feiniu_active_id, "list": list }))
|
||||
}
|
||||
|
||||
/// 新增/更新一条连接(不触碰已登录的 token;改地址后需重新登录)。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_save_connection(
|
||||
state: State<'_, MusicManager>,
|
||||
connection: FeiniuConnection,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let mut settings = state.load_settings();
|
||||
let mut conn = connection;
|
||||
conn.base_url = normalize_base_url(&conn.base_url);
|
||||
if conn.id.is_empty() {
|
||||
conn.id = new_conn_id();
|
||||
}
|
||||
let id = conn.id.clone();
|
||||
if let Some(existing) = settings.feiniu_connections.iter_mut().find(|c| c.id == conn.id) {
|
||||
conn.token = existing.token.clone(); // 保留既有 token
|
||||
// relay 是解析结果而非用户输入:同为 fnconnect 时沿用,切换类型则重置
|
||||
conn.relay = conn.kind == "fnconnect" && existing.kind == "fnconnect" && existing.relay;
|
||||
*existing = conn;
|
||||
} else {
|
||||
settings.feiniu_connections.push(conn);
|
||||
}
|
||||
state.save_settings(&settings)?;
|
||||
// 回传 id:新建时前端无需按「地址 + 名称」反查,避免 FnConnect(地址为空)匹配失败
|
||||
Ok(json!({ "ok": true, "id": id }))
|
||||
}
|
||||
|
||||
/// 删除一条连接;若删的是激活连接,自动切换激活到第一条。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_delete_connection(
|
||||
state: State<'_, MusicManager>,
|
||||
id: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let mut settings = state.load_settings();
|
||||
settings.feiniu_connections.retain(|c| c.id != id);
|
||||
if settings.feiniu_active_id == id {
|
||||
settings.feiniu_active_id = settings
|
||||
.feiniu_connections
|
||||
.first()
|
||||
.map(|c| c.id.clone())
|
||||
.unwrap_or_default();
|
||||
}
|
||||
// 旧版单连接字段是迁移逻辑的输入:残留会让「列表为空」再次被迁移出一条连接。
|
||||
// 删除是明确意图,顺手清掉,保证删了就是删了。
|
||||
settings.feiniu_base_url.clear();
|
||||
settings.feiniu_token.clear();
|
||||
settings.feiniu_username.clear();
|
||||
settings.feiniu_device_id.clear();
|
||||
settings.feiniu_access_code.clear();
|
||||
state.save_settings(&settings)?;
|
||||
// 顺带清掉该连接在系统凭据管理器里的 token,避免留下孤儿凭据
|
||||
let _ = crate::music::secrets::secret_delete(&crate::music::secrets::feiniu_token_key(&id));
|
||||
state.feiniu.sync_with_settings(&settings);
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
/// 设某连接为激活连接。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_activate_connection(
|
||||
state: State<'_, MusicManager>,
|
||||
id: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let mut settings = state.load_settings();
|
||||
if !settings.feiniu_connections.iter().any(|c| c.id == id) {
|
||||
return Err("连接不存在".into());
|
||||
}
|
||||
settings.feiniu_active_id = id;
|
||||
state.save_settings(&settings)?;
|
||||
state.feiniu.sync_with_settings(&settings);
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
/// 登录激活/某连接:校验通过后写回该连接的 token/device_id 并启动本地流代理。
|
||||
/// fnconnect 连接会先用 fnId 解析出可达 base_url 再登录。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_login(
|
||||
state: State<'_, MusicManager>,
|
||||
connection_id: String,
|
||||
username: String,
|
||||
password: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let mut settings = state.load_settings();
|
||||
let mut conn = settings
|
||||
.feiniu_connections
|
||||
.iter()
|
||||
.find(|c| c.id == connection_id)
|
||||
.cloned()
|
||||
.ok_or_else(|| "连接不存在,请先保存连接".to_string())?;
|
||||
// fnconnect:用 fnId 解析 base_url
|
||||
if conn.kind == "fnconnect" {
|
||||
let fid = extract_fn_id(&conn.fn_id).ok_or_else(|| "FnConnect 连接缺少有效 fnId".to_string())?;
|
||||
let (url, relay) = resolve_base_url(&fid).await?;
|
||||
conn.base_url = url;
|
||||
conn.relay = relay;
|
||||
if let Some(c) = settings.feiniu_connections.iter_mut().find(|c| c.id == connection_id) {
|
||||
c.base_url = conn.base_url.clone();
|
||||
c.relay = relay;
|
||||
}
|
||||
state.save_settings(&settings)?;
|
||||
}
|
||||
// 用该连接配置装备运行期
|
||||
let mut tmp = settings.clone();
|
||||
tmp.feiniu_active_id = conn.id.clone();
|
||||
state.feiniu.sync_with_settings(&tmp);
|
||||
|
||||
let (token, device_id) = state.feiniu.login(&conn.base_url, &username, &password).await?;
|
||||
|
||||
// token 存进系统凭据管理器;只有写入失败才降级为明文落 settings.json(并记日志)。
|
||||
// 顺序很重要:先确认凭据库写成功,再决定要不要把明文留在结构体里。
|
||||
let token_key = crate::music::secrets::feiniu_token_key(&connection_id);
|
||||
let token_protected = crate::music::secrets::try_store(&token_key, &token);
|
||||
if let Some(existing) = settings.feiniu_connections.iter_mut().find(|c| c.id == connection_id) {
|
||||
existing.token = if token_protected { String::new() } else { token.clone() };
|
||||
existing.device_id = device_id;
|
||||
existing.username = username;
|
||||
}
|
||||
settings.feiniu_active_id = connection_id.clone();
|
||||
state.save_settings(&settings)?;
|
||||
state.feiniu.sync_with_settings(&settings);
|
||||
let prefix = state.feiniu.media_prefix().await?;
|
||||
// 不把 token 回传前端:前端除了 mediaPrefix 之外不需要它,少一处明文暴露面
|
||||
Ok(json!({ "ok": true, "mediaPrefix": prefix, "protected": token_protected }))
|
||||
}
|
||||
|
||||
/// 登出某连接(清 token,保留地址/账号),代理 Cookie 同步失效。
|
||||
///
|
||||
/// 顺序有讲究:**必须先删凭据库里的 token 再 sync**,
|
||||
/// 否则 `sync_with_settings` 会从凭据库把刚登出的 token 又读回运行期(看起来「登出无效」)。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_logout(
|
||||
state: State<'_, MusicManager>,
|
||||
connection_id: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let mut settings = state.load_settings();
|
||||
let _ = crate::music::secrets::secret_delete(&crate::music::secrets::feiniu_token_key(
|
||||
&connection_id,
|
||||
));
|
||||
if let Some(c) = settings.feiniu_connections.iter_mut().find(|c| c.id == connection_id) {
|
||||
c.token.clear();
|
||||
}
|
||||
state.save_settings(&settings)?;
|
||||
state.feiniu.sync_with_settings(&settings);
|
||||
state.feiniu.logout();
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
/// 测试一条连接**草案**能否登录(不持久化任何变更)。
|
||||
///
|
||||
/// 入参是编辑对话框里的完整草案而非连接 id:新建连接在保存前没有 id,
|
||||
/// 若按 id 查库,对话框里的「测试」在保存前必然报 missing required key。
|
||||
/// 探测以「草案作为唯一连接」装备运行期,结束后恢复持久化的激活连接。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_test_connection(
|
||||
state: State<'_, MusicManager>,
|
||||
connection: FeiniuConnection,
|
||||
username: String,
|
||||
password: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let mut conn = connection;
|
||||
conn.base_url = normalize_base_url(&conn.base_url);
|
||||
// fnconnect:先解析 fnId(解析结果只用于本次探测,不回写设置)
|
||||
if conn.kind == "fnconnect" {
|
||||
let fid = extract_fn_id(&conn.fn_id).ok_or_else(|| "FnConnect 连接缺少有效 fnId".to_string())?;
|
||||
let (url, relay) = resolve_base_url(&fid).await?;
|
||||
conn.base_url = url;
|
||||
conn.relay = relay;
|
||||
}
|
||||
if conn.base_url.trim().is_empty() {
|
||||
return Err("请先填写服务器地址或飞牛 ID".to_string());
|
||||
}
|
||||
|
||||
let settings = state.load_settings();
|
||||
let mut tmp = settings.clone();
|
||||
tmp.feiniu_connections = vec![conn.clone()];
|
||||
tmp.feiniu_active_id = conn.id.clone();
|
||||
state.feiniu.sync_with_settings(&tmp);
|
||||
|
||||
let r = state.feiniu.login(&conn.base_url, &username, &password).await;
|
||||
// 探测可能污染运行期:恢复为持久化的激活连接
|
||||
state.feiniu.sync_with_settings(&state.load_settings());
|
||||
match r {
|
||||
Ok(_) => Ok(json!({ "ok": true })),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
|
||||
/// 查询当前激活连接配置:{ activeId, baseUrl, username, loggedIn }。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_get_config(state: State<'_, MusicManager>) -> Result<serde_json::Value, String> {
|
||||
let settings = state.load_settings();
|
||||
state.feiniu.sync_with_settings(&settings);
|
||||
let active_id = settings.feiniu_active_id;
|
||||
let mut cfg = state.feiniu.config();
|
||||
cfg["activeId"] = json!(active_id);
|
||||
Ok(cfg)
|
||||
}
|
||||
|
||||
/// 分页拉取激活连接曲目列表:{ page, size, keyword? } → NAS 原始 data。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_list_tracks(
|
||||
state: State<'_, MusicManager>,
|
||||
page: Option<u32>,
|
||||
size: Option<u32>,
|
||||
keyword: Option<String>,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
state.feiniu.sync_with_settings(&state.load_settings());
|
||||
state
|
||||
.feiniu
|
||||
.list_tracks(
|
||||
page.unwrap_or(1).max(1),
|
||||
size.unwrap_or(50).clamp(1, 100),
|
||||
keyword.as_deref(),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// 获取某曲目歌词:{ lyric }(无则空字符串)。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_lyric(
|
||||
state: State<'_, MusicManager>,
|
||||
guid: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
state.feiniu.sync_with_settings(&state.load_settings());
|
||||
let text = state.feiniu.lyric(&guid).await?;
|
||||
Ok(json!({ "lyric": text }))
|
||||
}
|
||||
|
||||
/// 本地媒体地址前缀:{ mediaPrefix }(首次调用惰性启动本地流代理)。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_media_prefix(
|
||||
state: State<'_, MusicManager>,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
state.feiniu.sync_with_settings(&state.load_settings());
|
||||
let prefix = state.feiniu.media_prefix().await?;
|
||||
Ok(json!({ "mediaPrefix": prefix }))
|
||||
}
|
||||
|
||||
/// 允许访问的本地目录(下载目录 + 自定义曲库目录)。
|
||||
/// 本地文件的**列举与删除**都限定在其中——前端只应能操作曲库范围内的文件。
|
||||
fn allowed_local_roots(state: &MusicManager) -> Vec<String> {
|
||||
let s = state.load_settings();
|
||||
let mut dirs: Vec<String> = vec![s.savedir.clone()];
|
||||
for d in &s.feiniu_local_dirs {
|
||||
if !dirs.iter().any(|x| x == d) {
|
||||
dirs.push(d.clone());
|
||||
}
|
||||
}
|
||||
dirs.into_iter().filter(|d| !d.trim().is_empty()).collect()
|
||||
}
|
||||
|
||||
/// 路径是否位于允许的根目录之下。
|
||||
/// 两侧都先 `canonicalize`:`..` 与符号链接因此无法越出根目录。
|
||||
fn is_within_roots(path: &std::path::Path, roots: &[String]) -> bool {
|
||||
let Ok(target) = std::fs::canonicalize(path) else {
|
||||
return false;
|
||||
};
|
||||
roots.iter().any(|r| {
|
||||
std::fs::canonicalize(r)
|
||||
.map(|root| target.starts_with(&root))
|
||||
.unwrap_or(false)
|
||||
})
|
||||
}
|
||||
|
||||
/// 列出某个下载目录中的音频文件(非递归):`{ items: [{path,name,size,mtim}] }`。
|
||||
///
|
||||
/// 供上传编排在下载目录里定位「刚落盘的文件」——用 `feiniu_scan_local` 会递归遍历
|
||||
/// 整个曲库并解析标签,为一次上传扫全库是纯浪费。不解析标签(匹配只需要文件名与时间)。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_list_audio_files(
|
||||
state: State<'_, MusicManager>,
|
||||
dir: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let roots = allowed_local_roots(&state);
|
||||
if roots.is_empty() || !is_within_roots(std::path::Path::new(&dir), &roots) {
|
||||
return Err(format!("拒绝列举曲库目录之外的路径:{dir}"));
|
||||
}
|
||||
tauri::async_runtime::spawn_blocking(move || crate::music::feiniu::list_audio_files(&dir))
|
||||
.await
|
||||
.map_err(|e| format!("列举目录失败: {e}"))
|
||||
}
|
||||
|
||||
/// 扫描本地曲库目录中的音频文件:{ items }(目录 = 下载 savedir + 用户自定义 dirs)。
|
||||
/// 标签解析结果缓存在 CacheManager(size+mtim 未变即复用)。
|
||||
///
|
||||
/// **必须 async + spawn_blocking**:Tauri 中不带 async 的命令在主线程执行,
|
||||
/// 而 walkdir 递归 + lofty 全量标签解析在万级曲库下会阻塞数秒——UI 直接冻住。
|
||||
/// 目录与缓存路径都先取出为自有值,避免把 `State` 借进 'static 的阻塞任务。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_scan_local(state: State<'_, MusicManager>) -> Result<serde_json::Value, String> {
|
||||
let dirs = allowed_local_roots(&state);
|
||||
let tags_cache = state.feiniu.local_tags_path();
|
||||
tauri::async_runtime::spawn_blocking(move || {
|
||||
crate::music::scan_local_dirs(&dirs, Some(tags_cache.as_path()))
|
||||
})
|
||||
.await
|
||||
.map_err(|e| format!("本地曲库扫描任务失败: {e}"))
|
||||
}
|
||||
|
||||
/// 播放缓存状态:{ count, usedBytes, usedMb }。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_cache_status(state: State<'_, MusicManager>) -> Result<serde_json::Value, String> {
|
||||
Ok(state.feiniu.cache_status())
|
||||
}
|
||||
|
||||
/// 清空播放缓存。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_cache_clear(state: State<'_, MusicManager>) -> Result<serde_json::Value, String> {
|
||||
state.feiniu.cache_clear();
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
/// 缓存一首歌(命中则直接返回):{ path } 或 { cached }。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_cache_fetch(
|
||||
state: State<'_, MusicManager>,
|
||||
guid: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
state.feiniu.sync_with_settings(&state.load_settings());
|
||||
let max_gb = state.load_settings().feiniu_cache_max_gb;
|
||||
let hit = state.feiniu.cache_fetch(&guid, max_gb).await?;
|
||||
Ok(json!({ "path": hit, "cached": hit.is_some() }))
|
||||
}
|
||||
|
||||
/// 生成一条新连接的 id(时间戳 + 进程号,避免引 rand)。
|
||||
fn new_conn_id() -> String {
|
||||
let n = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map(|d| d.as_nanos())
|
||||
.unwrap_or(0);
|
||||
format!("c{n:x}")
|
||||
}
|
||||
|
||||
// ============ P6:下载到飞牛 + 曲库增删(WebDAV,无状态) ============
|
||||
|
||||
/// 测试 WebDAV 连接与目标目录是否可达。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn webdav_test(
|
||||
config: crate::music::feiniu::webdav::WebDavConfig,
|
||||
dir: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let msg = crate::music::feiniu::webdav::test(&config, &dir).await?;
|
||||
Ok(json!({ "ok": true, "message": msg }))
|
||||
}
|
||||
|
||||
/// 上传本地文件到 WebDAV 目标目录(流式,不整载内存)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn webdav_upload(
|
||||
config: crate::music::feiniu::webdav::WebDavConfig,
|
||||
local_path: String,
|
||||
remote_path: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let name = crate::music::feiniu::webdav::upload_file(
|
||||
&config,
|
||||
std::path::Path::new(&local_path),
|
||||
&remote_path,
|
||||
)
|
||||
.await?;
|
||||
Ok(json!({ "ok": true, "name": name }))
|
||||
}
|
||||
|
||||
/// 删除 WebDAV 远程文件(404 视为已删除)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn webdav_delete(
|
||||
config: crate::music::feiniu::webdav::WebDavConfig,
|
||||
remote_path: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
crate::music::feiniu::webdav::delete(&config, &remote_path).await?;
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
// ============ 敏感串(系统凭据管理器,DPAPI 保护) ============
|
||||
// 统一实现在 crate::music::secrets:WebDAV 账号密码、QQ 音乐 Cookie、飞牛登录 token
|
||||
// 三类凭据同构存放,不再出现「一类进凭据库、另一类明文落盘」的双标。
|
||||
|
||||
/// 读取 WebDAV 凭据。未配置时 username/password 为 null。
|
||||
#[tauri::command]
|
||||
pub fn webdav_get_secret() -> Result<serde_json::Value, String> {
|
||||
let parsed = crate::music::secrets::secret_read(crate::music::secrets::KEY_WEBDAV)
|
||||
.unwrap_or(None)
|
||||
.and_then(|raw| serde_json::from_str::<serde_json::Value>(&raw).ok());
|
||||
Ok(parsed.unwrap_or_else(|| json!({ "username": null, "password": null })))
|
||||
}
|
||||
|
||||
/// 保存 WebDAV 凭据(账号 + 密码整体覆盖)。
|
||||
#[tauri::command]
|
||||
pub fn webdav_save_secret(username: String, password: String) -> Result<serde_json::Value, String> {
|
||||
let blob = json!({ "username": username, "password": password }).to_string();
|
||||
crate::music::secrets::secret_write(crate::music::secrets::KEY_WEBDAV, &blob)?;
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
/// 校验前端可访问的凭据键:只允许白名单内的键(见 `secrets::FRONTEND_KEYS`)。
|
||||
///
|
||||
/// 白名单刻意不含 `webdav-credentials` 与飞牛 token——
|
||||
/// 前端因此无法通过这两个通用命令去读写它们,只能碰自己的 QQ 音乐 Cookie。
|
||||
fn assert_frontend_secret_key(key: &str) -> Result<(), String> {
|
||||
if crate::music::secrets::frontend_key_allowed(key) {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(format!("不允许访问的凭据键:{key}"))
|
||||
}
|
||||
}
|
||||
|
||||
/// 读取一个音乐模块的敏感串(如 QQ 音乐 Cookie):{ value }(未设置 → null)。
|
||||
#[tauri::command]
|
||||
pub fn music_secret_get(key: String) -> Result<serde_json::Value, String> {
|
||||
assert_frontend_secret_key(&key)?;
|
||||
Ok(json!({ "value": crate::music::secrets::secret_read(&key)? }))
|
||||
}
|
||||
|
||||
/// 写入 / 清除一个音乐模块的敏感串。`value` 为空表示删除该凭据。
|
||||
#[tauri::command]
|
||||
pub fn music_secret_set(key: String, value: String) -> Result<serde_json::Value, String> {
|
||||
assert_frontend_secret_key(&key)?;
|
||||
if value.is_empty() {
|
||||
crate::music::secrets::secret_delete(&key)?;
|
||||
} else {
|
||||
crate::music::secrets::secret_write(&key, &value)?;
|
||||
}
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
/// 删除本地媒体文件(「下载到飞牛」落地即传流程的收尾)。
|
||||
/// 仅允许音频 / 歌词 / 封面扩展名,拒绝目录,且**必须落在已配置的下载/曲库目录内**——
|
||||
/// 只校验扩展名的话,前端一旦传错路径就能删掉用户的任意音乐文件。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn feiniu_delete_local(
|
||||
state: State<'_, MusicManager>,
|
||||
path: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
const ALLOWED: [&str; 13] = [
|
||||
"mp3", "flac", "wav", "m4a", "aac", "ogg", "ape", "wma", "lrc", "jpg", "jpeg", "png", "webp",
|
||||
];
|
||||
let p = std::path::Path::new(&path);
|
||||
let ext_ok = p
|
||||
.extension()
|
||||
.and_then(|e| e.to_str())
|
||||
.map(|e| ALLOWED.contains(&e.to_lowercase().as_str()))
|
||||
.unwrap_or(false);
|
||||
if !ext_ok {
|
||||
return Err(format!("拒绝删除非媒体文件:{path}"));
|
||||
}
|
||||
let meta = std::fs::metadata(p).map_err(|e| format!("文件不存在: {e}"))?;
|
||||
if meta.is_dir() {
|
||||
return Err("拒绝删除目录".to_string());
|
||||
}
|
||||
if !is_within_roots(p, &allowed_local_roots(&state)) {
|
||||
return Err(format!("拒绝删除曲库目录之外的文件:{path}"));
|
||||
}
|
||||
std::fs::remove_file(p).map_err(|e| format!("删除失败: {e}"))?;
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
// ============ P7:FnConnect 远程连接解析 ============
|
||||
|
||||
/// 解析 fnId → 可达 base_url(探测后返回)。命令层在 fnconnect 连接登录前调用。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_fnconnect_resolve(
|
||||
state: State<'_, MusicManager>,
|
||||
fn_id: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let _ = &state;
|
||||
let (url, relay) = resolve_base_url(&fn_id).await?;
|
||||
Ok(json!({ "baseUrl": url, "relay": relay }))
|
||||
}
|
||||
|
||||
@@ -0,0 +1,324 @@
|
||||
//! 音乐模块 · 本地解密的 Tauri 命令层。
|
||||
//!
|
||||
//! 与下载链路同构:命令只做参数校验 + 扫描 + 登记任务,立即返回;进度经
|
||||
//! `music-decrypt-event` 推送。前端 `decryptStore` 常驻监听。
|
||||
//!
|
||||
//! 登记位置见 `MUSIC_DECRYPT_PLAN.md` §4.1——**共 3 处**:
|
||||
//! `music/mod.rs` re-export、`lib.rs` 的 `collect_commands![]` 与 `generate_handler![]`。
|
||||
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use tauri::{AppHandle, State};
|
||||
|
||||
use super::scan;
|
||||
use super::spawn_batch;
|
||||
use crate::music::MusicManager;
|
||||
|
||||
/// 启动一批本地解密任务。
|
||||
///
|
||||
/// 两种输入方式(二选一,`folder` 优先):
|
||||
/// - `folder`:**文件夹批量**。递归扫描该目录下所有可解密的加密音乐
|
||||
/// (内容判定优先,见 `scan::route`),并按 `root` 还原相对目录结构。
|
||||
/// - `files`:显式文件列表(散选场景)。
|
||||
///
|
||||
/// `in_place = true` 时产物与源文件同目录同名——文件夹批量推荐这样用,
|
||||
/// 符合"就地解出来"的直觉;`false` 则统一输出到 `out_dir`。
|
||||
///
|
||||
/// 返回 `Ok(())` 表示任务已登记并开始执行;逐文件结果走事件。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_decrypt_run(
|
||||
state: State<'_, MusicManager>,
|
||||
app: AppHandle,
|
||||
task_id: String,
|
||||
files: Option<Vec<String>>,
|
||||
folder: Option<String>,
|
||||
root: Option<String>,
|
||||
out_dir: Option<String>,
|
||||
in_place: Option<bool>,
|
||||
) -> Result<(), String> {
|
||||
if task_id.trim().is_empty() {
|
||||
return Err("缺少任务 id".into());
|
||||
}
|
||||
let in_place = in_place.unwrap_or(false);
|
||||
let out_dir = resolve_out_dir(out_dir)?;
|
||||
|
||||
// ---- 收集待处理文件 ----
|
||||
let scanned: Vec<scan::ScannedFile> = match folder.as_deref().map(str::trim) {
|
||||
Some(dir) if !dir.is_empty() => {
|
||||
let folder_path = PathBuf::from(dir);
|
||||
let root_path = root
|
||||
.as_deref()
|
||||
.map(str::trim)
|
||||
.filter(|r| !r.is_empty())
|
||||
.map(PathBuf::from)
|
||||
.unwrap_or_else(|| folder_path.clone());
|
||||
let found = scan::scan(&folder_path, Some(&root_path))?;
|
||||
if found.is_empty() {
|
||||
return Err(format!(
|
||||
"{} 里没有找到可解密的加密音乐文件(支持网易云 .ncm 与 QQ音乐 QMC 系列)",
|
||||
folder_path.display()
|
||||
));
|
||||
}
|
||||
found
|
||||
}
|
||||
_ => {
|
||||
let list = files.unwrap_or_default();
|
||||
if list.is_empty() {
|
||||
return Err("未选择任何文件或文件夹".into());
|
||||
}
|
||||
// 散选:保留用户给的路径,不做递归;引擎按内容/后缀判定。
|
||||
// 认不出的文件也建条目,让 worker 回报 unsupported(用户能看到原因)。
|
||||
list.into_iter()
|
||||
.map(|f| {
|
||||
let path = PathBuf::from(&f);
|
||||
let name = path
|
||||
.file_name()
|
||||
.map(|n| n.to_string_lossy().to_string())
|
||||
.unwrap_or_else(|| f.clone());
|
||||
// 先算引擎再移动 `path`(否则所有权已转移)
|
||||
let engine = scan::route(&path).unwrap_or(scan::Engine::Ncm);
|
||||
scan::ScannedFile {
|
||||
path,
|
||||
rel_parent: None,
|
||||
name,
|
||||
// 默认为网易云引擎;真实平台由解密器在 worker 内报错说明
|
||||
engine,
|
||||
}
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
};
|
||||
|
||||
// ---- 输入输出相交保护(仅非就地模式;就地模式本来就写在源目录)----
|
||||
let scanned = if in_place {
|
||||
scanned
|
||||
} else {
|
||||
let kept = retain_outside(scanned, &out_dir);
|
||||
if kept.is_empty() {
|
||||
return Err("所选文件都位于输出目录内,已全部跳过(可改用「就地解密」)".into());
|
||||
}
|
||||
kept
|
||||
};
|
||||
|
||||
if scanned.is_empty() {
|
||||
return Err("没有可处理的文件".into());
|
||||
}
|
||||
|
||||
let tasks = state.decrypt_tasks();
|
||||
spawn_batch(app, tasks, task_id, scanned, out_dir, in_place);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 请求取消一个解密任务。
|
||||
///
|
||||
/// 队列级语义(与 `music_download_cancel` 一致):**当前文件会做完**,
|
||||
/// 剩余文件不再开始处理,随后发一个带 `cancelled` 计数的 `finished` 事件。
|
||||
/// 返回是否命中了一个在跑的任务(false 通常表示任务已结束)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_decrypt_cancel(
|
||||
state: State<'_, MusicManager>,
|
||||
task_id: String,
|
||||
) -> Result<bool, String> {
|
||||
Ok(state.decrypt_tasks().cancel(&task_id))
|
||||
}
|
||||
|
||||
/// 扫描一个文件夹,返回可解密文件的数量与平台分布(**不解密**)。
|
||||
///
|
||||
/// 给 UI 做预览:用户选完文件夹先看到"找到 N 个(网易云 x / QQ音乐 y)",
|
||||
/// 而不是直接开跑一个可能包含几千首的任务。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_decrypt_scan(folder: String, root: Option<String>) -> Result<ScanSummary, String> {
|
||||
let root_path = root
|
||||
.as_deref()
|
||||
.map(str::trim)
|
||||
.filter(|r| !r.is_empty())
|
||||
.map(PathBuf::from);
|
||||
let found = scan::scan(Path::new(folder.trim()), root_path.as_deref())?;
|
||||
let ncm = found
|
||||
.iter()
|
||||
.filter(|f| f.engine == scan::Engine::Ncm)
|
||||
.count();
|
||||
Ok(ScanSummary {
|
||||
total: found.len(),
|
||||
ncm,
|
||||
qmc: found.len() - ncm,
|
||||
})
|
||||
}
|
||||
|
||||
/// `music_decrypt_scan` 的返回(前端零手写类型)
|
||||
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, specta::Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct ScanSummary {
|
||||
pub total: usize,
|
||||
pub ncm: usize,
|
||||
pub qmc: usize,
|
||||
}
|
||||
|
||||
/// 探测 QQ 音乐**在线取密钥**能力(新版 musicex 文件解密的前置条件)。
|
||||
///
|
||||
/// 只读本机信息,不发网络请求:读 `QQMusicServiceConfig.ini` 的 `uin`,
|
||||
/// 再从运行中的 `QQMusic.exe` 内存里找 `authst`。
|
||||
///
|
||||
/// `authst` **不会**返回给前端(只在后端用于调接口),前端拿到的只有 QQ 号与状态。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_decrypt_qq_status() -> Result<super::qq_online::QqOnlineStatus, String> {
|
||||
Ok(super::qq_online::probe_status())
|
||||
}
|
||||
|
||||
/// 过滤掉位于 `out_dir` 内的输入文件。
|
||||
///
|
||||
/// 为什么需要:把输出目录选在输入目录内(或直接选输入目录)时,下一次运行会把
|
||||
/// 上一次的产物再当输入解一遍,产出 `_1`、`_2` 无限膨胀。
|
||||
///
|
||||
/// 路径比较用 `canonicalize`,因此能正确处理 `..`、大小写差异与短路径;
|
||||
/// **无法规范化(文件不存在/无权限)的路径一律保留**——让 worker 去报"读取失败",
|
||||
/// 比在这里静默丢弃更好(用户能看到原因)。
|
||||
fn retain_outside(files: Vec<scan::ScannedFile>, out_dir: &Path) -> Vec<scan::ScannedFile> {
|
||||
let Ok(out_canon) = out_dir.canonicalize() else {
|
||||
// 输出目录都规范化不了(理论上不会:resolve_out_dir 刚创建过它),
|
||||
// 此时放弃这层保护而不是误杀全部输入
|
||||
return files;
|
||||
};
|
||||
files
|
||||
.into_iter()
|
||||
.filter(|f| match f.path.canonicalize() {
|
||||
Ok(abs) => !abs.starts_with(&out_canon),
|
||||
Err(_) => true,
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// 解析输出目录:显式传入优先,否则回退到应用数据目录下的 `music/decrypted`。
|
||||
fn resolve_out_dir(out_dir: Option<String>) -> Result<PathBuf, String> {
|
||||
if let Some(d) = out_dir {
|
||||
let d = d.trim();
|
||||
if !d.is_empty() {
|
||||
let p = PathBuf::from(d);
|
||||
std::fs::create_dir_all(&p)
|
||||
.map_err(|e| format!("无法创建输出目录 {}:{e}", p.display()))?;
|
||||
return Ok(p);
|
||||
}
|
||||
}
|
||||
// 兜底:{app_data}/music/decrypted(前端正常都会传 savedir/decrypted)
|
||||
let base = dirs::data_dir()
|
||||
.ok_or_else(|| "无法定位应用数据目录".to_string())?
|
||||
.join("thing")
|
||||
.join("music")
|
||||
.join("decrypted");
|
||||
std::fs::create_dir_all(&base)
|
||||
.map_err(|e| format!("无法创建输出目录 {}:{e}", base.display()))?;
|
||||
Ok(base)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn tmpdir(tag: &str) -> PathBuf {
|
||||
let d = std::env::temp_dir().join(format!("dec_cmd_{tag}_{}", std::process::id()));
|
||||
let _ = std::fs::remove_dir_all(&d);
|
||||
std::fs::create_dir_all(&d).unwrap();
|
||||
d
|
||||
}
|
||||
|
||||
fn fake_ncm() -> Vec<u8> {
|
||||
let mut v = b"CTENFDAM".to_vec();
|
||||
v.extend_from_slice(&[0x02, 0x00, 0, 0, 0, 0]);
|
||||
v
|
||||
}
|
||||
|
||||
fn entry(path: PathBuf, rel: Option<&str>) -> scan::ScannedFile {
|
||||
scan::ScannedFile {
|
||||
name: path.file_name().unwrap().to_string_lossy().to_string(),
|
||||
path,
|
||||
rel_parent: rel.map(PathBuf::from),
|
||||
engine: scan::Engine::Ncm,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn retain_outside_drops_inputs_inside_output_dir() {
|
||||
let root = tmpdir("retain");
|
||||
let out = root.join("decrypted");
|
||||
std::fs::create_dir_all(&out).unwrap();
|
||||
|
||||
let inside = out.join("a.ncm");
|
||||
let outside = root.join("b.ncm");
|
||||
std::fs::write(&inside, fake_ncm()).unwrap();
|
||||
std::fs::write(&outside, fake_ncm()).unwrap();
|
||||
|
||||
let kept = retain_outside(vec![entry(inside, None), entry(outside, None)], &out);
|
||||
assert_eq!(kept.len(), 1, "应只保留输出目录外的文件");
|
||||
assert!(kept[0].path.ends_with("b.ncm"));
|
||||
|
||||
let _ = std::fs::remove_dir_all(&root);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn retain_outside_drops_nested_paths() {
|
||||
let root = tmpdir("nested");
|
||||
let out = root.join("decrypted");
|
||||
let deep = out.join("2026").join("07");
|
||||
std::fs::create_dir_all(&deep).unwrap();
|
||||
let f = deep.join("c.ncm");
|
||||
std::fs::write(&f, fake_ncm()).unwrap();
|
||||
|
||||
let kept = retain_outside(vec![entry(f, None)], &out);
|
||||
assert!(kept.is_empty(), "输出目录的子目录也应视为相交");
|
||||
|
||||
let _ = std::fs::remove_dir_all(&root);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn retain_outside_keeps_unresolvable_paths() {
|
||||
let root = tmpdir("unresolvable");
|
||||
let out = root.join("decrypted");
|
||||
std::fs::create_dir_all(&out).unwrap();
|
||||
|
||||
let ghost = root.join("not-here").join("ghost.ncm");
|
||||
let kept = retain_outside(vec![entry(ghost, None)], &out);
|
||||
assert_eq!(kept.len(), 1, "不存在的输入不应被静默丢弃");
|
||||
|
||||
let _ = std::fs::remove_dir_all(&root);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_out_dir_uses_explicit_value() {
|
||||
let root = tmpdir("outdir");
|
||||
let target = root.join("my").join("out");
|
||||
let got = resolve_out_dir(Some(target.to_string_lossy().to_string())).unwrap();
|
||||
assert_eq!(got, target);
|
||||
assert!(target.is_dir(), "输出目录应被创建");
|
||||
|
||||
let fallback = resolve_out_dir(Some(" ".into())).unwrap();
|
||||
assert!(fallback.ends_with("decrypted"));
|
||||
assert!(fallback.is_dir());
|
||||
|
||||
let _ = std::fs::remove_dir_all(&root);
|
||||
}
|
||||
|
||||
/// 文件夹扫描的汇总(UI 预览用)
|
||||
#[test]
|
||||
fn scan_summary_counts_per_engine() {
|
||||
let root = tmpdir("summary");
|
||||
std::fs::write(root.join("a.ncm"), fake_ncm()).unwrap();
|
||||
std::fs::write(root.join("b.qmcflac"), vec![0x22u8; 4096]).unwrap();
|
||||
std::fs::write(root.join("c.mgg"), vec![0x22u8; 4096]).unwrap();
|
||||
std::fs::write(root.join("d.mp3"), vec![0x44u8; 1024]).unwrap();
|
||||
|
||||
let found = scan::scan(&root, None).unwrap();
|
||||
let ncm = found
|
||||
.iter()
|
||||
.filter(|f| f.engine == scan::Engine::Ncm)
|
||||
.count();
|
||||
assert_eq!(found.len(), 3, "mp3 不应被计入");
|
||||
assert_eq!(ncm, 1);
|
||||
assert_eq!(found.len() - ncm, 2);
|
||||
|
||||
let _ = std::fs::remove_dir_all(&root);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,266 @@
|
||||
//! 本地解密的**统一错误类型与公共格式探测**。
|
||||
//!
|
||||
//! 两个引擎([`super::ncm`] 网易云 / [`super::qmc`] QQ音乐)各自的内部错误不同,
|
||||
//! 但调度层只关心「可读的中文原因」,因此都收敛到 [`DecryptError`]。
|
||||
//!
|
||||
//! 输出扩展名统一由 [`detect_format`] 按**音频首帧魔数**判定——
|
||||
//! 两个平台都不信任容器里声明的格式字段(详见 `MUSIC_DECRYPT_PLAN.md` §3.1⑥ / §3.2 末)。
|
||||
|
||||
use std::fmt;
|
||||
use std::path::PathBuf;
|
||||
|
||||
/// 解密失败原因。全部经 `to_string()` 上报为 per-file 失败,**不 panic**
|
||||
/// (否则一个坏文件会带走整批任务)。
|
||||
#[derive(Debug)]
|
||||
pub enum DecryptError {
|
||||
Io(String),
|
||||
/// 文件不属于本引擎认得的加密格式
|
||||
NotEncrypted(String),
|
||||
/// 容器/尾部结构残缺
|
||||
Broken(String),
|
||||
/// 缺少解密密钥(QQ QMC2 的 ekey 情况),文案要能给用户下一步动作
|
||||
KeyRequired(String),
|
||||
/// 输出失败
|
||||
Output(String),
|
||||
}
|
||||
|
||||
impl fmt::Display for DecryptError {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
match self {
|
||||
DecryptError::Io(e) => write!(f, "读取失败:{e}"),
|
||||
DecryptError::NotEncrypted(e) => write!(f, "{e}"),
|
||||
DecryptError::Broken(e) => write!(f, "文件结构损坏:{e}"),
|
||||
DecryptError::KeyRequired(e) => write!(f, "{e}"),
|
||||
DecryptError::Output(e) => write!(f, "输出失败:{e}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::error::Error for DecryptError {}
|
||||
|
||||
impl From<std::io::Error> for DecryptError {
|
||||
fn from(e: std::io::Error) -> Self {
|
||||
DecryptError::Io(e.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
pub type Result<T> = std::result::Result<T, DecryptError>;
|
||||
|
||||
/// 解密产物(两引擎统一形状)
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Outcome {
|
||||
pub output: PathBuf,
|
||||
/// 落盘用的扩展名(由首帧魔数判定)
|
||||
pub format: String,
|
||||
/// 单独落盘的封面(没有则为 None)
|
||||
pub cover: Option<PathBuf>,
|
||||
/// 音频明文字节数
|
||||
pub audio_bytes: u64,
|
||||
/// 给 UI 的一行备注(平台 / 密钥形态 / 元数据摘要)。
|
||||
///
|
||||
/// 结构化元数据目前只用来拼这一行——P2 做标签回填时再把 `NcmMeta` 提升到
|
||||
/// `Outcome` 上,不要提前加一个没人读的字段。
|
||||
pub note: String,
|
||||
}
|
||||
|
||||
/// 按音频首帧魔数判定输出扩展名。
|
||||
///
|
||||
/// **这是权威来源**:ncm 的 `format` 字段、QMC 的输入后缀都只是声明,
|
||||
/// 不可信(QKKDecrypt 同样以内容探测为准)。
|
||||
pub fn detect_format(head: &[u8]) -> &'static str {
|
||||
detect_format_opt(head).unwrap_or("flac")
|
||||
}
|
||||
|
||||
/// 同上,但认不出时返回 `None`(调用方可据此决定是否回退到后缀/声明格式)。
|
||||
pub fn detect_format_opt(head: &[u8]) -> Option<&'static str> {
|
||||
let starts = |m: &[u8]| head.len() >= m.len() && &head[..m.len()] == m;
|
||||
if starts(b"fLaC") {
|
||||
Some("flac")
|
||||
} else if starts(b"OggS") {
|
||||
Some("ogg")
|
||||
} else if starts(b"ID3") || (head.len() >= 2 && head[0] == 0xFF && head[1] & 0xE0 == 0xE0) {
|
||||
// ID3 标签,或无标签 MP3 的帧同步字(0xFFEx / 0xFFFx)
|
||||
Some("mp3")
|
||||
} else if starts(b"RIFF") && head.len() >= 12 && &head[8..12] == b"WAVE" {
|
||||
Some("wav")
|
||||
} else if head.len() >= 12 && &head[4..8] == b"ftyp" {
|
||||
Some("m4a")
|
||||
} else if starts(b"wvpk") {
|
||||
Some("wv")
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
/// 图片扩展名(按魔数)
|
||||
pub fn image_ext(data: &[u8]) -> &'static str {
|
||||
const PNG: &[u8] = &[0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
|
||||
if data.len() >= 8 && &data[..8] == PNG {
|
||||
"png"
|
||||
} else {
|
||||
"jpg"
|
||||
}
|
||||
}
|
||||
|
||||
/// 确保输出目录存在并返回「按相对目录展开后」的目标目录。
|
||||
///
|
||||
/// 文件夹批量模式要保留原目录结构(`Pop/a.mflac` → `out/Pop/a.flac`),
|
||||
/// 否则不同子目录的同名文件会在输出根目录里互相挤兑(虽然去重逻辑会让位成
|
||||
/// `_1`,但产物与源的对应关系就丢了)。
|
||||
pub fn ensure_subdir(
|
||||
dir: &std::path::Path,
|
||||
rel_parent: Option<&std::path::Path>,
|
||||
) -> Result<PathBuf> {
|
||||
let target = match rel_parent {
|
||||
Some(rel) if !rel.as_os_str().is_empty() => dir.join(rel),
|
||||
_ => dir.to_path_buf(),
|
||||
};
|
||||
std::fs::create_dir_all(&target)?;
|
||||
Ok(target)
|
||||
}
|
||||
|
||||
/// 在 `dir` 下为 `stem` + `ext` 找一个不冲突的输出路径。
|
||||
///
|
||||
/// 不同来源的同名文件若直接扁平落盘会**互相覆盖**,故占用时追加 `_1`/`_2`…
|
||||
/// `reserved` 是本批次内已占用的名字(磁盘上尚不存在的也算)。
|
||||
pub fn unique_output(
|
||||
dir: &std::path::Path,
|
||||
stem: &str,
|
||||
ext: &str,
|
||||
reserved: &mut std::collections::HashSet<String>,
|
||||
) -> Result<PathBuf> {
|
||||
let mut candidate = dir.join(format!("{stem}.{ext}"));
|
||||
let mut n = 1;
|
||||
loop {
|
||||
let key = candidate.to_string_lossy().to_lowercase();
|
||||
if !candidate.exists() && !reserved.contains(&key) {
|
||||
reserved.insert(key);
|
||||
return Ok(candidate);
|
||||
}
|
||||
candidate = dir.join(format!("{stem}_{n}.{ext}"));
|
||||
n += 1;
|
||||
if n > 9999 {
|
||||
return Err(DecryptError::Output(format!(
|
||||
"无法为 {stem} 找到不冲突的输出名"
|
||||
)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 读满 `buf` 或读到 EOF,返回实际字节数。
|
||||
///
|
||||
/// 与 `Read::read` 的关键区别:**只有 EOF 才会提前返回**,不会因为底层缓冲的
|
||||
/// 短读而返回半个块。流密码解密的块边界必须与加密侧严格一致,
|
||||
/// 否则相位错位、文件中途变噪声(`MUSIC_DECRYPT_PLAN.md` §6.24)。
|
||||
pub fn read_full(r: &mut impl std::io::Read, buf: &mut [u8]) -> Result<usize> {
|
||||
let mut filled = 0usize;
|
||||
while filled < buf.len() {
|
||||
match r.read(&mut buf[filled..]) {
|
||||
Ok(0) => break,
|
||||
Ok(n) => filled += n,
|
||||
Err(e) if e.kind() == std::io::ErrorKind::Interrupted => continue,
|
||||
Err(e) => return Err(DecryptError::Io(e.to_string())),
|
||||
}
|
||||
}
|
||||
Ok(filled)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn detect_format_by_magic() {
|
||||
assert_eq!(detect_format(b"fLaC\x00\x00\x00\x22"), "flac");
|
||||
assert_eq!(detect_format(b"OggS\x00\x02"), "ogg");
|
||||
assert_eq!(detect_format(b"ID3\x04\x00"), "mp3");
|
||||
assert_eq!(detect_format(&[0xFF, 0xFB, 0x90, 0x00]), "mp3");
|
||||
assert_eq!(detect_format(b"RIFF\x00\x00\x00\x00WAVEfmt "), "wav");
|
||||
assert_eq!(detect_format(b"\x00\x00\x00\x20ftypM4A "), "m4a");
|
||||
assert_eq!(detect_format(b"wvpk\x00\x00"), "wv");
|
||||
assert_eq!(detect_format(b"\x00\x01\x02\x03"), "flac");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn image_ext_by_magic() {
|
||||
assert_eq!(
|
||||
image_ext(&[0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]),
|
||||
"png"
|
||||
);
|
||||
assert_eq!(image_ext(&[0xFF, 0xD8, 0xFF, 0xE0]), "jpg");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unique_output_appends_suffix_on_collision() {
|
||||
let dir = std::env::temp_dir().join(format!("dec_unique_{}", std::process::id()));
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
let mut reserved = std::collections::HashSet::new();
|
||||
|
||||
let a = unique_output(&dir, "song", "flac", &mut reserved).unwrap();
|
||||
assert_eq!(a.file_name().unwrap(), "song.flac");
|
||||
let b = unique_output(&dir, "song", "flac", &mut reserved).unwrap();
|
||||
assert_eq!(b.file_name().unwrap(), "song_1.flac");
|
||||
let c = unique_output(&dir, "song", "mp3", &mut reserved).unwrap();
|
||||
assert_eq!(c.file_name().unwrap(), "song.mp3");
|
||||
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ensure_subdir_preserves_relative_structure() {
|
||||
let root = std::env::temp_dir().join(format!("dec_subdir_{}", std::process::id()));
|
||||
let _ = std::fs::remove_dir_all(&root);
|
||||
std::fs::create_dir_all(&root).unwrap();
|
||||
|
||||
// 无相对目录 → 输出根
|
||||
let flat = ensure_subdir(&root, None).unwrap();
|
||||
assert_eq!(flat, root);
|
||||
|
||||
// 有相对目录 → 逐级创建
|
||||
let nested = ensure_subdir(
|
||||
&root,
|
||||
Some(std::path::Path::new("Pop").join("2026").as_path()),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(nested.is_dir());
|
||||
assert!(nested.ends_with("Pop/2026") || nested.ends_with(r"Pop\2026"));
|
||||
|
||||
let _ = std::fs::remove_dir_all(&root);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn read_full_returns_whole_buffer() {
|
||||
// 一个每次只吐 3 字节的 reader:read_full 必须凑满整个 buf
|
||||
struct Drip {
|
||||
data: Vec<u8>,
|
||||
pos: usize,
|
||||
}
|
||||
impl std::io::Read for Drip {
|
||||
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
|
||||
if self.pos >= self.data.len() {
|
||||
return Ok(0);
|
||||
}
|
||||
let n = buf.len().min(3).min(self.data.len() - self.pos);
|
||||
buf[..n].copy_from_slice(&self.data[self.pos..self.pos + n]);
|
||||
self.pos += n;
|
||||
Ok(n)
|
||||
}
|
||||
}
|
||||
|
||||
let src: Vec<u8> = (0..100u8).collect();
|
||||
let mut r = Drip {
|
||||
data: src.clone(),
|
||||
pos: 0,
|
||||
};
|
||||
let mut buf = [0u8; 64];
|
||||
let n = read_full(&mut r, &mut buf).unwrap();
|
||||
assert_eq!(n, 64, "短读 reader 也必须凑满整块");
|
||||
assert_eq!(&buf[..], &src[..64]);
|
||||
|
||||
// 末尾不足一块时返回实际长度
|
||||
let n2 = read_full(&mut r, &mut buf).unwrap();
|
||||
assert_eq!(n2, 36);
|
||||
let n3 = read_full(&mut r, &mut buf).unwrap();
|
||||
assert_eq!(n3, 0, "EOF 返回 0");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,624 @@
|
||||
//! 音乐模块 · 本地解密(`music/decrypt/`)。
|
||||
//!
|
||||
//! 挂靠音乐模块的「解密」页签,与下载链路同构:命令先回一个 `taskId`,
|
||||
//! 之后所有进度经 `music-decrypt-event` 推送(前端 `decryptStore` 常驻监听,
|
||||
//! 页签切换卸载组件也不影响任务)。
|
||||
//!
|
||||
//! ## 分工
|
||||
//!
|
||||
//! - [`ncm`]:网易云 `.ncm` 的**纯 Rust 离线**引擎(P0 全部范围)。
|
||||
//! - `qq`(P1,未实施):QQ 音乐三层路由(内嵌 ekey 离线 → musicex API → Frida 兜底)。
|
||||
//! 见 `MUSIC_DECRYPT_PLAN.md` §3.2。
|
||||
//! - [`commands`]:Tauri 命令层(run / cancel)。
|
||||
//!
|
||||
//! ## 为什么事件在独立线程里发
|
||||
//!
|
||||
//! 解密是 CPU + 磁盘密集的同步流程,每读一块就要回报进度。把它放在
|
||||
//! `spawn_blocking` 里再逐块 `emit` 会阻塞 tokio 的工作线程;
|
||||
//! 这里改为「`std::thread` 干活 + `mpsc` 回传事件 + 异步任务节流转发」,
|
||||
//! 读盘线程最多被 `mpsc::send` 短暂挡住,不碰 tokio 运行时。
|
||||
//!
|
||||
//! 进度**按时间节流**([`PROGRESS_INTERVAL`]):单个大文件有成千上万个 32KB 块,
|
||||
//! 不节流会把 WebView 的事件通道打满。
|
||||
|
||||
pub mod commands;
|
||||
pub mod common;
|
||||
pub mod ncm;
|
||||
pub mod probe;
|
||||
pub mod qmc;
|
||||
pub mod qq_credentials;
|
||||
pub mod qq_ekey;
|
||||
pub mod qq_footer;
|
||||
pub mod qq_online;
|
||||
pub mod scan;
|
||||
|
||||
/// QQ 音乐进程内存扫描:纯 Win32 实现,非 Windows 平台不编译。
|
||||
#[cfg(windows)]
|
||||
pub mod qq_memscan;
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::{mpsc, Arc, Mutex};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
use tauri::{AppHandle, Emitter};
|
||||
|
||||
use common::DecryptError;
|
||||
|
||||
/// 进度事件的最小间隔
|
||||
pub const PROGRESS_INTERVAL: Duration = Duration::from_millis(300);
|
||||
|
||||
/// 单文件处理结果的三个状态
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Type)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum FileStatus {
|
||||
/// 解密成功
|
||||
Ok,
|
||||
/// 失败(`message` 为可读原因)
|
||||
Error,
|
||||
/// 该文件不属于本平台/本阶段支持范围
|
||||
Unsupported,
|
||||
}
|
||||
|
||||
/// 推送给前端的事件负载(与 `src/lib/bindings.ts` / `decryptStore.ts` 对应)。
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||
#[serde(tag = "type", rename_all = "kebab-case")]
|
||||
pub enum DecryptEvent {
|
||||
/// 批次开始,`total` 为待处理文件数
|
||||
Start { task_id: String, total: usize },
|
||||
/// 单个文件处理完毕
|
||||
File {
|
||||
task_id: String,
|
||||
/// 0-based 序号,与任务表行一一对应
|
||||
index: usize,
|
||||
name: String,
|
||||
status: FileStatus,
|
||||
/// 失败原因,或成功时的备注(平台 / 密钥形态)
|
||||
message: Option<String>,
|
||||
/// 主产物路径
|
||||
output: Option<String>,
|
||||
/// 单独落盘的封面(网易云 ncm 带内嵌封面时才有)
|
||||
cover: Option<String>,
|
||||
},
|
||||
/// 进度(节流后)
|
||||
Progress {
|
||||
task_id: String,
|
||||
done: usize,
|
||||
total: usize,
|
||||
/// 当前文件已处理字节数 / 总字节数(0 表示未知)
|
||||
bytes_done: u64,
|
||||
bytes_total: u64,
|
||||
name: String,
|
||||
},
|
||||
/// 批次结束
|
||||
Finished {
|
||||
task_id: String,
|
||||
ok: usize,
|
||||
failed: usize,
|
||||
/// 被取消时尚未处理的文件数
|
||||
cancelled: usize,
|
||||
},
|
||||
}
|
||||
|
||||
/// 任务表条目。只存「是否被要求取消」,不存进度——
|
||||
/// 进度的权威在前端 store(事件即真相),Rust 侧不需要镜像状态。
|
||||
pub struct DecryptTasks {
|
||||
inner: Mutex<HashMap<String, Arc<AtomicBool>>>,
|
||||
}
|
||||
|
||||
impl Default for DecryptTasks {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl DecryptTasks {
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
inner: Mutex::new(HashMap::new()),
|
||||
}
|
||||
}
|
||||
|
||||
/// 登记一个任务并返回它的取消标志
|
||||
pub fn register(&self, task_id: &str) -> Arc<AtomicBool> {
|
||||
let flag = Arc::new(AtomicBool::new(false));
|
||||
if let Ok(mut m) = self.inner.lock() {
|
||||
m.insert(task_id.to_string(), flag.clone());
|
||||
}
|
||||
flag
|
||||
}
|
||||
|
||||
/// 请求取消;返回是否命中了一个在跑的任务
|
||||
pub fn cancel(&self, task_id: &str) -> bool {
|
||||
match self.inner.lock() {
|
||||
Ok(m) => match m.get(task_id) {
|
||||
Some(flag) => {
|
||||
flag.store(true, Ordering::SeqCst);
|
||||
true
|
||||
}
|
||||
None => false,
|
||||
},
|
||||
Err(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn finish(&self, task_id: &str) {
|
||||
if let Ok(mut m) = self.inner.lock() {
|
||||
m.remove(task_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 线程 → 异步任务的事件通道消息
|
||||
enum Msg {
|
||||
Progress {
|
||||
bytes_done: u64,
|
||||
bytes_total: u64,
|
||||
name: String,
|
||||
},
|
||||
File {
|
||||
index: usize,
|
||||
name: String,
|
||||
status: FileStatus,
|
||||
message: Option<String>,
|
||||
output: Option<String>,
|
||||
cover: Option<String>,
|
||||
},
|
||||
/// 批次结束。**必须走通道**——否则它会在转发线程尚未冲出积压的
|
||||
/// `File` 事件之前就被 `emit`,前端会先看到"完成"再看到最后几个文件的结果。
|
||||
Finished {
|
||||
ok: usize,
|
||||
failed: usize,
|
||||
cancelled: usize,
|
||||
},
|
||||
}
|
||||
|
||||
/// 该文件是否是「需要联网取密钥」的形态(musicex)。
|
||||
///
|
||||
/// 只读尾部 192 字节,代价可忽略;用作"离线失败后要不要转在线"的判据,
|
||||
/// 避免对普通失败(如尾部损坏)也去发起网络请求。
|
||||
fn needs_online(path: &std::path::Path) -> bool {
|
||||
use std::io::{Read, Seek, SeekFrom};
|
||||
let Ok(mut f) = std::fs::File::open(path) else {
|
||||
return false;
|
||||
};
|
||||
let Ok(size) = f.metadata().map(|m| m.len()) else {
|
||||
return false;
|
||||
};
|
||||
let take = (qq_footer::MUSICEX_FOOTER_LEN as u64).min(size) as usize;
|
||||
if take < 8 || f.seek(SeekFrom::End(-(take as i64))).is_err() {
|
||||
return false;
|
||||
}
|
||||
let mut buf = vec![0u8; take];
|
||||
if f.read_exact(&mut buf).is_err() {
|
||||
return false;
|
||||
}
|
||||
qq_footer::is_musicex_tail(&buf)
|
||||
}
|
||||
|
||||
/// 启动一个解密批次:登记任务 → 起工作线程 → 异步转发事件。
|
||||
///
|
||||
/// 调用方(`commands::music_decrypt_run`)已完成参数校验与目录扫描;本函数只负责调度。
|
||||
///
|
||||
/// `in_place = true` 时**忽略 `out_dir`**,产物与源文件同目录同名(扩展名按格式改)。
|
||||
/// 这是文件夹批量的默认方式——用户的期望是"就地解出来",而不是去另一个目录找。
|
||||
pub fn spawn_batch(
|
||||
app: AppHandle,
|
||||
tasks: Arc<DecryptTasks>,
|
||||
task_id: String,
|
||||
files: Vec<scan::ScannedFile>,
|
||||
out_dir: PathBuf,
|
||||
in_place: bool,
|
||||
) {
|
||||
let flag = tasks.register(&task_id);
|
||||
let (tx, rx) = mpsc::channel::<Msg>();
|
||||
let total_files = files.len();
|
||||
|
||||
// ---- 工作线程:逐文件解密 ----
|
||||
let worker_task_id = task_id.clone();
|
||||
let worker_tasks = tasks.clone();
|
||||
std::thread::Builder::new()
|
||||
.name(format!("music-decrypt-{task_id}"))
|
||||
.spawn(move || {
|
||||
let total = files.len();
|
||||
|
||||
// 批次内已占用的输出名(防同名互相覆盖,见 common::unique_output)
|
||||
let mut reserved = std::collections::HashSet::new();
|
||||
let mut ok = 0usize;
|
||||
let mut failed = 0usize;
|
||||
let mut cancelled = 0usize;
|
||||
let mut done = 0usize;
|
||||
|
||||
for (index, job) in files.iter().enumerate() {
|
||||
if flag.load(Ordering::SeqCst) {
|
||||
cancelled = total - done;
|
||||
break;
|
||||
}
|
||||
|
||||
// 输出目录:就地模式与源文件同目录;否则按相对目录还原结构
|
||||
let target_dir = if in_place {
|
||||
job.path
|
||||
.parent()
|
||||
.map(|p| p.to_path_buf())
|
||||
.unwrap_or_else(|| out_dir.clone())
|
||||
} else {
|
||||
common::ensure_subdir(&out_dir, job.rel_parent.as_deref())
|
||||
.unwrap_or_else(|_| out_dir.clone())
|
||||
};
|
||||
|
||||
// 进度回调:只在文件内部回报,节流交给接收端
|
||||
let tx_progress = tx.clone();
|
||||
let name = job.name.clone();
|
||||
// 「网易云 / QQ音乐」前缀由调度层给出——引擎自己不该知道路由结果
|
||||
let label = job.engine.label();
|
||||
let mut progress_cb = |bytes_done: u64, bytes_total: u64| {
|
||||
let _ = tx_progress.send(Msg::Progress {
|
||||
bytes_done,
|
||||
bytes_total,
|
||||
name: name.clone(),
|
||||
});
|
||||
};
|
||||
let result = match job.engine {
|
||||
scan::Engine::Ncm => ncm::decrypt_file(
|
||||
&job.path,
|
||||
&target_dir,
|
||||
label,
|
||||
&mut reserved,
|
||||
&mut progress_cb,
|
||||
),
|
||||
// musicex 的 ekey 不在文件里,离线路径会返回明确的 KeyRequired;
|
||||
// 命中该形态时改走「本机凭据 → 在线取密钥」。
|
||||
scan::Engine::Qmc => {
|
||||
let offline = qmc::decrypt_file(
|
||||
&job.path,
|
||||
&target_dir,
|
||||
label,
|
||||
&mut reserved,
|
||||
&mut progress_cb,
|
||||
);
|
||||
match offline {
|
||||
Err(DecryptError::KeyRequired(_)) if needs_online(&job.path) => {
|
||||
qq_online::decrypt_musicex(
|
||||
&job.path,
|
||||
&target_dir,
|
||||
label,
|
||||
&mut progress_cb,
|
||||
)
|
||||
}
|
||||
other => other,
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
done += 1;
|
||||
match result {
|
||||
Ok(res) => {
|
||||
ok += 1;
|
||||
crate::logger::log_info(
|
||||
"music-decrypt",
|
||||
&format!(
|
||||
"{} → {}({},{} 字节)",
|
||||
job.path.display(),
|
||||
res.output.display(),
|
||||
res.format,
|
||||
res.audio_bytes
|
||||
),
|
||||
);
|
||||
let _ = tx.send(Msg::File {
|
||||
index,
|
||||
name: job.name.clone(),
|
||||
status: FileStatus::Ok,
|
||||
// 成功时把备注(平台/密钥形态)与产物一起回报
|
||||
message: Some(res.note),
|
||||
output: Some(res.output.to_string_lossy().to_string()),
|
||||
cover: res.cover.map(|c| c.to_string_lossy().to_string()),
|
||||
});
|
||||
}
|
||||
Err(e) => {
|
||||
failed += 1;
|
||||
crate::logger::log_warn(
|
||||
"music-decrypt",
|
||||
&format!("{} 解密失败:{e}", job.path.display()),
|
||||
);
|
||||
let _ = tx.send(Msg::File {
|
||||
index,
|
||||
name: job.name.clone(),
|
||||
status: FileStatus::Error,
|
||||
message: Some(e.to_string()),
|
||||
output: None,
|
||||
cover: None,
|
||||
});
|
||||
}
|
||||
}
|
||||
// 文件收尾时必推一次,保证进度条不因节流停在中间
|
||||
let _ = tx.send(Msg::Progress {
|
||||
bytes_done: done as u64,
|
||||
bytes_total: total as u64,
|
||||
name: job.name.clone(),
|
||||
});
|
||||
}
|
||||
|
||||
// 通道关闭 → 接收端读完剩余消息后收尾
|
||||
let _ = tx.send(Msg::Finished {
|
||||
ok,
|
||||
failed,
|
||||
cancelled,
|
||||
});
|
||||
drop(tx);
|
||||
worker_tasks.finish(&worker_task_id);
|
||||
})
|
||||
.expect("无法创建解密工作线程");
|
||||
|
||||
// ---- 异步转发:节流 + 顺序保证 ----
|
||||
//
|
||||
// 语义:
|
||||
// - `File` 事件(含文件收尾的那次 Progress)**立即转发**,否则结果会看起来卡在末尾。
|
||||
// - 文件内部的逐块 Progress 只保留最新一条,按 [`PROGRESS_INTERVAL`] 最多发一次,
|
||||
// 避免单个大文件的成千上万个块把 WebView 事件通道打满。
|
||||
tauri::async_runtime::spawn(async move {
|
||||
let mut last_progress: Option<Msg> = None;
|
||||
let mut last_emit = Instant::now() - PROGRESS_INTERVAL;
|
||||
let mut current_index = 0usize;
|
||||
// 批内文件总数:与下面 Start 事件取同一份来源
|
||||
let current_total = total_files;
|
||||
|
||||
// Start 先发:它必须在任何 Progress/File 之前到达,前端据此建行。
|
||||
let _ = app.emit(
|
||||
crate::constants::events::MUSIC_DECRYPT_EVENT,
|
||||
&DecryptEvent::Start {
|
||||
task_id: task_id.clone(),
|
||||
total: total_files,
|
||||
},
|
||||
);
|
||||
|
||||
loop {
|
||||
// 单次 recv_timeout 同时兼顾「有消息就收」和「到点就 flush」
|
||||
let msg = match rx.recv_timeout(PROGRESS_INTERVAL) {
|
||||
Ok(m) => Some(m),
|
||||
Err(mpsc::RecvTimeoutError::Timeout) => None,
|
||||
Err(mpsc::RecvTimeoutError::Disconnected) => break,
|
||||
};
|
||||
|
||||
match msg {
|
||||
Some(Msg::Progress {
|
||||
bytes_done,
|
||||
bytes_total,
|
||||
name,
|
||||
}) => {
|
||||
// 攒着;下面的 flush 决定何时真正发出
|
||||
last_progress = Some(Msg::Progress {
|
||||
bytes_done,
|
||||
bytes_total,
|
||||
name,
|
||||
});
|
||||
}
|
||||
Some(Msg::File {
|
||||
index,
|
||||
name,
|
||||
status,
|
||||
message,
|
||||
output,
|
||||
cover,
|
||||
}) => {
|
||||
// 结果事件优先:先把攒住的进度冲掉,再发结果,保证顺序自然
|
||||
flush_progress(
|
||||
&app,
|
||||
&task_id,
|
||||
&mut last_progress,
|
||||
&mut last_emit,
|
||||
current_index,
|
||||
current_total,
|
||||
);
|
||||
let _ = app.emit(
|
||||
crate::constants::events::MUSIC_DECRYPT_EVENT,
|
||||
&DecryptEvent::File {
|
||||
task_id: task_id.clone(),
|
||||
index,
|
||||
name,
|
||||
status,
|
||||
message,
|
||||
output,
|
||||
cover,
|
||||
},
|
||||
);
|
||||
current_index = index + 1;
|
||||
}
|
||||
Some(Msg::Finished {
|
||||
ok,
|
||||
failed,
|
||||
cancelled,
|
||||
}) => {
|
||||
// 收尾前把攒住的进度冲掉,再发 Finished,保证前端不丢最后一格进度
|
||||
last_emit = Instant::now() - PROGRESS_INTERVAL;
|
||||
flush_progress(
|
||||
&app,
|
||||
&task_id,
|
||||
&mut last_progress,
|
||||
&mut last_emit,
|
||||
current_index,
|
||||
current_total,
|
||||
);
|
||||
let _ = app.emit(
|
||||
crate::constants::events::MUSIC_DECRYPT_EVENT,
|
||||
&DecryptEvent::Finished {
|
||||
task_id: task_id.clone(),
|
||||
ok,
|
||||
failed,
|
||||
cancelled,
|
||||
},
|
||||
);
|
||||
// 通道随后关闭,循环自然退出
|
||||
}
|
||||
None => { /* 超时,走下面的 flush */ }
|
||||
}
|
||||
|
||||
flush_progress(
|
||||
&app,
|
||||
&task_id,
|
||||
&mut last_progress,
|
||||
&mut last_emit,
|
||||
current_index,
|
||||
current_total,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// 到点则把攒下的最新一条进度发出(最多每 [`PROGRESS_INTERVAL`] 一次)。
|
||||
fn flush_progress(
|
||||
app: &AppHandle,
|
||||
task_id: &str,
|
||||
pending: &mut Option<Msg>,
|
||||
last_emit: &mut Instant,
|
||||
index: usize,
|
||||
total: usize,
|
||||
) {
|
||||
if pending.is_none() || last_emit.elapsed() < PROGRESS_INTERVAL {
|
||||
return;
|
||||
}
|
||||
if let Some(Msg::Progress {
|
||||
bytes_done,
|
||||
bytes_total,
|
||||
name,
|
||||
}) = pending.take()
|
||||
{
|
||||
*last_emit = Instant::now();
|
||||
let _ = app.emit(
|
||||
crate::constants::events::MUSIC_DECRYPT_EVENT,
|
||||
&DecryptEvent::Progress {
|
||||
task_id: task_id.to_string(),
|
||||
// index = 当前正在处理的文件序号(已完成的文件数)
|
||||
done: index,
|
||||
total,
|
||||
bytes_done,
|
||||
bytes_total,
|
||||
name,
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// **跨端契约**:事件的实际 JSON 形状是前端 `decryptStore.ts` 里 `RawEvent`
|
||||
/// 的镜像。曾经打算写 camelCase(`taskId`),但枚举上只有 `tag` 带了
|
||||
/// `rename_all`,**字段名仍是 snake_case**——两边不一致时不会编译报错,
|
||||
/// 只会表现为「任务建好了但进度永远不动」。这个测试把形状钉死。
|
||||
#[test]
|
||||
fn event_json_contract() {
|
||||
let start = serde_json::to_value(DecryptEvent::Start {
|
||||
task_id: "t1".into(),
|
||||
total: 3,
|
||||
})
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
start,
|
||||
serde_json::json!({ "type": "start", "task_id": "t1", "total": 3 })
|
||||
);
|
||||
|
||||
let file = serde_json::to_value(DecryptEvent::File {
|
||||
task_id: "t1".into(),
|
||||
index: 2,
|
||||
name: "a.ncm".into(),
|
||||
status: FileStatus::Error,
|
||||
message: Some("坏了".into()),
|
||||
output: None,
|
||||
cover: None,
|
||||
})
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
file,
|
||||
serde_json::json!({
|
||||
"type": "file", "task_id": "t1", "index": 2, "name": "a.ncm",
|
||||
"status": "error", "message": "坏了", "output": null, "cover": null
|
||||
})
|
||||
);
|
||||
|
||||
let progress = serde_json::to_value(DecryptEvent::Progress {
|
||||
task_id: "t1".into(),
|
||||
done: 1,
|
||||
total: 3,
|
||||
bytes_done: 10,
|
||||
bytes_total: 100,
|
||||
name: "a.ncm".into(),
|
||||
})
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
progress,
|
||||
serde_json::json!({
|
||||
"type": "progress", "task_id": "t1", "done": 1, "total": 3,
|
||||
"bytes_done": 10, "bytes_total": 100, "name": "a.ncm"
|
||||
})
|
||||
);
|
||||
|
||||
let finished = serde_json::to_value(DecryptEvent::Finished {
|
||||
task_id: "t1".into(),
|
||||
ok: 2,
|
||||
failed: 1,
|
||||
cancelled: 0,
|
||||
})
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
finished,
|
||||
serde_json::json!({
|
||||
"type": "finished", "task_id": "t1", "ok": 2, "failed": 1, "cancelled": 0
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
/// `FileStatus` 的三个取值必须是前端 `DecryptFileStatus` 认得的字面量
|
||||
#[test]
|
||||
fn file_status_variants_are_lowercase() {
|
||||
let j = |s| serde_json::to_string(&s).unwrap();
|
||||
assert_eq!(j(FileStatus::Ok), "\"ok\"");
|
||||
assert_eq!(j(FileStatus::Error), "\"error\"");
|
||||
assert_eq!(j(FileStatus::Unsupported), "\"unsupported\"");
|
||||
}
|
||||
|
||||
/// 平台路由见 `scan::route`(内容优先于后缀)——这里只验证单测覆盖到的路径。
|
||||
#[test]
|
||||
fn engine_route_by_content_and_extension() {
|
||||
use scan::Engine;
|
||||
let dir = std::env::temp_dir().join(format!("dec_route_{}", std::process::id()));
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
|
||||
// 网易云:只看魔数,后缀随便
|
||||
let ncm = dir.join("x.bin");
|
||||
let mut bytes = b"CTENFDAM".to_vec();
|
||||
bytes.extend_from_slice(&[0x02, 0x00, 0, 0, 0, 0]);
|
||||
std::fs::write(&ncm, &bytes).unwrap();
|
||||
assert_eq!(scan::route(&ncm), Some(Engine::Ncm));
|
||||
|
||||
// QQ:后缀在家族里
|
||||
let qmc = dir.join("y.qmcflac");
|
||||
std::fs::write(&qmc, vec![0x22u8; 4096]).unwrap();
|
||||
assert_eq!(scan::route(&qmc), Some(Engine::Qmc));
|
||||
|
||||
// 普通音频文件不应被认领
|
||||
let mp3 = dir.join("z.mp3");
|
||||
std::fs::write(&mp3, vec![0x44u8; 4096]).unwrap();
|
||||
assert_eq!(scan::route(&mp3), None);
|
||||
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn task_registry_register_cancel_finish() {
|
||||
let tasks = DecryptTasks::new();
|
||||
let flag = tasks.register("t1");
|
||||
assert!(!flag.load(Ordering::SeqCst));
|
||||
// 取消命中
|
||||
assert!(tasks.cancel("t1"));
|
||||
assert!(flag.load(Ordering::SeqCst));
|
||||
// 未登记的任务取消不报错、返回 false
|
||||
assert!(!tasks.cancel("nope"));
|
||||
tasks.finish("t1");
|
||||
assert!(!tasks.cancel("t1"), "已结束的任务不应再被取消");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,734 @@
|
||||
//! 网易云音乐 `.ncm` 离线解密引擎(纯 Rust,无外部依赖、无运行时前置)。
|
||||
//!
|
||||
//! 算法对照 **MIT 协议** 的 `taurusxin/ncmdump`(`src/ncmcrypt.cpp`)独立重写。
|
||||
//! 下面每个常量与分支都对应容器里的一个实际字段,注释里标了「为什么」——
|
||||
//! 这几处正是最容易写错的地方,改动前请先读 `MUSIC_DECRYPT_PLAN.md` §3.1。
|
||||
//!
|
||||
//! ## 容器结构
|
||||
//!
|
||||
//! ```text
|
||||
//! 0x00 magic 8B "CTENFDAM"
|
||||
//! 0x08 2B 固定跳过
|
||||
//! 0x0A key_len 4B LE
|
||||
//! key_data XOR 0x64 → AES-128-ECB → 跳 17B → RC4 密钥盒种子
|
||||
//! meta_len 4B LE
|
||||
//! meta_data XOR 0x63 → 去 22B 前缀 → base64 → AES-128-ECB → 去 6B 前缀 → JSON
|
||||
//! 5B 固定跳过(CRC32 4B + 图片版本 1B)
|
||||
//! cover_len 4B LE / img_len 4B LE / img_data → 跳 cover_len - img_len
|
||||
//! audio 剩余全部(RC4 变体,按 0x8000 分块)
|
||||
//! ```
|
||||
//!
|
||||
//! 两段 XOR 常量不同(`0x64` / `0x63`)、AES 收尾是 PKCS#7 风格 padding、
|
||||
//! 密钥盒 KSA 带 `last_byte` 累加——任一写错都会全量解错,
|
||||
//! 且不会报错,只会产出乱码音频。
|
||||
|
||||
use std::fs::File;
|
||||
use std::io::{BufReader, BufWriter, Read, Write};
|
||||
use std::path::Path;
|
||||
|
||||
use aes::cipher::generic_array::GenericArray;
|
||||
use aes::cipher::{BlockDecrypt, KeyInit};
|
||||
use aes::Aes128;
|
||||
|
||||
use super::common::{self, DecryptError};
|
||||
|
||||
/// 头部魔数(ASCII `CTENFDAM`)
|
||||
const MAGIC: &[u8; 8] = b"CTENFDAM";
|
||||
/// key 段的 XOR 常量
|
||||
const XOR_KEY: u8 = 0x64;
|
||||
/// meta 段的 XOR 常量(**与 key 段不同**)
|
||||
const XOR_META: u8 = 0x63;
|
||||
/// key 段解密后需跳过的前缀:ASCII `neteasecloudmusic`(17 字节,含结尾 NUL)
|
||||
const CORE_KEY: &[u8; 17] = b"neteasecloudmusic";
|
||||
/// key 段 **AES 密钥**:ASCII `neteasecloudmusi`——`CORE_KEY` 的前 16 字节。
|
||||
///
|
||||
/// 注意与上面 17 字节的「前缀」区分:前缀(`neteasecloudmusic\0`,17B)是解密后
|
||||
/// 要从明文里剥掉的,AES 密钥(16B)是用来解密的。`aes::Aes128` 只吃 16 字节。
|
||||
const CORE_AES_KEY: &[u8; 16] = b"neteasecloudmusi";
|
||||
/// meta 段 AES 密钥:ASCII `#14ljk_!\]&0U<'(`(**与 CORE_KEY 不同**,别复用)
|
||||
///
|
||||
/// 注意是 16 字节而非 17——`aes::Aes128` 的密钥长度就是 16。
|
||||
const MODIFY_KEY: &[u8; 16] = b"#14ljk_!\\]&0U<'(";
|
||||
/// meta 段 base64 之前的字面量前缀
|
||||
const META_PREFIX: &[u8] = b"163 key(Don't modify):";
|
||||
/// meta 段 AES 解密后的字面量前缀
|
||||
const META_JSON_PREFIX: &[u8] = b"music:";
|
||||
/// 音频段分块大小。**块之间不额外跳字节**——这个值只是读写块大小。
|
||||
const CHUNK: usize = 0x8000;
|
||||
|
||||
/// ncm 内嵌元数据(meta 段 JSON 的子集)
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub struct NcmMeta {
|
||||
pub name: Option<String>,
|
||||
pub artist: Option<String>,
|
||||
pub album: Option<String>,
|
||||
pub bitrate: Option<u64>,
|
||||
pub duration: Option<u64>,
|
||||
/// 容器内声明的格式。**不用于决定输出扩展名**(那只认音频首帧魔数)。
|
||||
pub format: Option<String>,
|
||||
}
|
||||
|
||||
/// 本模块的错误类型 = 公共错误类型([`DecryptError`]),
|
||||
/// 便于调度层对两个引擎用同一套 `?` 与文案处理。
|
||||
pub type NcmError = DecryptError;
|
||||
|
||||
type Result<T> = std::result::Result<T, DecryptError>;
|
||||
|
||||
/// AES-128-ECB 解密 + PKCS#7 风格去 padding。
|
||||
///
|
||||
/// `aes` crate 只提供块原语(且本项目依赖树里**没有** `ecb` crate),
|
||||
/// 故这里手写块循环。收尾不是「去前缀」而是取最后一字节当 padding 长度——
|
||||
/// 这一点在 `MUSIC_DECRYPT_PLAN.md` §3.1③ 有说明。
|
||||
fn aes_ecb_decrypt(key: &[u8], data: &[u8]) -> Result<Vec<u8>> {
|
||||
if key.len() != 16 {
|
||||
return Err(NcmError::Broken(format!(
|
||||
"AES 密钥长度应为 16,实为 {}",
|
||||
key.len()
|
||||
)));
|
||||
}
|
||||
if data.is_empty() || data.len() % 16 != 0 {
|
||||
return Err(NcmError::Broken(format!(
|
||||
"AES 密文长度 {} 不是 16 的正整数倍",
|
||||
data.len()
|
||||
)));
|
||||
}
|
||||
let cipher = Aes128::new(GenericArray::from_slice(key));
|
||||
let blocks = data.len() / 16;
|
||||
let mut out = Vec::with_capacity(data.len());
|
||||
let mut buf = [0u8; 16];
|
||||
for i in 0..blocks {
|
||||
let block = GenericArray::from_slice(&data[i * 16..i * 16 + 16]);
|
||||
cipher.decrypt_block_b2b(block, GenericArray::from_mut_slice(&mut buf));
|
||||
// 最后一块按 padding 截断:末字节即填充长度,>16 视为无填充
|
||||
if i == blocks - 1 {
|
||||
let pad = if buf[15] > 16 { 0 } else { buf[15] as usize };
|
||||
out.extend_from_slice(&buf[..16 - pad.min(16)]);
|
||||
} else {
|
||||
out.extend_from_slice(&buf);
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// 密钥盒构造(KSA)。
|
||||
///
|
||||
/// 对照 `ncmdump` `src/ncmcrypt.cpp::buildKeyBox`——**单循环**,但每轮多累加一个
|
||||
/// `last_byte`(上一轮的 `c`):
|
||||
///
|
||||
/// ```text
|
||||
/// c = (swap + last_byte + key[key_offset]) & 0xff
|
||||
/// ```
|
||||
///
|
||||
/// 这个式子在模 256 下恰好化简为标准 RC4(实测两者密钥盒逐字节相同),
|
||||
/// 所以**它既不是「关键差异」,也不能靠与标准 RC4 比对来验证**——
|
||||
/// 验证只能靠固定向量,见单测 `key_box_matches_reference_vectors`。
|
||||
/// `key_offset` 触 keyLen 归零——即循环取 key。
|
||||
fn build_key_box(key: &[u8]) -> [u8; 256] {
|
||||
let mut key_box = [0u8; 256];
|
||||
for (i, b) in key_box.iter_mut().enumerate() {
|
||||
*b = i as u8;
|
||||
}
|
||||
if key.is_empty() {
|
||||
return key_box;
|
||||
}
|
||||
let mut last_byte: u8 = 0;
|
||||
let mut key_offset = 0usize;
|
||||
for i in 0..256usize {
|
||||
let swap = key_box[i];
|
||||
let c = swap.wrapping_add(last_byte).wrapping_add(key[key_offset]);
|
||||
key_offset += 1;
|
||||
if key_offset >= key.len() {
|
||||
key_offset = 0;
|
||||
}
|
||||
key_box[i] = key_box[c as usize];
|
||||
key_box[c as usize] = swap;
|
||||
last_byte = c;
|
||||
}
|
||||
key_box
|
||||
}
|
||||
|
||||
/// 原地解密一个音频块。
|
||||
///
|
||||
/// 对照 `ncmdump` `src/ncmcrypt.cpp::Dump`——`i` 是**块内下标**,`j = (i + 1) & 0xff`:
|
||||
///
|
||||
/// ```text
|
||||
/// buf[i] ^= mKeyBox[(mKeyBox[j] + mKeyBox[(mKeyBox[j] + j) & 0xff]) & 0xff];
|
||||
/// ```
|
||||
///
|
||||
/// 块与块之间不重置密钥盒、也不额外跳字节(`0x8000` 只是块大小)。
|
||||
/// 该式只依赖 `i` 与密钥盒,故分块与整体解密结果一致(见单测)。
|
||||
fn decrypt_audio_chunk(key_box: &[u8; 256], buf: &mut [u8]) {
|
||||
for i in 0..buf.len() {
|
||||
let j = (i + 1) & 0xff;
|
||||
let k = key_box
|
||||
[key_box[j].wrapping_add(key_box[key_box[j].wrapping_add(j as u8) as usize]) as usize];
|
||||
buf[i] ^= k;
|
||||
}
|
||||
}
|
||||
|
||||
/// 封面/标签用的图片扩展名(按魔数,不按 ncm 的说法)
|
||||
fn image_ext(data: &[u8]) -> &'static str {
|
||||
common::image_ext(data)
|
||||
}
|
||||
|
||||
/// 读满一块(短读不算块边界)——实现见 [`common::read_full`]。
|
||||
fn read_full(r: &mut impl Read, buf: &mut [u8]) -> Result<usize> {
|
||||
common::read_full(r, buf)
|
||||
}
|
||||
|
||||
fn read_u32(r: &mut impl Read) -> Result<u32> {
|
||||
let mut b = [0u8; 4];
|
||||
r.read_exact(&mut b)
|
||||
.map_err(|_| NcmError::Broken("读取长度字段时提前结束".into()))?;
|
||||
Ok(u32::from_le_bytes(b))
|
||||
}
|
||||
|
||||
fn read_n(r: &mut impl Read, n: usize) -> Result<Vec<u8>> {
|
||||
let mut buf = vec![0u8; n];
|
||||
r.read_exact(&mut buf)
|
||||
.map_err(|_| NcmError::Broken(format!("读取 {n} 字节时提前结束")))?;
|
||||
Ok(buf)
|
||||
}
|
||||
|
||||
/// 解析 meta JSON 为 `NcmMeta`。
|
||||
///
|
||||
/// `artist` 是二维数组(`[["名字", id], ...]`),取每项第 0 个元素并用 `/` 连接。
|
||||
fn parse_meta(json: &str) -> NcmMeta {
|
||||
let Ok(v) = serde_json::from_str::<serde_json::Value>(json) else {
|
||||
return NcmMeta::default();
|
||||
};
|
||||
let s = |k: &str| v.get(k).and_then(|x| x.as_str()).map(|x| x.to_string());
|
||||
let n = |k: &str| v.get(k).and_then(|x| x.as_u64());
|
||||
let artist = v.get("artist").and_then(|a| a.as_array()).map(|arr| {
|
||||
arr.iter()
|
||||
.filter_map(|item| {
|
||||
item.as_array()
|
||||
.and_then(|inner| inner.first())
|
||||
.and_then(|name| name.as_str())
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
.join("/")
|
||||
});
|
||||
NcmMeta {
|
||||
name: s("musicName"),
|
||||
artist: artist.filter(|a| !a.is_empty()),
|
||||
album: s("album"),
|
||||
bitrate: n("bitrate"),
|
||||
duration: n("duration"),
|
||||
format: s("format"),
|
||||
}
|
||||
}
|
||||
|
||||
/// 解析头部 + key 段 + meta 段 + 封面,返回 (密钥盒, meta, 封面字节)。
|
||||
fn read_header(r: &mut impl Read) -> Result<([u8; 256], NcmMeta, Option<Vec<u8>>)> {
|
||||
// 0x00 magic 8B
|
||||
let magic = read_n(r, 8)?;
|
||||
if &magic != MAGIC {
|
||||
return Err(NcmError::NotEncrypted(
|
||||
"不是网易云加密文件(头部魔数不是 CTENFDAM)".into(),
|
||||
));
|
||||
}
|
||||
// 0x08 固定 2 字节(读取权重仅为推进游标)
|
||||
let _ = read_n(r, 2)?;
|
||||
|
||||
// ---- key 段 ----
|
||||
let key_len = read_u32(r)? as usize;
|
||||
if key_len == 0 {
|
||||
return Err(NcmError::Broken("key 段长度为 0".into()));
|
||||
}
|
||||
let mut key_data = read_n(r, key_len)?;
|
||||
for b in key_data.iter_mut() {
|
||||
*b ^= XOR_KEY;
|
||||
}
|
||||
let key_plain = aes_ecb_decrypt(CORE_AES_KEY, &key_data)?;
|
||||
if key_plain.len() <= CORE_KEY.len() {
|
||||
return Err(NcmError::Broken(format!(
|
||||
"key 段解密后仅 {} 字节,不足以剥离前缀",
|
||||
key_plain.len()
|
||||
)));
|
||||
}
|
||||
// 剥离 "neteasecloudmusic\0" 前缀,其余即密钥盒种子
|
||||
let rc4_key = &key_plain[CORE_KEY.len()..];
|
||||
let key_box = build_key_box(rc4_key);
|
||||
|
||||
// ---- meta 段 ----
|
||||
let meta_len = read_u32(r)? as usize;
|
||||
let mut meta = NcmMeta::default();
|
||||
if meta_len > 0 {
|
||||
let mut meta_data = read_n(r, meta_len)?;
|
||||
for b in meta_data.iter_mut() {
|
||||
*b ^= XOR_META;
|
||||
}
|
||||
// 第一层前缀:literal,先剥掉再 base64
|
||||
if meta_data.len() > META_PREFIX.len() {
|
||||
let body = &meta_data[META_PREFIX.len()..];
|
||||
use base64::Engine;
|
||||
if let Ok(decoded) = base64::engine::general_purpose::STANDARD.decode(body) {
|
||||
if let Ok(plain) = aes_ecb_decrypt(MODIFY_KEY, &decoded) {
|
||||
// 第二层前缀:"music:"
|
||||
let json = if plain.len() > META_JSON_PREFIX.len() {
|
||||
&plain[META_JSON_PREFIX.len()..]
|
||||
} else {
|
||||
&plain[..]
|
||||
};
|
||||
// 元数据非 UTF-8 或非 JSON 都不致命:放弃标签即可
|
||||
if let Ok(s) = std::str::from_utf8(json) {
|
||||
meta = parse_meta(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---- 封面段 ----
|
||||
// 跳 5 字节:CRC32(4) + 图片版本(1)
|
||||
let mut five = [0u8; 5];
|
||||
r.read_exact(&mut five)
|
||||
.map_err(|_| NcmError::Broken("读取 CRC32/图片版本时提前结束".into()))?;
|
||||
let cover_frame_len = read_u32(r)? as usize;
|
||||
let img_len = read_u32(r)? as usize;
|
||||
let cover = if img_len > 0 {
|
||||
Some(read_n(r, img_len)?)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
// 跳到 key 帧末尾
|
||||
if cover_frame_len > img_len {
|
||||
let mut discard = vec![0u8; cover_frame_len - img_len];
|
||||
let _ = r.read_exact(&mut discard);
|
||||
}
|
||||
|
||||
Ok((key_box, meta, cover))
|
||||
}
|
||||
|
||||
/// 判断文件是否为网易云 `.ncm`(只读 8 字节魔数)。
|
||||
pub fn sniff(path: &Path) -> bool {
|
||||
let Ok(mut f) = File::open(path) else {
|
||||
return false;
|
||||
};
|
||||
let mut magic = [0u8; 8];
|
||||
std::io::Read::read_exact(&mut f, &mut magic).is_ok() && &magic == MAGIC
|
||||
}
|
||||
|
||||
/// 解密一个 `.ncm` 文件到 `out_dir`,返回产物信息。
|
||||
///
|
||||
/// `progress` 每处理一块回调一次(已处理字节数,总字节数),供上层节流后推事件。
|
||||
/// `platform_label` 由调度层给出(如「网易云」),用于产物备注。
|
||||
pub fn decrypt_file<F>(
|
||||
input: &Path,
|
||||
out_dir: &Path,
|
||||
platform_label: &str,
|
||||
reserved: &mut std::collections::HashSet<String>,
|
||||
mut progress: F,
|
||||
) -> Result<common::Outcome>
|
||||
where
|
||||
F: FnMut(u64, u64),
|
||||
{
|
||||
let total = std::fs::metadata(input).map(|m| m.len()).unwrap_or(0);
|
||||
let file = File::open(input)?;
|
||||
let mut reader = BufReader::with_capacity(CHUNK, file);
|
||||
|
||||
let (key_box, meta, cover) = read_header(&mut reader)?;
|
||||
|
||||
std::fs::create_dir_all(out_dir)?;
|
||||
|
||||
// 先写临时文件:格式要等第一块解出来才知道,而输出名又依赖格式。
|
||||
// 定稿后再 rename —— 中途失败不会留下半个音频冒充成品。
|
||||
let tmp = out_dir.join(format!(
|
||||
".dec_part_{}_{}.tmp",
|
||||
std::process::id(),
|
||||
std::time::SystemTime::now()
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.map(|d| d.as_nanos())
|
||||
.unwrap_or(0)
|
||||
));
|
||||
|
||||
let mut buf = vec![0u8; CHUNK];
|
||||
let mut done: u64 = 0;
|
||||
let mut format: Option<&'static str> = None;
|
||||
let mut audio_bytes: u64 = 0;
|
||||
|
||||
let write_result = (|| -> Result<()> {
|
||||
let out = File::create(&tmp)?;
|
||||
let mut writer = BufWriter::with_capacity(CHUNK, out);
|
||||
loop {
|
||||
// **必须读满一个块**(或读到 EOF),不能用 `read` 的短读结果当块边界。
|
||||
// 解密式依赖「块内偏移 i」,块边界一漂移密钥盒相位就错位——
|
||||
// 表现为文件从中间某处起全是噪声、前面对得上,极难排查(§6.24)。
|
||||
let n = read_full(&mut reader, &mut buf)?;
|
||||
if n == 0 {
|
||||
break;
|
||||
}
|
||||
decrypt_audio_chunk(&key_box, &mut buf[..n]);
|
||||
if format.is_none() {
|
||||
format = Some(common::detect_format(&buf[..n]));
|
||||
}
|
||||
writer.write_all(&buf[..n])?;
|
||||
done += n as u64;
|
||||
audio_bytes += n as u64;
|
||||
progress(done, total);
|
||||
}
|
||||
writer.flush()?;
|
||||
Ok(())
|
||||
})();
|
||||
|
||||
if let Err(e) = write_result {
|
||||
let _ = std::fs::remove_file(&tmp);
|
||||
return Err(e);
|
||||
}
|
||||
|
||||
let format = format.ok_or_else(|| {
|
||||
let _ = std::fs::remove_file(&tmp);
|
||||
NcmError::Broken("音频段为空".into())
|
||||
})?;
|
||||
|
||||
let stem = input
|
||||
.file_stem()
|
||||
.map(|s| s.to_string_lossy().to_string())
|
||||
.unwrap_or_else(|| "output".to_string());
|
||||
let target = common::unique_output(out_dir, &stem, format, reserved)?;
|
||||
std::fs::rename(&tmp, &target).map_err(|e| {
|
||||
let _ = std::fs::remove_file(&tmp);
|
||||
NcmError::Output(format!("重命名产物失败:{e}"))
|
||||
})?;
|
||||
|
||||
// 封面单独落盘(标签回填留 P2:需要 lofty 且要按容器分派)
|
||||
let cover_path = match cover {
|
||||
Some(data) if !data.is_empty() => {
|
||||
let ext = image_ext(&data);
|
||||
let path = common::unique_output(out_dir, &format!("{stem}.cover"), ext, reserved)?;
|
||||
std::fs::write(&path, &data)?;
|
||||
Some(path)
|
||||
}
|
||||
_ => None,
|
||||
};
|
||||
|
||||
// 标签信息汇总成一行备注(P2 回填标签前,这是元数据唯一的出口)
|
||||
let mut note = format!("{platform_label} ncm");
|
||||
if let Some(n) = meta.name.as_deref() {
|
||||
note.push_str(&format!(" · {n}"));
|
||||
}
|
||||
if let Some(a) = meta.artist.as_deref() {
|
||||
note.push_str(&format!(" - {a}"));
|
||||
}
|
||||
// 位率/时长/专辑:解析成本已经付过,顺手带进备注(也避免字段闲置)
|
||||
let mut bits: Vec<String> = Vec::new();
|
||||
if let Some(b) = meta.bitrate {
|
||||
if b > 0 {
|
||||
bits.push(format!("{} kbps", b / 1000));
|
||||
}
|
||||
}
|
||||
if let Some(d) = meta.duration {
|
||||
if d > 0 {
|
||||
let secs = d / 1000;
|
||||
bits.push(format!("{}:{:02}", secs / 60, secs % 60));
|
||||
}
|
||||
}
|
||||
if let Some(al) = meta.album.as_deref() {
|
||||
bits.push(format!("专辑《{al}》"));
|
||||
}
|
||||
if let Some(f) = meta.format.as_deref() {
|
||||
bits.push(format!("声明格式 {f}"));
|
||||
}
|
||||
if !bits.is_empty() {
|
||||
note.push_str(&format!("({})", bits.join(" · ")));
|
||||
}
|
||||
|
||||
Ok(common::Outcome {
|
||||
output: target,
|
||||
format: format.to_string(),
|
||||
cover: cover_path,
|
||||
audio_bytes,
|
||||
note,
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use aes::cipher::BlockEncrypt;
|
||||
|
||||
const ZERO_KEY: [u8; 16] = [0u8; 16];
|
||||
|
||||
/// AES 正向加密(测试用),与 `aes_ecb_decrypt` 互逆。
|
||||
fn aes_ecb_encrypt(key: &[u8; 16], data: &[u8]) -> Vec<u8> {
|
||||
let cipher = Aes128::new(GenericArray::from_slice(key));
|
||||
let mut out = Vec::with_capacity(data.len());
|
||||
let mut buf = [0u8; 16];
|
||||
for chunk in data.chunks(16) {
|
||||
let block = GenericArray::from_slice(chunk);
|
||||
cipher.encrypt_block_b2b(block, GenericArray::from_mut_slice(&mut buf));
|
||||
out.extend_from_slice(&buf);
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn pkcs7_pad(data: &[u8]) -> Vec<u8> {
|
||||
let pad = 16 - (data.len() % 16);
|
||||
let mut out = data.to_vec();
|
||||
out.extend(std::iter::repeat(pad as u8).take(pad));
|
||||
out
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn aes_ecb_roundtrip_with_pkcs7() {
|
||||
let plain = b"CTENFDAM-test-payload-1234";
|
||||
let padded = pkcs7_pad(plain);
|
||||
assert_eq!(padded.len() % 16, 0);
|
||||
let enc = aes_ecb_encrypt(&ZERO_KEY, &padded);
|
||||
let dec = aes_ecb_decrypt(&ZERO_KEY, &enc).expect("decrypt");
|
||||
assert_eq!(dec, plain);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn aes_ecb_rejects_non_block_multiple() {
|
||||
assert!(aes_ecb_decrypt(&ZERO_KEY, &[0u8; 17]).is_err());
|
||||
assert!(aes_ecb_decrypt(&ZERO_KEY, &[]).is_err());
|
||||
}
|
||||
|
||||
/// 空 key 时密钥盒必须是恒等置换(KSA 的边界行为)
|
||||
#[test]
|
||||
fn key_box_identity_for_empty_key() {
|
||||
let kb = build_key_box(&[]);
|
||||
for i in 0..256 {
|
||||
assert_eq!(kb[i], i as u8);
|
||||
}
|
||||
}
|
||||
|
||||
/// 已知答案向量:由参考实现(`ncmdump` 的 `buildKeyBox`)独立算出的值。
|
||||
///
|
||||
/// 注意**不能**用「与标准 RC4 比对」来验证——`last_byte` 在模 256 下是恒等变形,
|
||||
/// 两者逐字节相同。只能靠固定向量锁行为。
|
||||
#[test]
|
||||
fn key_box_matches_reference_vectors() {
|
||||
let kb = build_key_box(b"0123456789abcdef");
|
||||
assert_eq!(
|
||||
&kb[..8],
|
||||
&[0x88, 0x62, 0x96, 0xcc, 0x79, 0x85, 0x7a, 0x21],
|
||||
"密钥盒前 8 字节与参考实现不符"
|
||||
);
|
||||
assert_eq!(
|
||||
&kb[8..16],
|
||||
&[0x15, 0x49, 0xa5, 0x91, 0x3d, 0xc6, 0x65, 0xda],
|
||||
"密钥盒第 8..16 字节与参考实现不符"
|
||||
);
|
||||
}
|
||||
|
||||
/// 已知答案向量:全零明文的密钥流(即 PRGA 输出)前 24 字节。
|
||||
#[test]
|
||||
fn keystream_matches_reference_vector() {
|
||||
let kb = build_key_box(b"0123456789abcdef");
|
||||
let mut data = [0u8; 24];
|
||||
decrypt_audio_chunk(&kb, &mut data);
|
||||
assert_eq!(
|
||||
data,
|
||||
[
|
||||
0x1d, 0xaf, 0xd7, 0x79, 0xfa, 0xce, 0x0c, 0x2b, 0xab, 0xc4, 0x8c, 0xeb, 0x0d, 0xc3,
|
||||
0x6a, 0x5c, 0xc6, 0x07, 0x79, 0x63, 0x92, 0x72, 0x69, 0x1b
|
||||
],
|
||||
"密钥流与参考实现不符"
|
||||
);
|
||||
}
|
||||
|
||||
/// 密钥必须循环取用满 256 轮:`key_offset` 归零逻辑要正确。
|
||||
#[test]
|
||||
fn key_box_cycles_key_correctly() {
|
||||
let a = vec![7u8; 300];
|
||||
let mut b = vec![7u8; 300];
|
||||
b[250] = 8;
|
||||
assert_ne!(
|
||||
build_key_box(&a),
|
||||
build_key_box(&b),
|
||||
"密钥第 250 字节未参与运算——key_offset 取模有误"
|
||||
);
|
||||
|
||||
// 短密钥(1 字节)也不能 panic,且是合法置换
|
||||
let kb = build_key_box(&[0x42]);
|
||||
let mut seen = [false; 256];
|
||||
for &x in kb.iter() {
|
||||
seen[x as usize] = true;
|
||||
}
|
||||
assert!(seen.iter().all(|&v| v));
|
||||
}
|
||||
|
||||
/// 加密→解密往返:验证 `decrypt_audio_chunk` 与自身一致,
|
||||
/// 且块边界不改变结果(`i` 是块内下标这一设计的关键性质)。
|
||||
#[test]
|
||||
fn audio_chunk_roundtrip_and_block_boundary_invariance() {
|
||||
let kb = build_key_box(b"0123456789abcdef");
|
||||
let plain: Vec<u8> = (0..(CHUNK + 777)).map(|i| (i % 251) as u8).collect();
|
||||
|
||||
let mut whole = plain.clone();
|
||||
decrypt_audio_chunk(&kb, &mut whole);
|
||||
assert_ne!(whole, plain, "解密未改变数据,密钥盒或 XOR 有误");
|
||||
|
||||
let mut chunked = plain.clone();
|
||||
for c in chunked.chunks_mut(CHUNK) {
|
||||
decrypt_audio_chunk(&kb, c);
|
||||
}
|
||||
assert_eq!(chunked, whole, "分块解密与整体解密结果不一致");
|
||||
|
||||
decrypt_audio_chunk(&kb, &mut chunked);
|
||||
assert_eq!(chunked, plain);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_meta_reads_nested_artist() {
|
||||
let json = r#"{"musicName":"歌","album":"专辑","bitrate":999000,
|
||||
"duration":215000,"format":"flac",
|
||||
"artist":[["歌手甲",1],["歌手乙",2]]}"#;
|
||||
let m = parse_meta(json);
|
||||
assert_eq!(m.name.as_deref(), Some("歌"));
|
||||
assert_eq!(m.album.as_deref(), Some("专辑"));
|
||||
assert_eq!(m.artist.as_deref(), Some("歌手甲/歌手乙"));
|
||||
assert_eq!(m.bitrate, Some(999000));
|
||||
assert_eq!(m.duration, Some(215000));
|
||||
assert_eq!(m.format.as_deref(), Some("flac"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_meta_tolerates_garbage() {
|
||||
let m = parse_meta("not json at all");
|
||||
assert!(m.name.is_none() && m.artist.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn not_ncm_file_is_rejected() {
|
||||
let dir = std::env::temp_dir().join(format!("ncm_bad_{}", std::process::id()));
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
let p = dir.join("fake.ncm");
|
||||
std::fs::write(&p, b"NOTNCM!!\x02\x00\x00\x00\x00").unwrap();
|
||||
let mut reserved = std::collections::HashSet::new();
|
||||
let err = decrypt_file(&p, &dir, "网易云", &mut reserved, |_, _| {}).unwrap_err();
|
||||
assert!(
|
||||
matches!(err, NcmError::NotEncrypted(_)),
|
||||
"期望 NotEncrypted,实得 {err:?}"
|
||||
);
|
||||
assert!(!sniff(&p), "魔数不符的文件 sniff 应为 false");
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
/// **正向构造**一个合法 ncm 容器,再解回来。
|
||||
/// 这样无需把真实音乐样本(体积大、有版权)放进仓库,仍能覆盖:
|
||||
/// 两段 XOR 常量、两层 meta 前缀、封面段偏移、分块解密、魔数定格式、输出命名。
|
||||
#[test]
|
||||
fn synthetic_ncm_roundtrip() {
|
||||
let dir = std::env::temp_dir().join(format!("ncm_rt_{}", std::process::id()));
|
||||
let out = dir.join("out");
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
|
||||
// 与密钥盒用例共用的固定种子
|
||||
let seed: &[u8] = b"0123456789abcdef";
|
||||
|
||||
// 音频明文:以 fLaC 开头,长度跨块边界多一点
|
||||
let mut plain = b"fLaC".to_vec();
|
||||
plain.extend((0..(CHUNK + 123)).map(|i| (i % 253) as u8));
|
||||
|
||||
// 用它"加密"音频(XOR 自逆)。加密必须与解密用同样的块大小,
|
||||
// 否则 PRGA 相位错位(这正是 read_full 存在的原因)。
|
||||
let kb = build_key_box(seed);
|
||||
let mut cipher_audio = plain.clone();
|
||||
for c in cipher_audio.chunks_mut(CHUNK) {
|
||||
decrypt_audio_chunk(&kb, c);
|
||||
}
|
||||
|
||||
// key 段:**必须**是 CORE_KEY 前缀 + 种子——解密端会剥掉这 17 字节前缀,
|
||||
// 少了它就会拿到错误的种子。
|
||||
let mut key_plain = CORE_KEY.to_vec();
|
||||
key_plain.extend_from_slice(seed);
|
||||
let mut key_seg = aes_ecb_encrypt(CORE_AES_KEY, &pkcs7_pad(&key_plain));
|
||||
for b in key_seg.iter_mut() {
|
||||
*b ^= XOR_KEY;
|
||||
}
|
||||
|
||||
// meta 段:META_PREFIX + base64(AES(META_JSON_PREFIX + json)),再 XOR 0x63
|
||||
let json = r#"{"musicName":"合成曲","album":"合成专辑","bitrate":320000,"duration":1000,"format":"flac","artist":[["测试歌手",1]]}"#;
|
||||
let mut meta_plain = META_JSON_PREFIX.to_vec();
|
||||
meta_plain.extend_from_slice(json.as_bytes());
|
||||
let meta_enc = aes_ecb_encrypt(MODIFY_KEY, &pkcs7_pad(&meta_plain));
|
||||
use base64::Engine;
|
||||
let meta_b64 = base64::engine::general_purpose::STANDARD.encode(&meta_enc);
|
||||
let mut meta_seg = META_PREFIX.to_vec();
|
||||
meta_seg.extend_from_slice(meta_b64.as_bytes());
|
||||
for b in meta_seg.iter_mut() {
|
||||
*b ^= XOR_META;
|
||||
}
|
||||
|
||||
// 封面段:PNG 魔数 + 一点数据;cover_len 故意大于 img_len 以覆盖"跳过尾部"
|
||||
let img: Vec<u8> = [
|
||||
&[0x89u8, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A][..],
|
||||
&[7u8; 40],
|
||||
]
|
||||
.concat();
|
||||
let cover_padding = [0u8; 9];
|
||||
let cover_frame_len = (img.len() + cover_padding.len()) as u32;
|
||||
|
||||
let mut container = Vec::new();
|
||||
container.extend_from_slice(MAGIC);
|
||||
container.extend_from_slice(&[0x02, 0x00]); // 固定 2B
|
||||
container.extend_from_slice(&(key_seg.len() as u32).to_le_bytes());
|
||||
container.extend_from_slice(&key_seg);
|
||||
container.extend_from_slice(&(meta_seg.len() as u32).to_le_bytes());
|
||||
container.extend_from_slice(&meta_seg);
|
||||
container.extend_from_slice(&[0xAA, 0xBB, 0xCC, 0xDD, 0x01]); // CRC32 + 图片版本
|
||||
container.extend_from_slice(&cover_frame_len.to_le_bytes());
|
||||
container.extend_from_slice(&(img.len() as u32).to_le_bytes());
|
||||
container.extend_from_slice(&img);
|
||||
container.extend_from_slice(&cover_padding);
|
||||
container.extend_from_slice(&cipher_audio);
|
||||
|
||||
let src = dir.join("测试 曲目.ncm");
|
||||
std::fs::write(&src, &container).unwrap();
|
||||
assert!(sniff(&src), "合法容器的 sniff 应为 true");
|
||||
|
||||
let mut reserved = std::collections::HashSet::new();
|
||||
let mut ticks = 0usize;
|
||||
let res = decrypt_file(&src, &out, "网易云", &mut reserved, |_, _| ticks += 1)
|
||||
.expect("解密应成功");
|
||||
|
||||
assert_eq!(res.format, "flac");
|
||||
assert_eq!(res.audio_bytes, plain.len() as u64);
|
||||
assert!(ticks >= 2, "进度回调应至少触发两次(跨块),实得 {ticks}");
|
||||
|
||||
// 用长度 + 位置比较,避免 assert_eq! 在失败时倾倒几十万字节
|
||||
let got = std::fs::read(&res.output).unwrap();
|
||||
assert_eq!(got.len(), plain.len(), "音频长度不一致");
|
||||
let first_diff = got.iter().zip(plain.iter()).position(|(a, b)| a != b);
|
||||
assert!(
|
||||
got == plain,
|
||||
"音频明文不一致:第一个不同处在第 {:?} 字节",
|
||||
first_diff
|
||||
);
|
||||
|
||||
// 元数据不再单独暴露,而是拼进 note——所以直接验 note 里带上了它
|
||||
assert!(res.note.contains("合成曲"), "note 应含曲名:{}", res.note);
|
||||
assert!(res.note.contains("测试歌手"), "note 应含歌手:{}", res.note);
|
||||
assert!(res.note.contains("合成专辑"), "note 应含专辑:{}", res.note);
|
||||
// 位率 320000 → 320 kbps
|
||||
assert!(res.note.contains("320 kbps"), "note 应含位率:{}", res.note);
|
||||
|
||||
let cover = res.cover.expect("应提取出封面");
|
||||
let cover_bytes = std::fs::read(&cover).unwrap();
|
||||
assert_eq!(cover_bytes.len(), img.len(), "封面长度不一致");
|
||||
assert!(cover_bytes == img, "封面字节不一致");
|
||||
assert_eq!(cover.extension().unwrap(), "png");
|
||||
|
||||
// 中文文件名 + 中文输出路径:产物名应保留原名
|
||||
assert_eq!(
|
||||
res.output.file_name().unwrap().to_string_lossy(),
|
||||
"测试 曲目.flac"
|
||||
);
|
||||
|
||||
// 再解一次:同名必须让位而不是覆盖
|
||||
let res2 =
|
||||
decrypt_file(&src, &out, "网易云", &mut reserved, |_, _| {}).expect("二次解密应成功");
|
||||
assert_eq!(
|
||||
res2.output.file_name().unwrap().to_string_lossy(),
|
||||
"测试 曲目_1.flac"
|
||||
);
|
||||
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
//! **开发探针**:不落盘地跑完「musicex 尾部 → 凭据 → 在线取密钥 → 解密」并回传结果。
|
||||
//!
|
||||
//! 存在的唯一理由:musicex 这条路径的**真实响应字段**只能靠真机样本验证,
|
||||
//! 而跑起整个 Tauri 应用再手点一遍成本太高、也没法在命令行里复现。
|
||||
//! 它不参与产品逻辑——调度层走的是 [`super::qq_online::decrypt_musicex`]。
|
||||
//!
|
||||
//! 2026-09-27 用它跑通了首个真机样本(197MB `.mflac`,192kHz/24bit):
|
||||
//! ekey 704 字符 → 派生 512 字节密钥 → RC4 变体解密 → `fLaC` 头。
|
||||
//! **这条验证顺带推翻了一个错误假设**:该样本的密文头是 `51 74 03 75`,
|
||||
//! 并非文档里提到的 `#!Qk`,所以密文头不能当守卫(见 `qq_online` 的注释)。
|
||||
//!
|
||||
//! 用法见 `src-tauri/examples/decrypt_musicex_probe.rs`:
|
||||
//! ```text
|
||||
//! cargo run --example decrypt_musicex_probe -- "C:\path\to\sample.mflac" [输出目录]
|
||||
//! ```
|
||||
|
||||
use std::io::Read;
|
||||
use std::path::Path;
|
||||
|
||||
use super::common::DecryptError;
|
||||
use super::qmc;
|
||||
use super::qq_credentials;
|
||||
use super::qq_ekey::{self, EvkeyRequest};
|
||||
use super::qq_footer::{self, MusiCexTail};
|
||||
|
||||
/// 探针结果(都是"结论性"字段,便于一眼判断链路是否通了)
|
||||
pub struct ProbeOutcome {
|
||||
pub ekey_len: usize,
|
||||
pub key_len: usize,
|
||||
pub raw_key_bytes: Vec<u8>,
|
||||
/// 密文头部 4 字节(应是 `#!Qk`,即 QMC2 魔术)
|
||||
pub cipher_magic: Vec<u8>,
|
||||
/// 解密后头部 16 字节(FLAC 应为 `fLaC`)
|
||||
pub plain_magic: Vec<u8>,
|
||||
pub decrypted_bytes: usize,
|
||||
pub guessed_format: String,
|
||||
pub expiration_secs: i64,
|
||||
}
|
||||
|
||||
/// 对给定样本跑完整链路(**读内存、发网络请求、解密,但不写任何文件**)
|
||||
pub fn probe_musicex(input: &Path) -> Result<ProbeOutcome, DecryptError> {
|
||||
let total = std::fs::metadata(input).map(|m| m.len()).unwrap_or(0);
|
||||
if total < qq_footer::MUSICEX_FOOTER_LEN as u64 {
|
||||
return Err(DecryptError::Broken("文件太小,不可能是 musicex".into()));
|
||||
}
|
||||
|
||||
// 1) 尾部
|
||||
let tail: MusiCexTail = read_tail(input)?;
|
||||
let audio_len = tail.audio_len(total);
|
||||
|
||||
// 2) 凭据
|
||||
let creds = qq_credentials::read_credentials();
|
||||
let (Some(uin), Some(authst)) = (creds.uin.as_deref(), creds.authst.as_deref()) else {
|
||||
return Err(DecryptError::KeyRequired(format!(
|
||||
"凭据不可用:{}",
|
||||
creds.status_text()
|
||||
)));
|
||||
};
|
||||
|
||||
// 3) 取 ekey(真实网络请求)
|
||||
let req = EvkeyRequest::from_tail(&tail, uin, authst)?;
|
||||
let client = reqwest::Client::builder()
|
||||
.timeout(std::time::Duration::from_secs(25))
|
||||
.build()
|
||||
.map_err(|e| DecryptError::KeyRequired(format!("构建 HTTP 客户端失败:{e}")))?;
|
||||
let (ekey, expiration_secs) =
|
||||
tauri::async_runtime::block_on(qq_ekey::fetch_ekey(&client, &req))?;
|
||||
|
||||
// 4) ekey → 原始密钥
|
||||
let raw = qmc::parse_ekey(&ekey)?;
|
||||
|
||||
// 5) 解密音频段(探针只验证单文件,全量读入内存即可)
|
||||
let mut audio = read_audio(input, audio_len)?;
|
||||
let cipher_magic = audio[..4.min(audio.len())].to_vec();
|
||||
qmc::decrypt_with_raw_key(&raw, &mut audio);
|
||||
|
||||
let plain_magic = audio[..16.min(audio.len())].to_vec();
|
||||
let guessed_format = super::common::detect_format_opt(&audio)
|
||||
.unwrap_or("unknown")
|
||||
.to_string();
|
||||
|
||||
Ok(ProbeOutcome {
|
||||
ekey_len: ekey.len(),
|
||||
key_len: raw.len(),
|
||||
raw_key_bytes: raw,
|
||||
cipher_magic,
|
||||
plain_magic,
|
||||
decrypted_bytes: audio.len(),
|
||||
guessed_format,
|
||||
expiration_secs,
|
||||
})
|
||||
}
|
||||
|
||||
/// 读文件末尾的 musicex 尾部
|
||||
fn read_tail(input: &Path) -> Result<MusiCexTail, DecryptError> {
|
||||
use std::io::{Seek, SeekFrom};
|
||||
let mut f = std::fs::File::open(input)?;
|
||||
let size = f.metadata()?.len();
|
||||
let take = (qq_footer::MUSICEX_FOOTER_LEN as u64).min(size) as usize;
|
||||
f.seek(SeekFrom::End(-(take as i64)))?;
|
||||
let mut buf = vec![0u8; take];
|
||||
f.read_exact(&mut buf)?;
|
||||
qq_footer::parse_musicex_tail(&buf)
|
||||
.ok_or_else(|| DecryptError::Broken("musicex 尾部解析失败".into()))
|
||||
}
|
||||
|
||||
/// 只读音频段
|
||||
fn read_audio(input: &Path, audio_len: u64) -> Result<Vec<u8>, DecryptError> {
|
||||
let mut f = std::fs::File::open(input)?;
|
||||
let mut buf = vec![0u8; audio_len as usize];
|
||||
f.read_exact(&mut buf)?;
|
||||
Ok(buf)
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,285 @@
|
||||
//! QQ音乐本机凭据读取(`uin` + `authst`)。
|
||||
//!
|
||||
//! ## 为什么要读进程内存
|
||||
//!
|
||||
//! Windows 版 QQ 音乐**没有持久化 `authst`**:`uin` 能从
|
||||
//! `%APPDATA%\Tencent\QQMusic\QQMusicServiceConfig.ini` 明文读到,但 `authst`
|
||||
//! 只作为 JSON 字符串存在于运行中的 `QQMusic.exe` 内存里(有效期约 22.3 小时)。
|
||||
//! 所以「在线取 ekey」的前置条件是:**QQ 音乐正在运行且已登录**。
|
||||
//!
|
||||
//! 这里只做**只读**内存访问(`OpenProcess` + `VirtualQueryEx` + `ReadProcessMemory`),
|
||||
//! 不注入、不改写任何东西——这是它与 Frida 兜底方案的本质区别,
|
||||
//! 也是它通常不会被安全软件拦截的原因。
|
||||
//!
|
||||
//! ## 结构
|
||||
//!
|
||||
//! - [`parse_ini_uin`]:纯函数,可跨平台单测;
|
||||
//! - [`find_authst`]:纯函数,在给定字节里找 `"authst":"<token>"`,可单测;
|
||||
//! - [`read_credentials`]:平台相关的胶水(Windows 实现 / 其他平台的空实现)。
|
||||
|
||||
/// 从 QQ 音乐的 INI 文本里取 `[Account] Uin`。
|
||||
///
|
||||
/// 该文件很小(实测 27 字节)且是**纯文本**,格式固定:
|
||||
///
|
||||
/// ```ini
|
||||
/// [Account]
|
||||
/// Uin=1154027699
|
||||
/// ```
|
||||
///
|
||||
/// 解析上刻意宽松:允许前导空白、大小写不敏感、允许 `Uin` 出现在任意段里
|
||||
/// (不同版本段名可能变),但**只认第一处**出现的非空 Uin。
|
||||
pub fn parse_ini_uin(text: &str) -> Option<String> {
|
||||
for line in text.lines() {
|
||||
let line = line.trim();
|
||||
if line.is_empty() || line.starts_with(';') || line.starts_with('#') {
|
||||
continue;
|
||||
}
|
||||
let Some((key, value)) = line.split_once('=') else {
|
||||
continue;
|
||||
};
|
||||
if !key.trim().eq_ignore_ascii_case("uin") {
|
||||
continue;
|
||||
}
|
||||
let v = value.trim().trim_matches('"');
|
||||
// 必须是纯数字(QQ 号),排除 `Uin=` 之类的空值或占位
|
||||
if !v.is_empty() && v.bytes().all(|b| b.is_ascii_digit()) {
|
||||
return Some(v.to_string());
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// `authst` 在内存里的 JSON 形态:`"authst":"<base64url-ish>"`。
|
||||
const AUTHST_KEY: &[u8] = b"\"authst\":\"";
|
||||
|
||||
/// 在一段内存字节里查找 `authst` 的值(从 0 开始)。
|
||||
///
|
||||
/// 生产路径用 [`find_authst_from`](分块扫描需要偏移),这个薄封装给测试用。
|
||||
#[cfg_attr(not(test), allow(dead_code))]
|
||||
pub fn find_authst(haystack: &[u8]) -> Option<String> {
|
||||
find_authst_from(haystack, 0)
|
||||
}
|
||||
|
||||
/// 从 `start` 起查找(供分块扫描时避免重复命中同一处)
|
||||
pub fn find_authst_from(haystack: &[u8], start: usize) -> Option<String> {
|
||||
let mut pos = start;
|
||||
while pos + AUTHST_KEY.len() <= haystack.len() {
|
||||
let Some(rel) = find_subslice(&haystack[pos..], AUTHST_KEY) else {
|
||||
return None;
|
||||
};
|
||||
let val_start = pos + rel + AUTHST_KEY.len();
|
||||
// token 到下一个双引号结束
|
||||
let Some(end_rel) = haystack[val_start..].iter().position(|&b| b == b'"') else {
|
||||
return None;
|
||||
};
|
||||
let token = &haystack[val_start..val_start + end_rel];
|
||||
if is_plausible_token(token) {
|
||||
return Some(String::from_utf8_lossy(token).to_string());
|
||||
}
|
||||
// 命中但是假阳性:从下一个字节继续找
|
||||
pos = val_start;
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn find_subslice(haystack: &[u8], needle: &[u8]) -> Option<usize> {
|
||||
if needle.is_empty() || haystack.len() < needle.len() {
|
||||
return None;
|
||||
}
|
||||
haystack.windows(needle.len()).position(|w| w == needle)
|
||||
}
|
||||
|
||||
fn is_plausible_token(token: &[u8]) -> bool {
|
||||
token.len() >= 16
|
||||
&& token.iter().all(|&b| {
|
||||
b.is_ascii_alphanumeric()
|
||||
|| b == b'-'
|
||||
|| b == b'_'
|
||||
|| b == b'='
|
||||
|| b == b'+'
|
||||
|| b == b'/'
|
||||
})
|
||||
}
|
||||
|
||||
/// 凭据读取结果
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub struct QqCredentials {
|
||||
/// QQ 号(来自 INI)
|
||||
pub uin: Option<String>,
|
||||
/// 运行期认证令牌(来自进程内存)
|
||||
pub authst: Option<String>,
|
||||
}
|
||||
|
||||
impl QqCredentials {
|
||||
/// 是否可用于调用 `GetEVkey`
|
||||
pub fn usable(&self) -> bool {
|
||||
self.uin.is_some() && self.authst.is_some()
|
||||
}
|
||||
|
||||
/// 给 UI 的简短状态(三态,供状态卡渲染)
|
||||
pub fn status_text(&self) -> &'static str {
|
||||
match (self.uin.is_some(), self.authst.is_some()) {
|
||||
(true, true) => "已就绪",
|
||||
(true, false) => "QQ 音乐未运行或未登录",
|
||||
(false, _) => "未找到本机 QQ 音乐账号",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// `QQMusic.exe` 的进程名(枚举时用大小写不敏感的子串匹配)
|
||||
pub const QQ_PROCESS_HINT: &str = "qqmusic";
|
||||
|
||||
/// QQ 音乐配置 INI 的路径(Windows)
|
||||
#[cfg(windows)]
|
||||
pub fn config_ini_path() -> Option<std::path::PathBuf> {
|
||||
let appdata = std::env::var_os("APPDATA")?;
|
||||
Some(
|
||||
std::path::PathBuf::from(appdata)
|
||||
.join("Tencent")
|
||||
.join("QQMusic")
|
||||
.join("QQMusicServiceConfig.ini"),
|
||||
)
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
pub fn config_ini_path() -> Option<std::path::PathBuf> {
|
||||
None
|
||||
}
|
||||
|
||||
/// 读凭据:`uin` 从 INI,`authst` 扫进程内存。
|
||||
///
|
||||
/// 任何一步失败都只是 `None`(并记日志),不返回错误——调用方据
|
||||
/// [`QqCredentials::usable`] 决定是走在线取 ekey 还是给出引导。
|
||||
pub fn read_credentials() -> QqCredentials {
|
||||
let uin = config_ini_path()
|
||||
.and_then(|p| std::fs::read_to_string(&p).ok())
|
||||
.and_then(|t| parse_ini_uin(&t))
|
||||
.or_else(|| {
|
||||
// 兜底:文件读不到时,从进程内存里找 "uin":"..." 形态
|
||||
scan_authst_in_process().1
|
||||
});
|
||||
|
||||
let (authst, uin_from_mem) = match uin {
|
||||
// 有 uin 时只需要 authst
|
||||
Some(_) => (scan_authst_in_process().0, None),
|
||||
// 没 uin 时一次扫描同时拿两者
|
||||
None => {
|
||||
let (a, u) = scan_authst_in_process();
|
||||
(a, u)
|
||||
}
|
||||
};
|
||||
|
||||
QqCredentials {
|
||||
uin: uin.or(uin_from_mem),
|
||||
authst,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn scan_authst_in_process() -> (Option<String>, Option<String>) {
|
||||
match crate::music::decrypt::qq_memscan::scan_qq_process() {
|
||||
Ok(found) => (found.authst, found.uin),
|
||||
Err(e) => {
|
||||
crate::logger::log_warn("music-decrypt", &format!("扫描 QQ 音乐进程内存失败:{e}"));
|
||||
(None, None)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
fn scan_authst_in_process() -> (Option<String>, Option<String>) {
|
||||
(None, None)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
// ============ INI 解析 ============
|
||||
|
||||
#[test]
|
||||
fn parses_real_ini_shape() {
|
||||
// 本机实测就是这个形状(27 字节)
|
||||
let text = "[Account]\r\nUin=1154027699\r\n";
|
||||
assert_eq!(parse_ini_uin(text).as_deref(), Some("1154027699"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parses_ini_leniently() {
|
||||
// 大小写、空白、引号、注释、其他段
|
||||
let text = "\u{feff}; comment\r\n[Other]\r\nx=1\r\n\r\n uin = \"123456\" \r\n";
|
||||
assert_eq!(parse_ini_uin(text).as_deref(), Some("123456"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ignores_non_numeric_or_empty_uin() {
|
||||
assert!(parse_ini_uin("Uin=\r\n").is_none());
|
||||
assert!(parse_ini_uin("Uin=abc\r\n").is_none());
|
||||
assert!(parse_ini_uin("Uin=12a45\r\n").is_none());
|
||||
assert!(parse_ini_uin("").is_none());
|
||||
assert!(parse_ini_uin("[Account]\nFoo=1\n").is_none());
|
||||
}
|
||||
|
||||
// ============ authst 提取 ============
|
||||
|
||||
#[test]
|
||||
fn finds_authst_in_memory_blob() {
|
||||
let token = "AbCd_-1234567890AbCd_-1234567890";
|
||||
let blob = format!("junk{{\"uin\":\"1154027699\",\"authst\":\"{token}\",\"other\":1}}tail");
|
||||
assert_eq!(find_authst(blob.as_bytes()).as_deref(), Some(token));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_implausible_authst() {
|
||||
// 太短
|
||||
assert!(find_authst(b"\"authst\":\"short\"").is_none());
|
||||
// 含非法字符(像模板/日志)
|
||||
assert!(find_authst(b"\"authst\":\"this is not a token at all\"").is_none());
|
||||
// 没有值
|
||||
assert!(find_authst(b"\"authst\":\"\"").is_none());
|
||||
// 完全没有
|
||||
assert!(find_authst(b"nothing here").is_none());
|
||||
}
|
||||
|
||||
/// 第一处是假阳性时,应继续往后找真 token
|
||||
#[test]
|
||||
fn skips_false_positive_and_keeps_searching() {
|
||||
let token = "RealToken_1234567890abcdef";
|
||||
let blob = format!("\"authst\":\"x\"...\"authst\":\"{token}\"");
|
||||
assert_eq!(find_authst(blob.as_bytes()).as_deref(), Some(token));
|
||||
}
|
||||
|
||||
/// 跨缓冲区边界不会误判(分块扫描用 find_authst_from)
|
||||
#[test]
|
||||
fn find_from_offset_advances() {
|
||||
let blob = b"aaaa\"authst\":\"AAAAAAAAAAAAAAAA\"";
|
||||
let first = find_authst_from(blob, 0).unwrap();
|
||||
assert_eq!(first, "AAAAAAAAAAAAAAAA");
|
||||
// 从命中处之后继续找应该没有第二个
|
||||
let key_at = 4 + AUTHST_KEY.len();
|
||||
assert!(find_authst_from(blob, key_at).is_none());
|
||||
}
|
||||
|
||||
// ============ 状态文案 ============
|
||||
|
||||
#[test]
|
||||
fn credentials_status_text_covers_three_states() {
|
||||
let none = QqCredentials::default();
|
||||
assert!(!none.usable());
|
||||
assert!(none.status_text().contains("未找到"));
|
||||
|
||||
let uin_only = QqCredentials {
|
||||
uin: Some("1".into()),
|
||||
authst: None,
|
||||
};
|
||||
assert!(!uin_only.usable());
|
||||
assert!(uin_only.status_text().contains("未运行"));
|
||||
|
||||
let full = QqCredentials {
|
||||
uin: Some("1".into()),
|
||||
authst: Some("t".into()),
|
||||
};
|
||||
assert!(full.usable());
|
||||
assert_eq!(full.status_text(), "已就绪");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,342 @@
|
||||
//! 通过 QQ 音乐官方接口取 ekey(`music.vkey.GetEVkey`)。
|
||||
//!
|
||||
//! ## 前置条件(必须让用户知道)
|
||||
//!
|
||||
//! 新版 musicex 文件**不包含 ekey**,只能拿本机已登录的凭据向 QQ 音乐服务器换取:
|
||||
//!
|
||||
//! 1. 本机装有 QQ 音乐客户端;
|
||||
//! 2. **QQ 音乐正在运行且已登录**(`authst` 只存在于运行期内存,见
|
||||
//! [`super::qq_credentials`]);
|
||||
//! 3. 文件本身的尾部要有 `media_mid` 与 `filename`(musicex 尾部提供)。
|
||||
//!
|
||||
//! ## 接口契约里三个"必须"
|
||||
//!
|
||||
//! 对照 `MUSIC_DECRYPT_PLAN.md` §3.2 与 qmc-decoder 的协议文档:
|
||||
//!
|
||||
//! - `param.filename` **必须带扩展名**(`.mgg` / `.mflac`),否则返回 `104005`;
|
||||
//! - `param.songtype` **必须为 `1`**(表示请求加密资源的 ekey;为 0 只回 vkey);
|
||||
//! - `module` 必须是 **`music.vkey.GetEVkey`**(不是 `GetVkey`,后者不返回 ekey)。
|
||||
//!
|
||||
//! 另外 `authst` 约 **22.3 小时**过期,失败文案要给出"重新登录 QQ 音乐"的出口。
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use super::common::DecryptError;
|
||||
use super::qq_footer::MusiCexTail;
|
||||
|
||||
/// 取 ekey 的接口地址
|
||||
pub const EVKEY_ENDPOINT: &str = "https://u.y.qq.com/cgi-bin/musicu.fcg";
|
||||
/// PC 端的 platform 标识(Windows)
|
||||
pub const PLATFORM_WINDOWS: &str = "27";
|
||||
|
||||
/// 组装 `GetEVkey` 请求体。
|
||||
///
|
||||
/// 抽成纯函数是为了能单测那三个"必须"——它们是这个接口最容易踩的坑。
|
||||
pub fn build_evkey_request(
|
||||
uin: &str,
|
||||
authst: &str,
|
||||
media_mid: &str,
|
||||
filename: &str,
|
||||
login_type: u32,
|
||||
) -> serde_json::Value {
|
||||
serde_json::json!({
|
||||
"comm": {
|
||||
"authst": authst,
|
||||
"ct": "19",
|
||||
"cv": "1859",
|
||||
"uin": uin,
|
||||
"tmeLoginType": login_type.to_string(),
|
||||
},
|
||||
"req_1": {
|
||||
"module": "music.vkey.GetEVkey",
|
||||
"method": "CgiGetEVkey",
|
||||
"param": {
|
||||
"filename": [filename],
|
||||
"guid": "10000",
|
||||
"songmid": [media_mid],
|
||||
"songtype": [1],
|
||||
"uin": uin,
|
||||
"loginflag": 1,
|
||||
"platform": PLATFORM_WINDOWS,
|
||||
"ctx": 1,
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// `GetEVkey` 的响应(只声明用得到的字段)
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
pub struct EvkeyResponse {
|
||||
#[serde(default)]
|
||||
pub code: i64,
|
||||
#[serde(default)]
|
||||
pub req_1: Option<EvkeyReq1>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
pub struct EvkeyReq1 {
|
||||
#[serde(default)]
|
||||
pub code: i64,
|
||||
#[serde(default)]
|
||||
pub data: Option<EvkeyData>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
pub struct EvkeyData {
|
||||
#[serde(default)]
|
||||
pub midurlinfo: Vec<EvkeyItem>,
|
||||
/// ekey 有效期(秒),实测约 80400
|
||||
#[serde(default)]
|
||||
pub expiration: i64,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
pub struct EvkeyItem {
|
||||
#[serde(default)]
|
||||
pub ekey: String,
|
||||
#[serde(default)]
|
||||
pub result: i64,
|
||||
#[serde(default)]
|
||||
pub subcode: i64,
|
||||
}
|
||||
|
||||
/// 把响应解读为 `(ekey, 有效期秒数)` 或一个**可读的**失败原因。
|
||||
///
|
||||
/// 这里集中处理错误码,是为了让 UI 能给出下一步动作,而不是丢一个数字出去。
|
||||
/// 有效期一并返回:`authst` 过期是这条链路最常见的失败原因,把"还能用多久"
|
||||
/// 讲清楚比让用户猜要好。
|
||||
pub fn parse_evkey_response(resp: &EvkeyResponse) -> Result<(String, i64), DecryptError> {
|
||||
let req = resp
|
||||
.req_1
|
||||
.as_ref()
|
||||
.ok_or_else(|| DecryptError::KeyRequired("服务器响应缺少 req_1".into()))?;
|
||||
let data = req
|
||||
.data
|
||||
.as_ref()
|
||||
.ok_or_else(|| DecryptError::KeyRequired("服务器响应缺少 data".into()))?;
|
||||
|
||||
let item = data
|
||||
.midurlinfo
|
||||
.first()
|
||||
.ok_or_else(|| DecryptError::KeyRequired("服务器未返回任何资源信息".into()))?;
|
||||
|
||||
if item.ekey.is_empty() {
|
||||
let hint = match item.result {
|
||||
104005 => {
|
||||
"该资源的密钥需要 VIP 或当前账号无权访问(错误码 104005);也可能文件名缺少扩展名"
|
||||
}
|
||||
0 => "服务器返回了空 ekey,通常是登录态已过期——请在 QQ 音乐里重新登录后重试",
|
||||
_ => "服务器未返回 ekey",
|
||||
};
|
||||
return Err(DecryptError::KeyRequired(format!(
|
||||
"{hint}(result={}, subcode={}, code={}/{}/{})",
|
||||
item.result, item.subcode, resp.code, req.code, item.result
|
||||
)));
|
||||
}
|
||||
Ok((item.ekey.clone(), data.expiration))
|
||||
}
|
||||
|
||||
/// 从响应 JSON 文本解析出 ekey。
|
||||
///
|
||||
/// 生产路径走 [`fetch_ekey`](它需要有效期),这个薄封装主要给测试用,
|
||||
/// 也作为该接口对外的最小 API。
|
||||
#[cfg_attr(not(test), allow(dead_code))]
|
||||
pub fn extract_ekey(body: &str) -> Result<String, DecryptError> {
|
||||
let resp: EvkeyResponse = serde_json::from_str(body)
|
||||
.map_err(|e| DecryptError::KeyRequired(format!("解析服务器响应失败:{e}")))?;
|
||||
parse_evkey_response(&resp).map(|(ekey, _)| ekey)
|
||||
}
|
||||
|
||||
/// 在线取 ekey 的入参(把"要什么"与"怎么取"分开,便于测试与日志)
|
||||
#[derive(Debug, Clone, Serialize)]
|
||||
pub struct EvkeyRequest {
|
||||
pub uin: String,
|
||||
pub authst: String,
|
||||
pub media_mid: String,
|
||||
pub filename: String,
|
||||
pub login_type: u32,
|
||||
}
|
||||
|
||||
impl EvkeyRequest {
|
||||
/// 从 musicex 尾部 + 凭据构造
|
||||
pub fn from_tail(tail: &MusiCexTail, uin: &str, authst: &str) -> Result<Self, DecryptError> {
|
||||
if tail.media_mid.is_empty() {
|
||||
return Err(DecryptError::Broken(
|
||||
"musicex 尾部缺少 media_mid,无法向服务器索取密钥".into(),
|
||||
));
|
||||
}
|
||||
if tail.filename.is_empty() {
|
||||
return Err(DecryptError::Broken(
|
||||
"musicex 尾部缺少文件名,无法向服务器索取密钥".into(),
|
||||
));
|
||||
}
|
||||
// 接口要求 filename 必须带扩展名
|
||||
if !tail.filename.contains('.') {
|
||||
return Err(DecryptError::Broken(
|
||||
"musicex 尾部文件名没有扩展名,服务器会拒绝(104005)".into(),
|
||||
));
|
||||
}
|
||||
Ok(Self {
|
||||
uin: uin.to_string(),
|
||||
authst: authst.to_string(),
|
||||
media_mid: tail.media_mid.clone(),
|
||||
filename: tail.filename.clone(),
|
||||
// 默认按 QQ 登录;微信登录是 3,两者都能用 authst,不影响取 ekey
|
||||
login_type: 1,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn body(&self) -> serde_json::Value {
|
||||
build_evkey_request(
|
||||
&self.uin,
|
||||
&self.authst,
|
||||
&self.media_mid,
|
||||
&self.filename,
|
||||
self.login_type,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/// 实际发请求(异步),返回 `(ekey, 有效期秒数)`。
|
||||
pub async fn fetch_ekey(
|
||||
client: &reqwest::Client,
|
||||
req: &EvkeyRequest,
|
||||
) -> Result<(String, i64), DecryptError> {
|
||||
let body = req.body();
|
||||
let resp = tokio::time::timeout(
|
||||
std::time::Duration::from_secs(20),
|
||||
client.post(EVKEY_ENDPOINT).json(&body).send(),
|
||||
)
|
||||
.await
|
||||
.map_err(|_| DecryptError::KeyRequired("请求 QQ 音乐服务器超时".into()))?
|
||||
.map_err(|e| DecryptError::KeyRequired(format!("请求 QQ 音乐服务器失败:{e}")))?;
|
||||
|
||||
let status = resp.status();
|
||||
let text = resp
|
||||
.text()
|
||||
.await
|
||||
.map_err(|e| DecryptError::KeyRequired(format!("读取服务器响应失败:{e}")))?;
|
||||
|
||||
if !status.is_success() {
|
||||
return Err(DecryptError::KeyRequired(format!(
|
||||
"QQ 音乐服务器返回 HTTP {status}:{}",
|
||||
text.chars().take(200).collect::<String>()
|
||||
)));
|
||||
}
|
||||
parse_evkey_response(
|
||||
&serde_json::from_str(&text)
|
||||
.map_err(|e| DecryptError::KeyRequired(format!("解析服务器响应失败:{e}")))?,
|
||||
)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn tail() -> MusiCexTail {
|
||||
MusiCexTail {
|
||||
song_id: 1,
|
||||
media_mid: "0012ABCDEF".into(),
|
||||
filename: "O4M00012ABCDEF.mgg".into(),
|
||||
footer_size: 192,
|
||||
version: 1,
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
/// 接口契约的三个"必须"——写错了不会报错,只会静默拿不到 ekey
|
||||
#[test]
|
||||
fn request_body_satisfies_api_contract() {
|
||||
let req = EvkeyRequest::from_tail(&tail(), "1154027699", "TOKEN").unwrap();
|
||||
let body = req.body();
|
||||
|
||||
assert_eq!(body["req_1"]["module"], "music.vkey.GetEVkey");
|
||||
assert_eq!(body["req_1"]["method"], "CgiGetEVkey");
|
||||
|
||||
let param = &body["req_1"]["param"];
|
||||
// songtype 必须为 1(加密资源)
|
||||
assert_eq!(param["songtype"][0], 1);
|
||||
// filename 必须带扩展名
|
||||
assert_eq!(param["filename"][0], "O4M00012ABCDEF.mgg");
|
||||
assert!(param["filename"][0].as_str().unwrap().contains('.'));
|
||||
// songmid 来自 media_mid
|
||||
assert_eq!(param["songmid"][0], "0012ABCDEF");
|
||||
// platform = 27(Windows)
|
||||
assert_eq!(param["platform"], "27");
|
||||
|
||||
// comm 里要带 authst / uin
|
||||
assert_eq!(body["comm"]["authst"], "TOKEN");
|
||||
assert_eq!(body["comm"]["uin"], "1154027699");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn from_tail_rejects_incomplete_tail() {
|
||||
let mut t = tail();
|
||||
t.media_mid.clear();
|
||||
assert!(EvkeyRequest::from_tail(&t, "1", "T").is_err());
|
||||
|
||||
let mut t = tail();
|
||||
t.filename.clear();
|
||||
assert!(EvkeyRequest::from_tail(&t, "1", "T").is_err());
|
||||
|
||||
// 没有扩展名的文件名会被服务器拒绝,提前拦下
|
||||
let mut t = tail();
|
||||
t.filename = "O4M00012ABCDEF".into();
|
||||
let err = EvkeyRequest::from_tail(&t, "1", "T").unwrap_err();
|
||||
assert!(err.to_string().contains("扩展名"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parses_successful_response() {
|
||||
let body = r#"{
|
||||
"code": 0,
|
||||
"req_1": { "code": 0, "data": {
|
||||
"midurlinfo": [{ "ekey": "REAL_EKEY", "result": 0, "subcode": 0 }],
|
||||
"expiration": 80400
|
||||
}}
|
||||
}"#;
|
||||
assert_eq!(extract_ekey(body).unwrap(), "REAL_EKEY");
|
||||
}
|
||||
|
||||
/// 104005:要么需要 VIP,要么 filename 没带扩展名——文案必须点出这两条
|
||||
#[test]
|
||||
fn error_104005_is_actionable() {
|
||||
let body = r#"{
|
||||
"code": 0,
|
||||
"req_1": { "code": 0, "data": {
|
||||
"midurlinfo": [{ "ekey": "", "result": 104005, "subcode": 0 }]
|
||||
}}
|
||||
}"#;
|
||||
let err = extract_ekey(body).unwrap_err();
|
||||
let msg = err.to_string();
|
||||
assert!(msg.contains("104005"), "应带错误码:{msg}");
|
||||
assert!(msg.contains("VIP"), "应提示 VIP:{msg}");
|
||||
assert!(msg.contains("扩展名"), "应提示文件名要求:{msg}");
|
||||
}
|
||||
|
||||
/// result=0 但 ekey 为空 → 登录态过期
|
||||
#[test]
|
||||
fn empty_ekey_with_result_zero_suggests_relogin() {
|
||||
let body = r#"{
|
||||
"code": 0,
|
||||
"req_1": { "code": 0, "data": {
|
||||
"midurlinfo": [{ "ekey": "", "result": 0, "subcode": 0 }]
|
||||
}}
|
||||
}"#;
|
||||
let msg = extract_ekey(body).unwrap_err().to_string();
|
||||
assert!(msg.contains("重新登录"), "应提示重新登录:{msg}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn missing_sections_are_reported() {
|
||||
assert!(extract_ekey(r#"{"code":0}"#).is_err());
|
||||
assert!(extract_ekey(r#"{"code":0,"req_1":{"code":0}}"#).is_err());
|
||||
assert!(extract_ekey(r#"{"code":0,"req_1":{"code":0,"data":{"midurlinfo":[]}}}"#).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn malformed_json_is_reported() {
|
||||
let err = extract_ekey("not json").unwrap_err();
|
||||
assert!(err.to_string().contains("解析"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,231 @@
|
||||
//! QQ音乐 **musicex** 尾部解析(QQ 客户端 ≥ 19.57 / Windows 22.x)。
|
||||
//!
|
||||
//! 新版客户端不再把 ekey 写进文件,只在末尾留 192 字节元数据,ekey 必须联网取。
|
||||
//! 这个模块只做**纯解析**(无 IO、无网络),因此可以完整单测。
|
||||
//!
|
||||
//! ## 尾部布局(对照 `MUSIC_DECRYPT_PLAN.md` §3.2 与 qmc-decoder 的格式文档)
|
||||
//!
|
||||
//! ```text
|
||||
//! +0x00 [4B] song_id uint32 LE
|
||||
//! +0x04 [4B] quality_type1 uint32 LE
|
||||
//! +0x08 [4B] quality_type2 uint32 LE
|
||||
//! +0x0C [60B] media_mid UTF-16LE(可能以 NUL 结尾)
|
||||
//! +0x48 [68B] filename UTF-16LE(含扩展名,如 O4M0xxxx.mgg)
|
||||
//! +0x8C [48B] padding
|
||||
//! +0xC0 [4B] footer_size uint32 LE(= 0xC0 = 192)
|
||||
//! +0xC4 [4B] version uint32 LE(= 1)
|
||||
//! +0xC8 [8B] magic "musicex\0"
|
||||
//! ```
|
||||
//!
|
||||
//! 因此**音频段 = 文件大小 − footer_size**,且 footer 一定在文件末尾。
|
||||
|
||||
/// musicex 尾部魔术(含结尾 NUL)
|
||||
pub const MUSICEX_MAGIC: &[u8; 8] = b"musicex\0";
|
||||
/// 尾部固定长度(也是 footer_size 字段的期望值)
|
||||
pub const MUSICEX_FOOTER_LEN: usize = 0xC0;
|
||||
|
||||
/// 解析出的 musicex 元数据
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||
pub struct MusiCexTail {
|
||||
pub song_id: u32,
|
||||
pub quality_type1: u32,
|
||||
pub quality_type2: u32,
|
||||
/// 歌曲 mid(取 ekey 需要)
|
||||
pub media_mid: String,
|
||||
/// 资源文件名(**必须含扩展名**,否则 API 返回 104005)
|
||||
pub filename: String,
|
||||
/// 尾部声明的长度(正常为 192)
|
||||
pub footer_size: u32,
|
||||
pub version: u32,
|
||||
}
|
||||
|
||||
impl MusiCexTail {
|
||||
/// 音频段长度(文件总大小 − 尾部长度)
|
||||
pub fn audio_len(&self, file_size: u64) -> u64 {
|
||||
file_size.saturating_sub(self.footer_size as u64)
|
||||
}
|
||||
|
||||
/// 给 UI 的一行说明
|
||||
pub fn note(&self) -> String {
|
||||
if self.filename.is_empty() {
|
||||
format!("musicex(songId={})", self.song_id)
|
||||
} else {
|
||||
format!("musicex · {}", self.filename)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 判断一段**文件尾部字节**是否是 musicex 尾部。
|
||||
pub fn is_musicex_tail(buf: &[u8]) -> bool {
|
||||
buf.len() >= 8 && &buf[buf.len() - 8..] == MUSICEX_MAGIC
|
||||
}
|
||||
|
||||
/// 从文件末尾字节解析 musicex 尾部。
|
||||
///
|
||||
/// `buf` 必须至少包含整个尾部([`MUSICEX_FOOTER_LEN`] 字节),否则返回 `None`。
|
||||
pub fn parse_musicex_tail(buf: &[u8]) -> Option<MusiCexTail> {
|
||||
if !is_musicex_tail(buf) {
|
||||
return None;
|
||||
}
|
||||
let n = buf.len();
|
||||
let footer_size = le_u32(buf, n - 16)?;
|
||||
let version = le_u32(buf, n - 12)?;
|
||||
|
||||
// footer_size 是尾部总长;它必须落在缓冲区里才谈得上解析字段
|
||||
let footer_size_usize = footer_size as usize;
|
||||
if footer_size_usize < MUSICEX_FOOTER_LEN || footer_size_usize > n {
|
||||
return None;
|
||||
}
|
||||
let start = n - footer_size_usize;
|
||||
|
||||
Some(MusiCexTail {
|
||||
song_id: le_u32(buf, start)?,
|
||||
quality_type1: le_u32(buf, start + 4)?,
|
||||
quality_type2: le_u32(buf, start + 8)?,
|
||||
media_mid: utf16le_at(buf, start + 0x0C, 60)?,
|
||||
filename: utf16le_at(buf, start + 0x48, 68)?,
|
||||
footer_size,
|
||||
version,
|
||||
})
|
||||
}
|
||||
|
||||
fn le_u32(b: &[u8], at: usize) -> Option<u32> {
|
||||
let end = at.checked_add(4)?;
|
||||
let s = b.get(at..end)?;
|
||||
Some(u32::from_le_bytes([s[0], s[1], s[2], s[3]]))
|
||||
}
|
||||
|
||||
/// 读取定长 UTF-16LE 字段并去掉结尾的 NUL。
|
||||
///
|
||||
/// 字段是定长补齐的,未用部分为 0;也可能不补 NUL 而恰好占满,故两种都要容忍。
|
||||
fn utf16le_at(buf: &[u8], at: usize, byte_len: usize) -> Option<String> {
|
||||
let end = at.checked_add(byte_len)?;
|
||||
let s = buf.get(at..end)?;
|
||||
let mut units: Vec<u16> = s
|
||||
.chunks_exact(2)
|
||||
.map(|c| u16::from_le_bytes([c[0], c[1]]))
|
||||
.collect();
|
||||
while units.last() == Some(&0) {
|
||||
units.pop();
|
||||
}
|
||||
Some(String::from_utf16_lossy(&units))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// 构造一个合法的 musicex 尾部
|
||||
fn build_tail(song_id: u32, mid: &str, filename: &str) -> Vec<u8> {
|
||||
let mut tail = vec![0u8; MUSICEX_FOOTER_LEN];
|
||||
tail[0..4].copy_from_slice(&song_id.to_le_bytes());
|
||||
tail[4..8].copy_from_slice(&2u32.to_le_bytes());
|
||||
tail[8..12].copy_from_slice(&2u32.to_le_bytes());
|
||||
write_utf16(&mut tail[0x0C..0x0C + 60], mid);
|
||||
write_utf16(&mut tail[0x48..0x48 + 68], filename);
|
||||
let n = tail.len();
|
||||
tail[n - 16..n - 12].copy_from_slice(&(MUSICEX_FOOTER_LEN as u32).to_le_bytes());
|
||||
tail[n - 12..n - 8].copy_from_slice(&1u32.to_le_bytes());
|
||||
tail[n - 8..].copy_from_slice(MUSICEX_MAGIC);
|
||||
tail
|
||||
}
|
||||
|
||||
fn write_utf16(dst: &mut [u8], s: &str) {
|
||||
for (i, unit) in s.encode_utf16().enumerate() {
|
||||
let at = i * 2;
|
||||
if at + 2 > dst.len() {
|
||||
break;
|
||||
}
|
||||
dst[at..at + 2].copy_from_slice(&unit.to_le_bytes());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parses_valid_footer() {
|
||||
let tail = build_tail(0x0C27ABCD, "0012ABCDEF", "O4M00012ABCDEF.mgg");
|
||||
let parsed = parse_musicex_tail(&tail).expect("应解析成功");
|
||||
assert_eq!(parsed.song_id, 0x0C27ABCD);
|
||||
assert_eq!(parsed.quality_type1, 2);
|
||||
assert_eq!(parsed.quality_type2, 2);
|
||||
assert_eq!(parsed.media_mid, "0012ABCDEF");
|
||||
assert_eq!(parsed.filename, "O4M00012ABCDEF.mgg");
|
||||
assert_eq!(parsed.footer_size, 192);
|
||||
assert_eq!(parsed.version, 1);
|
||||
}
|
||||
|
||||
/// 尾部前面还有音频数据时,解析结果不受影响(按 footer_size 定位)
|
||||
#[test]
|
||||
fn parses_footer_with_audio_prefix() {
|
||||
let tail = build_tail(7, "mid123", "F00000mid123.mflac");
|
||||
let mut file = vec![0xAAu8; 5000];
|
||||
file.extend_from_slice(&tail);
|
||||
let parsed = parse_musicex_tail(&file).expect("应解析成功");
|
||||
assert_eq!(parsed.filename, "F00000mid123.mflac");
|
||||
assert_eq!(parsed.audio_len(file.len() as u64), 5000);
|
||||
}
|
||||
|
||||
/// 字段恰好占满、没有 NUL 终止符时也要能读全
|
||||
#[test]
|
||||
fn parses_full_width_field_without_nul() {
|
||||
let name = "A".repeat(34); // 68 字节 = 34 个 UTF-16 单元,正好占满
|
||||
let tail = build_tail(1, "M", &name);
|
||||
let parsed = parse_musicex_tail(&tail).expect("应解析成功");
|
||||
assert_eq!(parsed.filename, name);
|
||||
}
|
||||
|
||||
/// 中文文件名(UTF-16LE)要能正确还原
|
||||
#[test]
|
||||
fn parses_cjk_filename() {
|
||||
let tail = build_tail(1, "mid", "歌曲 名.mgg");
|
||||
let parsed = parse_musicex_tail(&tail).unwrap();
|
||||
assert_eq!(parsed.filename, "歌曲 名.mgg");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_non_musicex() {
|
||||
assert!(!is_musicex_tail(b"not a magic at all"));
|
||||
assert!(parse_musicex_tail(&[0u8; 192]).is_none());
|
||||
// 魔术对但长度不合理
|
||||
let mut bad = vec![0u8; 192];
|
||||
let n = bad.len();
|
||||
bad[n - 8..].copy_from_slice(MUSICEX_MAGIC);
|
||||
bad[n - 16..n - 12].copy_from_slice(&0xFFFFu32.to_le_bytes());
|
||||
assert!(parse_musicex_tail(&bad).is_none(), "footer_size 越界应拒绝");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_truncated_buffer() {
|
||||
// 只有 16 字节,放不下 192 字节的尾部结构
|
||||
let mut short = vec![0u8; 16];
|
||||
let n = short.len();
|
||||
short[n - 8..].copy_from_slice(MUSICEX_MAGIC);
|
||||
short[n - 16..n - 12].copy_from_slice(&192u32.to_le_bytes());
|
||||
assert!(parse_musicex_tail(&short).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn audio_len_saturates() {
|
||||
let t = MusiCexTail {
|
||||
footer_size: 192,
|
||||
..Default::default()
|
||||
};
|
||||
assert_eq!(t.audio_len(1000), 808);
|
||||
// 文件比尾部还小:不能下溢
|
||||
assert_eq!(t.audio_len(10), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn note_includes_filename_when_present() {
|
||||
let t = MusiCexTail {
|
||||
filename: "a.mgg".into(),
|
||||
song_id: 5,
|
||||
..Default::default()
|
||||
};
|
||||
assert!(t.note().contains("a.mgg"));
|
||||
let empty = MusiCexTail {
|
||||
song_id: 9,
|
||||
..Default::default()
|
||||
};
|
||||
assert!(empty.note().contains("9"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,216 @@
|
||||
//! `QQMusic.exe` 进程内存扫描(**只读**)。
|
||||
//!
|
||||
//! Windows 版 QQ 音乐把 `authst` 只放在运行期内存里,因此联网取 ekey 必须先把它捞出来。
|
||||
//! 这是纯 Win32 胶水层:真正的解析逻辑([`super::qq_credentials::find_authst`] /
|
||||
//! [`super::qq_credentials::parse_ini_uin`])是跨平台纯函数,已单独单测。
|
||||
//!
|
||||
//! ## 实现要点(踩过的坑)
|
||||
//!
|
||||
//! 1. **`MEMORY_BASIC_INFORMATION` 的 `PartitionId`**:Windows 10 1803+ 在
|
||||
//! `AllocationProtect` 与 `RegionSize` 之间插入了 2 字节。结构体里**必须**包含它,
|
||||
//! 否则 `RegionSize`/`State`/`Protect` 全部从错误偏移读取——症状是
|
||||
//! `VirtualQueryEx` 返回的 `State` 读成了 `Protect` 的值(如 `PAGE_READWRITE=0x04`
|
||||
//! 而不是 `MEM_COMMIT=0x1000`),于是**所有内存区域都被跳过**、永远扫不到。
|
||||
//! `windows-sys` 的定义已经包含该字段,这里直接用官方结构体。
|
||||
//! 2. **只扫 `MEM_COMMIT` 且可读的区域**,并跳过 `PAGE_GUARD` / `PAGE_NOACCESS`。
|
||||
//! 3. **分块读取**(1 MB),避免一次 `ReadProcessMemory` 大区域时中途失败整块丢。
|
||||
//! 4. 跨块保留 `AUTHST_KEY.len() - 1` 字节的重叠,防止 token 恰好横跨块边界。
|
||||
|
||||
use std::ffi::c_void;
|
||||
|
||||
use windows_sys::Win32::Foundation::{CloseHandle, INVALID_HANDLE_VALUE};
|
||||
use windows_sys::Win32::System::Diagnostics::Debug::ReadProcessMemory;
|
||||
use windows_sys::Win32::System::Diagnostics::ToolHelp::{
|
||||
CreateToolhelp32Snapshot, Process32FirstW, Process32NextW, PROCESSENTRY32W, TH32CS_SNAPPROCESS,
|
||||
};
|
||||
use windows_sys::Win32::System::Memory::{
|
||||
VirtualQueryEx, MEMORY_BASIC_INFORMATION, MEM_COMMIT, PAGE_GUARD, PAGE_NOACCESS,
|
||||
};
|
||||
use windows_sys::Win32::System::Threading::{
|
||||
OpenProcess, PROCESS_QUERY_INFORMATION, PROCESS_VM_READ,
|
||||
};
|
||||
|
||||
use super::qq_credentials::{find_authst_from, QQ_PROCESS_HINT};
|
||||
|
||||
/// 单次读取的块大小
|
||||
const CHUNK: usize = 1024 * 1024;
|
||||
/// 跨块重叠长度(`"authst":"` 的长度 - 1,防止 token 横跨块边界)
|
||||
const OVERLAP: usize = 16;
|
||||
/// 扫描上限:避免异常进程占用过久(每个进程最多读这么多字节)
|
||||
const MAX_SCAN_BYTES: usize = 512 * 1024 * 1024;
|
||||
|
||||
/// 扫描结果
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub struct Found {
|
||||
pub authst: Option<String>,
|
||||
pub uin: Option<String>,
|
||||
}
|
||||
|
||||
/// 按进程名(大小写不敏感子串)找 PID
|
||||
pub fn find_process_pid(hint: &str) -> Option<u32> {
|
||||
unsafe {
|
||||
let snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
|
||||
if snapshot == INVALID_HANDLE_VALUE {
|
||||
return None;
|
||||
}
|
||||
let mut entry: PROCESSENTRY32W = std::mem::zeroed();
|
||||
entry.dwSize = std::mem::size_of::<PROCESSENTRY32W>() as u32;
|
||||
|
||||
// 提前小写化,避免在进程列表里反复分配(进程数可达数百)
|
||||
let needle = hint.to_lowercase();
|
||||
let mut pid: Option<u32> = None;
|
||||
if Process32FirstW(snapshot, &mut entry) != 0 {
|
||||
loop {
|
||||
let name_len = entry
|
||||
.szExeFile
|
||||
.iter()
|
||||
.position(|&c| c == 0)
|
||||
.unwrap_or(entry.szExeFile.len());
|
||||
let name = String::from_utf16_lossy(&entry.szExeFile[..name_len]);
|
||||
if name.to_lowercase().contains(&needle) {
|
||||
pid = Some(entry.th32ProcessID);
|
||||
break;
|
||||
}
|
||||
if Process32NextW(snapshot, &mut entry) == 0 {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
CloseHandle(snapshot);
|
||||
pid
|
||||
}
|
||||
}
|
||||
|
||||
/// QQ 音乐是否在运行
|
||||
pub fn is_qqmusic_running() -> bool {
|
||||
find_process_pid(QQ_PROCESS_HINT).is_some()
|
||||
}
|
||||
|
||||
/// 扫描 QQ 音乐进程内存,捞出 `authst`(顺带尝试 `"uin":"..."`)。
|
||||
pub fn scan_qq_process() -> Result<Found, String> {
|
||||
let pid = find_process_pid(QQ_PROCESS_HINT).ok_or("未找到 QQMusic.exe 进程")?;
|
||||
|
||||
// windows-sys 0.52 的 HANDLE 是 isize(0 表示失败)
|
||||
let handle = unsafe { OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, 0, pid) };
|
||||
if handle == 0 {
|
||||
return Err("无法打开 QQMusic.exe(权限不足;请尝试以管理员身份运行本应用)".to_string());
|
||||
}
|
||||
let result = unsafe { scan_handle(handle) };
|
||||
unsafe { CloseHandle(handle) };
|
||||
result
|
||||
}
|
||||
|
||||
unsafe fn scan_handle(handle: isize) -> Result<Found, String> {
|
||||
let mut found = Found::default();
|
||||
let mut address: usize = 0;
|
||||
let mut buf = vec![0u8; CHUNK];
|
||||
let mut scanned: usize = 0;
|
||||
|
||||
while address < usize::MAX {
|
||||
let mut mbi: MEMORY_BASIC_INFORMATION = std::mem::zeroed();
|
||||
let written = VirtualQueryEx(
|
||||
handle,
|
||||
address as *const c_void,
|
||||
&mut mbi,
|
||||
std::mem::size_of::<MEMORY_BASIC_INFORMATION>(),
|
||||
);
|
||||
if written == 0 {
|
||||
break;
|
||||
}
|
||||
|
||||
let region_size = mbi.RegionSize;
|
||||
let base = mbi.BaseAddress as usize;
|
||||
|
||||
// 只读「已提交、且不是 guard/noaccess」的区域
|
||||
let readable = mbi.State == MEM_COMMIT
|
||||
&& (mbi.Protect & PAGE_GUARD) == 0
|
||||
&& (mbi.Protect & PAGE_NOACCESS) == 0
|
||||
&& mbi.Protect != 0;
|
||||
|
||||
if readable && region_size > 0 {
|
||||
let mut offset = 0usize;
|
||||
while offset < region_size && scanned < MAX_SCAN_BYTES {
|
||||
let want = CHUNK.min(region_size - offset);
|
||||
// 末尾留出重叠,保证 token 不因分块被截断
|
||||
let read_len = want.min(buf.len());
|
||||
let mut got = 0usize;
|
||||
let ok = ReadProcessMemory(
|
||||
handle,
|
||||
(base + offset) as *const c_void,
|
||||
buf.as_mut_ptr() as *mut c_void,
|
||||
read_len,
|
||||
&mut got,
|
||||
);
|
||||
if ok != 0 && got > 0 {
|
||||
scanned += got;
|
||||
let slice = &buf[..got];
|
||||
if found.authst.is_none() {
|
||||
if let Some(t) = find_authst_from(slice, 0) {
|
||||
found.authst = Some(t);
|
||||
}
|
||||
}
|
||||
if found.uin.is_none() {
|
||||
found.uin = find_json_string(slice, b"\"uin\":\"");
|
||||
}
|
||||
if found.authst.is_some() && found.uin.is_some() {
|
||||
return Ok(found);
|
||||
}
|
||||
}
|
||||
// 前进:整块减去重叠,避免漏掉跨块的匹配
|
||||
if want <= OVERLAP {
|
||||
break;
|
||||
}
|
||||
offset += want - OVERLAP;
|
||||
}
|
||||
}
|
||||
|
||||
// 前进到下一个区域;RegionSize 为 0 时强制前进,防止死循环
|
||||
let step = if region_size == 0 {
|
||||
0x1000
|
||||
} else {
|
||||
region_size
|
||||
};
|
||||
match address.checked_add(step) {
|
||||
Some(next) if next > address => address = next,
|
||||
_ => break,
|
||||
}
|
||||
}
|
||||
|
||||
Ok(found)
|
||||
}
|
||||
|
||||
/// 在字节里找 `"<key>":"<value>"` 形态的字符串值(用于 uin)
|
||||
unsafe fn find_json_string(haystack: &[u8], key: &[u8]) -> Option<String> {
|
||||
let mut pos = 0usize;
|
||||
while pos + key.len() <= haystack.len() {
|
||||
let rel = haystack[pos..].windows(key.len()).position(|w| w == key)?;
|
||||
let start = pos + rel + key.len();
|
||||
let end = haystack[start..].iter().position(|&b| b == b'"')?;
|
||||
let val = &haystack[start..start + end];
|
||||
if !val.is_empty() && val.iter().all(|b| b.is_ascii_digit()) {
|
||||
return Some(String::from_utf8_lossy(val).to_string());
|
||||
}
|
||||
pos = start;
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// 「QQ 在不在运行」必须能在本机跑通且不 panic
|
||||
/// (本机装了 QQ 音乐,结果可能是 true 或 false,取决于是否启动)
|
||||
#[test]
|
||||
fn process_detection_does_not_panic() {
|
||||
let running = is_qqmusic_running();
|
||||
// 只要求"不 panic 且能给出结论";不假设本机是否开着 QQ 音乐
|
||||
eprintln!("QQMusic running = {running}");
|
||||
}
|
||||
|
||||
/// 不存在的进程名必须返回 None,而不是卡住或 panic
|
||||
#[test]
|
||||
fn unknown_process_returns_none() {
|
||||
assert!(find_process_pid("definitely-not-a-real-process-xyzzy").is_none());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,361 @@
|
||||
//! QQ音乐解密的**编排层**:把「尾部形态 → 密钥来源 → 流密码」串起来。
|
||||
//!
|
||||
//! 密钥来源按 `MUSIC_DECRYPT_PLAN.md` §3.2 分层:
|
||||
//!
|
||||
//! | 尾部 | 密钥来源 | 需要联网 |
|
||||
//! |---|---|---|
|
||||
//! | QMC1 | 内置静态表 | 否 |
|
||||
//! | QTag / V1 | 尾部内嵌 ekey | 否 |
|
||||
//! | musicex | **本机已登录凭据 → `GetEVkey`** | 是 |
|
||||
//!
|
||||
//! 之所以单开一个模块而不是塞进 `qmc.rs`:联网那一路牵涉 HTTP 客户端、
|
||||
//! 凭据与工作线程里的运行时,与纯算法拆开后 `qmc.rs` 可以保持零 IO 依赖。
|
||||
|
||||
use std::path::Path;
|
||||
|
||||
use super::common::{self, DecryptError};
|
||||
use super::qmc;
|
||||
use super::qq_credentials;
|
||||
use super::qq_ekey::{self, EvkeyRequest};
|
||||
use super::qq_footer::{self, MusiCexTail};
|
||||
|
||||
/// 在线能力状态(给 UI 状态卡用)
|
||||
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, specta::Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct QqOnlineStatus {
|
||||
/// QQMusic.exe 是否在运行
|
||||
pub running: bool,
|
||||
/// 是否取到了 authst(= 已登录且能读到内存)
|
||||
pub logged_in: bool,
|
||||
/// 本机读到的 QQ 号(仅用于展示;没有则为 None)
|
||||
pub uin: Option<String>,
|
||||
/// 是否具备在线取 ekey 的能力
|
||||
pub ready: bool,
|
||||
/// 给用户的一句话状态
|
||||
pub message: String,
|
||||
/// 需要用户照做的步骤(ready 时为一条"无需额外设置")
|
||||
pub steps: Vec<String>,
|
||||
}
|
||||
|
||||
/// 探测在线能力(**只读**:读 INI + 扫进程内存,不发网络请求)
|
||||
pub fn probe_status() -> QqOnlineStatus {
|
||||
let running = qq_memscan_running();
|
||||
let creds = qq_credentials::read_credentials();
|
||||
let ready = creds.usable();
|
||||
|
||||
let message = if ready {
|
||||
"已就绪:可直接解密 QQ 音乐新版 musicex 文件".to_string()
|
||||
} else if !running {
|
||||
"QQ 音乐未运行——新版 musicex 文件的密钥只在登录后存在于内存中".to_string()
|
||||
} else if creds.uin.is_none() {
|
||||
"QQ 音乐在运行,但没读到本机账号(可能尚未登录)".to_string()
|
||||
} else {
|
||||
"QQ 音乐在运行,但未取到登录令牌(authst),请确认已登录".to_string()
|
||||
};
|
||||
|
||||
let steps = if ready {
|
||||
vec!["无需额外设置;QMC1 与尾部内嵌 ekey 的文件本来就不需要登录。".to_string()]
|
||||
} else {
|
||||
vec![
|
||||
"1. 在电脑上启动 QQ 音乐客户端(Windows 版)。".to_string(),
|
||||
"2. 用它登录你的账号(扫码或账号密码均可),并保持客户端开着。".to_string(),
|
||||
"3. 回到本页点「重新检测」;状态变为「已就绪」后即可解密 musicex 文件。".to_string(),
|
||||
"4. 若显示未取到登录令牌:先播放任意一首歌触发一次网络请求,再重新检测。".to_string(),
|
||||
"5. 若仍失败,试过以管理员身份运行本应用(读取进程内存可能受权限限制)。".to_string(),
|
||||
"6. 登录令牌约 22.3 小时过期;过期后重新检测即可。".to_string(),
|
||||
]
|
||||
};
|
||||
|
||||
QqOnlineStatus {
|
||||
running,
|
||||
logged_in: creds.authst.is_some(),
|
||||
uin: creds.uin.clone(),
|
||||
ready,
|
||||
message,
|
||||
steps,
|
||||
}
|
||||
}
|
||||
|
||||
fn qq_memscan_running() -> bool {
|
||||
#[cfg(windows)]
|
||||
{
|
||||
super::qq_memscan::is_qqmusic_running()
|
||||
}
|
||||
#[cfg(not(windows))]
|
||||
{
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
/// musicex 的联网取密钥 + 解密。
|
||||
///
|
||||
/// `client` 用于发请求;调用方负责给它一个带超时的实例。整个流程会在
|
||||
/// 当前线程上建一个最小 tokio 运行时来 `block_on`——调度层本来就是
|
||||
/// 独立工作线程,不占 tokio 的工作线程。
|
||||
pub fn decrypt_musicex<F>(
|
||||
input: &Path,
|
||||
out_dir: &Path,
|
||||
platform_label: &str,
|
||||
mut progress: F,
|
||||
) -> Result<common::Outcome, DecryptError>
|
||||
where
|
||||
F: FnMut(u64, u64),
|
||||
{
|
||||
let total = std::fs::metadata(input).map(|m| m.len()).unwrap_or(0);
|
||||
if total < qq_footer::MUSICEX_FOOTER_LEN as u64 {
|
||||
return Err(DecryptError::Broken("文件太小,不可能是 musicex".into()));
|
||||
}
|
||||
|
||||
// 1) 解析尾部
|
||||
let tail = read_musicex_tail(input)?;
|
||||
let audio_len = tail.audio_len(total);
|
||||
|
||||
// 2) 取凭据
|
||||
let creds = qq_credentials::read_credentials();
|
||||
let (uin, authst) = match (creds.uin.as_deref(), creds.authst.as_deref()) {
|
||||
(Some(u), Some(a)) => (u, a),
|
||||
_ => {
|
||||
return Err(DecryptError::KeyRequired(format!(
|
||||
"{}。请在电脑上启动并登录 QQ 音乐客户端后重试,或在「解密」页点「重新检测」查看当前状态。",
|
||||
creds.status_text()
|
||||
)))
|
||||
}
|
||||
};
|
||||
|
||||
// 3) 请求 ekey
|
||||
let req = EvkeyRequest::from_tail(&tail, uin, authst)?;
|
||||
let client = reqwest::Client::builder()
|
||||
.timeout(std::time::Duration::from_secs(25))
|
||||
.build()
|
||||
.map_err(|e| DecryptError::KeyRequired(format!("构建 HTTP 客户端失败:{e}")))?;
|
||||
let (ekey, expiration) = block_on(fetch_ekey_async(&client, &req))?;
|
||||
|
||||
// 4) ekey → 原始密钥
|
||||
let raw = qmc::parse_ekey(&ekey)?;
|
||||
if raw.len() < 16 || raw.len() > 4096 {
|
||||
return Err(DecryptError::KeyRequired(format!(
|
||||
"服务器返回的密钥长度异常({} 字节),已放弃以免解出噪声",
|
||||
raw.len()
|
||||
)));
|
||||
}
|
||||
|
||||
// 5) 解密音频段
|
||||
let audio = read_audio_segment(input, audio_len)?;
|
||||
|
||||
// 用**解密结果**判定密钥是否正确,而不是猜密文头。
|
||||
//
|
||||
// 曾经的写法是"密文必须以 `#!Qk` 开头,否则拒绝"——**这个假设是错的**:
|
||||
// 真机样本(Avicii - Heaven,musicex)的密文头是 `51 74 03 75`,
|
||||
// 按那条守卫会把完全合法的文件误拒。QMC2 密文头没有稳定魔术,
|
||||
// 而"用取到的密钥解出的前 16 字节是不是已知音频魔术"才可靠:
|
||||
// 密钥错时它是随机噪声,几乎不可能凑成 `fLaC` / `OggS` / `ID3` / `ftyp`。
|
||||
let mut plaintext = audio;
|
||||
qmc::decrypt_with_raw_key(&raw, &mut plaintext);
|
||||
let Some(format) = super::common::detect_format_opt(&plaintext) else {
|
||||
return Err(DecryptError::KeyRequired(format!(
|
||||
"取到的密钥没能解出可识别的音频头(前 16 字节 {:02x?})——可能是该资源的 ekey \
|
||||
与文件不匹配,或登录态已过期;请重新检测后重试",
|
||||
&plaintext[..16.min(plaintext.len())]
|
||||
)));
|
||||
};
|
||||
|
||||
let decrypted = plaintext;
|
||||
let stem = input
|
||||
.file_stem()
|
||||
.map(|s| s.to_string_lossy().to_string())
|
||||
.unwrap_or_else(|| "output".to_string());
|
||||
std::fs::create_dir_all(out_dir)?;
|
||||
let mut reserved = std::collections::HashSet::new();
|
||||
let target = super::common::unique_output(out_dir, &stem, format, &mut reserved)?;
|
||||
std::fs::write(&target, &decrypted)?;
|
||||
progress(decrypted.len() as u64, decrypted.len() as u64);
|
||||
|
||||
Ok(common::Outcome {
|
||||
output: target,
|
||||
format: format.to_string(),
|
||||
cover: None,
|
||||
audio_bytes: decrypted.len() as u64,
|
||||
note: format!(
|
||||
"{platform_label} · {} · 在线取密钥解密(密钥有效期约 {} 小时)",
|
||||
tail.note(),
|
||||
// expiration 单位为秒(实测约 80400 ≈ 22.3 小时)
|
||||
if expiration > 0 {
|
||||
format!("{:.1}", expiration as f64 / 3600.0)
|
||||
} else {
|
||||
"未知".to_string()
|
||||
}
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
/// 读文件末尾的 musicex 尾部
|
||||
fn read_musicex_tail(input: &Path) -> Result<MusiCexTail, DecryptError> {
|
||||
use std::io::{Read, Seek, SeekFrom};
|
||||
let mut f = std::fs::File::open(input)?;
|
||||
let size = f.metadata()?.len();
|
||||
let take = (qq_footer::MUSICEX_FOOTER_LEN as u64).min(size) as usize;
|
||||
f.seek(SeekFrom::End(-(take as i64)))?;
|
||||
let mut buf = vec![0u8; take];
|
||||
f.read_exact(&mut buf)?;
|
||||
// 注意:这里只读了尾部 192 字节,而 footer_size 可能 > 192(版本变化)——
|
||||
// 那就退化成"按已知长度解析",字段偏移仍以文件末尾为基准。
|
||||
qq_footer::parse_musicex_tail(&buf)
|
||||
.ok_or_else(|| DecryptError::Broken("musicex 尾部解析失败(魔术或长度字段异常)".into()))
|
||||
}
|
||||
|
||||
/// 只读音频段(musicex 场景下文件不大,但依然按大小一次读入以便就地解密)
|
||||
fn read_audio_segment(input: &Path, audio_len: u64) -> Result<Vec<u8>, DecryptError> {
|
||||
use std::io::Read;
|
||||
let mut f = std::fs::File::open(input)?;
|
||||
let mut buf = vec![0u8; audio_len as usize];
|
||||
f.read_exact(&mut buf)?;
|
||||
Ok(buf)
|
||||
}
|
||||
|
||||
/// 在**当前线程**上跑一个最小 tokio 运行时。
|
||||
///
|
||||
/// 调度层用独立 `std::thread` 干活,所以这里 `block_on` 是安全的
|
||||
/// (不会在 tokio 的 worker 线程里嵌套)。
|
||||
fn block_on<F: std::future::Future>(fut: F) -> F::Output {
|
||||
match tokio::runtime::Builder::new_current_thread()
|
||||
.enable_all()
|
||||
.build()
|
||||
{
|
||||
Ok(rt) => rt.block_on(fut),
|
||||
Err(_) => {
|
||||
// 极端情况下退化为全局运行时(项目里已有 rt-multi-thread)
|
||||
tauri::async_runtime::block_on(fut)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn fetch_ekey_async(
|
||||
client: &reqwest::Client,
|
||||
req: &EvkeyRequest,
|
||||
) -> Result<(String, i64), DecryptError> {
|
||||
qq_ekey::fetch_ekey(client, req).await
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// 状态探测必须能跑通且文案自洽(不假设本机 QQ 是否开着)
|
||||
#[test]
|
||||
fn probe_status_is_self_consistent() {
|
||||
let s = probe_status();
|
||||
assert_eq!(s.ready, s.running && s.logged_in);
|
||||
assert!(!s.message.is_empty());
|
||||
assert!(!s.steps.is_empty());
|
||||
if s.ready {
|
||||
assert!(s.steps.len() == 1, "就绪时只应给一条说明");
|
||||
} else {
|
||||
assert!(s.steps.len() >= 3, "未就绪时步骤要能照做");
|
||||
}
|
||||
}
|
||||
|
||||
/// 把本机真实探测结果打出来,便于人工核对「在线能力」是否按预期工作。
|
||||
/// 不加断言(依赖本机是否开着 QQ 音乐),只在 `--nocapture` 时可见。
|
||||
#[test]
|
||||
fn probe_status_reports_machine_state() {
|
||||
let s = probe_status();
|
||||
eprintln!(
|
||||
"[qq-online] running={} logged_in={} uin={:?} ready={}\n message: {}\n steps: {}",
|
||||
s.running,
|
||||
s.logged_in,
|
||||
s.uin,
|
||||
s.ready,
|
||||
s.message,
|
||||
s.steps.len()
|
||||
);
|
||||
}
|
||||
|
||||
/// musicex 文件必须被**离线路径**判为「需要密钥」,并且在有凭据时被识别为
|
||||
/// 「该走在线路径」。
|
||||
///
|
||||
/// 刻意**不**真的发网络请求:单元测试不该依赖 QQ 服务器可达性与账号状态,
|
||||
/// 否则本机登录后测试就会变慢、变脆。
|
||||
#[test]
|
||||
fn musicex_routes_to_online_path() {
|
||||
let dir = std::env::temp_dir().join(format!("qq_online_{}", std::process::id()));
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
|
||||
// 造一个 musicex 文件:尾部合法(含 media_mid / filename)。
|
||||
// 音频段的内容无所谓——这条只验证"路由与入参构造",不发网络请求。
|
||||
let mut file = vec![0u8; 4096];
|
||||
let n = file.len();
|
||||
let tail_start = n - qq_footer::MUSICEX_FOOTER_LEN;
|
||||
write_utf16(
|
||||
&mut file[tail_start + 0x0C..tail_start + 0x0C + 60],
|
||||
"0012ABCDEF",
|
||||
);
|
||||
write_utf16(
|
||||
&mut file[tail_start + 0x48..tail_start + 0x48 + 68],
|
||||
"O4M00012ABCDEF.mgg",
|
||||
);
|
||||
file[n - 16..n - 12].copy_from_slice(&(qq_footer::MUSICEX_FOOTER_LEN as u32).to_le_bytes());
|
||||
file[n - 12..n - 8].copy_from_slice(&1u32.to_le_bytes());
|
||||
file[n - 8..].copy_from_slice(qq_footer::MUSICEX_MAGIC);
|
||||
let src = dir.join("a.mgg");
|
||||
std::fs::write(&src, &file).unwrap();
|
||||
|
||||
// 1) 尾部能被解析出取密钥所需的两个字段
|
||||
let tail = read_musicex_tail(&src).expect("尾部应解析成功");
|
||||
assert_eq!(tail.media_mid, "0012ABCDEF");
|
||||
assert_eq!(tail.filename, "O4M00012ABCDEF.mgg");
|
||||
assert_eq!(tail.audio_len(file.len() as u64), (tail_start) as u64);
|
||||
|
||||
// 2) 离线路径必须明确报「需要密钥」,而不是解出噪声
|
||||
let offline = super::super::qmc::sniff_tail(&src).unwrap();
|
||||
assert_eq!(offline.kind, super::super::qmc::TailKind::MusiCex);
|
||||
|
||||
// 3) 请求能从尾部正确构造(这正是联网那一步的入参)
|
||||
let req = EvkeyRequest::from_tail(&tail, "1154027699", "TOKEN").unwrap();
|
||||
assert_eq!(req.media_mid, "0012ABCDEF");
|
||||
assert_eq!(req.filename, "O4M00012ABCDEF.mgg");
|
||||
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
/// 密钥错误时不应产出"看起来成功"的垃圾:
|
||||
/// 判据是**解密结果**能否识别成已知音频魔术。
|
||||
///
|
||||
/// 这条同时固化一个真机结论:QMC2 的**密文头没有稳定魔术**
|
||||
/// (真机 musicex 样本头为 `51 74 03 75`,而 MIT/Apache 文档里提到的
|
||||
/// `#!Qk` 并不适用于它),所以**不能**用密文头做守卫。
|
||||
#[test]
|
||||
fn wrong_key_yields_unrecognizable_header() {
|
||||
// 用一段随机数据当"密文",配一个随便的密钥
|
||||
let mut data = vec![0x51u8, 0x74, 0x03, 0x75];
|
||||
data.extend((0..4092).map(|i| (i * 7 % 251) as u8));
|
||||
let key: Vec<u8> = (0..64).map(|i| (i * 3 + 1) as u8).collect();
|
||||
|
||||
super::super::qmc::decrypt_with_raw_key(&key, &mut data);
|
||||
// 解出来必须是"认不出",才会走到 KeyRequired 那条错误分支
|
||||
assert!(
|
||||
super::super::common::detect_format_opt(&data).is_none(),
|
||||
"随机数据不应被识别成音频"
|
||||
);
|
||||
}
|
||||
|
||||
/// `#!Qk` 是 QMC2 的一种形态,但**不是** musicex 的头部——这里留一条记录性断言,
|
||||
/// 防止后人再次把它当成通用守卫。
|
||||
#[test]
|
||||
fn qmc2_ciphertext_header_is_not_a_reliable_magic() {
|
||||
assert_ne!(b"#!Qk", &[0x51u8, 0x74, 0x03, 0x75]);
|
||||
// 真机样本的头就是后者;`detect_format_opt` 对两者都不应误判成音频
|
||||
assert!(super::super::common::detect_format_opt(b"#!Qk\x00\x00\x00\x00").is_none());
|
||||
}
|
||||
|
||||
/// 把一个定长 UTF-16LE 字段写进缓冲区(测试辅助)
|
||||
fn write_utf16(dst: &mut [u8], s: &str) {
|
||||
for (i, unit) in s.encode_utf16().enumerate() {
|
||||
let at = i * 2;
|
||||
if at + 2 > dst.len() {
|
||||
break;
|
||||
}
|
||||
dst[at..at + 2].copy_from_slice(&unit.to_le_bytes());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,249 @@
|
||||
//! 文件夹批量:递归扫描 + 平台路由。
|
||||
//!
|
||||
//! 用户要的是「以文件夹为单位处理」,所以这里的判定原则是:
|
||||
//!
|
||||
//! 1. **内容优先于后缀**。同一个曲库里 `.ncm` / `.mflac` / `.qmcflac` / `.mgg` 混放是常态,
|
||||
//! 而后者还有 `.mgg0`、`.mflac0` 这类后缀变体;靠后缀枚举会漏。
|
||||
//! 因此先看头部魔数(网易云 `CTENFDAM`),再看尾部形态(QMC 家族)。
|
||||
//! 2. **只扫一次、只走一层递归**。目录树遍历用 `walkdir`,过滤在遍历中完成,
|
||||
//! 不把整个目录列表灌进内存(几万首的曲库会很难看)。
|
||||
//! 3. 扫描结果按**路径排序**,保证同一目录每次处理的顺序稳定(进度条与任务表可预期)。
|
||||
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use walkdir::WalkDir;
|
||||
|
||||
use super::{ncm, qmc};
|
||||
|
||||
/// 一个待处理的文件
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ScannedFile {
|
||||
/// 绝对路径
|
||||
pub path: PathBuf,
|
||||
/// 相对扫描根的父目录(用于在输出目录里还原目录结构);根目录下的文件为 None
|
||||
pub rel_parent: Option<PathBuf>,
|
||||
/// 文件名(含后缀),给 UI 显示
|
||||
pub name: String,
|
||||
/// 该用哪个引擎
|
||||
pub engine: Engine,
|
||||
}
|
||||
|
||||
/// 引擎路由结果
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum Engine {
|
||||
/// 网易云 ncm
|
||||
Ncm,
|
||||
/// QQ音乐 QMC 家族
|
||||
Qmc,
|
||||
}
|
||||
|
||||
impl Engine {
|
||||
pub fn label(self) -> &'static str {
|
||||
match self {
|
||||
Engine::Ncm => "网易云",
|
||||
Engine::Qmc => "QQ音乐",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 单文件路由:读 8 字节魔数 + 4KB 尾部即可判定,不做全文件读。
|
||||
///
|
||||
/// 返回 `None` 表示这个文件不是我们认得的加密音乐(目录扫描时直接跳过,
|
||||
/// 用户显式选中的文件则会得到一条 `unsupported` 结果)。
|
||||
pub fn route(path: &Path) -> Option<Engine> {
|
||||
if ncm::sniff(path) {
|
||||
return Some(Engine::Ncm);
|
||||
}
|
||||
// QMC:尾部能判出形态就算认得
|
||||
if qmc::sniff_tail(path).is_ok() {
|
||||
// 后缀也在 QMC 家族里、或尾部形态明确(非纯 QMC1 兜底)时才算
|
||||
let ext = path
|
||||
.extension()
|
||||
.map(|e| e.to_string_lossy().to_string())
|
||||
.unwrap_or_default();
|
||||
if qmc::is_qmc_extension(&ext) {
|
||||
return Some(Engine::Qmc);
|
||||
}
|
||||
// 后缀不认识时,只有明确的尾部形态(QTag/V1/musicex)才认;
|
||||
// 否则任何末尾凑巧不是 QTag 的文件都会被判成"QMC1",噪声太大。
|
||||
if let Ok(tail) = qmc::sniff_tail(path) {
|
||||
if tail.kind != qmc::TailKind::Qmc1 {
|
||||
return Some(Engine::Qmc);
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// 递归扫描 `folder`,返回所有可解密的加密音乐文件。
|
||||
///
|
||||
/// `root` 用于计算相对路径(输出时还原目录结构)。`folder == root` 时即
|
||||
/// 「以这个文件夹为单位处理」。传 `root = None` 则所有文件平铺。
|
||||
///
|
||||
/// 排序保证稳定;`max_depth` 为 `None` 时递归全部层级。
|
||||
pub fn scan(folder: &Path, root: Option<&Path>) -> Result<Vec<ScannedFile>, String> {
|
||||
if !folder.is_dir() {
|
||||
return Err(format!("{} 不是文件夹", folder.display()));
|
||||
}
|
||||
let root = root.unwrap_or(folder);
|
||||
|
||||
let mut out = Vec::new();
|
||||
for entry in WalkDir::new(folder)
|
||||
.follow_links(false)
|
||||
.into_iter()
|
||||
.filter_map(|e| e.ok())
|
||||
{
|
||||
if !entry.file_type().is_file() {
|
||||
continue;
|
||||
}
|
||||
let path = entry.path();
|
||||
let Some(engine) = route(path) else {
|
||||
continue;
|
||||
};
|
||||
let rel_parent = path
|
||||
.parent()
|
||||
.and_then(|p| p.strip_prefix(root).ok())
|
||||
.filter(|p| !p.as_os_str().is_empty())
|
||||
.map(|p| p.to_path_buf());
|
||||
let name = path
|
||||
.file_name()
|
||||
.map(|n| n.to_string_lossy().to_string())
|
||||
.unwrap_or_else(|| path.display().to_string());
|
||||
out.push(ScannedFile {
|
||||
path: path.to_path_buf(),
|
||||
rel_parent,
|
||||
name,
|
||||
engine,
|
||||
});
|
||||
}
|
||||
|
||||
// 稳定排序:按相对目录 + 文件名,处理顺序可预期
|
||||
out.sort_by(|a, b| {
|
||||
a.rel_parent
|
||||
.cmp(&b.rel_parent)
|
||||
.then_with(|| a.name.to_lowercase().cmp(&b.name.to_lowercase()))
|
||||
});
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::fs;
|
||||
|
||||
fn tmpdir(tag: &str) -> PathBuf {
|
||||
let d = std::env::temp_dir().join(format!("dec_scan_{tag}_{}", std::process::id()));
|
||||
let _ = fs::remove_dir_all(&d);
|
||||
fs::create_dir_all(&d).unwrap();
|
||||
d
|
||||
}
|
||||
|
||||
/// 构造一个最小合法 ncm 头(只需魔数即可被 route 认出来)
|
||||
fn fake_ncm() -> Vec<u8> {
|
||||
let mut v = b"CTENFDAM".to_vec();
|
||||
v.extend_from_slice(&[0x02, 0x00, 0, 0, 0, 0]);
|
||||
v
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn route_detects_ncm_by_magic_not_extension() {
|
||||
let dir = tmpdir("route");
|
||||
// 后缀故意起错,内容是对的 → 应按内容识别
|
||||
let p = dir.join("mystery.bin");
|
||||
fs::write(&p, fake_ncm()).unwrap();
|
||||
assert_eq!(route(&p), Some(Engine::Ncm));
|
||||
|
||||
// 后缀像 ncm 但内容不对 → 不应识别(尾部判成 QMC1 但后缀不在家族里)
|
||||
let q = dir.join("wrong.ncm");
|
||||
fs::write(&q, vec![0x11u8; 1024]).unwrap();
|
||||
assert_eq!(route(&q), None);
|
||||
|
||||
let _ = fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
/// QMC1 靠后缀识别(尾部形态是兜底,不做主判据)
|
||||
#[test]
|
||||
fn route_detects_qmc_by_extension() {
|
||||
let dir = tmpdir("qmc");
|
||||
let p = dir.join("a.qmcflac");
|
||||
fs::write(&p, vec![0x22u8; 4096]).unwrap();
|
||||
assert_eq!(route(&p), Some(Engine::Qmc));
|
||||
|
||||
let _ = fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scan_is_recursive_and_preserves_relative_dirs() {
|
||||
let dir = tmpdir("scan");
|
||||
fs::create_dir_all(dir.join("Pop").join("2026")).unwrap();
|
||||
fs::create_dir_all(dir.join("Rock")).unwrap();
|
||||
|
||||
fs::write(dir.join("root.ncm"), fake_ncm()).unwrap();
|
||||
fs::write(dir.join("Pop").join("a.qmcflac"), vec![0x22u8; 512]).unwrap();
|
||||
fs::write(dir.join("Pop").join("2026").join("b.ncm"), fake_ncm()).unwrap();
|
||||
fs::write(dir.join("Rock").join("c.txt"), b"not audio").unwrap();
|
||||
|
||||
let files = scan(&dir, Some(&dir)).unwrap();
|
||||
assert_eq!(files.len(), 3, "应找到 3 个加密文件(txt 被跳过)");
|
||||
|
||||
// 排序稳定:先根目录,再 Pop,再 Pop/2026
|
||||
assert_eq!(files[0].name, "root.ncm");
|
||||
assert!(
|
||||
files[0].rel_parent.is_none(),
|
||||
"根目录文件 rel_parent 应为 None"
|
||||
);
|
||||
|
||||
let a = files.iter().find(|f| f.name == "a.qmcflac").unwrap();
|
||||
assert_eq!(a.rel_parent.as_deref(), Some(Path::new("Pop")));
|
||||
assert_eq!(a.engine, Engine::Qmc);
|
||||
|
||||
let b = files.iter().find(|f| f.name == "b.ncm").unwrap();
|
||||
assert_eq!(
|
||||
b.rel_parent.as_deref(),
|
||||
Some(Path::new("Pop").join("2026").as_path())
|
||||
);
|
||||
assert_eq!(b.engine, Engine::Ncm);
|
||||
|
||||
let _ = fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
/// 以子目录为根时,相对路径相对**子目录**而不是父目录
|
||||
#[test]
|
||||
fn scan_uses_given_root_for_relative_paths() {
|
||||
let dir = tmpdir("root");
|
||||
let sub = dir.join("Album");
|
||||
fs::create_dir_all(sub.join("Disc1")).unwrap();
|
||||
fs::write(sub.join("Disc1").join("x.qmc0"), vec![0x33u8; 512]).unwrap();
|
||||
|
||||
// 以子目录为 root:Disc1 在 root 内 → rel_parent = Disc1
|
||||
let files = scan(&sub, Some(&sub)).unwrap();
|
||||
assert_eq!(files.len(), 1);
|
||||
assert_eq!(files[0].rel_parent.as_deref(), Some(Path::new("Disc1")));
|
||||
|
||||
// 以上级为 root:rel_parent = Album/Disc1
|
||||
let files2 = scan(&sub, Some(&dir)).unwrap();
|
||||
assert_eq!(
|
||||
files2[0].rel_parent.as_deref(),
|
||||
Some(Path::new("Album").join("Disc1").as_path())
|
||||
);
|
||||
|
||||
let _ = fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scan_rejects_non_directory() {
|
||||
let dir = tmpdir("notdir");
|
||||
let f = dir.join("a.txt");
|
||||
fs::write(&f, b"x").unwrap();
|
||||
assert!(scan(&f, None).is_err());
|
||||
let _ = fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scan_on_empty_dir_returns_empty() {
|
||||
let dir = tmpdir("empty");
|
||||
let files = scan(&dir, None).unwrap();
|
||||
assert!(files.is_empty());
|
||||
let _ = fs::remove_dir_all(&dir);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
//! 飞牛音乐播放缓存(容量限制 + LRU 逐出)。
|
||||
//!
|
||||
//! 缓存目录:`{app_data}/music/cache`,文件 `guid.<ext>`(ext 缺省记 `bin`)。
|
||||
//! 元数据:`index.json` → `{ "guid": { "size", "lastUsed", "file" } }`。
|
||||
//! 超上限按 lastUsed 升序逐出,直到总占用低于上限。
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::fs;
|
||||
use std::io::Write;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::json;
|
||||
|
||||
/// 单条缓存元数据
|
||||
#[derive(Serialize, Deserialize, Clone)]
|
||||
pub struct CacheEntry {
|
||||
pub size: u64,
|
||||
pub last_used: u64,
|
||||
pub file: String,
|
||||
}
|
||||
|
||||
pub struct CacheManager {
|
||||
root: PathBuf,
|
||||
index_path: PathBuf,
|
||||
}
|
||||
|
||||
impl CacheManager {
|
||||
pub fn new(app_data_dir: &Path) -> Self {
|
||||
let root = app_data_dir.join("music").join("cache");
|
||||
fs::create_dir_all(&root).ok();
|
||||
let index_path = root.join("index.json");
|
||||
Self { root, index_path }
|
||||
}
|
||||
|
||||
/// 本地曲库标签缓存文件:{cache_root}/local-tags.json。
|
||||
/// 记录 path -> {size, mtim, 标签},扫描时未变化的文件直接复用,
|
||||
/// 避免万级曲库每次都重新解析音频标签。
|
||||
pub fn local_tags_path(&self) -> PathBuf {
|
||||
self.root.join("local-tags.json")
|
||||
}
|
||||
|
||||
fn load_index(&self) -> HashMap<String, CacheEntry> {
|
||||
fs::read_to_string(&self.index_path)
|
||||
.ok()
|
||||
.and_then(|s| serde_json::from_str(&s).ok())
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
fn save_index(&self, idx: &HashMap<String, CacheEntry>) {
|
||||
if let Ok(s) = serde_json::to_string(idx) {
|
||||
fs::write(&self.index_path, s).ok();
|
||||
}
|
||||
}
|
||||
|
||||
fn now_ms(&self) -> u64 {
|
||||
SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map(|d| d.as_millis() as u64)
|
||||
.unwrap_or(0)
|
||||
}
|
||||
|
||||
/// 命中缓存:更新 lastUsed 并返回文件路径。
|
||||
pub fn hit(&self, guid: &str) -> Option<String> {
|
||||
let mut idx = self.load_index();
|
||||
if let Some(e) = idx.get_mut(guid) {
|
||||
let path = self.root.join(&e.file);
|
||||
if path.exists() {
|
||||
e.last_used = self.now_ms();
|
||||
self.save_index(&idx);
|
||||
return Some(path.to_string_lossy().to_string());
|
||||
}
|
||||
idx.remove(guid);
|
||||
self.save_index(&idx);
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// 写入缓存(流式 chunk);按上限(GB)逐出。返回写入总字节数。
|
||||
pub async fn put<E: std::fmt::Display>(
|
||||
&self,
|
||||
guid: &str,
|
||||
ext: &str,
|
||||
max_gb: u32,
|
||||
mut stream: impl futures_util::Stream<Item = Result<bytes::Bytes, E>> + Unpin,
|
||||
) -> Result<u64, String> {
|
||||
let safe_guid = sanitize(guid);
|
||||
let ext = if ext.is_empty() { "bin" } else { ext };
|
||||
let file = format!("{safe_guid}.{ext}");
|
||||
let path = self.root.join(&file);
|
||||
let mut total: u64 = 0;
|
||||
let mut f = fs::File::create(&path).map_err(|e| format!("创建缓存文件失败: {e}"))?;
|
||||
while let Some(chunk) = futures_util::StreamExt::next(&mut stream).await {
|
||||
let chunk = chunk.map_err(|e| format!("读取流失败: {e}"))?;
|
||||
total += chunk.len() as u64;
|
||||
f.write_all(chunk.as_ref()).map_err(|e| format!("写入缓存失败: {e}"))?;
|
||||
}
|
||||
f.flush().ok();
|
||||
|
||||
let mut idx = self.load_index();
|
||||
idx.insert(
|
||||
guid.to_string(),
|
||||
CacheEntry {
|
||||
size: total,
|
||||
last_used: self.now_ms(),
|
||||
file,
|
||||
},
|
||||
);
|
||||
self.save_index(&idx);
|
||||
self.evict(max_gb);
|
||||
Ok(total)
|
||||
}
|
||||
|
||||
/// 按上限(GB)逐出。max_gb==0 视为全部清空。
|
||||
fn evict(&self, max_gb: u32) {
|
||||
if max_gb == 0 {
|
||||
self.clear();
|
||||
return;
|
||||
}
|
||||
let max_bytes = max_gb as u64 * 1024 * 1024 * 1024;
|
||||
let mut idx = self.load_index();
|
||||
let mut total: u64 = idx.values().map(|e| e.size).sum();
|
||||
let mut order: Vec<(String, u64)> = idx.iter().map(|(g, e)| (g.clone(), e.last_used)).collect();
|
||||
order.sort_by_key(|(_, t)| *t);
|
||||
for (guid, _) in order {
|
||||
if total <= max_bytes {
|
||||
break;
|
||||
}
|
||||
if let Some(e) = idx.remove(&guid) {
|
||||
let _ = fs::remove_file(self.root.join(&e.file));
|
||||
total = total.saturating_sub(e.size);
|
||||
}
|
||||
}
|
||||
self.save_index(&idx);
|
||||
}
|
||||
|
||||
/// 当前占用与条目数。
|
||||
pub fn status(&self) -> serde_json::Value {
|
||||
let idx = self.load_index();
|
||||
let total: u64 = idx.values().map(|e| e.size).sum();
|
||||
json!({
|
||||
"count": idx.len(),
|
||||
"usedBytes": total,
|
||||
"usedMb": (total as f64 / 1024.0 / 1024.0 * 10.0).round() / 10.0,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn clear(&self) {
|
||||
let idx = self.load_index();
|
||||
for e in idx.values() {
|
||||
let _ = fs::remove_file(self.root.join(&e.file));
|
||||
}
|
||||
fs::remove_file(&self.index_path).ok();
|
||||
}
|
||||
}
|
||||
|
||||
fn sanitize(s: &str) -> String {
|
||||
s.chars()
|
||||
.map(|c| if c.is_ascii_alphanumeric() || c == '-' || c == '_' { c } else { '_' })
|
||||
.collect()
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
//! 飞牛音乐原生接口纯函数工具(登录签名、地址规范化、设备 ID)。
|
||||
//! 接口路径/认证方式对照 FeiNiuMusic(Flutter) `api_client.dart` 的第三方实现。
|
||||
|
||||
use sha2::{Digest, Sha256};
|
||||
|
||||
/// 规范化服务器地址:去首尾空白、去尾部各层斜杠、去误粘贴的 `/music/api/v1` 后缀。
|
||||
pub fn normalize_base_url(input: &str) -> String {
|
||||
let mut u = input.trim().trim_end_matches('/').to_string();
|
||||
let lower = u.to_lowercase();
|
||||
if lower.ends_with("/music/api/v1") {
|
||||
u = u[..u.len() - "/music/api/v1".len()].to_string();
|
||||
}
|
||||
u.trim_end_matches('/').to_string()
|
||||
}
|
||||
|
||||
/// SHA-256 十六进制(登录时密码签名,对齐原生客户端 `sha256Hex(password)`)。
|
||||
pub fn sha256_hex(input: &str) -> String {
|
||||
let mut hasher = Sha256::new();
|
||||
hasher.update(input.as_bytes());
|
||||
format!("{:x}", hasher.finalize())
|
||||
}
|
||||
|
||||
/// 32 位 hex 设备 ID(首次生成后落 settings 复用;不依赖 rand,用时间戳+进程号哈希)。
|
||||
pub fn generate_device_id() -> String {
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
let nanos = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map(|d| d.as_nanos())
|
||||
.unwrap_or(0);
|
||||
sha256_hex(&format!("{}-{}", nanos, std::process::id()))[..32].to_string()
|
||||
}
|
||||
Loaded 100 of 381 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user