Compare commits
3
Commits
v26.9.1
...
lfeng-patch-1
| Author | SHA1 | Date | |
|---|---|---|---|
 LFeng
|
69db7118a9 | ||
|
LFeng
|
ffa410b399 | ||
 zhongluofeng
|
d702ed0d31 |
@@ -10,6 +10,9 @@ lerna-debug.log*
|
||||
# 发布暂存目录
|
||||
release_stage/
|
||||
|
||||
# musicdl 手动测试产物（search_results.pkl 等）
|
||||
musicdl_outputs/
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
|
||||
@@ -0,0 +1,253 @@
|
||||
# 2026-09-12
|
||||
|
||||
## 设置页图标修复 + WebDAV 凭据加密存储 / 配置后隐藏
|
||||
|
||||
- **图标不显示根因**：设置页模板用了 `HardDriveDownload` 但从未 import——`vue-tsc` 不报错（未在 script 中引用、模板解析为未知组件静默失败），**运行时图标直接消失**。以后设置页新增图标必须同步加到 lucide import 列表。
|
||||
- **WebDAV 凭据加密**：新增 Rust 命令 `webdav_get_secret` / `webdav_save_secret`（`commands.rs`，非 specta，走 raw invoke；已注册 mod.rs 导出 + lib.rs generate_handler）。Windows 用 **keyring v3（windows-native，凭据管理器，DPAPI 保护）**，service="Thing" user="webdav-credentials"，blob 为 `{"username","password"}` JSON；NoEntry 视为未配置。
|
||||
- **feiniuStore**：`WEBDAV_KEY` localStorage 现在只存 `{url, dir}`；`patchWebdav` 检测 `username/password` 字段时调 `webdav_save_secret`；`init()` 从凭据管理器加载凭据，并做一次性迁移（localStorage 有旧明文凭据 → 写入凭据管理器 + 立即改写 LS 去掉明文；用 `hasStoredSecret` 标志避免误覆盖）。`davConfig()` 仍从内存取明文传给 webdav_* 命令，链路不变。
|
||||
- **设置页 UI**：`webdavEditing` ref 控制——`webdavReady && !webdavEditing` 时显示摘要卡（服务地址/目标目录 + 「账号/密码已保存（系统凭据管理器加密存储）」），带「修改配置」「测试连接」；编辑态完整表单（密码框 type=password 本身掩码）+「收起」。
|
||||
- 校验：cargo check（新增 keyring 3.6.3）/ vue-tsc / vite build 全 0。
|
||||
|
||||
## 音乐模块全链路检查 + 排序/设置页/任务页调整
|
||||
|
||||
- **模块排序**：`music/index.ts` order 55→15（代理=10 之后、整体第二）；`appStore.ts` loadSettings 增加一次性迁移（`musicOrderMigrated` 标记随设置持久化，声明在 store setup 内的非响应式 let），已保存过 moduleOrder 的用户下次启动自动把 music 移到 proxy 后，之后尊重手动拖动。
|
||||
- **隐藏 bug 修复（MusicModule.vue）**：
|
||||
1. `downloadToFeiniu` 早退分支（Rust 引擎/无下载源）未清理 `feiniuUploadingKeys` → 行按钮 spinner 永久卡死；
|
||||
2. `resolvePendingUploads` 只处理 done，临时「下载到飞牛」任务 error/cancelled/interrupted 或被手动移除时 spinner 同样卡死 → 增加失败/移除清理分支（注意：临时任务的 tempTaskIds.add 发生在任务进入 tasks 之后，watch 触发时序依赖后续状态变化再触发一次）；
|
||||
3. `feiniu.uploading` 时不再叠加触发 `uploadRecentToFeiniu`。
|
||||
- **下载任务 tabs**：去掉标题上的进行中计数（连同 `activeTaskCount` computed，noUnusedLocals 会拦未用变量）；任务卡片容器 `py-4`→`pb-4`，贴近 tabs。
|
||||
- **设置页 UI 重做**：section+Separator 改为 Card/CardHeader/CardTitle/CardContent 卡片式（max-w-2xl、gap-4、图标+text-base 标题，与 DownloaderModule 设置页一致）；「播放条常驻在所有模块底部」等过时文案改为「标题栏播放控制」。
|
||||
- 全链路审查结论：旧审查的 P0（曲库搜索失效/重启后播放键失效/双音频引擎）均已在现码修复；musicdl 事件幂等、任务持久化签名 watch、歌词二分+邻近缓存等设计良好。
|
||||
- 校验：`vue-tsc --noEmit` 0 错误，`vite build` 通过。
|
||||
|
||||
## 「下载到飞牛」改为同链路落地即传（用户实测 URL 直传失败）
|
||||
|
||||
用户确认：WebDAV 测试连接 OK、下载+自动上传 OK，但发现音乐行的「下载并上传」失败（旧的 URL 拉流直传机制）。按要求改为与「下载完成后自动上传」完全同链路：
|
||||
|
||||
- `downloadToFeiniu`：直接 `store.startDownload([song])`（musicdl 引擎，含引擎侧解析/代理/音质），不再手动 resolve + 拼 headers；记 `tempTaskStarts`（taskId→创建时刻，扫描下界）。
|
||||
- 任务 done → `finishTempUpload`：`uploadRecentToFeiniu(0, { since, deleteLocal: true })` 上传 → `feiniu_delete_local` 删本地音频及同名 lrc/封面 → `store.removeTask` 移除记录。**失败时保留本地文件与任务记录**供排查重试。
|
||||
- `uploadRecentToFeiniu` 扩展 opts `{ since?, deleteLocal? }`；默认行为（自动上传）不变、不删本地。
|
||||
- 后端新增 `feiniu_delete_local`（音频/歌词/封面扩展名白名单 + 拒绝目录）；**删除** `webdav_upload_from_url` 命令与 webdav.rs `upload_from_url`（机制废弃）。
|
||||
- musicdl 引擎守卫保留：Rust 引擎任务在「下载器」模块，无法回传。
|
||||
- 校验：tsc / vite / cargo 全 0。
|
||||
|
||||
## 文件服务 → WebDAV（飞牛传输改版，最终形态）
|
||||
|
||||
fnOS 文件服务（WS + RSA/AES 登录）经三轮协议修复仍无法在用户 NAS 上稳定登录，且会话易失（重启要重登）。用户确认局域网场景改用标准文件协议，整体替换为 **WebDAV**（fnOS 系统设置 → 文件服务 → WebDAV，HTTP 5005/HTTPS 5006，Basic 认证，文件夹需在可见范围+团队文件夹要勾"允许协议挂载"）。
|
||||
|
||||
- **删除**：`fnos.rs`（WS 客户端）、`Feiniu.fnos_sessions`、`feiniu_fnos_*` 与 `feiniu_upload_from_url` 命令、ConnectionsSettings 云朵登录弹窗。
|
||||
- **新增**：`src-tauri/src/music/feiniu/webdav.rs`——无状态：`test`（PROPFIND Depth 0）、`upload_file`（128KB 分块流式 PUT，unfold 转 Stream 免 tokio-util）、`upload_from_url`（GET 拉流→直接 PUT，本地不落地，**不再要求 Content-Length**）、`delete`；上传前逐级 MKCOL；URL 逐段百分号编码；401/403/404/409 可读错误。
|
||||
- **命令**：`webdav_test` / `webdav_upload` / `webdav_upload_from_url` / `webdav_delete`（config 由前端每次传入，serde+specta 结构 `WebDavConfig`）。
|
||||
- **前端**：`feiniuStore.webdav = {url, username, password, dir}` 持久化 `thing.music.feiniu.webdav`（密码明文 localStorage，LAN 工具可接受）；`webdavReady` computed 四项齐备；`patchWebdav` / `testWebdav`；曲库目标目录语义改为 **WebDAV 根下相对路径**。设置页「存储与上传」为配置表单 + 测试按钮 + fnOS 侧设置折叠提示；TrackItem/发现音乐「下载到飞牛」门控全部改 `webdavReady`。
|
||||
- 校验：vue-tsc / vite build / cargo check 全 0。
|
||||
|
||||
## fnOS 登录协议修复（第三轮："fnOS 登录未返回 token"）
|
||||
|
||||
第二轮修复后登录请求**有响应了**（不再超时），但 rid 命中的回包里没有 token。对照 pyfnos 发现关键行为：**登录最终成功包可能不按 reqid 关联**——pyfnos 的 `_is_final_login_success` 是按内容特征（`result=="succ" && token && secret`）识别任意消息，而非按 reqid 匹配。rid 命中的那条很可能只是中间应答，带 token 的包以独立推送到达，被旧 reader 直接丢弃。
|
||||
|
||||
修复（`fnos.rs`）：
|
||||
- 新增 `login_waiter` 通道；reader 对每条消息先做内容识别，命中最终成功包就投递给登录流程，reqid 匹配照旧（并容忍服务端把 reqid 回显成数字，`resp_rid` 辅助函数）。
|
||||
- `login()` 双通道等待：rid 应答里直接有 token → 用之；是中间应答 → 最多再等 8s 登录推送；send_and_wait 超时 → 再宽限 5s 等推送。
|
||||
- 识别两步验证挑战（`isBindTwofaSecret` / `isTwofaEnforced` / `accessToken`），明确报"账号开启了两步验证"而不是干等。
|
||||
- 诊断兜底：若始终等不到 token，报错里带上服务端实际回包的前 300 字符，用户可直接贴回继续定位。
|
||||
- 断开时同时唤醒登录等待者（Null）。
|
||||
|
||||
`cargo check` 通过。协议参考：pyfnos `client.py`（响应扁平结构：`result/token/secret/longToken/reqid` 顶层）。
|
||||
|
||||
## fnOS 登录协议修复（第二轮："fnOS 请求超时(encrypted)"）
|
||||
|
||||
上一轮修完 WS 并发缺陷后，错误变成"请求超时(encrypted)"——说明握手和 `util.crypto.getRSAPub` 都通了，**卡在登录这一条**。根因：**加密登录体里缺字段**。
|
||||
|
||||
已对照两个参考实现逐字核对并修复：
|
||||
- **FNOSP/fnnas-api** `sdk/encryption.py` 的 `login_encrypt()` 示例（原开发注释里引用的就是它）
|
||||
- **Timandes/pyfnos** `fnos/client.py` 的 `_encrypt_login_data()`
|
||||
|
||||
### 正确的加密登录体（必须逐字段对齐）
|
||||
```json
|
||||
{"reqid":"...","user":"...","password":"...","deviceType":"Browser",
|
||||
"deviceName":"...","stay":false,"req":"user.login","si":"..."}
|
||||
```
|
||||
要点：
|
||||
- **`req: "user.login"` 必须在加密体内** —— 服务端靠它路由；缺了就静默不回包（=超时）。
|
||||
- **`reqid` 必须在加密体内**，且与 `pending` 等待者登记的 key 一致；外层 `encrypted` **不带** reqid。
|
||||
- **没有 `did` 字段**（FNOSP 示例没有；pyfnos 有但非必需，为减少变量已去掉）。
|
||||
- `stay: false`。
|
||||
- 加密方式：AES-256-CBC(key=32 字节随机 ASCII 串, iv=16 字节随机) + PKCS7，RSA 只加密那个 32 字符 key（PKCS1v1.5），全部 base64。
|
||||
|
||||
### 顺带核对过、确认我们原本就正确的部分
|
||||
- 签名：`hmac_sha256_b64(sign_key, json) + json`（签名前置）；`sign_key` = 登录响应 `secret` → AES 解密 → base64(明文) → **base64 解码后的字节**。
|
||||
- **不签名白名单**：`encrypted` / `util.getSI` / `util.crypto.getRSAPub`（已按参考实现补上 `UNSIGNED_REQ`）。
|
||||
- 后续请求不携带 token 字段，服务端靠 WS 连接 + 签名识别会话；HTTP 上传走 `Trim-Token` 头。
|
||||
- reqid 格式宽松（各实现 18~28 位不等），我们现有的 `0000000000000000<hex毫秒>` 服务端接受（getRSAPub 已验证）。
|
||||
|
||||
### 其他改动
|
||||
- `request()` 拆成 `send_and_wait(message, rid, label)` + `request()`，登录走前者以便用加密体内的 reqid 关联。
|
||||
- 错误处理补齐 `result=="fail"` 分支并带出 `msg`/`errmsg`（密码错误等现在能看到具体原因）。
|
||||
- 新增**应用层心跳**：fnOS 网关会关闭长时间无消息的连接（参考实现默认 10s 一次 `{"req":"ping"}`）。做成"发请求前按需补发"（>20s 才发），避免常驻任务的生命周期问题——多文件批量上传时 WS 不会被闲置断开。
|
||||
- 报错里的 label 更可读（如 `user.login(encrypted)`）。
|
||||
|
||||
校验：`cargo check` exit 0。**仍未对真实 NAS 验证**，需要用户实测。
|
||||
|
||||
---
|
||||
|
||||
## 修复 fnOS 文件服务登录（"输入密码没反应，很久后报发送请求失败"）
|
||||
|
||||
### 根因（`src-tauri/src/music/feiniu/fnos.rs`）
|
||||
1. **WS 读写共用一个 `tokio::sync::Mutex`，且 reader 在持锁状态下 `await stream.next()`** —— `request()` 要拿同一把锁才能发送。第一次 `request()` 里 `ensure_reader()` 先 spawn 了 reader，reader 抢到锁后就在等一条永远不会发出的消息；发送方要么永久阻塞（超时也覆盖不到锁获取），要么在 reader 已退出后发送才报错 —— 这正是"等很久 → 发送请求失败"的来源。
|
||||
2. **握手没带 `Origin`**。浏览器发起的 WS 必带 `Origin`，Rust 客户端默认不带；fnOS 会据此判断来源，缺了它会"握手成功但立刻被对端关闭"。这是"连上了却什么都没发生"的典型原因。
|
||||
3. **没有回 Pong**。tungstenite 的 Stream/Sink API 不会自动回 Pong，服务端 ping 得不到响应会判定死连接。
|
||||
4. 连接/请求均**没有超时覆盖**（`timeout` 只包了 `rx`，不含锁获取与握手），主机不可达时会干等系统 TCP 重试。
|
||||
|
||||
### 修复
|
||||
- 读写分离：`futures_util::StreamExt::split(ws)` → writer 任务独占写半边（mpsc 队列），reader 独占读半边。发送不再与"等响应"争锁。
|
||||
- 握手请求改为构造 `Request` 并注入 `Origin`（由 ws url 反推 `http://host:port`）与浏览器 UA。
|
||||
- reader 显式处理 `Ping → Pong`，并记录断开原因到 `closed: Arc<Mutex<Option<String>>>`。
|
||||
- `connect_async` 加 12s 超时；`request` 的 15s 超时改为覆盖整个等待，并在入口先检查 `closed`，断开时立刻带原因报错。
|
||||
- 所有报错都带上尝试的 ws 地址或断开原因，例如 `连接 fnOS 文件服务失败：ws://ip:port/websocket?type=main → ...`。
|
||||
- 前端：`ConnectionsSettings` 的 fnOS 弹窗加 `fnosConnecting`（按钮显示"连接中…"）与弹窗内联错误块（错误里含地址/状态码，留在弹窗里可复制），并显示"当前地址"供核对。
|
||||
- `feiniuStore.fnosLogin(connectionId, ...)` 改为显式接收 connectionId 并校验它等于 activeId —— 上传命令按 `settings.feiniu_active_id` 找会话，登录非激活连接会存成永远用不上的会话。
|
||||
|
||||
**注意**：以上都只做了 `cargo check` + 前端构建校验，没有对真实飞牛 NAS 验证过协议细节（`Origin` 校验、`file.checkUpload`/`Trim-Path` 约定可能随 fnOS 版本不同）。如果仍失败，报错文案已包含具体地址与失败阶段。
|
||||
|
||||
---
|
||||
|
||||
## 发现音乐：分组头去白底 + 新增「下载到飞牛」一条龙 + 飞牛上传链路修复
|
||||
|
||||
### 分组头
|
||||
`MusicModule.vue` 里源分组头原来是 `sticky top-0 z-10 bg-background/95 backdrop-blur`，在浅色背景下会形成一条白色横条。已去掉 sticky 与底色，改为普通的 `border-b border-border/60 px-2` 分组标签（px-2 与行对齐）。
|
||||
|
||||
### 新增 Rust 命令 `feiniu_upload_from_url`（下载 + 上传一条龙，本地不留文件）
|
||||
链路：前端 `feiniuStore.uploadUrlToFeiniu()` → `invoke('feiniu_upload_from_url')` → `Feiniu::fnos_upload_from_url()` → `fnos::upload_stream()`。
|
||||
|
||||
- `fnos.rs` 新增泛型 `upload_stream<S, E>()`：`Part::stream_with_length(Body::wrap_stream(stream), size)`，配套 `upload_client(proxy)`（`proxy` 为空则 `no_proxy()`）。
|
||||
- `upload_file()` 重写为**流式**（`stream::unfold` + `tokio::fs::File` 分块 128KB）。原来用 `std::fs::read` 把整个文件读进内存，100MB 无损会直接吃 100MB RAM。用 unfold 是为了不引入 `tokio-util` 依赖。
|
||||
- `FnOsSession::connect` 增加 scheme 校验：`https://` 直接返回可读错误（`ws_url` 只把 `http://` 换成 `ws://`，https 会变成非法 WS scheme 并抛出难懂的 tungstenite 错误）。
|
||||
- `guess_mime(&Path)` 改为 `mime_of(&str)`（现在需要按 NAS 上的文件名推断）。
|
||||
- **依赖音源返回 `Content-Length`**（fnOS `checkUpload` 需要精确 size），缺失时返回可读错误，而不是先把整首缓冲进内存。
|
||||
- 前端 `downloadToFeiniu()`：懒解析歌曲先 `resolveSong(source, index, quality)` 拿真实链接（quality 取默认下载音质），合并 `defaultDownloadHeaders` + `defaultDownloadCookies` 为 Cookie 头，并**过滤非 ASCII 头**（reqwest 遇到非法头值会 panic，不能把外部数据直接塞进去）。
|
||||
|
||||
### 飞牛上传链路审查结论（重要）
|
||||
1. **fnOS 会话只存在内存里**（`Feiniu.fnos_sessions`），应用重启即失效 → 设置页显示的「未连接」是准确的，需要重新点云朵图标登录。已在设置页与登录弹窗里明确写出"仅本次运行有效"。
|
||||
2. **仅支持 `http://` 局域网直连**，https/frp 无法上传（协议限制），已给出明确报错。
|
||||
3. `feiniu_scan_local` 扫描 `savedir` + `feiniu_local_dirs`，因此下载到本地目录的文件能被"上传最近下载"找到；但该功能是**按 mtime 10 分钟窗口**筛选，与具体下载任务无关联——这是它不可靠的根因（这就是为什么要新增 URL 直传）。
|
||||
4. `feiniu_fnos_upload` 用 `settings.feiniu_active_id` 找连接，`fnos_login` 用传入的 connection_id；只要激活连接一致就没问题。
|
||||
|
||||
### 校验（本机 bash 不可用，PowerShell + 绝对路径）
|
||||
- `cargo check`（`src-tauri`，`%USERPROFILE%\.cargo\bin\cargo.exe`）→ exit 0，仅 3 个既有 warning
|
||||
- `vue-tsc --noEmit` → exit 0；`vite build` → exit 0
|
||||
|
||||
---
|
||||
|
||||
## 曲库左栏：去掉灰底容器、数量列对齐、行高统一
|
||||
|
||||
用户反馈截图问题（灰底 + 文字竖向不齐）后的修正，`MyMusicLibrary.vue`：
|
||||
- **去掉 `bg-muted` 容器**：来源项不再包在灰色圆角块里。选中态保留 `bg-background font-medium shadow-sm`，并**补 `ring-1 ring-border`**——否则白底上的白色胶囊只有 5% 透明度的阴影，几乎看不见（顶部 Tabs 那个"可见边框"其实是 `:focus-visible` 的 ring，不是常态样式，不能照抄）。
|
||||
- **数量列始终渲染**：原来 `v-if="nav.count"` 会在 0 时隐藏整列，造成右侧数字列参差。改为无歌曲时显示 `0`，并加 `min-w-[3ch] text-right tabular-nums` 让个位数/三位数右边缘对齐。
|
||||
- **行高统一为固定值**：来源项 `h-8`、歌单子项 `h-7`，配合 `items-center`，不再依赖 `py-1.5` + 行高推算，彻底消除逐行细微的垂直错位。
|
||||
- 未选中项 hover 从 `hover:bg-accent/50` 统一为 `hover:bg-accent/60`（无容器后需要更明显的悬停反馈）。
|
||||
- 歌单子项的选中态也同步改成同一套胶囊样式，保持层级内一致。
|
||||
|
||||
---
|
||||
|
||||
## 曲库左栏收窄 + 选中态对齐顶部 Tabs + 切换动画
|
||||
|
||||
`MyMusicLibrary.vue`：
|
||||
- 左栏宽度 `w-[210px]` → `w-[168px]`（"飞牛曲库 → 数量"之间的大段空白因此明显收窄）。内边距 `p-2.5` → `p-2`，字号 13px → 保留。
|
||||
- 三个来源（飞牛曲库/本地曲库/我的歌单）从裸列表改为 **`rounded-lg bg-muted p-1` 容器 + 选中项 `bg-background font-medium shadow-sm rounded-md`**，与顶部 `TabsList`/`TabsTrigger` 的默认选中态一致。
|
||||
- 歌单子树加 `border-l` 缩进表示层级；展开/收起加了 `pl-list` Transition（opacity + translateY(-6px)，0.18s）。
|
||||
- **标签截断修复**：`<span class="truncate">` 在 flex 行里不会真正截断（flex item 默认 `min-width:auto`）。改成 `min-w-0 flex-1 truncate` + 右侧计数 `shrink-0`，并去掉 `ml-auto`。以后左栏加条目记得照这个写。
|
||||
- 右栏内容切换动画：给 `<section>` 加 `:key="view"` + 全局 `tab-animate`，靠重挂载触发动画（与模块级 TabsContent 的做法一致，无需自造 Transition）。
|
||||
|
||||
---
|
||||
|
||||
## 歌单新增「编辑音乐」编辑器
|
||||
|
||||
- 新组件 `src/modules/music/components/PlaylistEditorDialog.vue`（props `open` / `playlistId`，emit `update:open`）。
|
||||
- 双 Tab：**全部音乐**（来源筛选 全部/飞牛/本地 → 勾选加入；已在歌单的项置灰并标「已加入」，不可重复勾选）、**已在歌单**（勾选批量移出，勾选框用 destructive 色）。
|
||||
- 含搜索（歌名/歌手/专辑）、全选当前列表、增量渲染每批 120 + 「显示更多」、飞牛曲库「继续加载」、本地曲库未扫描时的内联「扫描本地」按钮。
|
||||
- 勾选框**不用** `Checkbox` 组件：整行是 `<button>`，视觉勾选框是纯 span（避免 label/按钮与 Checkbox 双重触发导致 net-zero toggle）。若以后要加交互型复选框，注意这个坑。
|
||||
- 关闭/打开时 `resetState()`，切 Tab 与切来源时清空选择（避免"看不见的项仍被选中"导致数量对不上）。
|
||||
- 入口：`MyMusicLibrary.vue` 歌单详情工具栏的「编辑音乐」按钮，以及歌单为空时 `Empty` 里的按钮。
|
||||
- 依赖 store 既有 API：`addToPlaylist`（内部已按 `guid+source` 去重）、`removeItemsFromPlaylist(id, keys)`（key 形如 `${source}:${guid}`）。
|
||||
|
||||
---
|
||||
|
||||
## 音乐模块播放器入口改版 + tabs 统一（在同日重构之后）
|
||||
|
||||
> 本节修订上面「结构变更」里的播放器结论，以本节为准。
|
||||
|
||||
- **删除底部播放条**：`GlobalPlayerBar.vue` 已删除，`App.vue` 不再渲染播放条。不要再新增底部坞站播放条。
|
||||
- **新增标题栏音乐栏** `src/components/layout/TitleBarMusic.vue`，插在 `TitleBar.vue` 里**搜索输入框的左侧**（在保存设置按钮与搜索框之间），外层包 `pointer-events-auto`，触发按钮带 `@mousedown.stop`（标题栏是 Tauri 拖拽区，不加会导致点击被拖拽吞掉）。
|
||||
- 未播放过（`store.nowPlaying` 为空）→ 只显示唱片图标，隐藏歌名。
|
||||
- 有曲目 → 图标替换为封面（`rounded-full` + `overflow-hidden`），`store.playing` 为真时用 CSS `animation-play-state` 旋转（8s/圈，暂停保留角度）。
|
||||
- 点击弹出方形控制窗（`Popover`，`w-[300px]`，约 300×340）：封面（点击进大屏）、曲目信息、`ScrubBar` 进度、循环/上下首/播放/队列、音量 `ScrubBar`、歌词/队列入口。
|
||||
- `feiniu.playError` 的 toast 消费点从 GlobalPlayerBar 移到了这里——**删播放条时容易漏掉这个 watcher**，导致播放失败静默。
|
||||
- **音乐模块 tabs 回归统一写法**：改回 `<Tabs><div ref="tabsListRef" class="shrink-0"><TabsList class="grid w-full max-w-md grid-cols-4 !bg-transparent !p-0 !shadow-none">…<TabsTrigger class="gap-1.5"><Icon class="size-3.5"/>标签</TabsTrigger>` + `<TabsContent class="mt-4 min-h-0 flex-1 tab-animate">`；模块根节点恢复 `h-full p-6 overflow-hidden flex flex-col`。`SegmentedNav` 不再被 MusicModule 使用，仅 `NowPlayingDialog` 的歌词/队列切换仍在用。
|
||||
- 发现音乐 / 任务 / 设置三块内部的横向内边距改为 `0`（由模块根 `p-6` 统一提供，避免左右不对称）。
|
||||
|
||||
---
|
||||
|
||||
## 音乐模块重构（审查之后落地实施）
|
||||
|
||||
### 结构变更（重要，改这块前先读）
|
||||
- ~~**播放器已提升到全局层**：`GlobalPlayerBar.vue` + `NowPlayingDialog.vue`~~ → 已被上一节取代；`NowPlayingDialog.vue`（大屏，含歌词/队列）保留，由标题栏方形控制窗打开。
|
||||
- **新增通用组件**：`src/components/common/ScrubBar.vue`（提交式 seek 进度条，含缓冲层/时间气泡/键盘支持）、`SegmentedNav.vue`（分段导航，现由 NowPlayingDialog 使用）。
|
||||
- **音乐模块导航**：模块级 `Tabs`（曲库/发现音乐/下载任务/设置）；「曲库」内部是 `MyMusicLibrary` 的「左侧来源树 + 右侧列表」两栏，来源树含飞牛曲库/本地曲库/我的歌单（歌单列表在树内展开）。
|
||||
- `TrackItem.vue` 重写为 44px 紧凑行（网格列 `28px 36px 1fr 74px 28px`，有专辑时多一列）；序号列悬停原位切换播放按钮，播放中显示 `.music-eq` 跳动均衡器（该 CSS 已加到 `style.css` 全局，NowPlayingDialog 复用）。
|
||||
- 所有列表表头/行网格用**字面量** Tailwind 类或内联 `gridTemplateColumns`（Tailwind v4 不识别运行时拼接的类名）。
|
||||
|
||||
### feiniuStore 关键 API 变化
|
||||
- `PlayableItem.source` 增加 `'preview'`，另加 `coverUrl` / `url` / `ext` 字段。
|
||||
- 新增 `nowPlaying`（试听优先于队列当前项）、`playPreview` / `stopPreview`、`playNext` / `addToQueue` / `removeFromQueue` / `clearQueue`、`loadMoreTracks`（分页 200/页）、`searchKeyword`（曲库搜索，之前是孤立局部变量导致搜索无效）、`playError` / `clearPlayError`、`muted` / `toggleMute`、`setPlayMode`、`bufferedPercent`、`nowPlayingTab`。
|
||||
- `playItem(item, context?)` 第二参数是播放上下文；不传则退化为单曲播放。
|
||||
- `init()` 幂等；`setCacheMode`/`clearCache` 不再中断播放；shuffle 用「待播池 + 历史栈」，自动切歌也随机；`currentLine()` 改为缓存索引 + 二分。
|
||||
- 已移除 `queueVisible` / `lyricVisible`（改用 `nowPlayingOpen` + `nowPlayingTab`）。
|
||||
- `musicStore.startDownload` 返回值改为 `{ engine, skipped, taskId? }`。
|
||||
|
||||
### 校验方式（本机 bash 工具不可用，用 PowerShell + node 直接跑）
|
||||
```
|
||||
node node_modules/vue-tsc/bin/vue-tsc.js --noEmit -p tsconfig.json
|
||||
node node_modules/vite/bin/vite.js build
|
||||
```
|
||||
两者在本次重构后均为 exit 0。注意：PowerShell 工具不返回 stdout，需 `| Out-File` 后再 Read；`Remove-Item` 被沙箱拦截（静默失败），删文件要用 `node -e "fs.unlinkSync(...)"`。
|
||||
|
||||
排障经验：`feiniuStore` 任何「返回对象里引用了不存在的变量」（如漏掉 `clearQueue` 函数体）都会让 TS 对整个 store 的类型推断失败，进而让所有 `store.xxx` 变成 `any`，报出一堆看似无关的 `TS7006 implicitly has an 'any' type`。遇到成片 implicit any，先检查 store 自身的错误。
|
||||
|
||||
### 报告
|
||||
`MUSIC_MODULE_REVIEW.md` 已追加「§9 重构落地记录」，逐条对应 30 项改动与「仍未做」清单。
|
||||
|
||||
---
|
||||
|
||||
## 音乐模块全链路审查（数据请求 / 播放控制 / 状态管理 / UI）
|
||||
|
||||
产出：
|
||||
- `MUSIC_MODULE_REVIEW.md` —— 完整审查报告（P0/P1 bug + 性能瓶颈 + 25 条界面缺陷 + 重设计方案 + 分阶段落地路径）
|
||||
- `music-redesign-mockup.html` —— 「当前实现 / 建议方案」可切换的界面改版对照稿（浅色主题）
|
||||
|
||||
### 关键结论（后续如要动这块，先看这些）
|
||||
|
||||
**架构共识（不要改错方向）**
|
||||
- 搜索/解析/下载 → Python 桥接 musicdl；播放 → Rust 本地流代理 `127.0.0.1:<port>/feiniu/stream`（`src-tauri/src/music/feiniu/proxy.rs`），**真流式透传 Range，seek 依赖它，别改成前端直连 NAS**。
|
||||
- 播放内核在 `src/stores/feiniuStore.ts`（不是 musicStore）；`musicStore` 只管搜索/下载任务。
|
||||
- `PlayerBar.vue` / `PlayerFull.vue` 用的是 `useFeiniuStore`，不是 musicStore。
|
||||
|
||||
**P0（确认可复现）**
|
||||
1. 飞牛曲库搜索框完全无效：`MyMusicLibrary.vue:21` 的 `keywordInput` 从未写入 `feiniuStore.keyword`，而 `loadTracks` 读的是 store 的 `keyword`（全仓无赋值点）。
|
||||
2. 重启后点播放键无反应：`restoreQueue()` 只恢复队列不设 `audio.src`，`toggle()` 里 `play()` 被空 catch 吞掉。
|
||||
3. 双音频引擎可同时发声：`MusicModule.vue:1413` 的试听 `<audio>` 与 `feiniuStore` 的 `new Audio()` 互不感知。
|
||||
|
||||
**最值得优先做的一件事**
|
||||
把 `PlayerBar` + `PlayerFull` 从 `MusicModule.vue` 提升到 `App.vue` 全局层。原因：`App.vue` 的模块容器是 `:key="activeModule"` 重挂载，切到其他模块时播放条整体卸载，但音频继续播 → 用户失去所有控制入口。
|
||||
|
||||
**其它已确认的坑**
|
||||
- shuffle 模式下自动切歌是顺序的（`next(manual)` 的随机分支带 `manual` 条件）。
|
||||
- `setCacheMode('stream')` / `clearCache()` 都会 `clearPlayback()`，改设置即中断播放。
|
||||
- `CacheSettings.vue` 的 `cacheEnabled` 开关从不回填 store 的 `cacheMode`，状态不同步；`cacheMax` 是死代码（后端字段是 `feiniu_cache_max_gb`）。
|
||||
- `feiniuStore.init()` 被 `MyMusicLibrary`/`CacheSettings` 重复调用，内含 `restoreQueue()` 会覆盖内存队列，应加幂等标志。
|
||||
- `musicStore` 任务持久化把每首歌的 `rawSearch` 一起写 localStorage，大歌单会爆 5MB 配额且静默失败。
|
||||
- `playItem` 未命中队列时替换整个队列（单曲播放语义），歌单里的 TrackItem 还没有双击且播放键会被 disabled → 正在播的歌无法暂停。
|
||||
- rust 下载引擎下 `doDownload` 仍跳「下载任务」tab，但该 tab 是空的（任务在下载器模块）。
|
||||
- 拖动进度条即写 `currentTime` → 流式下反复中断 Range 请求，应改「拖动预览 + 松手提交」。
|
||||
|
||||
**界面主线（详见报告 §5）**
|
||||
播放条未贴底且离开模块即消失；模块左右内边距不对称（左 28 / 右 40 含滚动条）；三套切换控件（模块 Tabs / 自绘 segmented / 裸文字）；音质徽标 5 色抢戏；列表是「卡片堆」而非紧凑行；`Empty` 组件被裸 children 误用（gap-6 + md:p-12 + border-dashed 无 border）。改版方向：左侧来源树 + 紧凑表格列表 + 全宽坞站播放条 + 可折叠「正在播放」右栏。
|
||||
@@ -0,0 +1,31 @@
|
||||
# 项目长期记忆（Thing / F:\AtieProject\Thing）
|
||||
|
||||
Tauri + Vue 3 + Pinia + Tailwind v4 + reka-ui(shadcn-vue) 的桌面工具箱，按模块组织（`src/modules/<id>/`）。
|
||||
|
||||
## 架构约定
|
||||
|
||||
- **模块挂载**：`App.vue` 的 `ModuleContainer` 用 `:key="activeModule"` 重挂载，**模块不 keep-alive**。因此任何「需要跨模块常驻」的 UI 都必须挂在 `App.vue` 层，不能放在模块内部。
|
||||
- **音乐播放器**：内核在 `src/stores/feiniuStore.ts`（不是 musicStore）；UI 入口在**标题栏** `src/components/layout/TitleBarMusic.vue`（搜索框左侧：唱片图标 + 歌名，点击弹出方形控制窗，播放中图标换封面并旋转），大屏 `src/components/layout/NowPlayingDialog.vue`（歌词/队列）由控制窗的入口打开，由 `App.vue` 渲染。`musicStore` 只负责搜索/歌单解析/下载任务。
|
||||
- 历史沿革：`PlayerBar/PlayerFull`（模块内）→ `GlobalPlayerBar`（App 全局坞站）→ 现为 `TitleBarMusic`（标题栏）。前者们均已删除，不要再新增底部播放条。
|
||||
- **模块顶部 tabs 统一写法**：`<Tabs v-model>` → `<div ref="tabsListRef" class="shrink-0">` → `<TabsList class="grid w-full max-w-md grid-cols-N !bg-transparent !p-0 !shadow-none">` → `TabsTrigger`(带 `class="gap-1.5"` + 图标) → `TabsContent class="mt-4 min-h-0 flex-1 ... tab-animate"`；模块根节点统一 `h-full p-6 overflow-hidden flex flex-col`。
|
||||
- 注意：顶部 Tabs 上那个"可见边框"是 `:focus-visible` 的 ring，并非常态样式。别处若要复刻选中态且背景也是白色，需要自己补 `ring-1 ring-border`，否则白色胶囊只靠 `shadow-sm`（5% 透明度）在白底上几乎不可见。
|
||||
- **列表/导航行的对齐**：行高用固定值（`h-8` / `h-7`）+ `items-center`，不要靠 `py-x` 推算；右侧数字列始终渲染（空时显示 `0`）并加 `min-w-[3ch] text-right tabular-nums`，否则数字列会参差。
|
||||
- 音乐播放走 Rust 本地流代理 `127.0.0.1:<port>/feiniu/stream`，**真流式透传 Range**（`src-tauri/src/music/feiniu/proxy.rs`），seek 依赖它，不要改成前端直连 NAS。
|
||||
- 模块生命周期钩子：`src/modules/<id>/index.ts` 的 `lifecycle.onActivate/onDeactivate/onEnable/onDisable`。
|
||||
- 模块内分段导航统一用 `src/components/common/SegmentedNav.vue`；进度/音量统一用 `src/components/common/ScrubBar.vue`（拖动只预览、松手才提交 seek）。
|
||||
|
||||
## 工程约定
|
||||
|
||||
- **Tailwind v4**：不识别运行时拼接的类名。动态网格用内联 `gridTemplateColumns`，或把完整字面量类名写在模板里。
|
||||
- **tsconfig 开启 `noUnusedLocals` / `noUnusedParameters`**，未使用的 import 会导致构建失败。
|
||||
- 主题 token 在 `src/style.css`（`--primary` / `--muted` / `--background` 等）。**禁止硬编码** `bg-white` / `border-white/10`，否则暗色主题会失效。
|
||||
- 全局可复用动画类写在 `src/style.css`（如 `.music-eq`、`.tab-animate`）。
|
||||
- 构建校验：`npm run build`（= `vue-tsc --noEmit && vite build`）。
|
||||
|
||||
## 本机环境注意事项
|
||||
|
||||
- Bash 工具在本机不可用（PATH 未初始化，`ls`/`find` 等均 not found）。用 PowerShell + 显式绝对路径的 node 执行命令。
|
||||
- PowerShell 工具**不返回 stdout**：需 `| Out-File` 写文件后再用 Read 读取。
|
||||
- `Remove-Item` 被沙箱静默拦截；删除文件用 `node -e "require('fs').unlinkSync('绝对路径')"`。
|
||||
- 受管 node：`C:\Users\Administrator\.workbuddy\binaries\node\versions\22.22.2-3\node.exe`。
|
||||
- 排障经验：Pinia setup store 里若返回对象引用了未定义变量，TS 会让整个 store 退化成 `any`，进而报出成片无关的 `TS7006 implicitly has an 'any' type`。先查 store 自身的错误。
|
||||
@@ -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,465 @@
|
||||
# 音乐模块全链路审查报告
|
||||
|
||||
> 审查范围：数据请求（搜索/歌单解析/下载/解析真实链接）、播放控制（试听、播放器内核、队列、歌词、缓存）、状态管理（musicStore / feiniuStore）、UI 交互与视觉。
|
||||
> 覆盖文件（前端 11 个 + Rust 4 个）：
|
||||
> `src/stores/musicStore.ts`、`src/stores/feiniuStore.ts`、`src/modules/music/MusicModule.vue`、`components/PlayerBar.vue`、`components/PlayerFull.vue`、`components/MyMusicLibrary.vue`、`components/TrackItem.vue`、`components/settings/ConnectionsSettings.vue`、`components/settings/CacheSettings.vue`、`SourcePicker.vue`、`sources.ts`、`index.ts`、`src/App.vue`、`src/components/layout/ModuleContainer.vue`、`src-tauri/src/music/{mod,commands}.rs`、`src-tauri/src/music/feiniu/{mod,proxy}.rs`
|
||||
|
||||
---
|
||||
|
||||
## 0. 结论摘要
|
||||
|
||||
整体架构是清晰的：**搜索/下载走 Python 桥接（musicdl）**，**播放走飞牛 NAS 本地流代理（Rust axum，支持 Range 透传）**，两个 store 职责分离，流代理与缓存设计是对的。问题集中在三类：
|
||||
|
||||
| 类别 | 数量 | 代表问题 |
|
||||
|---|---|---|
|
||||
| P0 功能性失效 | 3 | 飞牛曲库搜索框完全无效；重启后播放键无响应；两个音频引擎可同时发声 |
|
||||
| P1 逻辑/状态缺陷 | 12 | shuffle 自动切歌不随机；缓存开关状态不同步；队列被单曲播放重置；任务持久化写入 `rawSearch` 撑爆 localStorage |
|
||||
| P2 性能瓶颈 | 9 | 拖动进度条即发 Range 请求；歌词/队列无虚拟滚动；全屏模糊背景；每行 2 个 Tooltip |
|
||||
| P3 界面与交互缺陷 | 25 | 播放条未贴底且离开模块即消失；左右内边距不对称；三套切换控件；徽标 5 色抢戏；列表变卡片堆 |
|
||||
|
||||
**最需要优先决策的一件事**：把 `PlayerBar` / `PlayerFull` 从 `MusicModule.vue` 提升到 `App.vue` 全局层。当前它们挂载在音乐模块内部，而模块容器是 `:key="activeModule"` 重挂载（`App.vue:36-41`）——**切到任何其他模块，播放条和"正在播放"大屏整体卸载，但音频仍在后台播放，用户完全失去控制入口**。这是当前体验上最严重的问题。
|
||||
|
||||
---
|
||||
|
||||
## 1. P0 功能性失效（必须修）
|
||||
|
||||
### 1.1 飞牛曲库搜索框完全无效
|
||||
**现象**：输入关键词、回车，曲库列表纹丝不动。
|
||||
|
||||
**根因**：`MyMusicLibrary.vue:21` 定义了本地 `keywordInput`，`onSearchInput`（:24-29）只做了防抖后调用 `store.loadTracks(1)`，而 `loadTracks` 读的是 **store 里的 `keyword`**（`feiniuStore.ts:381`）。检查全仓：`store.keyword` **从未被任何 UI 赋值**。
|
||||
|
||||
```ts
|
||||
// feiniuStore.ts:375-382
|
||||
const data = await invoke('feiniu_list_tracks', {
|
||||
page: p, size: 50,
|
||||
keyword: keyword.value.trim() || null // ← keyword 永远是 ''
|
||||
})
|
||||
```
|
||||
|
||||
**修复**：把输入直接接到 store 字段，去掉中间层。
|
||||
|
||||
```vue
|
||||
<!-- MyMusicLibrary.vue -->
|
||||
<Input v-model="store.keyword" placeholder="搜索飞牛曲库（歌名 / 歌手）"
|
||||
@input="onSearchInput" @keydown.enter="onSearchInput" />
|
||||
```
|
||||
```ts
|
||||
// onSearchInput 里补一句：清空关键词时立即回全量
|
||||
function onSearchInput() {
|
||||
clearTimeout(searchTimer)
|
||||
searchTimer = setTimeout(() => store.loadTracks(1).catch(e => toast.error(String(e))), 400)
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 1.2 应用重启后，播放键点了没反应
|
||||
**现象**：重启应用，底部播放条显示着上次的歌，点播放键没任何反应，也没有提示。
|
||||
|
||||
**根因**：`restoreQueue()`（`feiniuStore.ts:644-655`）只恢复了 `queue` / `queueIndex`，**没有给 audio 设置 `src`**。此时点击播放走 `toggle()`（:564-568）：
|
||||
|
||||
```ts
|
||||
function toggle() {
|
||||
const a = ensureAudio()
|
||||
if (a.paused) a.play().catch(() => {}) // ← 无 src，play() 直接 reject，被静默吞掉
|
||||
else a.pause()
|
||||
}
|
||||
```
|
||||
|
||||
`ensureAudio()` 新建的 `Audio()` 没有 `src`，`play()` 抛 `NotSupportedError`，被空 catch 吞掉。点「上一首/下一首」反而能用（走 `playCurrent()` 会设 src），所以表现为"只有播放键坏了"。
|
||||
|
||||
**修复**：`toggle()` 检测无 src 时先走一次 `playCurrent()`；同时给失败加可见提示。
|
||||
|
||||
```ts
|
||||
function toggle() {
|
||||
const a = ensureAudio()
|
||||
if (!a.src) { // 恢复队列后首次播放
|
||||
if (current.value) playCurrent()
|
||||
return
|
||||
}
|
||||
if (a.paused) a.play().catch(err => { playing.value = false; logger.error(`播放失败: ${err}`) })
|
||||
else a.pause()
|
||||
}
|
||||
```
|
||||
另外建议 `startPlayback` 的 catch 里落一条 `toast.error('播放失败：' + err.message)`，当前 `:558-561` 是先 catch 再静默，用户拿不到任何信息。
|
||||
|
||||
---
|
||||
|
||||
### 1.3 两个独立音频引擎，可同时发声
|
||||
**现象**：在「发现音乐」点某首歌试听，再回到播放器播另一首 → 两首歌同时响；或者试听中点播放器播放，两路声音叠加。
|
||||
|
||||
**根因**：存在两个互不知晓的 `<audio>`：
|
||||
- `MusicModule.vue:1413` —— 试听用的模板 `<audio ref="audioEl">`（`togglePlay` :372-406 驱动）
|
||||
- `feiniuStore.ts:109-126` —— 播放器内核 `new Audio()`
|
||||
|
||||
二者没有互斥，`playingKey` 与 `store.playing` 彼此独立。附带问题：试听音频在**切换 tab / 卸载模块时不会停止**（模板 audio 被移除，引用置空，媒体仍可能继续播到自然结束）。
|
||||
|
||||
**修复（推荐）**：废弃模块内试听 audio，试听直接走同一内核——`playQueue([{...}], 0)`，source 用 `'preview'`，播完即止。若短期不想动内核，至少在 `togglePlay` 之前 `feiniu.clearPlayback()`，并在 `onBeforeUnmount` 里 `audioEl.value?.pause()`。
|
||||
|
||||
---
|
||||
|
||||
## 2. P1 逻辑与状态缺陷
|
||||
|
||||
| # | 问题 | 位置 | 说明与改法 |
|
||||
|---|---|---|---|
|
||||
| 2.1 | **shuffle 自动切歌不随机** | `feiniuStore.ts:570-586` | `next(manual)` 的随机分支带 `manual` 条件，`onEnded → next(false)` 在 shuffle 下走的是顺序 `++`。用户开了随机，一首播完却是下一首。改：把随机逻辑与 `manual` 解耦，`shuffle` 时无论手动/自动都随机（并记录已播集合避免短期重复）。 |
|
||||
| 2.2 | **prev 在 shuffle 下也是顺序** | `feiniuStore.ts:598-607` | 同上；随机模式应回退到历史栈。 |
|
||||
| 2.3 | **切缓存模式/清缓存会中断播放** | `feiniuStore.ts:266-280` | `setCacheMode('stream')` 和 `clearCache()` 都调 `clearPlayback()`；而 `CacheSettings.setEnabled(false)` 又会触发 `setCacheMode('stream')`。改设置就把歌停了，属于误伤。应只在必要（如清掉正在播的那首缓存）时停止，或改为"下一首生效"。 |
|
||||
| 2.4 | **缓存开关与真实模式不同步** | `CacheSettings.vue:13-23,32-35` | `cacheEnabled` 初始恒为 `false`，`onMounted` 只读了 `cacheMode` 没回填开关；若历史已是 cache 模式，打开设置页看到的是"关"，但实际在缓存。另外 `cacheMax = ref(5)` 是死代码（从未使用，后端对应字段是 `feiniu_cache_max_gb`），`cacheStatus` 在 onMounted 也没刷新。 |
|
||||
| 2.5 | **单曲播放会重置整个队列** | `feiniuStore.ts:500-511` | `playItem` 未命中队列时 `queue.value = [{...item}]`——用户从 2000 首的曲库点播放，队列被替换成 1 首，播完就停。播放器语义应是"以所在列表为上下文播放"。改：`playItem(item, contextList?)`，命中则跳转，未命中则以 `contextList` 建队列。 |
|
||||
| 2.6 | **歌单内的曲目无法暂停 / 无法整单播放** | `MyMusicLibrary.vue:228-233` | 歌单里的 `TrackItem` 既没有 `@dblclick`，播放按钮又被 `TrackItem.vue:71` 的 `:disabled="store.playing && store.current?.guid === item.guid"` 禁用——正在播这首时按钮变灰，**没有任何方式暂停**。且点击播放会走 2.5 的"单曲替换队列"。 |
|
||||
| 2.7 | **`init()` 被重复调用，会覆盖内存中的队列** | `feiniuStore.ts:129-157` | `MyMusicLibrary.onMounted`（:64-69）与 `CacheSettings.onMounted`（:16-20）都调 `store.init()`；`init` 内含 `restoreQueue()`，会在用户切到设置页时用 localStorage 的旧值覆盖当前队列/索引。应加 `inited` 标志位做幂等，或把 `restoreQueue` 只放在应用启动路径。 |
|
||||
| 2.8 | **任务持久化把 `rawSearch` 一起写进 localStorage** | `musicStore.ts:79-93,228-234,439` | `songsData: songs` 保留了每首歌的 `rawSearch`（上游 API 原始响应）。一个 500 首歌单任务 → 序列化后极易超过 5MB 配额，`persistTasks` 的 catch 会静默失败，历史记录随机丢失。改：持久化前剥离 `rawSearch` / `defaultDownloadHeaders`，只留重下所需字段。 |
|
||||
| 2.9 | **`pendingUploadOnDone` 泄漏，造成误上传** | `MusicModule.vue:60,74-82,483-500` | 该标志在下发下载请求时置 `true`，只有"检测到有任务 done"才清 `false`。若下载报错/被取消、或用户在选择音质弹窗点了取消，标志会残留，之后**任意一个无关任务完成**都会触发一次上传。`autoUpload` 打开时则是每个任务完成都重复全量上传一次。建议改为按 `taskId` 记录"待上传任务集合"，完成时精确消费。 |
|
||||
| 2.10 | **Rust 引擎下载后跳到空的任务页** | `MusicModule.vue:460` | `doDownload` 无条件 `activeTab.value = 'tasks'`，但 `downloadEngine === 'rust'` 时任务被交给「下载器」模块（`musicStore.ts:391-430` 不创建本模块任务），本模块任务列表是空的，用户看到"暂无下载任务"。且此时 `downloadTarget === 'feiniu'` 的自动上传链路也永远不会触发。应在 rust 引擎下改为提示"已交给下载器模块"并跳转到对应模块。 |
|
||||
| 2.11 | **`duration` 未知时拖动进度条无效** | `feiniuStore.ts:609-613`（配合 `PlayerBar.vue:18-20`） | `onProgress` 用 `store.duration` 换算秒数；若流没有返回 `Content-Length`，`loadedmetadata` 后 `duration` 为 `NaN`，`a.currentTime = NaN` 被忽略，进度条要么不动要么跳回 0。应在 `seek` 内做 `if (!isFinite(a.duration) || a.duration <= 0) return` 并给出"当前音频不支持跳转"的提示。 |
|
||||
| 2.12 | **`nowPlayingOpen` 状态跨模块残留** | `feiniuStore.ts:105` + `PlayerFull.vue:43` | 大屏开着时切走模块，Dialog 随模块卸载消失，但 `nowPlayingOpen` 仍是 `true`；回到音乐模块会突兀地自动弹出。建议改为由组件本地 `ref` 承载，或在 `onMounted` 时重置。 |
|
||||
|
||||
其它可在后续清理的小项：`doneCount` 在重复 `done` 事件下会虚增（`musicStore.ts:320`）；`redownloadTask` 用的是**当前默认音质**而非原任务音质（`musicStore.ts:523`）；音质弹窗取消后 `selectedKeys` 已被清空（`MusicModule.vue:505-509`）；`installRuntime` 的进度监听清理逻辑正确，但 `installError` 与最后一条进度事件之间缺少"失败即清进度"的处理（注释已提到，代码未做）。
|
||||
|
||||
---
|
||||
|
||||
## 3. 性能瓶颈与优化点
|
||||
|
||||
### 3.1 拖动进度条 = 连续发起 Range 请求（最该改的一项）
|
||||
`PlayerBar.vue:104-110` / `PlayerFull.vue:75-80` 把 Slider 的 `update:model-value` 直接接到 `store.seek()`，而 `seek` 立刻写 `a.currentTime`。飞牛流代理是**真流式透传 Range**（`proxy.rs:131-133`），所以拖动一次会触发几十次"中断旧请求 → 发新 Range 请求"：
|
||||
|
||||
- 占用带宽、NAS 侧反复建连
|
||||
- 拖动过程中出现爆音/卡顿
|
||||
- 拖到底后又从新位置重新缓冲
|
||||
|
||||
**推荐**：拖动期间只更新本地"预览位置"，`pointerup` / `change` 时提交 `seek`。
|
||||
|
||||
```ts
|
||||
// 父组件维护 dragging + previewValue
|
||||
const dragging = ref(false)
|
||||
const preview = ref(0)
|
||||
function onProgressInput(v?: number[]) { dragging.value = true; preview.value = v?.[0] ?? 0 }
|
||||
function onProgressCommit(v?: number[]) {
|
||||
dragging.value = false
|
||||
store.seek(((v?.[0] ?? 0) / 100) * store.duration)
|
||||
}
|
||||
```
|
||||
```vue
|
||||
<Slider :model-value="[dragging ? preview : store.progress]" @update:model-value="onProgressInput" @value-commit="onProgressCommit" />
|
||||
```
|
||||
另外 `:step="0.5"`（200 档）对 4 分钟歌 ≈ 1.2s 粒度尚可，但对播客/长音频（1 小时以上）单档 ≈ 18s，建议改为按 `duration` 动态计算 step（如 `100 / duration`）。
|
||||
|
||||
### 3.2 进度时间轴以 4Hz 驱动整棵组件树
|
||||
`timeupdate` 约每 250ms 一次写 `position.value`，凡是读它的组件都会重渲染。当前影响面：
|
||||
- `PlayerBar` + `PlayerFull` **同时挂载**（大屏打开时）→ 双份重渲染
|
||||
- `PlayerFull` 的 `currentLine()`（`feiniuStore.ts:710-717`）是**线性扫描**，每次重算 O(歌词行数)。改：缓存上次命中的索引，只在 `position > 下一行时间` 时 `idx++`（歌词已排序，单调推进），或二分查找。
|
||||
- `PlayerFull.vue:33-39` 的 `watchEffect` 每次行切换都 `querySelectorAll('[data-line]')` 全量查询后再 `scrollIntoView({behavior:'smooth'})`。改：用 `ref` 数组或在 v-for 里收集 DOM，仅对目标行滚动；并给滚动加 `prefers-reduced-motion` 降级。
|
||||
|
||||
```ts
|
||||
let lastLineIdx = -1
|
||||
function currentLine(): number {
|
||||
const lines = lyricLines.value
|
||||
if (lastLineIdx >= 0 && lastLineIdx < lines.length
|
||||
&& (lastLineIdx + 1 >= lines.length || position.value < lines[lastLineIdx + 1].t)) {
|
||||
while (lastLineIdx > 0 && position.value < lines[lastLineIdx].t) lastLineIdx--
|
||||
while (lastLineIdx + 1 < lines.length && lines[lastLineIdx + 1].t <= position.value) lastLineIdx++
|
||||
return lastLineIdx
|
||||
}
|
||||
lastLineIdx = -1
|
||||
for (let k = 0; k < lines.length; k++) if (lines[k].t <= position.value) lastLineIdx = k; else break
|
||||
return lastLineIdx
|
||||
}
|
||||
```
|
||||
同时建议歌词/队列上**虚拟滚动**：LRC 常有 80~200 行，长播放列表可上千行，当前是全量 DOM。
|
||||
|
||||
### 3.3 大屏背景的整图高斯模糊
|
||||
`PlayerFull.vue:50-52`：`<img class="h-full w-full scale-110 object-cover blur-2xl opacity-30">` 铺满整个弹窗（`min-h-[70vh]`，实际常超 900×700）。一张全尺寸图叠加 `blur-2xl` + `scale-110`，在打开期间持续占用合成/光栅资源，低端机上会明显掉帧（拖进度条时最明显）。
|
||||
|
||||
**推荐**：改为一次性低分辨率方案——用同图 `size=96` 缩略图 + CSS 渐变遮罩，或直接用取色（后端返回主色）生成柔和纯色/线性渐变背景。收益远大于视觉损失。
|
||||
|
||||
### 3.4 搜索结果行每行 2 个 Tooltip 组件
|
||||
`MusicModule.vue:928-965`：每首歌行包了 2 个 `Tooltip`（reka-ui 组件 + 上下文）。首批 80 行 = 160 个 Tooltip 实例，滚动加载到 500 行 = 1000 个。挂载/更新成本高，且 Tooltip 会随列表 diff 频繁重建。
|
||||
|
||||
**推荐**：列表行用原生 `title` 属性承载提示（无需组件）；只对"需要富文本提示"的 `+N` 音质档位保留一个 Tooltip。
|
||||
|
||||
### 3.5 其它
|
||||
- **下载任务聚合计算**：`taskAggDone/taskAggTotal`（`MusicModule.vue:547-548`）每次渲染都遍历全部 `songs`。一个 500 首歌的任务，每来一次进度事件就重算 500×2。改：在 `handleDownloadEvent` 里维护 `task.doneBytes/totalBytes` 增量字段。
|
||||
- **`displayItems` / `groupKeys` / `groupAllSelected`**：模板中对每个源分组头调用 `groupAllSelected`，内部 `filteredResults.filter(...)` 是 O(n)；结果集大时是 O(n × 分组数)。改：用一次 `computed` 预生成 `Map<source, keys[]>`。
|
||||
- **飞牛曲库无分页**：`loadTracks` 固定 `size: 50`，`page/total` 暴露了却没有 UI。曲库 > 50 首时后面的歌**完全访问不到**（`playAll` 也只能播前 50 首）。应加无限滚动或分页。
|
||||
- **本地扫描无上限**：`scanLocal` 一次性返回全部条目，超大音乐目录下会长时间占住主线程做映射与渲染。
|
||||
- **缓存模式首播延迟**：`feiniu_cache_fetch`（`commands.rs:421-429` → `cache_fetch`）是"**下载完整文件后返回路径**"，即 `cache` 模式下首次播放要等整首下完；而 `loadingPlay` 这个状态在 UI 上**从未被使用**（`PlayerBar`/`PlayerFull` 都没读），用户看到的是"点了没反应"。要么改用边下边播的双源策略，要么至少把 `loadingPlay` 接上 spinner。
|
||||
|
||||
---
|
||||
|
||||
## 4. 交互体验问题（按操作路径）
|
||||
|
||||
**播放控制**
|
||||
1. 播放/暂停按钮 `disabled` 时无视觉降级（`PlayerBar.vue:76-84`），看起来可点却没反应。
|
||||
2. 音量图标（`PlayerBar.vue:117`）不可点击，没有"一键静音"；音量条只有 80px，长按/滚轮调节都没有。
|
||||
3. 切歌没有 crossfade，也没有间奏/淡出，切歌瞬间是硬切。
|
||||
4. 播放模式按钮图标随状态变（Repeat/Repeat1/Shuffle），初看像三个不同功能，且没有文字提示（只有 Tooltip）。
|
||||
5. 队列入口用 `ListMusic` 图标 + 数字角标，但点击是**平铺开关**（`store.queueVisible = !store.queueVisible`），而队列实际渲染在 `PlayerFull` 的右栏里——在大屏没打开时点这个图标看不到任何反馈（因为它只切了右栏的 tab，而弹窗没开）。
|
||||
6. 上一首/下一首没有"按住快进/快退"（老播放器的常见预期）。
|
||||
|
||||
**进度条**
|
||||
7. 没有 hover 时间气泡、没有缓冲进度层、没有"拖动时显示预览时间"。当前拖动时只能看两侧的小字。
|
||||
8. 轨道 6px + 16px 白色圆点滑块，`Slider.vue:40` 硬编码 `bg-white`，在浅色主题下白滑块白描边几乎隐形。
|
||||
|
||||
**列表切换**
|
||||
9. 发现音乐页切到「我的音乐」再切回，搜索关键词和结果**全部丢失**（模块内 tab 用 `Tabs` 非 keep-alive，`flatResults` 被重算但 store 里 `results` 还在——实际是因为 `MusicModule` 未卸载所以结果还在，但 `visibleCount` 会被 `watch(filteredResults)` 重置，滚动位置丢失）。
|
||||
10. 列表里双击行不会播放（只有点小图标才播），不符合音乐软件的肌肉记忆。
|
||||
11. 键盘：无空格播放/暂停、无 ↑↓ 选行、无 Enter 播放；所有列表行都不可聚焦。
|
||||
12. 多选操作只有"下载所选"，缺"加入歌单""加入队列""下一首播放"。
|
||||
|
||||
---
|
||||
|
||||
## 5. 界面缺陷清单（具体位置 + 改法）
|
||||
|
||||
### 5.1 结构与布局
|
||||
|
||||
| # | 缺陷 | 位置 | 改法 |
|
||||
|---|---|---|---|
|
||||
| L1 | **播放条没贴底**：被模块根 `p-6` 包住，`border-t` 只在左右各缩进 24px 的宽度上出现，视觉上像一张"飘着的卡片"而非底部坞站 | `MusicModule.vue:688,1416` | 把 `PlayerBar` 提升到 `App.vue`，作为 `flex-col` 壳层的最后一行（全宽、`border-t`、`h-[72px]`）；音乐模块内容区 `pb-[72px]` 让位 |
|
||||
| L2 | **左右内边距不对称**：模块左 24px + `px-1`(4px) = 28px；右 24px + `pr-3`(12px) + `px-1` = 40px，右侧被滚动条再吃一层，卡片右边距明显窄于左边 | `MusicModule.vue:688,706-707,987-988` | 统一成 `px-6`，滚动区改成 `[&>[data-slot=scroll-area-viewport]]:pr-6` 或让 ScrollArea 用 `scrollbar-gutter: stable`，避免内边距被滚动条挤压 |
|
||||
| L3 | **三套切换控件**：模块级 `TabsList`（半透明覆盖）、`MyMusicLibrary` 自绘分段按钮（:89-114）、`PlayerFull` 的裸文字切换（:113-129）——三种视觉语言表达同一件事 | 三处 | 统一为一种 segmented 控件（建议用现有 `Tabs`/`TabsList`，或统一样式的 `ButtonGroup`），并用同一套"选中=主色底/浅底 + 中粗字"的规则 |
|
||||
| L4 | **`Empty` 组件误用**：直接塞裸 children，继承 `gap-6`(24px) 与 `md:p-12`(48px)，图标与文案间距过大且垂直被撑高；`border-dashed` 没有宽度声明，虚线框实际不显示 | `MusicModule.vue:801-809, 977-980`、`MyMusicLibrary.vue:76-83,135-140` | 用组件既定的子结构：`EmptyMedia / EmptyTitle / EmptyDescription`；或给容器加 `border` + `border-dashed`、`gap-3`、`p-8` |
|
||||
| L5 | **横向 Tab 与子 Tab 层级混乱**：顶层 4 个 tab 里，「我的音乐」内部又横排 3 个子 tab，「设置」内部又竖排 5 张卡；导航成本高 | `MusicModule.vue:691-696`、`MyMusicLibrary.vue:88-114` | 见 §6 的"左侧来源树 + 右侧主区"结构，把两级 tab 压成一级 |
|
||||
| L6 | **首屏被低价值信息占据**：「下载到 本地/飞牛」占一整个卡片行（`MusicModule.vue:709-726`），说明文字是 12px 灰字却放在最显眼位置；真正的搜索框被挤到第二行 | `MusicModule.vue:708-794` | 把"下载目标"收进搜索工具栏右侧的 `Select`（与源选择器同排），或放进设置页；首行只留 搜索输入 + 源选择 + 搜索按钮 |
|
||||
| L7 | **歌单详情页底部孤零零一个"移除最后一首"按钮** | `MyMusicLibrary.vue:234-243` | 语义错误，删掉。改为：行 hover 显示「⋯」菜单（从歌单移除 / 上移 / 下移），或支持多选后批量移除 |
|
||||
| L8 | **歌单左栏无滚动**：`grid-cols-[220px_1fr]`，左栏是普通 `div`，歌单多了会撑高整页 | `MyMusicLibrary.vue:189-205` | 左栏用 `ScrollArea` 并固定高度（`h-[calc(100vh-260px)]`），或整体改三栏布局 |
|
||||
| L9 | **设置页信息密度过低 + 语义重复**：「飞牛音乐连接」管连接，「上传到飞牛曲库」又要求用户回头去前一张卡点云朵登录；5 张卡片纵向拉得很长 | `MusicModule.vue:1123-1371` | 合并为「连接与存储」一张卡：连接列表 + NAS 文件服务登录 + 曲库目录 + 自动上传；「播放缓存」并入「播放」分组；「环境检查」做成折叠的"诊断"面板 |
|
||||
|
||||
### 5.2 视觉与色彩
|
||||
|
||||
| # | 缺陷 | 位置 | 改法 |
|
||||
|---|---|---|---|
|
||||
| V1 | **音质徽标 5 色抢戏**：Hi-Res=琥珀、无损=紫、320K=天蓝、192K=橙、128K=锌灰，一行里 2 个高饱和徽标 + 1 个 `+N`，视觉噪音压过歌名 | `MusicModule.vue:336-355, 879-905` | 降为**两档**：无损/高解析用实心浅色徽标（一个色），其余用 `outline` 中性色；颜色不承担"档位"信息，档位靠文字。或改为歌名后的一个小图标 + Tooltip 详情 |
|
||||
| V2 | **列表变成卡片堆**：每行 `border` + `rounded-lg` + `p-2.5` + `space-y-2`，80 行 = 80 张卡，行间 8px 空隙，扫描效率低 | `MusicModule.vue:845-859` | 改紧凑单行：行高 44~48px、无独立边框、`border-b border-border/60` 或干脆无分隔、hover `bg-accent/60`；表头一行（`# / 标题 / 专辑 / 时长 / 操作`） |
|
||||
| V3 | **源分组头与大卡片行不匹配**：分组头只是 12px 小字，紧贴一堆 56px 卡片 | `MusicModule.vue:848-857` | 分组头改 `sticky top-0 z-10 bg-background/95 backdrop-blur` + 底部分隔线，字号 13px medium；或改用左侧来源 Tab 过滤，取消组内嵌头 |
|
||||
| V4 | **当前播放项用"选中态"表达**：`border-primary bg-primary/10` 在浅色主题下是"近黑边框 + 10% 黑底"，像复选框选中而非"正在播放" | `TrackItem.vue:53-54` | 改为：左侧 3px 主色竖条 + 歌名主色 + 一个 12px 的跳动均衡器图标；hover 与 active 语义分离 |
|
||||
| V5 | **`PlayerFull` 硬编码白色边框**：`border-l border-white/10`，浅色主题下完全不可见 | `PlayerFull.vue:112` | 改用 `border-border` |
|
||||
| V6 | **`PlayerFull` 背景被"洗白"**：整图 `opacity-30` + 白→白渐变，浅色下糊成一片；同时是持续 GPU 开销 | `PlayerFull.vue:50-53` | 改为缩略图小尺寸模糊，或纯色/双色线性渐变（从封面取色）；浅色主题下用极浅的封面色调，深色主题下用暗化封面色 |
|
||||
| V7 | **滑块基本不可见**：`Slider.vue:40` 硬编码 `bg-white`，16px 白色滑块 + 白色描边叠在浅底上；轨道仅 6px | `Slider.vue:36-41` | 滑块改 `bg-background` + 主色描边（或直接用 `bg-primary`）；静息轨道 4px、hover/拖动时平滑增到 8px；加 `transition-[height]` |
|
||||
| V8 | **`PlayerFull` 歌词行区分度不足**：非当前行 `text-muted-foreground/60`，当前行仅 `font-medium text-foreground`，没有位置指示 | `PlayerFull.vue:136-145` | 当前行放大到 17~18px + `text-foreground` + 左侧或下方主色指示；两侧行逐级降透明度（60/40/25）形成景深；点击区域扩大到整行并加 hover 背景 |
|
||||
| V9 | **`PlayerFull` 进度时间只在下方一行小字**，且控制按钮组与进度条分属两个块，视觉不聚合 | `PlayerFull.vue:74-108` | 进度条与控制键合并为一块：`[时间] ──●──── [时间]` 上、`[模式][上一首][播放][下一首][队列]` 下的居中控制簇 |
|
||||
| V10 | **「词」按钮用单个汉字**当歌词开关 | `PlayerBar.vue:125-132` | 换成 `Lyrics` 图标（`FileText`/`MicVocal`），与两侧图标风格一致 |
|
||||
| V11 | **下载任务标题行过载**：状态标签 + 歌名 + 歌手 + 音质标签 + 已下载/总量 + 最多 4 个图标按钮挤在一行；且 `Card` 被 `gap-0 py-0` + `CardContent py-2` 覆盖，内边距与模块内其它卡片不一致 | `MusicModule.vue:995-1060` | 拆两行：第一行 `[状态] 歌名 · 歌手 ……… [音质] [⋯菜单]`；第二行进度条 + 大小 + "打开目录/取消/重下"收进 `⋯` 菜单。`Card` 统一 `p-0` + 内部 `p-3` |
|
||||
| V12 | **多曲目任务行进度条只有 56px**（`w-14`），几乎读不出进度；错误信息被截断到 112px | `MusicModule.vue:1086-1097` | 进度条改占满剩余宽度（去掉固定宽度，放歌名下方一行）；错误信息用 Tooltip 或点击展开 |
|
||||
| V13 | **`TrackItem` 悬停才出现的播放按钮占 40px 固定宽度**，未悬停时标题左侧留出空白列，触屏/键盘用户无法触发 | `TrackItem.vue:68-75` | 改为：封面左下角 24px 半透明播放浮层（hover 显现），或整行 hover 时标题左侧淡入小图标；并支持双击整行播放 |
|
||||
| V14 | **飞牛曲库行/本地曲库行/歌单行的"来源"标识不统一**：本地用行内小标签「本地」，飞牛没有标识，歌单混排时无法区分 | `TrackItem.vue:81` | 统一在行尾或封面角标显示来源（NAS 云图标 / 本机图标），并在歌单详情里按来源分组或加筛选 |
|
||||
| V15 | **搜索历史下拉不适合键盘操作**：`@focusout` 关闭 + `@mousedown.prevent` 的组合同样让 Tab 导航无法进入历史项 | `MusicModule.vue:738-760` | 改用 `Combobox`/`Popover` + `Command` 组件（仓库已有 `components/ui/combobox`），支持 ↑↓ 选择、Enter 确认、Esc 关闭 |
|
||||
| V16 | **`+N` 音质档位靠 Tooltip**，触屏不可达；`visibleTiers` 固定展示 2 个，长歌名下把歌名挤窄 | `MusicModule.vue:888-904` | 行内只留 1 个"最高音质"徽标，全部档位收进右侧 `⋯` 菜单或点击弹出 popover |
|
||||
| V17 | **`PlayerBar` 缺少播放态反馈**：`loadingPlay` 未接 UI；NAS 慢时点播放毫无反应 | `PlayerBar.vue:76-84` | 播放键上叠加 spinner（`loadingPlay` 时），或封面加旋转/脉冲 |
|
||||
| V18 | **`PlayerBar` 三段留白失衡**：左侧信息 `max-w-44`，中间控制区 `flex-1` 里塞了模式/上下首/播放/队列 + 进度条，右侧音量+词+最大化；窄窗口下中间进度条被压到很短 | `PlayerBar.vue:34-141` | 采用标准三段：左 `w-[240px]` 固定、中 `flex-1 min-w-0`（控制 + 进度）、右 `w-[200px]`（音量/词/大屏）；窄容器下用 `container query` 渐进隐藏音量条与歌词按钮 |
|
||||
| V19 | **`TabsList` 同时带 `grid w-full max-w-md` 与组件默认 `inline-flex w-fit`**，并靠 `!p-0 !bg-transparent !shadow-none` 强行覆盖 | `MusicModule.vue:691` | 不要用覆盖式改写；把"模块级分段导航"抽成一个 `SegmentedNav` 组件（`grid grid-cols-N`、`bg-muted p-0.5`、激活项 `bg-background shadow-sm`） |
|
||||
| V20 | **封面圆角/阴影规格不统一**：列表 40px `rounded-md`、播放条 44px `rounded-md shadow`、大屏 256px `rounded-xl shadow-2xl` | 多处 | 定规格：列表 6px 无阴影、播放条 6px 无阴影、大屏 12px + `ring-1 ring-border/60` 无重阴影 |
|
||||
| V21 | **下载任务空态文案指向错误**：「去"搜索"页选择歌曲下载」，但 tab 已改名为「发现音乐」 | `MusicModule.vue:991` | 改为"去「发现音乐」页选择歌曲下载" |
|
||||
| V22 | **`PlayerFull` 未提供音量、队列收起、下一首信息**；队列项没有播放态指示（只有 `bg-primary/10`） | `PlayerFull.vue:147-163` | 补：右上角音量滑条；队列项用序号↔均衡器切换表示当前项，hover 显示"下一首播放/移除" |
|
||||
| V23 | **`ConnectionsSettings` 图标按钮语义不明**：`Power` 既表示"激活"又表示"登出"，两个含义相同的图标相邻 | `ConnectionsSettings.vue:157-171` | 激活用 `CircleCheck`/`RadioButton`，登出用 `LogOut`，删除保留 `Trash2`；并为所有 icon-only 按钮补 `Tooltip` + `aria-label` |
|
||||
| V24 | **歌单/曲库的「播放全部」用文字 `▶ 播放全部`**，与其他按钮的图标风格不统一 | `MyMusicLibrary.vue:115-117,214-216` | 统一为图标 + 文字：`<Play class="size-4"/> 播放全部` |
|
||||
| V25 | **`MusicModule` 里两处搜索框文案不一致**（"输入歌名/歌手/专辑关键词" vs "粘贴歌单链接"）且歌单解析行的 Input 靠 `border-0 bg-transparent` 融进容器，缺少"这是一行输入"的暗示 | `MusicModule.vue:730-782` | 歌单解析改为折叠的"粘贴歌单链接"次级入口（默认收起），避免与主搜索竞争注意力 |
|
||||
|
||||
---
|
||||
|
||||
## 6. 重设计方案
|
||||
|
||||
### 6.1 参考基准
|
||||
- **Spotify / Apple Music**：左侧来源树 + 中间列表 + 底部全宽播放条 + 右侧可折叠"正在播放"。
|
||||
- **网易云音乐 / QQ 音乐**：紧凑表格行（`# / 标题 / 歌手 / 专辑 / 时长`）、行内 hover 操作、双击播放、底部播放条 + 播放列表面板。
|
||||
- **foobar2000 / MusicBee**：信息密度高、可排序表头、键盘优先。
|
||||
本项目的定位是"NAS 曲库 + 本地曲库 + 多平台搜索下载"的**工具型播放器**，建议取 **Spotify 的骨架 + 网易云的列表密度**，避免做成消费级流媒体的强视觉风格。
|
||||
|
||||
### 6.2 目标信息架构（三级 tab → 一级导航）
|
||||
|
||||
```
|
||||
音乐
|
||||
├── 曲库
|
||||
│ ├── 飞牛曲库 (NAS 曲目，分页/无限滚动 + 搜索 + 排序)
|
||||
│ ├── 本地曲库 (扫描目录，按文件夹浏览)
|
||||
│ └── 我的歌单 (歌单列表 → 歌单详情，可拖拽排序)
|
||||
├── 发现音乐 (多平台搜索 + 歌单解析 + 下载)
|
||||
├── 下载任务 (进行中 / 已完成 分组)
|
||||
└── 设置 (连接与存储 / 播放 / 下载 / 诊断，用左侧锚点或分段)
|
||||
```
|
||||
把「我的音乐」内部的 3 个子 tab 提升为导航的一级子项（来源树），「设置」内部的 5 张卡片改为分组锚点。
|
||||
|
||||
### 6.3 布局结构（目标）
|
||||
|
||||
```
|
||||
┌───────────────────────────────────────────────────────────────────────┐
|
||||
│ TitleBar（含模块浮动切换器） │
|
||||
├──────────┬──────────────┬─────────────────────────────────────────────┤
|
||||
│ Sidebar │ 来源树 │ 内容主区 │
|
||||
│ （模块） │ 240px │ ┌ 固定工具栏 ────────────────────────────┐ │
|
||||
│ │ │ │ 搜索 来源筛 音质筛 排序 多选操作 │ │
|
||||
│ │ 曲库 │ ├ 表头 (# 标题 歌手 专辑 时长 操作) ──────┤ │
|
||||
│ │ · 飞牛曲库 │ │ 44px 紧凑行，hover 显示操作 │ │
|
||||
│ │ · 本地曲库 │ │ 播放中：主色竖条 + 跳动的均衡器 │ │
|
||||
│ │ · 我的歌单 │ │ ... │ │
|
||||
│ │ 发现音乐 │ └────────────────────────────────────────┘ │
|
||||
│ │ 下载任务 │ │
|
||||
│ │ 设置 │ （可选右栏 320px：正在播放/歌词/队列） │
|
||||
├──────────┴──────────────┴─────────────────────────────────────────────┤
|
||||
│ MiniPlayer 72px（全宽坞站：左曲目 中控制+进度 右音量/歌词/大屏） │
|
||||
└───────────────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
要点：
|
||||
1. **MiniPlayer 提升到 `App.vue`**，全宽贴底、不参与任何模块内边距；音乐模块内容区 `pb-[72px]`。这样在任何模块都能控制播放。
|
||||
2. **`PlayerFull` 也提升到 `App.vue`**（全局 Dialog/Overlay），解决跨模块残留问题。
|
||||
3. **去掉"模块级横向 Tab"**，音乐模块内部用来源树；`useModuleTabs` 仍可保留，用于把来源树的第一级注册给 TitleBar 浮动切换器（保持现有能力）。
|
||||
4. **右栏"正在播放"可折叠**：窄窗口默认收起，宽窗口（≥1280px）默认展开，用 `container query` 或 `useMediaQuery` 决定。
|
||||
|
||||
### 6.4 视觉规范（建议写入项目 Design Token）
|
||||
|
||||
| 项目 | 规范 |
|
||||
|---|---|
|
||||
| 主色使用 | 只用于：主操作按钮、播放中指示、"正在播放"高亮。**不用于**徽标分类、分组头 |
|
||||
| 中性色阶 | 文本 `foreground` / 次文本 `muted-foreground` / 三级文本 `muted-foreground/70`；分隔线 `border/60`；hover 面 `accent/60` |
|
||||
| 圆角 | 行/输入 6px（`radius-md`）、卡片 10px（`radius-lg`）、大图 12px、头像/封面圆形仅用于单曲大图 |
|
||||
| 阴影 | 列表与播放条**不用阴影**，靠 `border` 分层；只有 Dialog/Popover 用 `shadow-lg` |
|
||||
| 行高 | 列表行 44px（紧凑）/ 48px（标准）；表头 32px |
|
||||
| 字号 | 歌名 14px/500，歌手·专辑 12px/400，时长时间数字 12px `tabular-nums` |
|
||||
| 徽标 | 一类语义一个样式：状态用实心浅底，属性（音质/格式）用 `outline` 中性色 + 文字；不超过 2 个 |
|
||||
| 动效 | 仅 `opacity` / `transform`，120~180ms `ease-out`；进度条高度过渡 150ms；尊重 `prefers-reduced-motion` |
|
||||
| 明暗主题 | **禁止硬编码** `bg-white` / `border-white/10` / `text-white`；一律走 token |
|
||||
| 空状态 | 统一 `EmptyMedia(32px 图标) → EmptyTitle(14px) → EmptyDescription(12px)`，`gap-3`、`p-10`、无边框 |
|
||||
|
||||
### 6.5 关键组件规格
|
||||
|
||||
**MiniPlayer**
|
||||
```
|
||||
高度 72px | 全宽 | border-t | bg-background/85 backdrop-blur
|
||||
左 240px ：封面 48px(6px 圆角) + 歌名 14px/500 截断 + 歌手 12px 截断 + ♥
|
||||
中 flex-1：① [模式][上一首][播放 40px 圆形主色][下一首][队列] 居中
|
||||
② [时间 00:00] ──进度条(hover 4→8px，含缓冲层)── [总时长] 居中 max-w-[560px]
|
||||
右 200px ：音量图标(可点静音) + 音量条 96px | 歌词 | 大屏 | （窄屏只留大屏）
|
||||
播放中：封面右侧叠加 3 条均衡器动效；`loadingPlay` 时播放键显示 spinner
|
||||
```
|
||||
|
||||
**列表行（TrackItem 重写）**
|
||||
```
|
||||
[#/均衡器 24px] [封面 40px] [标题 14px/500 + 歌手 12px] [专辑 12px 可隐藏] [时长 12px tabular] [⋯ hover 显示]
|
||||
高度 44px | 无边框 | border-b border-border/50 | hover:bg-accent/60 | 当前项：左侧 3px 主色条 + 标题主色
|
||||
双击整行播放；⋯ 菜单：下一首播放 / 加入队列 / 加入歌单 / 查看文件位置 / 下载
|
||||
```
|
||||
|
||||
**进度条交互**
|
||||
```
|
||||
拖动中：只更新预览位置 + 显示时间气泡；轨道加粗；不写 currentTime
|
||||
释放时：一次性 seek；若 duration 未知则禁用拖动并提示"该音频不支持跳转"
|
||||
缓冲层：在轨道里用 bg-muted-foreground/25 画已缓冲区间（audio.buffered）
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 7. 落地路径（按性价比排序）
|
||||
|
||||
| 阶段 | 内容 | 影响面 | 预估 |
|
||||
|---|---|---|---|
|
||||
| **S1 修 Bug（不做设计变更）** | 1.1 搜索框绑定 store.keyword；1.2 `toggle()` 无 src 兜底；1.3 试听与播放器互斥（或合并内核）；2.1/2.2 shuffle 自动切歌；2.4 缓存开关回填；2.7 `init` 幂等；2.8 持久化剥离 `rawSearch` | 仅改逻辑，风险低 | 半天 |
|
||||
| **S2 播放器骨架调整** | 3.1 拖动提交式 seek；3.2 歌词行索引缓存；3.3 大屏背景降级；4.1 播放键 loading 态；L1/V18 MiniPlayer 全宽贴底；V5/V7 主题 token 修正 | 播放条 + 大屏 | 1~2 天 |
|
||||
| **S3 列表与信息架构** | V2 紧凑列表；V1 徽标降噪；V3 分组头；V13/V4 TrackItem 重写；L6 首屏工具栏重构；2.5 上下文队列；2.6 歌单播放/暂停 | 发现音乐 + 曲库 | 3~4 天 |
|
||||
| **S4 结构性重构** | §6.2/6.3 左侧来源树 + 全局播放条；PlayerBar/PlayerFull 提升到 App.vue；右栏正在播放；设置页分组 | 模块外壳 | 1 周 |
|
||||
| **S5 体验补全** | 键盘快捷键、虚拟滚动、分页/无限滚动、拖拽排序歌单、音质档位 popover、缓冲层、桌面歌词 | — | 按需 |
|
||||
|
||||
**建议先做 S1 + S2**：S1 全是低风险的逻辑修复，S2 集中在两个组件文件里，能立刻解决"卡顿 + 没有控制感 + 拖动难用"的主观感受；S4 的结构调整等到前面稳定后再动，避免一次改动面过大。
|
||||
|
||||
---
|
||||
|
||||
## 8. 附：值得保留的设计
|
||||
|
||||
- 流代理走 `127.0.0.1` 动态端口 + `Cookie` 注入 + **Range 透传**（`proxy.rs`）——这是正确做法，seek 能真正生效，不要改成前端直连。
|
||||
- 桥接进程按需拉起、禁用模块时停止（`music/index.ts:34-45`）——避免了常驻 Python 进程。
|
||||
- `tasksSignature` 轻量签名代替深度 watch（`musicStore.ts:257-266`）——思路正确（只是 payload 需要瘦身）。
|
||||
- 搜索结果**懒解析**（搜索阶段拿档位、播放/下载前才解析真实链接）+ `rawSearch` 支持隔夜链接重解析（`musicStore.ts:355-370,458`）——设计合理。
|
||||
- 发现音乐列表的**增量渲染 + IntersectionObserver 哨兵**（`MusicModule.vue:265-305`）——方向正确，可平滑迁移为新列表的基础。
|
||||
|
||||
---
|
||||
|
||||
## 9. 重构落地记录（本次已实施）
|
||||
|
||||
### 9.1 新增文件
|
||||
|
||||
| 文件 | 作用 |
|
||||
|---|---|
|
||||
| `src/components/layout/TitleBarMusic.vue` | 标题栏音乐栏：唱片图标 + 歌名，点击弹出**方形播放控制窗** |
|
||||
| `src/modules/music/components/PlaylistEditorDialog.vue` | 歌单音乐编辑器：从全部音乐勾选加入 / 批量移出 |
|
||||
| `src/components/layout/NowPlayingDialog.vue` | 「正在播放」大屏（封面 + 控制 + 歌词 / 队列），由方形控制窗的「歌词 / 队列」入口打开 |
|
||||
| `src/components/common/ScrubBar.vue` | 通用拖拽进度条：**拖动只预览、松手才 seek**，含缓冲层与时间气泡 |
|
||||
| `src/components/common/SegmentedNav.vue` | 分段导航（现由 `NowPlayingDialog` 的「歌词 / 队列」切换使用） |
|
||||
|
||||
`PlayerBar.vue` / `PlayerFull.vue` 已删除；`GlobalPlayerBar.vue` 曾短暂作为全局坞站播放条存在，现已被标题栏音乐栏取代并删除。
|
||||
|
||||
**播放器入口最终形态**：标题栏搜索框左侧的音乐栏（`TitleBarMusic`）——未播放过时只显示唱片图标；有曲目后图标替换为封面并随播放旋转，右侧显示截断歌名。点击弹出约 300×340 的方形控制窗（封面 / 曲目信息 / 进度 / 循环·上下首·播放·队列 / 音量 / 歌词·队列入口），点击封面或「歌词 / 队列」进入大屏。
|
||||
|
||||
### 9.2 修复的缺陷
|
||||
|
||||
**P0**
|
||||
1. 飞牛曲库搜索框：直接 `v-model="store.searchKeyword"` 并新增 `loadTracks(page, append)` + `loadMoreTracks()`，搜索真正生效且支持分页续拉。
|
||||
2. 重启后播放键失效：`toggle()` 在 `audio` 无 src 时先按当前条目装载（试听或队列当前曲），失败原因经 `playError` 冒泡成 toast。
|
||||
3. 双音频引擎：删除模块内试听 `<audio>`，试听改走 `feiniu.playPreview()`，与队列播放**共用同一个 audio 实例**，天然互斥。
|
||||
|
||||
**P1**
|
||||
4. shuffle 自动切歌：`next()` 不再区分手动/自动，随机模式下都从「待播池」抽取；新增切歌历史栈，`prev()` 在随机模式下真正回退。播放模式持久化。
|
||||
5. 缓存模式：`setCacheMode` / `clearCache` 不再调用 `clearPlayback`，改设置不中断播放。
|
||||
6. 缓存开关状态：`CacheSettings` 的开关改为 `cacheMode` 的双向 computed，删除死代码 `cacheMax`，补 `ensureCacheStatus` 刷新。
|
||||
7. `init()` 幂等化（`inited` 标志），不会再覆盖内存队列。
|
||||
8. 任务持久化：超过 1.5MB 时自动剥离 `rawSearch` / `defaultDownloadHeaders` 后重试。
|
||||
9. 上传触发：`pendingUploadOnDone` 布尔标志改为 `uploadOnDoneTaskIds` 任务集合 + `uploadedTaskIds` 去重表，每个任务最多触发一次；启动时的历史任务不触发重传。
|
||||
10. Rust 引擎下载：`startDownload` 返回 `{ engine, skipped, taskId }`；Rust 引擎不再跳到空的任务页，改为提示到「下载器」查看；「下载到飞牛 + Rust 引擎」组合直接给出可读的错误提示并阻止。
|
||||
11. 队列语义：`playItem(item, context?)` 支持以所在列表为播放上下文，解决「从大曲库点一首就只剩一首」；新增 `playNext` / `addToQueue` / `removeFromQueue`。
|
||||
12. `done` 事件幂等，`doneCount` 不再虚增；`redownloadTask` 沿用原任务音质。
|
||||
|
||||
**性能**
|
||||
13. 提交式 seek（`ScrubBar`），拖动不再触发几十次 Range 请求中断重建。
|
||||
14. 歌词行索引由 O(n) 全量扫描改为「命中缓存微调 + 未命中二分」，并缓存上次索引。
|
||||
15. 大屏背景从「整图 `blur-2xl scale-110`」改为主题色径向渐变，去掉持续 GPU 开销。
|
||||
16. 列表行去掉 reka Tooltip（改用原生 `title` + 单个 Popover 展示音质档位），500 行不再产生 1000 个组件实例。
|
||||
17. 歌词滚动用函数 ref 收集节点，不再每次 `querySelectorAll`。
|
||||
18. 播放队列增量渲染（每批 200 行）。
|
||||
19. 曲库分页 200/页 + 滚动续拉；任务明细进度条由固定 56px 改为占满剩余宽度。
|
||||
|
||||
**交互与视觉**
|
||||
20. 播放入口改到**标题栏**：移除模块内播放条与全局坞站播放条，在自定义标题栏搜索框左侧新增音乐栏（唱片图标 + 歌名，未播放过时隐藏歌名）；点击弹出方形控制窗；播放中图标替换为封面并旋转。
|
||||
21. 音乐模块顶部 tabs 改回与其余模块完全一致的写法：`<Tabs><div ref="tabsListRef"><TabsList class="grid w-full max-w-md grid-cols-4 !bg-transparent !p-0 !shadow-none">` + `TabsTrigger` + `TabsContent class="mt-4 min-h-0 flex-1 ... tab-animate"`，根节点恢复为 `h-full p-6 overflow-hidden flex flex-col`。
|
||||
22. 三级 tab 压成「模块 tab → 曲库内左侧来源树」两级。左栏由 `w-[210px]` 收窄到 `w-[168px]`，来源项的选中态对齐顶部 Tabs（`rounded-lg bg-muted` 容器 + `bg-background shadow-sm` 胶囊），歌单子树用 `border-l` 缩进 + 展开动画；右栏内容切换加 `tab-animate`（`:key="view"` 重挂载触发），不再生硬。
|
||||
23. 首屏工具栏：搜索框回到首行，下载目标 / 来源筛选 / 音质筛选收到筛选条，歌单解析收进 Popover。
|
||||
24. 列表改 44px 紧凑行：无独立边框、hover 高亮、双击整行播放、序号列悬停原位切换为播放按钮（不再出现 40px 空白列）；播放中行用 `music-eq` 跳动均衡器 + 主色文字。
|
||||
25. 音质徽标由 5 色降为单枚中性 outline 徽标 + Popover 详情。
|
||||
26. `Empty` 全部改为组件既定结构（`EmptyMedia` / `EmptyTitle` / `EmptyDescription`）。
|
||||
27. 歌单：删除语义奇怪的「移除最后一首」，改为行内「⋯」菜单的支持上移 / 下移 / 移除；新增重命名；左侧歌单列表可独立滚动。
|
||||
28. **歌单页新增「编辑音乐」**（`components/PlaylistEditorDialog.vue`）：双 Tab 编辑器——「全部音乐」按来源（全部 / 飞牛 / 本地）勾选加入，已在歌单的曲目置灰标记「已加入」不可重复勾选；「已在歌单」批量勾选移出。含搜索、全选当前列表、增量渲染（每批 120）、飞牛曲库续拉、本地未扫描时的内联扫描入口。
|
||||
29. 源分组头去掉 `sticky` 与白色底色（原 `bg-background/95 backdrop-blur` 会在浅色背景上形成白色横条）。
|
||||
30. **发现音乐每行新增「下载到飞牛」**（试听 / 下载右侧）：走新增的 Rust 命令 `feiniu_upload_from_url`，由后端边拉音源边传给 NAS，**本地不落地文件**；懒解析歌曲会先按默认音质解析真实链接，并合并 `defaultDownloadHeaders` + `defaultDownloadCookies`（过滤非 ASCII 头，避免 reqwest panic）。
|
||||
31. 设置页从「5 张卡片」改为「连接 / 存储与上传 / 播放 / 搜索与下载 / 环境与诊断（折叠）」分组，并把「NAS 文件服务登录」并入存储分组。
|
||||
32. 主题一致性：删除 `border-white/10`、`bg-white` 等硬编码；滑块、均衡器、进度条全部走 `--primary` / `--muted` / `--background` token。
|
||||
33. 连接管理图标语义修正（激活用 `CircleCheck`、登出用 `LogOut`），全部 icon-only 按钮补齐 `title` + `aria-label`。
|
||||
34. 搜索历史下拉改为 `focusin/focusout` 容器判定，Tab 键可以进入历史项。
|
||||
|
||||
### 9.2.1 飞牛上传链路：fnOS 文件服务 → WebDAV（最终形态）
|
||||
|
||||
> 演进：multipart over WS 的 fnOS 文件服务存在会话易失、握手/登录协议联调困难等问题（三轮修复：
|
||||
> WS 读写分离与 Origin → 加密登录体补 `req`/`reqid` → 登录结果双通道等待），最终整体替换为 **WebDAV**。
|
||||
|
||||
| 结论 | 说明 |
|
||||
|---|---|
|
||||
| **协议选型** | fnOS 提供的 SMB / WebDAV / FTP / NFS 中选 **WebDAV**：纯 HTTP 语义、reqwest 即可实现、Basic 认证随请求携带**无会话**（重启免登录）；SMB 的 Rust 客户端生态差、FTP 明文且被动模式易出问题、NFS 无 Windows 客户端方案 |
|
||||
| 后端实现 | `src-tauri/src/music/feiniu/webdav.rs`（`fnos.rs` 已删除）：`test`（PROPFIND Depth 0）/ `upload_file`（本地文件 128KB 分块流式 PUT）/ `delete`；上传前逐级 MKCOL 补目录 |
|
||||
| 「下载到飞牛」机制 | **与自动上传同链路**：正常走 musicdl 下载（引擎侧解析/代理/音质）→ 任务完成后扫描下载目录（下界=任务创建时刻）→ WebDAV 上传 → 删除本地音频及同名歌词/封面（`feiniu_delete_local`，扩展名白名单）→ 移除任务记录。失败时保留本地文件与任务记录供排查。早期的「URL 拉流直传」（`webdav_upload_from_url`）因可靠性不足已移除 |
|
||||
| 前端配置 | `feiniuStore.webdav = { url, username, password, dir }` 持久化 localStorage（`thing.music.feiniu.webdav`）；`webdavReady` 四项齐备才放行上传；设置页「存储与上传」分组内配置 + 「测试连接」 |
|
||||
| fnOS 侧设置 | 系统设置 → 文件服务 → WebDAV 开启（HTTP 5005 / HTTPS 5006）；目标文件夹在「可见文件夹范围」内；团队文件夹需勾选「允许通过文件共享协议挂载」；账号需读写权限（已写成设置页折叠提示） |
|
||||
| 路径语义 | 目标目录是 **WebDAV 根下的相对路径**（不是 NAS 内部绝对路径），URL 逐段百分号编码 |
|
||||
| 错误可读化 | 401 认证失败 / 403 无权限 / 404 目录不存在或不在可见范围 / 409 父目录不存在，均带上下文 |
|
||||
|
||||
### 9.3 校验
|
||||
|
||||
```
|
||||
vue-tsc --noEmit → exit 0（0 error）
|
||||
vite build → exit 0（11.5s）
|
||||
cargo check → exit 0
|
||||
```
|
||||
|
||||
### 9.4 仍未做的部分（建议后续）
|
||||
|
||||
- 键盘全局快捷键（空格播放/暂停、↑↓ 选行）——需接入项目既有快捷键体系，避免与输入框冲突。
|
||||
- 列表虚拟滚动（当前为增量渲染，千级以上仍有优化空间）。
|
||||
- 歌单拖拽排序（`vue-draggable-plus` 已在依赖中，可直接接入）。
|
||||
- 本地文件的时长 / 内嵌封面解析（当前时长列退化为文件大小）。
|
||||
- 缓存模式改为「边下边播」的双源策略（当前 `cache` 模式首播仍需等整首下完）。
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
"class-variance-authority": "^0.7.1",
|
||||
"clsx": "^2.1.1",
|
||||
"pinia": "^3.0.4",
|
||||
"pinyin-pro": "^3.28.2",
|
||||
"reka-ui": "^2.10.1",
|
||||
"tailwind-merge": "^3.6.0",
|
||||
"tailwindcss": "^4.3.2",
|
||||
@@ -381,6 +382,8 @@
|
||||
|
||||
"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=="],
|
||||
|
||||
"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=="],
|
||||
|
||||
"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=="],
|
||||
|
||||
@@ -0,0 +1,430 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>音乐模块 · 界面改版对照稿</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
:root{
|
||||
--bg:#f4f4f5; --panel:#ffffff; --panel-2:#fafafa; --line:#e7e7e9; --line-2:#f0f0f1;
|
||||
--fg:#18181b; --fg-2:#71717a; --fg-3:#a1a1aa;
|
||||
--primary:#18181b; --primary-fg:#fafafa; --accent:#f4f4f5;
|
||||
--ok:#0f7b4f; --warn:#9a3412; --err:#b91c1c;
|
||||
}
|
||||
body{
|
||||
font-family: system-ui,-apple-system,"Segoe UI","Microsoft YaHei","PingFang SC",sans-serif;
|
||||
background:var(--bg); color:var(--fg); font-size:13px; line-height:1.55; padding:28px 20px 60px;
|
||||
-webkit-font-smoothing:antialiased;
|
||||
}
|
||||
.wrap{ max-width:1180px; margin:0 auto; }
|
||||
h1{ font-size:19px; font-weight:600; letter-spacing:-.01em; }
|
||||
.sub{ color:var(--fg-2); font-size:12.5px; margin-top:4px; }
|
||||
.toolbar{ display:flex; align-items:center; gap:10px; margin:18px 0 14px; flex-wrap:wrap; }
|
||||
.seg{ display:inline-flex; background:#e9e9eb; border-radius:8px; padding:3px; gap:2px; }
|
||||
.seg button{
|
||||
border:0; background:transparent; font:inherit; font-size:12.5px; color:var(--fg-2);
|
||||
padding:6px 14px; border-radius:6px; cursor:pointer; transition:.15s;
|
||||
}
|
||||
.seg button.on{ background:#fff; color:var(--fg); font-weight:500; box-shadow:0 1px 2px rgba(0,0,0,.08); }
|
||||
.hint{ color:var(--fg-3); font-size:12px; }
|
||||
|
||||
/* ---------- window frame ---------- */
|
||||
.win{
|
||||
background:var(--panel); border:1px solid var(--line); border-radius:11px; overflow:hidden;
|
||||
box-shadow:0 8px 28px rgba(0,0,0,.07); display:flex; flex-direction:column; height:640px;
|
||||
}
|
||||
.titlebar{
|
||||
height:38px; flex:0 0 38px; display:flex; align-items:center; gap:8px; padding:0 12px;
|
||||
background:var(--panel-2); border-bottom:1px solid var(--line);
|
||||
}
|
||||
.dots{ display:flex; gap:5px; }
|
||||
.dots i{ width:9px; height:9px; border-radius:50%; background:#dcdce0; display:block; }
|
||||
.tb-title{ font-size:12px; color:var(--fg-2); margin-left:6px; }
|
||||
.tb-tabs{ margin-left:auto; display:flex; gap:4px; }
|
||||
.tb-tabs span{ font-size:11px; color:var(--fg-2); padding:3px 9px; border-radius:5px; }
|
||||
.tb-tabs span.on{ background:#e9e9eb; color:var(--fg); }
|
||||
.body{ flex:1; display:flex; min-height:0; }
|
||||
|
||||
/* ---------- left module rail ---------- */
|
||||
.rail{
|
||||
width:52px; flex:0 0 52px; border-right:1px solid var(--line); background:var(--panel-2);
|
||||
display:flex; flex-direction:column; align-items:center; gap:4px; padding:10px 0;
|
||||
}
|
||||
.rail i{
|
||||
width:32px; height:32px; border-radius:8px; background:#ececed; display:grid; place-items:center;
|
||||
font-size:12px; color:var(--fg-2); font-style:normal;
|
||||
}
|
||||
.rail i.on{ background:var(--primary); color:#fff; }
|
||||
|
||||
/* ---------- source tree ---------- */
|
||||
.tree{ width:186px; flex:0 0 186px; border-right:1px solid var(--line); padding:12px 10px; background:var(--panel); }
|
||||
.tree h4{ font-size:11px; color:var(--fg-3); font-weight:500; padding:6px 8px 4px; letter-spacing:.03em; }
|
||||
.tree a{
|
||||
display:flex; align-items:center; gap:8px; padding:6px 8px; border-radius:6px;
|
||||
color:var(--fg-2); text-decoration:none; font-size:12.5px; margin-bottom:1px;
|
||||
}
|
||||
.tree a.on{ background:#ececed; color:var(--fg); font-weight:500; }
|
||||
.tree a b{ margin-left:auto; font-weight:400; font-size:11px; color:var(--fg-3); }
|
||||
|
||||
/* ---------- main ---------- */
|
||||
.main{ flex:1; min-width:0; display:flex; flex-direction:column; background:var(--panel); }
|
||||
.main-head{ padding:12px 16px 10px; border-bottom:1px solid var(--line-2); display:flex; align-items:center; gap:8px; }
|
||||
.field{
|
||||
height:30px; border:1px solid var(--line); border-radius:7px; background:#fff;
|
||||
display:flex; align-items:center; padding:0 10px; color:var(--fg-3); font-size:12.5px; flex:1; max-width:330px;
|
||||
}
|
||||
.btn{ height:30px; padding:0 12px; border-radius:7px; border:1px solid var(--line); background:#fff; color:var(--fg); font-size:12.5px; display:inline-flex; align-items:center; gap:5px; }
|
||||
.btn.dark{ background:var(--primary); color:#fff; border-color:var(--primary); }
|
||||
.main-body{ flex:1; min-height:0; overflow:hidden; }
|
||||
.thead{
|
||||
display:grid; grid-template-columns:34px 44px minmax(0,3fr) minmax(0,2fr) 52px 34px;
|
||||
gap:10px; align-items:center; padding:6px 16px; border-bottom:1px solid var(--line-2);
|
||||
font-size:11px; color:var(--fg-3);
|
||||
}
|
||||
.row{
|
||||
display:grid; grid-template-columns:34px 44px minmax(0,3fr) minmax(0,2fr) 52px 34px;
|
||||
gap:10px; align-items:center; padding:5px 16px; height:44px; border-bottom:1px solid var(--line-2);
|
||||
}
|
||||
.row:hover{ background:var(--accent); }
|
||||
.row.on{ background:#f4f4f5; }
|
||||
.row.on .t1{ color:var(--fg); font-weight:500; }
|
||||
.idx{ font-size:11.5px; color:var(--fg-3); text-align:right; }
|
||||
.eq{ display:flex; align-items:flex-end; gap:2px; height:12px; }
|
||||
.eq i{ width:2.5px; background:var(--primary); border-radius:1px; display:block; }
|
||||
.eq i:nth-child(1){ height:5px } .eq i:nth-child(2){ height:11px } .eq i:nth-child(3){ height:8px }
|
||||
.cov{ width:36px; height:36px; border-radius:6px; background:#e9e9eb; }
|
||||
.t1{ font-size:13px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
|
||||
.t2{ font-size:11.5px; color:var(--fg-2); white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
|
||||
.tag{ font-size:10px; padding:1px 6px; border-radius:4px; border:1px solid var(--line); color:var(--fg-2); white-space:nowrap; }
|
||||
.tag.solid{ background:#ececed; border-color:transparent; }
|
||||
.dur{ font-size:11.5px; color:var(--fg-3); font-variant-numeric:tabular-nums; text-align:right; }
|
||||
.more{ color:var(--fg-3); text-align:center; opacity:0; }
|
||||
.row:hover .more{ opacity:1; }
|
||||
|
||||
/* ---------- right now playing ---------- */
|
||||
.np{ width:250px; flex:0 0 250px; border-left:1px solid var(--line); padding:16px; display:flex; flex-direction:column; gap:12px; background:var(--panel); }
|
||||
.np-cover{ width:100%; aspect-ratio:1; border-radius:10px; background:linear-gradient(150deg,#e8e8ea,#d6d6da); }
|
||||
.np h3{ font-size:14px; font-weight:500; }
|
||||
.np p{ font-size:12px; color:var(--fg-2); }
|
||||
.lyric{ display:flex; flex-direction:column; gap:7px; margin-top:4px; }
|
||||
.lyric span{ font-size:12.5px; color:var(--fg-3); }
|
||||
.lyric span.on{ font-size:14px; color:var(--fg); font-weight:500; }
|
||||
|
||||
/* ---------- player bar ---------- */
|
||||
.player{
|
||||
flex:0 0 72px; height:72px; border-top:1px solid var(--line); background:rgba(255,255,255,.92);
|
||||
backdrop-filter:blur(12px); display:flex; align-items:center; gap:14px; padding:0 16px;
|
||||
}
|
||||
.pl-left{ width:236px; flex:0 0 236px; display:flex; align-items:center; gap:10px; min-width:0; }
|
||||
.pl-left .cov{ width:44px; height:44px; border-radius:6px; }
|
||||
.pl-mid{ flex:1; min-width:0; display:flex; flex-direction:column; align-items:center; gap:4px; }
|
||||
.pl-ctrl{ display:flex; align-items:center; gap:16px; color:var(--fg-2); }
|
||||
.pl-play{ width:34px; height:34px; border-radius:50%; background:var(--primary); color:#fff; display:grid; place-items:center; font-size:11px; }
|
||||
.pl-seek{ width:100%; max-width:520px; display:flex; align-items:center; gap:8px; }
|
||||
.pl-seek .time{ font-size:10.5px; color:var(--fg-3); font-variant-numeric:tabular-nums; width:34px; }
|
||||
.track{ flex:1; height:4px; border-radius:2px; background:#e4e4e7; position:relative; }
|
||||
.track .buf{ position:absolute; inset:0 auto 0 0; width:34%; background:#d4d4d8; border-radius:2px; }
|
||||
.track .fill{ position:absolute; inset:0 auto 0 0; width:22%; background:var(--primary); border-radius:2px; }
|
||||
.track .knob{ position:absolute; left:22%; top:50%; width:10px; height:10px; margin:-5px 0 0 -5px; border-radius:50%; background:var(--primary); }
|
||||
.pl-right{ width:196px; flex:0 0 196px; display:flex; align-items:center; justify-content:flex-end; gap:10px; color:var(--fg-2); }
|
||||
.vol{ width:76px; height:4px; border-radius:2px; background:#e4e4e7; position:relative; }
|
||||
.vol i{ position:absolute; inset:0 auto 0 0; width:70%; background:var(--primary); border-radius:2px; display:block; }
|
||||
|
||||
/* ---------- before view ---------- */
|
||||
.before-pad{ padding:22px 22px 0; flex:1; min-height:0; display:flex; flex-direction:column; gap:14px; overflow:hidden; }
|
||||
.b-tabs{ display:grid; grid-template-columns:repeat(4,1fr); max-width:430px; background:#ececed; border-radius:8px; padding:3px; font-size:12.5px; text-align:center; }
|
||||
.b-tabs span{ padding:5px 0; border-radius:6px; color:var(--fg-2); }
|
||||
.b-tabs span.on{ background:#fff; color:var(--fg); font-weight:500; }
|
||||
.b-card{ border:1px solid var(--line); border-radius:9px; padding:9px 12px; display:flex; align-items:center; gap:10px; font-size:12.5px; }
|
||||
.b-card.muted{ background:#fafafa; }
|
||||
.b-row{ border:1px solid var(--line); border-radius:9px; padding:9px 11px; display:flex; align-items:center; gap:11px; margin-bottom:7px; }
|
||||
.b-sub{ display:inline-flex; gap:3px; background:#ececed; border-radius:7px; padding:3px; font-size:12px; }
|
||||
.b-sub span{ padding:4px 11px; border-radius:5px; color:var(--fg-2); }
|
||||
.b-sub span.on{ background:var(--primary); color:#fff; }
|
||||
.b-player{ border-top:1px solid var(--line); margin:0 22px; padding:10px 0; display:flex; align-items:center; gap:12px; }
|
||||
.mark{
|
||||
width:17px; height:17px; border-radius:50%; background:#b91c1c; color:#fff; font-size:10.5px;
|
||||
display:inline-grid; place-items:center; flex:0 0 17px; font-weight:500;
|
||||
}
|
||||
.mark.g{ background:#0f7b4f; }
|
||||
.mark.amber{ background:#b45309; }
|
||||
|
||||
/* ---------- legend ---------- */
|
||||
.legend{ margin-top:20px; display:grid; grid-template-columns:repeat(auto-fit,minmax(310px,1fr)); gap:10px; }
|
||||
.li{ background:#fff; border:1px solid var(--line); border-radius:9px; padding:11px 13px; display:flex; gap:10px; }
|
||||
.li b{ display:block; font-size:12.5px; font-weight:500; margin-bottom:2px; }
|
||||
.li p{ font-size:12px; color:var(--fg-2); }
|
||||
.hide{ display:none !important; }
|
||||
.note{ font-size:11.5px; color:var(--fg-3); margin-top:6px; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="wrap">
|
||||
<h1>音乐模块 · 界面改版对照稿</h1>
|
||||
<p class="sub">左边是当前实现的实际问题，右边是按建议方案重排后的目标形态。改版要点见下方图例。</p>
|
||||
|
||||
<div class="toolbar">
|
||||
<div class="seg" id="seg">
|
||||
<button data-v="before" class="on">当前实现</button>
|
||||
<button data-v="after">建议方案</button>
|
||||
</div>
|
||||
<span class="hint" id="hint">红/橙标记 = 缺陷位置</span>
|
||||
</div>
|
||||
|
||||
<!-- ================= BEFORE ================= -->
|
||||
<div class="win" id="view-before">
|
||||
<div class="titlebar">
|
||||
<div class="dots"><i></i><i></i><i></i></div>
|
||||
<span class="tb-title">Thing</span>
|
||||
<div class="tb-tabs"><span class="on">我的音乐</span><span>发现音乐</span><span>下载任务</span><span>设置</span></div>
|
||||
</div>
|
||||
<div class="body">
|
||||
<div class="rail">
|
||||
<i class="on">音</i><i>载</i><i>监</i><i>代</i><i>设</i>
|
||||
</div>
|
||||
<div class="before-pad">
|
||||
<div style="display:flex;align-items:center;gap:10px">
|
||||
<div class="b-tabs">
|
||||
<span class="on">我的音乐</span><span>发现音乐</span><span>下载任务</span><span>设置</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;align-items:center;gap:10px">
|
||||
<span class="b-sub"><span class="on">飞牛曲库</span><span>本地曲库</span><span>我的歌单</span></span>
|
||||
<span class="hint">← 第二套切换控件，与上一行风格不同</span>
|
||||
<span class="mark" style="margin-left:auto">3</span>
|
||||
</div>
|
||||
|
||||
<div class="b-card">
|
||||
<span class="hint">下载到</span>
|
||||
<span class="tag">本地目录 ▾</span>
|
||||
<span class="hint">下载到本地目录（musicdl）</span>
|
||||
<span class="mark" style="margin-left:auto">1</span>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;gap:8px;align-items:center">
|
||||
<div class="field" style="max-width:none">输入歌名 / 歌手 / 专辑关键词</div>
|
||||
<span class="tag">已选 3 个源 ▾</span>
|
||||
<span class="btn dark">搜索</span>
|
||||
</div>
|
||||
|
||||
<div class="b-card muted">
|
||||
<span class="hint">粘贴歌单链接（网易云 / QQ 音乐等）</span>
|
||||
<span class="btn" style="margin-left:auto">解析歌单</span>
|
||||
</div>
|
||||
|
||||
<div style="margin-top:2px">
|
||||
<div class="b-row">
|
||||
<span class="tag">☐</span><div class="cov" style="width:38px;height:38px"></div>
|
||||
<div style="flex:1;min-width:0">
|
||||
<div class="t1">海阔天空 <span class="tag" style="color:#7c3aed">无损 flac 32.4 MB</span> <span class="tag" style="color:#0369a1">320K mp3</span> <span class="tag">+2</span></div>
|
||||
<div class="t2">Beyond · 乐与怒</div>
|
||||
</div>
|
||||
<span class="tag">05:21</span><span class="tag">▷</span><span class="tag">⤓</span>
|
||||
<span class="mark">2</span><span class="mark">5</span>
|
||||
</div>
|
||||
<div class="b-row">
|
||||
<span class="tag">☐</span><div class="cov" style="width:38px;height:38px"></div>
|
||||
<div style="flex:1;min-width:0">
|
||||
<div class="t1">光辉岁月 <span class="tag" style="color:#b45309">Hi-Res flac 96.1 MB</span> <span class="tag" style="color:#a16207">192K mp3</span></div>
|
||||
<div class="t2">Beyond · 命运派对</div>
|
||||
</div>
|
||||
<span class="tag">04:58</span><span class="tag">▷</span><span class="tag">⤓</span>
|
||||
<span class="mark">2</span>
|
||||
</div>
|
||||
<div class="b-row">
|
||||
<span class="tag">☐</span><div class="cov" style="width:38px;height:38px"></div>
|
||||
<div style="flex:1;min-width:0">
|
||||
<div class="t1">喜欢你</div><div class="t2">Beyond · 秘密警察</div>
|
||||
</div>
|
||||
<span class="tag">04:35</span><span class="tag">▷</span><span class="tag">⤓</span>
|
||||
<span class="mark">6</span>
|
||||
</div>
|
||||
<span class="note">每行都是独立圆角卡片 + 8px 间距；一行内 6~8 个视觉元素，彩色徽标抢过歌名。</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="b-player">
|
||||
<div class="cov" style="width:44px;height:44px;border-radius:6px"></div>
|
||||
<div style="min-width:0;max-width:150px">
|
||||
<div class="t1">未播放</div><div class="t2">选择一首歌曲开始播放</div>
|
||||
</div>
|
||||
<div style="flex:1;display:flex;flex-direction:column;align-items:center;gap:4px">
|
||||
<div class="pl-ctrl" style="font-size:13px"><span>⟳</span><span>⏮</span><span class="pl-play">▶</span><span>⏭</span><span>☰</span></div>
|
||||
<div class="pl-seek" style="max-width:360px">
|
||||
<span class="time">--:--</span>
|
||||
<div class="track"><div class="fill" style="width:0"></div><div class="knob" style="left:0"></div></div>
|
||||
<span class="time">--:--</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pl-right"><span>🔊</span><div class="vol"><i></i></div><span>词</span><span>⤢</span></div>
|
||||
<span class="mark" style="position:absolute">4</span>
|
||||
</div>
|
||||
<div style="position:relative">
|
||||
<span class="mark" style="position:absolute;right:14px;bottom:44px">7</span>
|
||||
<span class="mark" style="position:absolute;left:14px;bottom:60px">8</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ================= AFTER ================= -->
|
||||
<div class="win hide" id="view-after">
|
||||
<div class="titlebar">
|
||||
<div class="dots"><i></i><i></i><i></i></div>
|
||||
<span class="tb-title">Thing</span>
|
||||
<div class="tb-tabs"><span class="on">曲库</span><span>发现音乐</span><span>下载任务</span><span>设置</span></div>
|
||||
<span class="mark g" style="margin-left:8px">3</span>
|
||||
</div>
|
||||
<div class="body">
|
||||
<div class="rail">
|
||||
<i class="on">音</i><i>载</i><i>监</i><i>代</i><i>设</i>
|
||||
</div>
|
||||
|
||||
<div class="tree">
|
||||
<h4>曲库</h4>
|
||||
<a class="on">飞牛曲库 <b>1.2k</b></a>
|
||||
<a>本地曲库 <b>318</b></a>
|
||||
<a>我的歌单 <b>7</b></a>
|
||||
<h4>其他</h4>
|
||||
<a>发现音乐</a>
|
||||
<a>下载任务 <b>2</b></a>
|
||||
<a>设置</a>
|
||||
<span class="mark g" style="margin:10px 0 0 8px">3</span>
|
||||
</div>
|
||||
|
||||
<div class="main">
|
||||
<div class="main-head">
|
||||
<div class="field">搜索歌名 / 歌手 / 专辑</div>
|
||||
<span class="tag">全部来源 ▾</span>
|
||||
<span class="tag">全部音质 ▾</span>
|
||||
<span class="btn" style="margin-left:auto">排序 ▾</span>
|
||||
<span class="btn">扫描本地</span>
|
||||
<span class="btn dark">▶ 播放全部</span>
|
||||
<span class="mark g" style="margin-left:6px">1</span>
|
||||
</div>
|
||||
<div class="main-body">
|
||||
<div class="thead">
|
||||
<span style="text-align:right">#</span><span></span><span>标题</span><span>专辑</span><span style="text-align:right">时长</span><span></span>
|
||||
</div>
|
||||
<div class="row on">
|
||||
<span class="idx"><span class="eq"><i></i><i></i><i></i></span></span>
|
||||
<div class="cov"></div>
|
||||
<div style="min-width:0">
|
||||
<div class="t1">海阔天空</div>
|
||||
<div class="t2">Beyond · 1993</div>
|
||||
</div>
|
||||
<div class="t2">乐与怒</div>
|
||||
<span class="dur">05:21</span>
|
||||
<span class="more">⋯</span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<span class="idx">2</span>
|
||||
<div class="cov"></div>
|
||||
<div style="min-width:0"><div class="t1">光辉岁月</div><div class="t2">Beyond</div></div>
|
||||
<div class="t2">命运派对</div>
|
||||
<span class="dur">04:58</span>
|
||||
<span class="more">⋯</span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<span class="idx">3</span>
|
||||
<div class="cov"></div>
|
||||
<div style="min-width:0"><div class="t1">喜欢你</div><div class="t2">Beyond</div></div>
|
||||
<div class="t2">秘密警察</div>
|
||||
<span class="dur">04:35</span>
|
||||
<span class="more">⋯</span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<span class="idx">4</span>
|
||||
<div class="cov"></div>
|
||||
<div style="min-width:0"><div class="t1">冷雨夜</div><div class="t2">Beyond</div></div>
|
||||
<div class="t2">现代舞台</div>
|
||||
<span class="dur">04:12</span>
|
||||
<span class="more">⋯</span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<span class="idx">5</span>
|
||||
<div class="cov"></div>
|
||||
<div style="min-width:0"><div class="t1">真的爱你</div><div class="t2">Beyond</div></div>
|
||||
<div class="t2">Beyond IV</div>
|
||||
<span class="dur">04:41</span>
|
||||
<span class="more">⋯</span>
|
||||
</div>
|
||||
<div style="padding:8px 16px" class="note">
|
||||
行高 44px、无独立边框、hover 高亮、双击整行播放；播放中行用主色竖条 + 均衡器表示，不再用“选中框”。
|
||||
<span class="mark g">2</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="np">
|
||||
<div class="np-cover"></div>
|
||||
<div>
|
||||
<h3>海阔天空</h3>
|
||||
<p>Beyond · 乐与怒</p>
|
||||
</div>
|
||||
<div class="track" style="height:4px"><div class="fill" style="width:38%"></div><div class="knob" style="left:38%"></div></div>
|
||||
<div class="lyric">
|
||||
<span>今天我 寒夜里看雪飘过</span>
|
||||
<span>怀着冷却了的心窝漂远方</span>
|
||||
<span class="on">风雨里追赶 雾里分不清影踪</span>
|
||||
<span>天空海阔你与我</span>
|
||||
<span>可会变（谁没在变）</span>
|
||||
</div>
|
||||
<span class="note">右栏“正在播放”可折叠（窄窗口自动收起）</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="player">
|
||||
<div class="pl-left">
|
||||
<div class="cov"></div>
|
||||
<div style="min-width:0">
|
||||
<div class="t1">海阔天空</div>
|
||||
<div class="t2">Beyond · 乐与怒</div>
|
||||
</div>
|
||||
<span class="mark g" style="margin-left:auto">4</span>
|
||||
</div>
|
||||
<div class="pl-mid">
|
||||
<div class="pl-ctrl"><span>🔀</span><span>⏮</span><span class="pl-play">❚❚</span><span>⏭</span><span>☰</span></div>
|
||||
<div class="pl-seek">
|
||||
<span class="time">01:12</span>
|
||||
<div class="track"><div class="buf"></div><div class="fill"></div><div class="knob"></div></div>
|
||||
<span class="time">05:21</span>
|
||||
</div>
|
||||
<span class="note" style="margin:0">拖动只更新预览，松手才 seek；轨道含缓冲层，hover 加粗到 8px</span>
|
||||
</div>
|
||||
<div class="pl-right">
|
||||
<span class="mark g">5</span>
|
||||
<span>🔊</span><div class="vol"><i></i></div><span>詞</span><span>⤢</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="legend" id="legend">
|
||||
<div class="li"><span class="mark">1</span><div><b>首屏信息层级</b><p>“下载到 本地/飞牛”不再独占一行卡片，收进工具栏；搜索框回到首行黄金位置。</p></div></div>
|
||||
<div class="li"><span class="mark">2</span><div><b>列表密度与徽标降噪</b><p>卡片堆 → 44px 紧凑表格行；音质徽标从 5 色降为 1 类中性 outline，档位详情收进 ⋯ 菜单。</p></div></div>
|
||||
<div class="li"><span class="mark">3</span><div><b>两级横向 Tab → 左侧来源树</b><p>模块级 Tab + 子 Tab 合并为一条来源树，导航层级从三层降到两层。</p></div></div>
|
||||
<div class="li"><span class="mark g">4</span><div><b>播放条全宽贴底</b><p>MiniPlayer 提升到 App 全局层：任何模块都能控制播放；离开音乐模块不再丢失控制入口。</p></div></div>
|
||||
<div class="li"><span class="mark g">5</span><div><b>进度与音量交互</b><p>提交式 seek + 缓冲进度层；音量图标可点静音；滑块配色改走主题 token（原为硬编码纯白）。</p></div></div>
|
||||
<div class="li"><span class="mark">6</span><div><b>来源与来源标识统一</b><p>本地/NAS/歌单混排时用统一图标标识来源，不再靠行内小标签。</p></div></div>
|
||||
<div class="li"><span class="mark">7</span><div><b>内边距不对称</b><p>模块左 28px / 右 40px（含滚动条），卡片右边距明显偏窄；统一为 24px 并保留滚动条槽位。</p></div></div>
|
||||
<div class="li"><span class="mark">8</span><div><b>播放条未贴底</b><p>被模块 p-6 包住，分隔线左右各缩进 24px，读作“漂浮卡片”而非底部坞站。</p></div></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
var seg = document.getElementById('seg');
|
||||
var before = document.getElementById('view-before');
|
||||
var after = document.getElementById('view-after');
|
||||
var hint = document.getElementById('hint');
|
||||
seg.addEventListener('click', function (e) {
|
||||
var b = e.target.closest('button');
|
||||
if (!b) return;
|
||||
var v = b.getAttribute('data-v');
|
||||
seg.querySelectorAll('button').forEach(function (x) { x.classList.toggle('on', x === b); });
|
||||
before.classList.toggle('hide', v !== 'before');
|
||||
after.classList.toggle('hide', v !== 'after');
|
||||
hint.textContent = v === 'before' ? '红/橙标记 = 缺陷位置' : '绿色标记 = 改版要点';
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "thing",
|
||||
"private": true,
|
||||
"version": "26.8.5",
|
||||
"version": "26.9.1",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
import sys, importlib.util
|
||||
sys.stdout.reconfigure(encoding="utf-8")
|
||||
from musicdl.modules.sources.qq import QQMusicClient
|
||||
from musicdl.modules.sources.netease import NeteaseMusicClient
|
||||
from musicdl.modules.sources.kugou import KugouMusicClient
|
||||
from musicdl.modules.utils.qqutils import SongFileType
|
||||
# find MUSIC_QUALITIES in source modules
|
||||
for mod in (QQMusicClient, NeteaseMusicClient, KugouMusicClient):
|
||||
src = mod.__module__
|
||||
m = getattr(mod, 'source', '?')
|
||||
names = [x for x in mod.__init__.__globals__.keys() if 'QUALIT' in x.upper()]
|
||||
print("SRC", m, "quality-names-in-globals:", names)
|
||||
for n in names:
|
||||
v = mod.__init__.__globals__[n]
|
||||
print(" ", n, "=", v)
|
||||
print("QQ SORTED_QUALITIES:", SongFileType.SORTED_QUALITIES.value)
|
||||
@@ -0,0 +1,21 @@
|
||||
import sys, json, importlib.util
|
||||
sys.stdout.reconfigure(encoding="utf-8")
|
||||
spec = importlib.util.spec_from_file_location("bridge", r"d:\Atie\Gitea\Thing\src-tauri\src\music\bridge.py")
|
||||
b = importlib.util.module_from_spec(spec); spec.loader.exec_module(b)
|
||||
client = b.get_client(["QQMusicClient"])
|
||||
res = client.search("海阔天空")
|
||||
s = res["QQMusicClient"][0]
|
||||
rs = (s.raw_data or {}).get("search")
|
||||
src = b._get_resolve_client("QQMusicClient")
|
||||
print("raw song:", s.song_name, "| id", s.identifier)
|
||||
# official alone, lossless_quality_is_sufficient=False, no cap
|
||||
from musicdl.modules.utils.data import SongInfo
|
||||
official = src._parsewithofficialapiv1
|
||||
r2 = official(search_result=rs, song_info_flac=SongInfo(source="QQMusicClient"), lossless_quality_is_sufficient=False)
|
||||
print("official-only uncapped -> ext=", getattr(r2,"ext",None), "valid=", getattr(r2,"with_valid_download_url",None))
|
||||
for target in ("", "最高", "无损", "320K", "128K"):
|
||||
r = b._resolve_song(src, rs, target)
|
||||
print("target=%r ->" % target, "ext=", getattr(r,"ext",None), "bitrate=", getattr(r,"bitrate",None), "valid=", getattr(r,"with_valid_download_url",None))
|
||||
# verify constant restored
|
||||
import musicdl.modules.utils.qqutils as qq
|
||||
print("restored SORTED len:", len(qq.SongFileType.SORTED_QUALITIES.value))
|
||||
Generated
+245
-2
@@ -515,6 +515,12 @@ version = "0.23.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
|
||||
|
||||
[[package]]
|
||||
name = "base64ct"
|
||||
version = "1.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
|
||||
|
||||
[[package]]
|
||||
name = "bit-set"
|
||||
version = "0.8.0"
|
||||
@@ -566,6 +572,15 @@ dependencies = [
|
||||
"generic-array 0.14.7",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block-padding"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
|
||||
dependencies = [
|
||||
"generic-array 0.14.7",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block2"
|
||||
version = "0.6.2"
|
||||
@@ -748,6 +763,15 @@ dependencies = [
|
||||
"toml 0.9.12+spec-1.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cbc"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
|
||||
dependencies = [
|
||||
"cipher",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.67"
|
||||
@@ -908,6 +932,12 @@ dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "const-oid"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
|
||||
|
||||
[[package]]
|
||||
name = "const_panic"
|
||||
version = "0.2.17"
|
||||
@@ -1192,6 +1222,17 @@ version = "0.1.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2"
|
||||
|
||||
[[package]]
|
||||
name = "der"
|
||||
version = "0.7.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
|
||||
dependencies = [
|
||||
"const-oid",
|
||||
"pem-rfc7468",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "deranged"
|
||||
version = "0.5.8"
|
||||
@@ -1240,6 +1281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
|
||||
dependencies = [
|
||||
"block-buffer",
|
||||
"const-oid",
|
||||
"crypto-common",
|
||||
"subtle",
|
||||
]
|
||||
@@ -2619,6 +2661,7 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
|
||||
dependencies = [
|
||||
"block-padding",
|
||||
"generic-array 0.14.7",
|
||||
]
|
||||
|
||||
@@ -2822,6 +2865,18 @@ dependencies = [
|
||||
"unicode-segmentation",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "keyring"
|
||||
version = "3.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"log",
|
||||
"windows-sys 0.60.2",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "kqueue"
|
||||
version = "1.2.0"
|
||||
@@ -2847,6 +2902,9 @@ name = "lazy_static"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||
dependencies = [
|
||||
"spin",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "leaky-bucket"
|
||||
@@ -2908,6 +2966,12 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libm"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
|
||||
|
||||
[[package]]
|
||||
name = "libredox"
|
||||
version = "0.1.18"
|
||||
@@ -3324,6 +3388,16 @@ version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
|
||||
|
||||
[[package]]
|
||||
name = "md-5"
|
||||
version = "0.10.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"digest",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.8.3"
|
||||
@@ -3570,6 +3644,22 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-bigint-dig"
|
||||
version = "0.8.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"libm",
|
||||
"num-integer",
|
||||
"num-iter",
|
||||
"num-traits",
|
||||
"rand 0.8.8",
|
||||
"smallvec",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-complex"
|
||||
version = "0.2.4"
|
||||
@@ -3623,6 +3713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"libm",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3989,6 +4080,15 @@ dependencies = [
|
||||
"hmac",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pem-rfc7468"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
|
||||
dependencies = [
|
||||
"base64ct",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "percent-encoding"
|
||||
version = "2.3.2"
|
||||
@@ -4065,6 +4165,27 @@ dependencies = [
|
||||
"futures-io",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pkcs1"
|
||||
version = "0.7.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
|
||||
dependencies = [
|
||||
"der",
|
||||
"pkcs8",
|
||||
"spki",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pkcs8"
|
||||
version = "0.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
|
||||
dependencies = [
|
||||
"der",
|
||||
"spki",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.33"
|
||||
@@ -4346,13 +4467,24 @@ version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha 0.3.1",
|
||||
"rand_core 0.6.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
|
||||
dependencies = [
|
||||
"rand_chacha",
|
||||
"rand_chacha 0.9.0",
|
||||
"rand_core 0.9.5",
|
||||
]
|
||||
|
||||
@@ -4367,6 +4499,16 @@ dependencies = [
|
||||
"rand_core 0.10.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core 0.6.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.9.0"
|
||||
@@ -4377,6 +4519,15 @@ dependencies = [
|
||||
"rand_core 0.9.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||
dependencies = [
|
||||
"getrandom 0.2.17",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.9.5"
|
||||
@@ -4547,6 +4698,7 @@ dependencies = [
|
||||
"js-sys",
|
||||
"log",
|
||||
"mime",
|
||||
"mime_guess",
|
||||
"native-tls",
|
||||
"percent-encoding",
|
||||
"pin-project-lite",
|
||||
@@ -4666,6 +4818,26 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rsa"
|
||||
version = "0.9.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d"
|
||||
dependencies = [
|
||||
"const-oid",
|
||||
"digest",
|
||||
"num-bigint-dig",
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
"pkcs1",
|
||||
"pkcs8",
|
||||
"rand_core 0.6.4",
|
||||
"signature",
|
||||
"spki",
|
||||
"subtle",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rusqlite"
|
||||
version = "0.32.1"
|
||||
@@ -5167,6 +5339,16 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signature"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
|
||||
dependencies = [
|
||||
"digest",
|
||||
"rand_core 0.6.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "simd-adler32"
|
||||
version = "0.3.9"
|
||||
@@ -5327,6 +5509,12 @@ dependencies = [
|
||||
"specta",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "spin"
|
||||
version = "0.9.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e"
|
||||
|
||||
[[package]]
|
||||
name = "spinning_top"
|
||||
version = "0.3.0"
|
||||
@@ -5336,6 +5524,16 @@ dependencies = [
|
||||
"lock_api",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "spki"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
|
||||
dependencies = [
|
||||
"base64ct",
|
||||
"der",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stable_deref_trait"
|
||||
version = "1.2.1"
|
||||
@@ -5951,24 +6149,32 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "thing"
|
||||
version = "26.8.5"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"axum 0.7.9",
|
||||
"base64 0.22.1",
|
||||
"bytes",
|
||||
"cbc",
|
||||
"chrono",
|
||||
"dirs 5.0.1",
|
||||
"futures-util",
|
||||
"hmac",
|
||||
"image",
|
||||
"keyring",
|
||||
"librqbit",
|
||||
"md-5",
|
||||
"notify",
|
||||
"rand 0.8.8",
|
||||
"raw-window-handle",
|
||||
"regex",
|
||||
"reqwest 0.12.28",
|
||||
"rsa",
|
||||
"rusqlite",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_yaml",
|
||||
"sha2",
|
||||
"specta",
|
||||
"specta-typescript",
|
||||
"sysinfo",
|
||||
@@ -5982,6 +6188,7 @@ dependencies = [
|
||||
"tauri-plugin-snap-layout",
|
||||
"tauri-specta",
|
||||
"tokio",
|
||||
"tokio-tungstenite",
|
||||
"url",
|
||||
"walkdir",
|
||||
"windows 0.52.0",
|
||||
@@ -6156,6 +6363,18 @@ dependencies = [
|
||||
"tokio-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-tungstenite"
|
||||
version = "0.24.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
|
||||
dependencies = [
|
||||
"futures-util",
|
||||
"log",
|
||||
"tokio",
|
||||
"tungstenite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-util"
|
||||
version = "0.7.18"
|
||||
@@ -6395,6 +6614,24 @@ version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
||||
|
||||
[[package]]
|
||||
name = "tungstenite"
|
||||
version = "0.24.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"bytes",
|
||||
"data-encoding",
|
||||
"http",
|
||||
"httparse",
|
||||
"log",
|
||||
"rand 0.8.8",
|
||||
"sha1",
|
||||
"thiserror 1.0.69",
|
||||
"utf-8",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typeid"
|
||||
version = "1.0.3"
|
||||
@@ -6526,6 +6763,12 @@ dependencies = [
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "utf-8"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
|
||||
|
||||
[[package]]
|
||||
name = "utf8_iter"
|
||||
version = "1.0.4"
|
||||
|
||||
+19
-10
File diff suppressed because one or more lines are too long
@@ -63,6 +63,10 @@ pub mod events {
|
||||
pub const SCROLL_CANCELLED: &str = "screenshot-scroll-cancelled";
|
||||
// 内核安装进度
|
||||
pub const KERNEL_INSTALL_PROGRESS: &str = "kernel-install-progress";
|
||||
// 音乐模块：Python 便携运行时安装进度
|
||||
pub const MUSIC_RUNTIME_INSTALL_PROGRESS: &str = "music-runtime-install-progress";
|
||||
// 音乐模块：下载任务事件（桥接事件行 → 前端，负载见 bridge.py _emit_event）
|
||||
pub const MUSIC_DOWNLOAD_EVENT: &str = "music-download-event";
|
||||
// 后端自动切换节点完成（前端据以刷新节点列表并提示）
|
||||
pub const PROXY_AUTO_SWITCH: &str = "proxy-auto-switch";
|
||||
// 应用更新进度
|
||||
|
||||
+57
-2
@@ -6,6 +6,7 @@ mod download_engine;
|
||||
mod logger;
|
||||
mod mihomo_manager;
|
||||
mod monitor_kernel;
|
||||
mod music;
|
||||
mod network_monitor;
|
||||
mod osd_window;
|
||||
mod process_manager;
|
||||
@@ -41,6 +42,16 @@ use monitor_kernel::{
|
||||
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_tracks, feiniu_login, feiniu_logout, feiniu_lyric,
|
||||
feiniu_media_prefix, feiniu_save_connection, feiniu_scan_local, feiniu_test_connection,
|
||||
music_cancel_runtime_install, 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_stop_bridge, webdav_delete,
|
||||
webdav_get_secret, webdav_save_secret, webdav_test, webdav_upload, MusicManager,
|
||||
};
|
||||
use network_monitor::network_status;
|
||||
use osd_window::{
|
||||
osd_apply_overlay_style, osd_begin_drag, osd_set_bounds, osd_set_click_through,
|
||||
@@ -61,7 +72,7 @@ use screenshot::commands::{
|
||||
screenshot_register_shortcut,
|
||||
screenshot_save_cache, screenshot_save_png, screenshot_scroll_capture,
|
||||
screenshot_scroll_cancel, screenshot_scroll_finish, screenshot_scroll_start,
|
||||
screenshot_show_overlay, screenshot_take_editor_image_raw,
|
||||
screenshot_set_scroll_hole, screenshot_show_overlay, screenshot_take_editor_image_raw,
|
||||
screenshot_unregister_pin_shortcut, screenshot_unregister_shortcut,
|
||||
};
|
||||
use clipboard::{
|
||||
@@ -149,7 +160,10 @@ fn export_bindings() {
|
||||
downloader_get_tasks, downloader_check_url, downloader_add_task, downloader_pause_task,
|
||||
downloader_resume_task, downloader_cancel_task, downloader_redownload, downloader_remove_task, downloader_get_settings,
|
||||
downloader_save_settings, downloader_open_dir, downloader_open_url, downloader_focus_window, downloader_inspect, downloader_select_bt_files,
|
||||
// screenshot（22，豁免 3：get_fullscreen_bmp / take_editor_image_raw 返回 ipc::Response、
|
||||
// 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,
|
||||
// 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,
|
||||
@@ -158,6 +172,7 @@ fn export_bindings() {
|
||||
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,
|
||||
])
|
||||
@@ -243,6 +258,41 @@ 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_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_cache_status,
|
||||
feiniu_cache_clear,
|
||||
feiniu_cache_fetch,
|
||||
feiniu_fnconnect_resolve,
|
||||
webdav_test,
|
||||
webdav_upload,
|
||||
webdav_delete,
|
||||
webdav_get_secret,
|
||||
webdav_save_secret,
|
||||
feiniu_delete_local,
|
||||
network_status,
|
||||
osd_apply_overlay_style,
|
||||
osd_begin_drag,
|
||||
@@ -344,6 +394,7 @@ pub fn run() {
|
||||
screenshot_scroll_cancel,
|
||||
screenshot_scroll_finish,
|
||||
screenshot_scroll_start,
|
||||
screenshot_set_scroll_hole,
|
||||
screenshot_take_editor_image_raw,
|
||||
screenshot_copy_image,
|
||||
screenshot_save_png,
|
||||
@@ -395,6 +446,10 @@ pub fn run() {
|
||||
});
|
||||
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(clip) = app.try_state::<ClipboardManager>() {
|
||||
clip.stop();
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
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,580 @@
|
||||
//! 音乐模块 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(())
|
||||
}
|
||||
|
||||
/// 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>>,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let params = serde_json::json!({ "keyword": keyword, "sources": sources.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>>,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let params = serde_json::json!({ "url": url, "sources": sources.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()
|
||||
}
|
||||
|
||||
/// 保存音乐模块设置（立即生效）
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn music_save_settings(
|
||||
state: State<'_, MusicManager>,
|
||||
settings: MusicSettings,
|
||||
) -> Result<(), String> {
|
||||
state.save_settings(&settings)
|
||||
}
|
||||
|
||||
/// 解析歌曲真实下载链接（懒解析：搜索只取元数据，试听/下载前调用）。
|
||||
/// 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>,
|
||||
) -> 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() });
|
||||
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>,
|
||||
) -> 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(),
|
||||
});
|
||||
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}] }`。
|
||||
#[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(),
|
||||
"accessCode": c.access_code,
|
||||
"insecure": c.insecure,
|
||||
"fnId": c.fn_id,
|
||||
})
|
||||
})
|
||||
.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();
|
||||
}
|
||||
if let Some(existing) = settings.feiniu_connections.iter_mut().find(|c| c.id == conn.id) {
|
||||
conn.token = existing.token.clone(); // 保留既有 token
|
||||
*existing = conn;
|
||||
} else {
|
||||
settings.feiniu_connections.push(conn);
|
||||
}
|
||||
state.save_settings(&settings)?;
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
/// 删除一条连接；若删的是激活连接，自动切换激活到第一条。
|
||||
#[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();
|
||||
}
|
||||
state.save_settings(&settings)?;
|
||||
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;
|
||||
if let Some(c) = settings.feiniu_connections.iter_mut().find(|c| c.id == connection_id) {
|
||||
c.base_url = conn.base_url.clone();
|
||||
}
|
||||
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?;
|
||||
|
||||
if let Some(existing) = settings.feiniu_connections.iter_mut().find(|c| c.id == connection_id) {
|
||||
existing.token = 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?;
|
||||
Ok(json!({ "ok": true, "userToken": token, "mediaPrefix": prefix }))
|
||||
}
|
||||
|
||||
/// 登出某连接（清 token，保留地址/账号），代理 Cookie 同步失效。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_logout(
|
||||
state: State<'_, MusicManager>,
|
||||
connection_id: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let mut settings = state.load_settings();
|
||||
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 }))
|
||||
}
|
||||
|
||||
/// 测试某连接是否能登录（不持久化 token），探测后恢复原激活连接的运行期状态。
|
||||
#[tauri::command]
|
||||
pub async fn feiniu_test_connection(
|
||||
state: State<'_, MusicManager>,
|
||||
connection_id: String,
|
||||
username: String,
|
||||
password: String,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let settings = state.load_settings();
|
||||
let conn = settings
|
||||
.feiniu_connections
|
||||
.iter()
|
||||
.find(|c| c.id == connection_id)
|
||||
.cloned()
|
||||
.ok_or_else(|| "连接不存在".to_string())?;
|
||||
let mut tmp = settings.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 }))
|
||||
}
|
||||
|
||||
/// 扫描本地曲库目录中的音频文件：{ items }（目录 = 下载 savedir + 用户自定义 dirs）。
|
||||
#[tauri::command]
|
||||
pub fn feiniu_scan_local(state: State<'_, MusicManager>) -> Result<serde_json::Value, 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());
|
||||
}
|
||||
}
|
||||
Ok(state.feiniu.scan_local(&dirs))
|
||||
}
|
||||
|
||||
/// 播放缓存状态：{ 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 }))
|
||||
}
|
||||
|
||||
// ============ WebDAV 凭据加密存储（Windows 凭据管理器，DPAPI 保护） ============
|
||||
|
||||
/// 凭据以 JSON blob 存入系统凭据管理器：{"username","password"}。
|
||||
/// 明文仅存在于内存与系统凭据库，绝不写回 localStorage / 配置文件。
|
||||
#[cfg(windows)]
|
||||
const WEBDAV_SECRET_SERVICE: &str = "Thing";
|
||||
#[cfg(windows)]
|
||||
const WEBDAV_SECRET_USER: &str = "webdav-credentials";
|
||||
|
||||
#[cfg(windows)]
|
||||
fn webdav_secret_entry() -> Result<keyring::Entry, String> {
|
||||
keyring::Entry::new(WEBDAV_SECRET_SERVICE, WEBDAV_SECRET_USER)
|
||||
.map_err(|e| format!("无法访问系统凭据管理器: {e}"))
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn webdav_secret_read() -> Result<Option<serde_json::Value>, String> {
|
||||
let entry = webdav_secret_entry()?;
|
||||
match entry.get_password() {
|
||||
Ok(blob) => serde_json::from_str(&blob)
|
||||
.map(Some)
|
||||
.map_err(|e| format!("凭据数据损坏: {e}")),
|
||||
// 未配置过凭据不算错误
|
||||
Err(keyring::Error::NoEntry) => Ok(None),
|
||||
Err(e) => Err(format!("读取凭据失败: {e}")),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn webdav_secret_write(username: &str, password: &str) -> Result<(), String> {
|
||||
let blob = json!({ "username": username, "password": password }).to_string();
|
||||
let entry = webdav_secret_entry()?;
|
||||
entry.set_password(&blob).map_err(|e| format!("保存凭据失败: {e}"))
|
||||
}
|
||||
|
||||
/// 读取 WebDAV 凭据。未配置时 username/password 为 null。
|
||||
#[tauri::command]
|
||||
pub fn webdav_get_secret() -> Result<serde_json::Value, String> {
|
||||
#[cfg(windows)]
|
||||
{
|
||||
Ok(webdav_secret_read()?.unwrap_or_else(|| json!({ "username": null, "password": null })))
|
||||
}
|
||||
#[cfg(not(windows))]
|
||||
{
|
||||
Ok(json!({ "username": null, "password": null }))
|
||||
}
|
||||
}
|
||||
|
||||
/// 保存 WebDAV 凭据（账号 + 密码整体覆盖）。
|
||||
#[tauri::command]
|
||||
pub fn webdav_save_secret(username: String, password: String) -> Result<serde_json::Value, String> {
|
||||
#[cfg(windows)]
|
||||
{
|
||||
webdav_secret_write(&username, &password)?;
|
||||
}
|
||||
#[cfg(not(windows))]
|
||||
{
|
||||
let _ = (&username, &password);
|
||||
}
|
||||
Ok(json!({ "ok": true }))
|
||||
}
|
||||
|
||||
/// 删除本地媒体文件（「下载到飞牛」落地即传流程的收尾）。
|
||||
/// 仅允许音频 / 歌词 / 封面扩展名，且拒绝目录——防止前端误删任意文件。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn feiniu_delete_local(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());
|
||||
}
|
||||
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,155 @@
|
||||
//! 飞牛音乐播放缓存（容量限制 + 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 }
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
@@ -0,0 +1,166 @@
|
||||
//! FnConnect 远程连接解析（参考 feiniu-car-music `fn-api.js`）。
|
||||
//!
|
||||
//! fnId → 网关 `https://5ddd.com/api/v1/fn/con`（authx md5 签名）→ 内网/公网/中继候选 →
|
||||
//! 探测可达性 → 得到可用的 base_url（含 mode=relay 的中继地址）。
|
||||
|
||||
use md5::Md5;
|
||||
use rand::RngCore;
|
||||
use serde_json::{json, Value};
|
||||
use sha2::{Digest, Sha256};
|
||||
|
||||
/// 网关地址与签名常量（对齐 feiniu-car-music）。
|
||||
const FN_CONNECT_URL: &str = "https://5ddd.com/api/v1/fn/con";
|
||||
const FN_AUTHX_PREFIX: &str = "NDzZTVxnRKP8Z0jXg1VAMonaG8akvh";
|
||||
const FN_API_KEY: &str = "zIGtkc3dqZnJpd29qZXJqa2w7c";
|
||||
|
||||
fn md5_hex(input: &str) -> String {
|
||||
let mut h = Md5::new();
|
||||
h.update(input.as_bytes());
|
||||
format!("{:x}", h.finalize())
|
||||
}
|
||||
|
||||
fn sha256_hex(input: &str) -> String {
|
||||
let mut h = Sha256::new();
|
||||
h.update(input.as_bytes());
|
||||
format!("{:x}", h.finalize())
|
||||
}
|
||||
|
||||
/// 从输入识别 fnId：`fnos.net/<id>`、`<id>.5ddd.com`、或裸 fnId。
|
||||
pub fn extract_fn_id(input: &str) -> Option<String> {
|
||||
let s = input.trim();
|
||||
if s.is_empty() {
|
||||
return None;
|
||||
}
|
||||
if let Some(id) = s.split_once("fnos.net/").map(|(_, r)| r.split('/').next().unwrap_or("")) {
|
||||
if !id.is_empty() {
|
||||
return Some(id.trim().to_string());
|
||||
}
|
||||
}
|
||||
if let Some(rest) = s.rsplit_once("/") {
|
||||
let last = rest.1;
|
||||
if last.ends_with(".5ddd.com") {
|
||||
return Some(last.trim_end_matches(".5ddd.com").to_string());
|
||||
}
|
||||
}
|
||||
if s.ends_with(".5ddd.com") {
|
||||
return Some(s.trim_end_matches(".5ddd.com").to_string());
|
||||
}
|
||||
// 裸 fnId
|
||||
if s.len() >= 3 && s.chars().all(|c| c.is_alphanumeric() || c == '-' || c == '_') && !s.starts_with("http") {
|
||||
return Some(s.to_string());
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// 计算网关 authx 签名。
|
||||
fn fn_authx(method: &str, url: &str, data: &Value) -> String {
|
||||
let body = if method.eq_ignore_ascii_case("get") {
|
||||
String::new()
|
||||
} else {
|
||||
serde_json::to_string(data).unwrap_or_default()
|
||||
};
|
||||
let mut nonce = String::new();
|
||||
let mut rng = rand::thread_rng();
|
||||
for _ in 0..6 {
|
||||
nonce.push(char::from(b'0' + (rng.next_u32() % 10) as u8));
|
||||
}
|
||||
let timestamp = std::time::SystemTime::now()
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.map(|d| d.as_millis().to_string())
|
||||
.unwrap_or_default();
|
||||
let raw = format!(
|
||||
"{FN_AUTHX_PREFIX}_{url}_{nonce}_{timestamp}_{}__{FN_API_KEY}",
|
||||
md5_hex(&body)
|
||||
);
|
||||
format!("nonce={nonce}×tamp={timestamp}&sign={}", md5_hex(&raw))
|
||||
}
|
||||
|
||||
/// 从网关查询 fnId 的连接参数。
|
||||
pub async fn query_fn_connect(fn_id: &str) -> Result<Value, String> {
|
||||
let client = reqwest::Client::builder()
|
||||
.timeout(std::time::Duration::from_secs(10))
|
||||
.build()
|
||||
.map_err(|e| e.to_string())?;
|
||||
let body = json!({ "fnId": fn_id });
|
||||
let resp = client
|
||||
.post(FN_CONNECT_URL)
|
||||
.header("Content-Type", "application/json")
|
||||
.header("authx", fn_authx("post", "/api/v1/fn/con", &body))
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("FnConnect 网关不可达: {e}"))?;
|
||||
let b: Value = resp.json().await.map_err(|e| e.to_string())?;
|
||||
if b["code"].as_i64().unwrap_or(-1) != 0 {
|
||||
return Err(b["msg"].as_str().unwrap_or("FnConnect 网关返回错误").to_string());
|
||||
}
|
||||
Ok(b["data"].clone())
|
||||
}
|
||||
|
||||
/// 构建候选 base_url 列表。返回 (url, is_relay)。
|
||||
pub fn build_candidates(data: &Value) -> Vec<(String, bool)> {
|
||||
let mut out: Vec<(String, bool)> = Vec::new();
|
||||
let port = &data["port"];
|
||||
let http = port["httpPort"].as_u64().unwrap_or(5666);
|
||||
let https = port["httpsPort"].as_u64().unwrap_or(5667);
|
||||
let empty = vec![];
|
||||
for ip in data["ipv4"].as_array().unwrap_or(&empty).iter().filter_map(|v| v.as_str()) {
|
||||
out.push((format!("http://{ip}:{http}"), false));
|
||||
out.push((format!("https://{ip}:{https}"), false));
|
||||
}
|
||||
for ip in data["publicIpv4"].as_array().unwrap_or(&empty).iter().filter_map(|v| v.as_str()) {
|
||||
out.push((format!("http://{ip}:{http}"), false));
|
||||
out.push((format!("https://{ip}:{https}"), false));
|
||||
}
|
||||
for ip in data["publicIpv6"].as_array().unwrap_or(&empty).iter().filter_map(|v| v.as_str()) {
|
||||
out.push((format!("http://[{ip}]:{http}"), false));
|
||||
out.push((format!("https://[{ip}]:{https}"), false));
|
||||
}
|
||||
let relays = data["fn"].as_array().unwrap_or(&empty);
|
||||
let relay_addrs: Vec<String> = if relays.is_empty() {
|
||||
vec!["5ddd.com".to_string()]
|
||||
} else {
|
||||
relays
|
||||
.iter()
|
||||
.filter_map(|v| v.as_str().map(|s| s.to_string()))
|
||||
.collect()
|
||||
};
|
||||
for addr in relay_addrs {
|
||||
let domain = addr.split(':').next().unwrap_or(&addr).to_string();
|
||||
out.push((format!("https://{domain}"), true));
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// 探测某个 base_url 是否可用。
|
||||
async fn probe(url: &str) -> bool {
|
||||
let client = reqwest::Client::builder()
|
||||
.timeout(std::time::Duration::from_secs(6))
|
||||
.build()
|
||||
.unwrap_or_else(|_| reqwest::Client::new());
|
||||
let full = format!("{}/music/api/v1/track/list?page=1&size=1", url.trim_end_matches('/'));
|
||||
match client.get(&full).send().await {
|
||||
Ok(resp) => resp.status().as_u16() < 500,
|
||||
Err(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// 解析 fnId → 第一个可达的 base_url；返回 (base_url, is_relay)。
|
||||
pub async fn resolve_base_url(fn_id: &str) -> Result<(String, bool), String> {
|
||||
let data = query_fn_connect(fn_id).await?;
|
||||
let candidates = build_candidates(&data);
|
||||
if candidates.is_empty() {
|
||||
return Err("FnConnect 未返回可用地址".into());
|
||||
}
|
||||
for (url, relay) in &candidates {
|
||||
if probe(url).await {
|
||||
return Ok((url.clone(), *relay));
|
||||
}
|
||||
}
|
||||
Err(format!("FnConnect 候选均不可达（{} 个）", candidates.len()))
|
||||
}
|
||||
|
||||
/// sha256 hex（登录用）。
|
||||
pub fn sha256_hex_pub(input: &str) -> String {
|
||||
sha256_hex(input)
|
||||
}
|
||||
@@ -0,0 +1,515 @@
|
||||
//! 飞牛音乐(NAS)原生接口客户端 + 本地流代理的运行期。
|
||||
//!
|
||||
//! 支持多连接（本地 / frp / 预留 FnConnect），当前以"激活连接"为准。
|
||||
//! 原生接口路径/认证（`music-token` Cookie、`x-access-code` 安全码、`/user/password-login` 登录）
|
||||
//! 对照 FeiNiuMusic(Flutter) `api_client.dart` 的第三方纯前端实现翻译。
|
||||
//! 所有对 NAS 的 HTTP 请求在本模块收敛（页面/命令层不直接发请求）。
|
||||
|
||||
use std::path::Path;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::Duration;
|
||||
|
||||
use axum::http::StatusCode;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
use serde_json::{json, Value};
|
||||
|
||||
use super::MusicSettings;
|
||||
|
||||
pub use conn::normalize_base_url;
|
||||
mod cache;
|
||||
mod conn;
|
||||
mod fnconnect;
|
||||
pub mod proxy;
|
||||
pub mod webdav;
|
||||
|
||||
pub use cache::CacheManager;
|
||||
pub use fnconnect::{extract_fn_id, resolve_base_url};
|
||||
|
||||
use conn::{generate_device_id, sha256_hex};
|
||||
use proxy::{ProxyCfg, ProxyShared};
|
||||
|
||||
/// 一条飞牛音乐连接（持久化在 `MusicSettings`）。
|
||||
#[derive(Serialize, Deserialize, Clone, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct FeiniuConnection {
|
||||
pub id: String,
|
||||
pub name: String,
|
||||
/// "lan" | "frp" | "fnconnect"（fnconnect 预留）
|
||||
pub kind: String,
|
||||
/// 服务器地址（http://192.168.x.x:5666 或 https://域名）
|
||||
pub base_url: String,
|
||||
pub username: String,
|
||||
pub token: String,
|
||||
pub device_id: String,
|
||||
pub access_code: String,
|
||||
/// https 遇到自签证书时忽略校验
|
||||
pub insecure: bool,
|
||||
/// fnconnect 连接的 fnId（如 fnos.net/<id> 或裸 id）
|
||||
#[serde(default)]
|
||||
pub fn_id: String,
|
||||
}
|
||||
|
||||
impl Default for FeiniuConnection {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
id: String::new(),
|
||||
name: String::new(),
|
||||
kind: "lan".to_string(),
|
||||
base_url: String::new(),
|
||||
username: String::new(),
|
||||
token: String::new(),
|
||||
device_id: String::new(),
|
||||
access_code: String::new(),
|
||||
insecure: false,
|
||||
fn_id: String::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 当前激活连接信息（运行期副本，与 `MusicSettings` 的激活连接一致）。
|
||||
struct Conn {
|
||||
base_url: String,
|
||||
token: String,
|
||||
username: String,
|
||||
device_id: String,
|
||||
access_code: String,
|
||||
insecure: bool,
|
||||
}
|
||||
|
||||
/// LAN 直连，`no_proxy` 避免被代理模块(mihomo)拦走；按 insecure 惰性重建（支持自签证书）。
|
||||
struct ClientSlot {
|
||||
insecure: bool,
|
||||
client: reqwest::Client,
|
||||
}
|
||||
|
||||
pub struct Feiniu {
|
||||
client: Mutex<Option<ClientSlot>>,
|
||||
conn: Mutex<Conn>,
|
||||
proxy: Mutex<Option<(u16, ProxyShared)>>,
|
||||
cache: CacheManager,
|
||||
}
|
||||
|
||||
impl Default for Feiniu {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
client: Mutex::new(None),
|
||||
conn: Mutex::new(Conn {
|
||||
base_url: String::new(),
|
||||
token: String::new(),
|
||||
username: String::new(),
|
||||
device_id: String::new(),
|
||||
access_code: String::new(),
|
||||
insecure: false,
|
||||
}),
|
||||
proxy: Mutex::new(None),
|
||||
cache: CacheManager::new(Path::new("placeholder")), // 由 set_cache_root 重建
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Feiniu {
|
||||
/// 设置缓存根目录（{app_data}/music/cache），应用启动时调用一次。
|
||||
pub fn set_cache_root(&mut self, app_data_dir: &Path) {
|
||||
self.cache = CacheManager::new(app_data_dir);
|
||||
}
|
||||
/// 取（并惰性构建）对应 insecure 的 reqwest client。
|
||||
fn client(&self, insecure: bool) -> reqwest::Client {
|
||||
let mut g = self.client.lock().unwrap_or_else(|e| e.into_inner());
|
||||
let hit = g.as_ref().map(|s| s.insecure == insecure).unwrap_or(false);
|
||||
if !hit {
|
||||
*g = Some(ClientSlot {
|
||||
insecure,
|
||||
client: reqwest::Client::builder()
|
||||
.no_proxy()
|
||||
.timeout(Duration::from_secs(10))
|
||||
.danger_accept_invalid_certs(insecure)
|
||||
.build()
|
||||
.unwrap_or_else(|_| reqwest::Client::new()),
|
||||
});
|
||||
}
|
||||
g.as_ref().unwrap().client.clone()
|
||||
}
|
||||
|
||||
/// 从持久化设置刷新运行期连接与代理配置（以激活连接为准；幂等）。
|
||||
pub fn sync_with_settings(&self, s: &MusicSettings) {
|
||||
let (base_url, token, username, device_id, access_code, insecure) =
|
||||
match s.feiniu_active() {
|
||||
Some(c) => (
|
||||
c.base_url.clone(),
|
||||
c.token.clone(),
|
||||
c.username.clone(),
|
||||
c.device_id.clone(),
|
||||
c.access_code.clone(),
|
||||
c.insecure,
|
||||
),
|
||||
None => (
|
||||
String::new(),
|
||||
String::new(),
|
||||
String::new(),
|
||||
String::new(),
|
||||
String::new(),
|
||||
false,
|
||||
),
|
||||
};
|
||||
if let Ok(mut c) = self.conn.lock() {
|
||||
c.base_url = base_url;
|
||||
c.token = token;
|
||||
c.username = username;
|
||||
c.device_id = device_id;
|
||||
c.access_code = access_code;
|
||||
c.insecure = insecure;
|
||||
}
|
||||
// 确保 client 构建到位（insecure 变化时重建）
|
||||
self.client(insecure);
|
||||
self.sync_proxy_cfg();
|
||||
self.sync_proxy_client();
|
||||
}
|
||||
|
||||
fn sync_proxy_cfg(&self) {
|
||||
if let Ok(g) = self.proxy.lock() {
|
||||
if let Some((_, shared)) = g.as_ref() {
|
||||
let cfg = self.current_cfg();
|
||||
if let Ok(mut c) = shared.cfg.lock() {
|
||||
*c = cfg;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn sync_proxy_client(&self) {
|
||||
let (_, client) = self.conn_client();
|
||||
if let Ok(mut g) = self.proxy.lock() {
|
||||
if let Some((_, shared)) = g.as_mut() {
|
||||
shared.client = client;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn conn_client(&self) -> (bool, reqwest::Client) {
|
||||
let insecure = self.conn.lock().unwrap_or_else(|e| e.into_inner()).insecure;
|
||||
(insecure, self.client(insecure))
|
||||
}
|
||||
|
||||
fn current_cfg(&self) -> ProxyCfg {
|
||||
let c = self.conn.lock().unwrap_or_else(|e| e.into_inner());
|
||||
ProxyCfg {
|
||||
base_url: c.base_url.clone(),
|
||||
token: c.token.clone(),
|
||||
access_code: c.access_code.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
fn auth_triple(&self) -> (String, String, String) {
|
||||
let c = self.conn.lock().unwrap_or_else(|e| e.into_inner());
|
||||
(c.base_url.clone(), c.token.clone(), c.access_code.clone())
|
||||
}
|
||||
|
||||
/// 对某个 base_url 执行登录（探测/登录连接共用）。
|
||||
/// 成功返回 `(userToken, device_id)` 并更新运行期 conn；命令层负责落回对应连接持久化。
|
||||
pub async fn login(
|
||||
&self,
|
||||
base_url: &str,
|
||||
username: &str,
|
||||
password: &str,
|
||||
) -> Result<(String, String), String> {
|
||||
let base = normalize_base_url(base_url);
|
||||
let (device_id, insecure) = {
|
||||
let c = self.conn.lock().unwrap_or_else(|e| e.into_inner());
|
||||
let d = if c.device_id.is_empty() {
|
||||
generate_device_id()
|
||||
} else {
|
||||
c.device_id.clone()
|
||||
};
|
||||
(d, c.insecure)
|
||||
};
|
||||
let body = json!({
|
||||
"username": username,
|
||||
"password": sha256_hex(password),
|
||||
"deviceId": device_id,
|
||||
});
|
||||
let resp = self
|
||||
.client(insecure)
|
||||
.post(format!("{base}/music/api/v1/user/password-login"))
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| {
|
||||
let kind = if e.is_timeout() {
|
||||
"连接超时（NAS 不可达？）"
|
||||
} else {
|
||||
"连接失败"
|
||||
};
|
||||
format!("{kind}: {e}")
|
||||
})?;
|
||||
let status = resp.status();
|
||||
let b: Value = resp
|
||||
.json()
|
||||
.await
|
||||
.unwrap_or_else(|_| json!({ "code": status.as_u16() }));
|
||||
let code = b["code"].as_i64().unwrap_or(i64::from(status.as_u16()));
|
||||
if code != 0 {
|
||||
if code == 120001 {
|
||||
return Err("用户名或密码错误".into());
|
||||
}
|
||||
let msg = b["msg"]
|
||||
.as_str()
|
||||
.map(|s| s.to_string())
|
||||
.unwrap_or_else(|| format!("HTTP {status}"));
|
||||
return Err(msg);
|
||||
}
|
||||
let token = b["data"]["userToken"]
|
||||
.as_str()
|
||||
.ok_or_else(|| "登录失败：未返回 token".to_string())?
|
||||
.to_string();
|
||||
|
||||
if let Ok(mut c) = self.conn.lock() {
|
||||
c.base_url = base;
|
||||
c.token = token.clone();
|
||||
c.username = username.to_string();
|
||||
c.device_id = device_id.clone();
|
||||
}
|
||||
self.sync_proxy_cfg();
|
||||
Ok((token, device_id))
|
||||
}
|
||||
|
||||
/// 登出：仅清运行期 token（保留连接信息与账号）。
|
||||
pub fn logout(&self) {
|
||||
if let Ok(mut c) = self.conn.lock() {
|
||||
c.token.clear();
|
||||
}
|
||||
self.sync_proxy_cfg();
|
||||
}
|
||||
|
||||
/// 当前激活连接配置（前端状态展示 + 是否已登录）。
|
||||
pub fn config(&self) -> Value {
|
||||
let c = self.conn.lock().unwrap_or_else(|e| e.into_inner());
|
||||
json!({
|
||||
"baseUrl": c.base_url,
|
||||
"username": c.username,
|
||||
"loggedIn": !c.token.is_empty(),
|
||||
})
|
||||
}
|
||||
|
||||
/// 分页拉取曲目列表：`GET /music/api/v1/track/list`（可选关键词）。
|
||||
pub async fn list_tracks(&self, page: u32, size: u32, keyword: Option<&str>) -> Result<Value, String> {
|
||||
let mut query = vec![
|
||||
("page".to_string(), page.to_string()),
|
||||
("size".to_string(), size.to_string()),
|
||||
];
|
||||
let kw = keyword.unwrap_or("").trim().to_string();
|
||||
if !kw.is_empty() {
|
||||
query.push(("keyword".to_string(), kw));
|
||||
}
|
||||
self.authed_get("/music/api/v1/track/list", query).await
|
||||
}
|
||||
|
||||
/// 歌词：`GET /music/api/v1/lyric/list?trackGUID=<guid>`。
|
||||
pub async fn lyric(&self, guid: &str) -> Result<String, String> {
|
||||
let v = self
|
||||
.authed_get(
|
||||
"/music/api/v1/lyric/list",
|
||||
vec![("trackGUID".to_string(), guid.to_string())],
|
||||
)
|
||||
.await?;
|
||||
Ok(extract_lyric_text(&v))
|
||||
}
|
||||
|
||||
/// 本地媒体地址前缀：`http://127.0.0.1:<port>/feiniu`。首次调用惰性启动代理。
|
||||
pub async fn media_prefix(&self) -> Result<String, String> {
|
||||
let port = self.ensure_proxy().await?;
|
||||
Ok(format!("http://127.0.0.1:{port}/feiniu"))
|
||||
}
|
||||
|
||||
/// 递归扫描本地曲库目录中的音频文件，返回轻量条目（不解析时长/封面）。
|
||||
pub fn scan_local(&self, dirs: &[String]) -> Value {
|
||||
const EXTS: [&str; 7] = ["mp3", "flac", "wav", "m4a", "aac", "ogg", "ape"];
|
||||
let mut items: Vec<Value> = Vec::new();
|
||||
for dir in dirs {
|
||||
let p = Path::new(dir);
|
||||
if !p.is_dir() {
|
||||
continue;
|
||||
}
|
||||
for entry in walkdir::WalkDir::new(p).follow_links(false) {
|
||||
let Ok(entry) = entry else { continue };
|
||||
if !entry.file_type().is_file() {
|
||||
continue;
|
||||
}
|
||||
let path = entry.path();
|
||||
let ext = path
|
||||
.extension()
|
||||
.and_then(|e| e.to_str())
|
||||
.map(|e| e.to_lowercase())
|
||||
.unwrap_or_default();
|
||||
if !EXTS.contains(&ext.as_str()) {
|
||||
continue;
|
||||
}
|
||||
let size = entry.metadata().map(|m| m.len()).unwrap_or(0);
|
||||
let mtim = entry
|
||||
.metadata()
|
||||
.ok()
|
||||
.and_then(|m| m.modified().ok())
|
||||
.and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok())
|
||||
.map(|d| d.as_secs())
|
||||
.unwrap_or(0);
|
||||
let name = path
|
||||
.file_stem()
|
||||
.and_then(|n| n.to_str())
|
||||
.unwrap_or("未知")
|
||||
.to_string();
|
||||
items.push(json!({
|
||||
"path": path.to_string_lossy(),
|
||||
"title": name,
|
||||
"size": size,
|
||||
"mtim": mtim,
|
||||
"dir": dir,
|
||||
}));
|
||||
}
|
||||
}
|
||||
json!({ "items": items })
|
||||
}
|
||||
|
||||
/// 缓存状态。
|
||||
pub fn cache_status(&self) -> Value {
|
||||
self.cache.status()
|
||||
}
|
||||
|
||||
/// 清空缓存。
|
||||
pub fn cache_clear(&self) {
|
||||
self.cache.clear();
|
||||
}
|
||||
|
||||
/// 命中缓存直接返回文件路径；未命中则从 NAS 流式拉取写入缓存后返回。
|
||||
/// 返回缓存文件路径。失败返回 Err。
|
||||
pub async fn cache_fetch(&self, guid: &str, max_gb: u32) -> Result<Option<String>, String> {
|
||||
if let Some(hit) = self.cache.hit(guid) {
|
||||
return Ok(Some(hit));
|
||||
}
|
||||
let (base, token, access_code) = self.auth_triple();
|
||||
if base.is_empty() || token.is_empty() {
|
||||
return Err("未登录".into());
|
||||
}
|
||||
let (_, client) = self.conn_client();
|
||||
let mut rb = client.get(format!("{base}/music/api/v1/track/stream?guid={guid}"));
|
||||
rb = rb.header("cookie", format!("music-token={token}"));
|
||||
if !access_code.is_empty() {
|
||||
use base64::Engine;
|
||||
rb = rb
|
||||
.header(
|
||||
"x-access-code",
|
||||
base64::engine::general_purpose::STANDARD.encode(access_code.as_bytes()),
|
||||
)
|
||||
.header("x-access-source", "app");
|
||||
}
|
||||
let resp = rb.send().await.map_err(|e| format!("拉取失败: {e}"))?;
|
||||
if !resp.status().is_success() {
|
||||
return Err(format!("拉取失败（HTTP {}）", resp.status().as_u16()));
|
||||
}
|
||||
let ct = resp
|
||||
.headers()
|
||||
.get("content-type")
|
||||
.and_then(|v| v.to_str().ok())
|
||||
.map(|s| s.to_string())
|
||||
.unwrap_or_default();
|
||||
let ext = match ct.split('/').last() {
|
||||
Some("flac") => "flac",
|
||||
Some("mpeg") => "mp3",
|
||||
Some("wav") => "wav",
|
||||
Some("ogg") => "ogg",
|
||||
Some("mp4") => "m4a",
|
||||
Some("aac") => "aac",
|
||||
_ => "bin",
|
||||
};
|
||||
let stream = resp.bytes_stream();
|
||||
let path = self
|
||||
.cache
|
||||
.put(guid, ext, max_gb, stream)
|
||||
.await
|
||||
.map_err(|e| e)?;
|
||||
let _ = path;
|
||||
Ok(self.cache.hit(guid))
|
||||
}
|
||||
|
||||
// ===== WebDAV 传输（下载到飞牛 / 曲库增删）=====
|
||||
// 无状态：配置由前端每次调用传入，实现在 webdav 模块，命令层直接调用。
|
||||
|
||||
async fn ensure_proxy(&self) -> Result<u16, String> {
|
||||
if let Ok(g) = self.proxy.lock() {
|
||||
if let Some((port, _)) = g.as_ref() {
|
||||
return Ok(*port);
|
||||
}
|
||||
}
|
||||
let (_, client) = self.conn_client();
|
||||
let shared = ProxyShared {
|
||||
client,
|
||||
cfg: Arc::new(Mutex::new(self.current_cfg())),
|
||||
};
|
||||
let port = proxy::start(shared.clone()).await?;
|
||||
if let Ok(mut g) = self.proxy.lock() {
|
||||
*g = Some((port, shared));
|
||||
}
|
||||
Ok(port)
|
||||
}
|
||||
|
||||
async fn authed_get(&self, path: &str, query: Vec<(String, String)>) -> Result<Value, String> {
|
||||
let (base, token, access_code) = self.auth_triple();
|
||||
if base.is_empty() || token.is_empty() {
|
||||
return Err("未登录".into());
|
||||
}
|
||||
let (_, client) = self.conn_client();
|
||||
let qrefs: Vec<(&str, &str)> = query.iter().map(|(k, v)| (k.as_str(), v.as_str())).collect();
|
||||
let mut rb = client.get(format!("{base}{path}")).query(&qrefs);
|
||||
rb = rb.header("cookie", format!("music-token={token}"));
|
||||
if !access_code.is_empty() {
|
||||
use base64::Engine;
|
||||
rb = rb
|
||||
.header(
|
||||
"x-access-code",
|
||||
base64::engine::general_purpose::STANDARD.encode(access_code.as_bytes()),
|
||||
)
|
||||
.header("x-access-source", "app");
|
||||
}
|
||||
let resp = rb.send().await.map_err(|e| format!("请求失败: {e}"))?;
|
||||
let status = resp.status();
|
||||
let body: Value = resp
|
||||
.json()
|
||||
.await
|
||||
.unwrap_or_else(|_| json!({ "code": status.as_u16() }));
|
||||
let code = body["code"].as_i64().unwrap_or(i64::from(status.as_u16()));
|
||||
if code != 0 {
|
||||
if status == StatusCode::UNAUTHORIZED || status == StatusCode::FORBIDDEN {
|
||||
return Err("登录已过期，请重新登录".into());
|
||||
}
|
||||
let msg = body["msg"]
|
||||
.as_str()
|
||||
.map(|s| s.to_string())
|
||||
.unwrap_or_else(|| format!("请求失败（HTTP {status}）"));
|
||||
return Err(msg);
|
||||
}
|
||||
Ok(body["data"].clone())
|
||||
}
|
||||
}
|
||||
|
||||
/// 尽力从 /lyric/list 响应中取第一段歌词文本（响应结构未文档化，做宽松映射）。
|
||||
fn extract_lyric_text(v: &Value) -> String {
|
||||
match v {
|
||||
Value::Array(arr) => arr
|
||||
.first()
|
||||
.map(|it| {
|
||||
it["content"]
|
||||
.as_str()
|
||||
.or_else(|| it["lyric"].as_str())
|
||||
.or_else(|| it["text"].as_str())
|
||||
.unwrap_or("")
|
||||
.to_string()
|
||||
})
|
||||
.unwrap_or_default(),
|
||||
Value::Object(_) => v["content"]
|
||||
.as_str()
|
||||
.or_else(|| v["lyric"].as_str())
|
||||
.or_else(|| v["text"].as_str())
|
||||
.unwrap_or("")
|
||||
.to_string(),
|
||||
_ => String::new(),
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,164 @@
|
||||
//! 飞牛音乐本地流代理（axum）。
|
||||
//!
|
||||
//! 原生 `/track/stream`、`/static/cover` 需要 `Cookie: music-token=<token>`，而
|
||||
//! WebView 的 `<audio>/<img>` 无法设置 Cookie。本模块绑定 `127.0.0.1:<动态端口>`，
|
||||
//! 转发请求时注入 Cookie 与可选的安全码头，前端直接用本地地址播放/显示，天然支持 Range/seek。
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use axum::{
|
||||
extract::{Query, State},
|
||||
http::{header, HeaderMap, StatusCode},
|
||||
response::{IntoResponse, Response},
|
||||
routing::get,
|
||||
Router,
|
||||
};
|
||||
|
||||
use super::conn::normalize_base_url;
|
||||
|
||||
/// 由 Feiniu 运行期与代理 handler 共享的连接配置（登录更新、登出置空）。
|
||||
#[derive(Clone, Default)]
|
||||
pub struct ProxyCfg {
|
||||
pub base_url: String,
|
||||
pub token: String,
|
||||
pub access_code: String,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct ProxyShared {
|
||||
pub client: reqwest::Client,
|
||||
pub cfg: Arc<Mutex<ProxyCfg>>,
|
||||
}
|
||||
|
||||
/// 启动本地流代理，绑定到 `127.0.0.1:0`（动态空闲端口），返回实际端口。
|
||||
/// 代理以独立 tokio 任务常驻应用存活期；token 变化经共享 `ProxyCfg` 即时生效，无需重启。
|
||||
pub async fn start(shared: ProxyShared) -> Result<u16, String> {
|
||||
let listener = tokio::net::TcpListener::bind("127.0.0.1:0")
|
||||
.await
|
||||
.map_err(|e| format!("绑定本地端口失败: {e}"))?;
|
||||
let port = listener
|
||||
.local_addr()
|
||||
.map_err(|e| e.to_string())?
|
||||
.port();
|
||||
let app = Router::new()
|
||||
.route("/feiniu/stream", get(proxy_stream))
|
||||
.route("/feiniu/cover", get(proxy_cover))
|
||||
.with_state(shared);
|
||||
tokio::spawn(async move {
|
||||
if let Err(e) = axum::serve(listener, app).await {
|
||||
crate::logger::log_error("music", &format!("飞牛流代理异常: {e}"));
|
||||
}
|
||||
});
|
||||
Ok(port)
|
||||
}
|
||||
|
||||
async fn proxy_stream(
|
||||
State(s): State<ProxyShared>,
|
||||
Query(q): Query<HashMap<String, String>>,
|
||||
headers: HeaderMap,
|
||||
) -> Response {
|
||||
let guid = q.get("guid").cloned().unwrap_or_default().trim().to_string();
|
||||
if guid.is_empty() {
|
||||
return (StatusCode::BAD_REQUEST, "missing guid").into_response();
|
||||
}
|
||||
forward(
|
||||
&s,
|
||||
"/music/api/v1/track/stream",
|
||||
vec![("guid".to_string(), guid)],
|
||||
&headers,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn proxy_cover(
|
||||
State(s): State<ProxyShared>,
|
||||
Query(q): Query<HashMap<String, String>>,
|
||||
headers: HeaderMap,
|
||||
) -> Response {
|
||||
let cover_id = q
|
||||
.get("coverId")
|
||||
.cloned()
|
||||
.unwrap_or_default()
|
||||
.trim()
|
||||
.to_string();
|
||||
if cover_id.is_empty() {
|
||||
return (StatusCode::BAD_REQUEST, "missing coverId").into_response();
|
||||
}
|
||||
let size = q.get("size").cloned().unwrap_or_else(|| "320".into());
|
||||
forward(
|
||||
&s,
|
||||
"/music/api/v1/static/cover",
|
||||
vec![
|
||||
("coverId".to_string(), cover_id),
|
||||
("size".to_string(), size),
|
||||
],
|
||||
&headers,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// 统一转发：向 NAS 发起上游 GET，注入 Cookie/安全码，透传 Range 与响应头，流式回传 body。
|
||||
async fn forward(
|
||||
s: &ProxyShared,
|
||||
path: &str,
|
||||
query: Vec<(String, String)>,
|
||||
headers: &HeaderMap,
|
||||
) -> Response {
|
||||
let cfg = match s.cfg.lock() {
|
||||
Ok(g) => g.clone(),
|
||||
Err(e) => e.into_inner().clone(),
|
||||
};
|
||||
if cfg.base_url.is_empty() || cfg.token.is_empty() {
|
||||
return (StatusCode::UNAUTHORIZED, "飞牛音乐未登录").into_response();
|
||||
}
|
||||
|
||||
let base = normalize_base_url(&cfg.base_url);
|
||||
let url = format!("{base}{path}");
|
||||
let qrefs: Vec<(&str, &str)> = query.iter().map(|(k, v)| (k.as_str(), v.as_str())).collect();
|
||||
|
||||
let mut rb = s.client.get(&url).query(&qrefs);
|
||||
rb = rb.header("cookie", format!("music-token={}", cfg.token));
|
||||
if !cfg.access_code.is_empty() {
|
||||
use base64::Engine;
|
||||
rb = rb
|
||||
.header(
|
||||
"x-access-code",
|
||||
base64::engine::general_purpose::STANDARD.encode(cfg.access_code.as_bytes()),
|
||||
)
|
||||
.header("x-access-source", "app");
|
||||
}
|
||||
if let Some(range) = headers.get(header::RANGE) {
|
||||
rb = rb.header(header::RANGE, range.clone());
|
||||
}
|
||||
drop(cfg);
|
||||
|
||||
let resp = match rb.send().await {
|
||||
Ok(r) => r,
|
||||
Err(e) => return (StatusCode::BAD_GATEWAY, format!("上游错误: {e}")).into_response(),
|
||||
};
|
||||
let status = resp.status();
|
||||
|
||||
let ct = resp.headers().get(header::CONTENT_TYPE).cloned();
|
||||
let cl = resp.headers().get(header::CONTENT_LENGTH).cloned();
|
||||
let cr = resp.headers().get(header::CONTENT_RANGE).cloned();
|
||||
let ar = resp.headers().get(header::ACCEPT_RANGES).cloned();
|
||||
|
||||
let body = axum::body::Body::from_stream(resp.bytes_stream());
|
||||
let mut out = Response::new(body);
|
||||
*out.status_mut() = status;
|
||||
let h = out.headers_mut();
|
||||
if let Some(v) = ct {
|
||||
h.insert(header::CONTENT_TYPE, v);
|
||||
}
|
||||
if let Some(v) = cl {
|
||||
h.insert(header::CONTENT_LENGTH, v);
|
||||
}
|
||||
if let Some(v) = cr {
|
||||
h.insert(header::CONTENT_RANGE, v);
|
||||
}
|
||||
if let Some(v) = ar {
|
||||
h.insert(header::ACCEPT_RANGES, v);
|
||||
}
|
||||
out
|
||||
}
|
||||
@@ -0,0 +1,217 @@
|
||||
//! WebDAV 客户端（无状态）——用于把音乐传输到 fnOS NAS 的曲库目录。
|
||||
//!
|
||||
//! 选择 WebDAV 而非 SMB/FTP/NFS 的原因：
|
||||
//! - 纯 HTTP 语义，`reqwest` 即可实现，无原生依赖（SMB 在 Rust 侧生态差）；
|
||||
//! - **无会话**：Basic 认证随每个请求携带，没有"重启后要重新登录"的问题；
|
||||
//! - fnOS 原生支持：系统设置 → 文件服务 → WebDAV（HTTP 5005 / HTTPS 5006）。
|
||||
//!
|
||||
//! fnOS 侧需要的设置（作为 UI 提示展示）：
|
||||
//! 1. 开启 WebDAV 服务并记下端口；
|
||||
//! 2. 目标文件夹必须在「可见文件夹范围」内（团队文件夹需勾选
|
||||
//! 「允许通过文件共享协议(SMB、WebDAV、FTP)挂载到其他设备上」）；
|
||||
//! 3. 账号对该文件夹有读写权限。
|
||||
|
||||
use bytes::Bytes;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::time::Duration;
|
||||
|
||||
/// WebDAV 连接配置（由前端每次调用时传入，后端不持有状态）。
|
||||
#[derive(Debug, Clone, Deserialize, Serialize, specta::Type)]
|
||||
pub struct WebDavConfig {
|
||||
/// 服务地址，如 `http://192.168.110.100:5005`
|
||||
pub url: String,
|
||||
pub username: String,
|
||||
pub password: String,
|
||||
}
|
||||
|
||||
/// WebDAV 操作结果状态码相关的可读错误。
|
||||
fn status_err(action: &str, status: u16, url: &str) -> String {
|
||||
match status {
|
||||
401 => format!("WebDAV 认证失败（401）：请检查账号与密码"),
|
||||
403 => format!("WebDAV 拒绝访问（403）：账号可能没有该目录的写入权限"),
|
||||
404 => format!("WebDAV 目标不存在（404）：{url}（目录需要先在 NAS 上创建，且在 WebDAV 可见范围内）"),
|
||||
409 => format!("WebDAV 父目录不存在（409）：{url}"),
|
||||
_ => format!("WebDAV {action}失败（HTTP {status}）：{url}"),
|
||||
}
|
||||
}
|
||||
|
||||
fn dav_client(_cfg: &WebDavConfig) -> Result<reqwest::Client, String> {
|
||||
// NAS 通常在内网，默认禁用系统代理（走代理会连不上）；Basic 认证在请求级设置
|
||||
reqwest::Client::builder()
|
||||
.timeout(Duration::from_secs(600))
|
||||
.connect_timeout(Duration::from_secs(10))
|
||||
.no_proxy()
|
||||
.build()
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
/// 拼接 WebDAV 完整 URL：base + 远程路径（逐段百分号编码，保留 `/`）。
|
||||
fn dav_url(cfg: &WebDavConfig, remote_path: &str) -> String {
|
||||
let base = cfg.url.trim_end_matches('/');
|
||||
let path = remote_path.trim_start_matches('/');
|
||||
let encoded: Vec<String> = path
|
||||
.split('/')
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(|seg| {
|
||||
let mut out = String::new();
|
||||
for b in seg.bytes() {
|
||||
match b {
|
||||
b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' => {
|
||||
out.push(b as char)
|
||||
}
|
||||
_ => out.push_str(&format!("%{b:02X}")),
|
||||
}
|
||||
}
|
||||
out
|
||||
})
|
||||
.collect();
|
||||
format!("{base}/{}", encoded.join("/"))
|
||||
}
|
||||
|
||||
fn with_auth(mut rb: reqwest::RequestBuilder, cfg: &WebDavConfig) -> reqwest::RequestBuilder {
|
||||
if !cfg.username.is_empty() {
|
||||
rb = rb.basic_auth(&cfg.username, Some(&cfg.password));
|
||||
}
|
||||
rb
|
||||
}
|
||||
|
||||
/// 逐级 MKCOL 创建远程目录（已存在会被忽略）。
|
||||
async fn ensure_dirs(cfg: &WebDavConfig, remote_path: &str) -> Result<(), String> {
|
||||
let path = remote_path.trim_start_matches('/');
|
||||
let segs: Vec<&str> = path.split('/').filter(|s| !s.is_empty()).collect();
|
||||
// 最后一段是文件名，只建目录部分
|
||||
let dirs: Vec<String> = segs
|
||||
.iter()
|
||||
.take(segs.len().saturating_sub(1))
|
||||
.fold(Vec::new(), |mut acc, s| {
|
||||
let prev = acc.last().cloned().unwrap_or_default();
|
||||
acc.push(if prev.is_empty() {
|
||||
s.to_string()
|
||||
} else {
|
||||
format!("{prev}/{s}")
|
||||
});
|
||||
acc
|
||||
});
|
||||
let client = dav_client(cfg)?;
|
||||
for d in dirs {
|
||||
let url = dav_url(cfg, &d);
|
||||
let method = reqwest::Method::from_bytes(b"MKCOL").expect("MKCOL 是合法的 HTTP 方法");
|
||||
let resp = with_auth(client.request(method, &url), cfg)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("WebDAV MKCOL 失败: {e}"))?;
|
||||
// 201 创建成功；405 已存在；其余只记不阻断（权限问题会在 PUT 时暴露）
|
||||
let code = resp.status().as_u16();
|
||||
if code != 201 && code != 405 && code != 301 && code != 409 && code != 200 {
|
||||
return Err(status_err("创建目录", code, &url));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 测试连接：PROPFIND 目标目录（Depth 0）。成功返回目录确认信息。
|
||||
pub async fn test(cfg: &WebDavConfig, dir: &str) -> Result<String, String> {
|
||||
let url = dav_url(cfg, dir);
|
||||
let client = dav_client(cfg)?;
|
||||
let resp = with_auth(
|
||||
client
|
||||
.request(reqwest::Method::from_bytes(b"PROPFIND").unwrap(), &url)
|
||||
.header("Depth", "0")
|
||||
.body(String::new()),
|
||||
cfg,
|
||||
)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("无法连接 WebDAV 服务：{e}（请确认地址与端口）"))?;
|
||||
let code = resp.status().as_u16();
|
||||
match code {
|
||||
207 | 200 => Ok(format!("连接成功：{url}")),
|
||||
404 => Err(format!(
|
||||
"WebDAV 服务可达，但目标目录不存在（404）：{url}\n请先在 NAS 上创建该目录，并确认它在 WebDAV「可见文件夹范围」内"
|
||||
)),
|
||||
401 => Err("WebDAV 认证失败（401）：请检查账号与密码".to_string()),
|
||||
403 => Err("WebDAV 拒绝访问（403）：账号可能没有该目录的读取权限".to_string()),
|
||||
_ => Err(status_err("连接", code, &url)),
|
||||
}
|
||||
}
|
||||
|
||||
/// 上传本地文件（流式读取，不整载内存）。返回远程路径。
|
||||
pub async fn upload_file(
|
||||
cfg: &WebDavConfig,
|
||||
local_path: &std::path::Path,
|
||||
remote_path: &str,
|
||||
) -> Result<String, String> {
|
||||
ensure_dirs(cfg, remote_path).await?;
|
||||
let file = tokio::fs::File::open(local_path)
|
||||
.await
|
||||
.map_err(|e| format!("读取本地文件失败: {e}"))?;
|
||||
// 128KB 分块流：用 unfold 把 AsyncRead 转 Stream，避免引入 tokio-util
|
||||
let stream = futures_util::stream::unfold(file, |mut f| async move {
|
||||
use tokio::io::AsyncReadExt;
|
||||
let mut buf = vec![0u8; 128 * 1024];
|
||||
match f.read(&mut buf).await {
|
||||
Ok(0) => None,
|
||||
Ok(n) => Some((Ok::<Bytes, std::io::Error>(Bytes::copy_from_slice(&buf[..n])), f)),
|
||||
Err(e) => Some((Err(e), f)),
|
||||
}
|
||||
});
|
||||
let url = dav_url(cfg, remote_path);
|
||||
let client = dav_client(cfg)?;
|
||||
let resp = with_auth(client.put(&url), cfg)
|
||||
.header("Content-Type", mime_of(remote_path))
|
||||
.body(reqwest::Body::wrap_stream(stream))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("WebDAV 上传失败: {e}"))?;
|
||||
let code = resp.status().as_u16();
|
||||
if !(200..300).contains(&code) {
|
||||
return Err(status_err("上传", code, &url));
|
||||
}
|
||||
Ok(remote_path.to_string())
|
||||
}
|
||||
|
||||
/// 删除远程文件（404 视为已删除）。
|
||||
pub async fn delete(cfg: &WebDavConfig, remote_path: &str) -> Result<(), String> {
|
||||
let url = dav_url(cfg, remote_path);
|
||||
let client = dav_client(cfg)?;
|
||||
let resp = with_auth(client.delete(&url), cfg)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("WebDAV 删除失败: {e}"))?;
|
||||
let code = resp.status().as_u16();
|
||||
if code == 404 {
|
||||
return Ok(());
|
||||
}
|
||||
if !(200..300).contains(&code) {
|
||||
return Err(status_err("删除", code, &url));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn mime_of(name: &str) -> &'static str {
|
||||
let ext = name.rsplit('.').next().unwrap_or("").to_lowercase();
|
||||
match ext.as_str() {
|
||||
"mp3" => "audio/mpeg",
|
||||
"flac" => "audio/flac",
|
||||
"wav" => "audio/wav",
|
||||
"m4a" => "audio/mp4",
|
||||
"aac" => "audio/aac",
|
||||
"ogg" => "audio/ogg",
|
||||
"ape" => "audio/x-ape",
|
||||
_ => "application/octet-stream",
|
||||
}
|
||||
}
|
||||
|
||||
/// 保留给调用方校验配置完整性。
|
||||
pub fn validate(cfg: &WebDavConfig, dir: &str) -> Result<(), String> {
|
||||
if cfg.url.trim().is_empty() {
|
||||
return Err("请先填写 WebDAV 服务地址（如 http://192.168.110.100:5005）".into());
|
||||
}
|
||||
if cfg.username.trim().is_empty() {
|
||||
return Err("请先填写 WebDAV 账号".into());
|
||||
}
|
||||
if dir.trim().is_empty() {
|
||||
return Err("请先填写 WebDAV 曲库目标目录".into());
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,594 @@
|
||||
//! 音乐下载模块（musicdl 桥接）。
|
||||
//!
|
||||
//! 架构：Vue 前端 → Tauri 命令 → [MusicManager] → stdio JSON-Lines → `bridge.py`
|
||||
//! → musicdl（纯 Python 聚合下载器）。
|
||||
//!
|
||||
//! 目录布局（{app_data_dir}/music/）：
|
||||
//! - `bridge.py`：桥接脚本（include_str! 内置，运行时写出）
|
||||
//! - `runtime/python/`：便携 Python（python.org embeddable，含 pip）
|
||||
//! - `runtime/get-pip.py`：pip 引导脚本（下载后删除）
|
||||
//! - `runtime/*.zip`：下载过程中的临时安装包（完成后删除）
|
||||
//! - `outputs/`：默认音乐下载目录
|
||||
//!
|
||||
//! 子模块：
|
||||
//! - [`runtime`]：Python 运行时探测与便携版安装
|
||||
//! - [`bridge`]：桥接进程生命周期（spawn / JSON 协议 / ping / 停止）
|
||||
//! - [`commands`]：Tauri 命令层
|
||||
|
||||
mod bridge;
|
||||
mod commands;
|
||||
mod feiniu;
|
||||
mod runtime;
|
||||
|
||||
pub use feiniu::{extract_fn_id, normalize_base_url, resolve_base_url, Feiniu, FeiniuConnection};
|
||||
|
||||
pub use commands::{
|
||||
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_tracks, feiniu_login, feiniu_logout, feiniu_lyric,
|
||||
feiniu_media_prefix, feiniu_save_connection, feiniu_scan_local, feiniu_test_connection,
|
||||
music_cancel_runtime_install, 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_stop_bridge, webdav_delete,
|
||||
webdav_get_secret, webdav_save_secret, webdav_test, webdav_upload,
|
||||
};
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
use std::collections::HashMap;
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use std::process::{Child, ChildStdin};
|
||||
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::{Duration, Instant};
|
||||
use tauri::AppHandle;
|
||||
|
||||
/// 便携 Python 版本（python.org embeddable，含 pip 引导）
|
||||
pub const BUNDLED_PY_VERSION: &str = "3.12.10";
|
||||
/// musicdl 锁定版本（其 API 每周都在变，必须锁版本并定期升级）
|
||||
pub const MUSICDL_VERSION: &str = "2.13.11";
|
||||
/// pip 镜像源（国内网络直连 PyPI 较慢，默认用清华镜像，可改回官方）
|
||||
pub const PIP_INDEX_URL: &str = "https://pypi.tuna.tsinghua.edu.cn/simple";
|
||||
/// 默认搜索源（网易云 / QQ音乐 / 酷狗）
|
||||
pub const DEFAULT_SOURCES: [&str; 3] = [
|
||||
"NeteaseMusicClient",
|
||||
"QQMusicClient",
|
||||
"KugouMusicClient",
|
||||
];
|
||||
|
||||
/// 桥接进程条目（自管 stdio，不走 ProcessManager）
|
||||
pub(crate) struct BridgeEntry {
|
||||
pub child: Child,
|
||||
pub stdin: ChildStdin,
|
||||
}
|
||||
|
||||
/// 解析出的 Python 运行时信息（内部使用，不序列化）
|
||||
pub(crate) struct PythonEnv {
|
||||
pub source: &'static str, // "system" | "bundled"
|
||||
pub exe: PathBuf,
|
||||
pub version: String,
|
||||
}
|
||||
|
||||
/// 环境状态（返回前端，设置页「环境检查」面板展示）
|
||||
#[derive(Serialize, Clone, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct MusicEnvStatus {
|
||||
/// 系统 Python 版本（如 "3.14.5"），无则 None
|
||||
pub python: Option<String>,
|
||||
/// python 来源："system" | "bundled" | "none"
|
||||
pub python_source: String,
|
||||
/// 便携 Python 可执行文件路径（未安装则 None）
|
||||
pub bundled_python: Option<String>,
|
||||
/// musicdl 是否可导入
|
||||
pub musicdl_installed: bool,
|
||||
/// musicdl 版本
|
||||
pub musicdl_version: Option<String>,
|
||||
/// FFmpeg 是否可用（部分音源需要，非必需）
|
||||
pub ffmpeg: Option<String>,
|
||||
/// 桥接进程是否在运行
|
||||
pub bridge_running: bool,
|
||||
/// 运行时目录（{app_data_dir}/music）
|
||||
pub runtime_dir: String,
|
||||
}
|
||||
|
||||
/// 运行时安装进度事件负载（对应 events::MUSIC_RUNTIME_INSTALL_PROGRESS）
|
||||
#[derive(Serialize, Clone, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct MusicInstallProgress {
|
||||
pub stage: String,
|
||||
pub percent: u32,
|
||||
pub downloaded_bytes: u64,
|
||||
pub total_bytes: Option<u64>,
|
||||
pub message: String,
|
||||
}
|
||||
|
||||
/// 音乐模块设置（settings.json 持久化；变更即时生效）
|
||||
#[derive(Serialize, Deserialize, Clone, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct MusicSettings {
|
||||
/// 下载保存目录
|
||||
pub savedir: String,
|
||||
/// 搜索源（musicdl 客户端名，如 NeteaseMusicClient）
|
||||
pub sources: Vec<String>,
|
||||
/// 下载时同步保存歌词
|
||||
pub lyric_download: bool,
|
||||
/// 下载时同步保存封面
|
||||
pub cover_download: bool,
|
||||
/// 搜索/下载请求是否走代理模块（mihomo mixed 端口）
|
||||
pub use_proxy: bool,
|
||||
/// 最大并发下载数
|
||||
pub max_concurrent: u32,
|
||||
/// 下载引擎："musicdl" | "rust"（P2 生效）
|
||||
pub download_engine: String,
|
||||
/// 下载时是否弹窗选择音质（默认关；开启后点下载弹出所选歌曲档位并集选择）
|
||||
pub select_quality_on_download: bool,
|
||||
/// 下载时默认音质："" 表示最高；否则为搜索音质档位 label（如 "无损"、"320K"）
|
||||
pub default_download_quality: String,
|
||||
/// 飞牛音乐(NAS)连接：服务器地址（如 http://192.168.1.10:5666，空=未配置）
|
||||
#[serde(default)]
|
||||
pub feiniu_base_url: String,
|
||||
/// 飞牛音乐登录 token（登录成功后保存）
|
||||
#[serde(default)]
|
||||
pub feiniu_token: String,
|
||||
/// 飞牛音乐登录账号（展示 + 重新登录回填用）
|
||||
#[serde(default)]
|
||||
pub feiniu_username: String,
|
||||
/// 飞牛音乐设备 ID（32 位 hex，登录签名用，一次生成复用）
|
||||
#[serde(default)]
|
||||
pub feiniu_device_id: String,
|
||||
/// 飞牛音乐访问安全码（可选；仅需访问码的库才填，LAN 通常为空）
|
||||
#[serde(default)]
|
||||
pub feiniu_access_code: String,
|
||||
/// 飞牛音乐连接列表（多连接：本地 / frp / 预留 fnconnect）
|
||||
#[serde(default)]
|
||||
pub feiniu_connections: Vec<FeiniuConnection>,
|
||||
/// 当前激活连接的 id
|
||||
#[serde(default)]
|
||||
pub feiniu_active_id: String,
|
||||
/// 本地曲库扫描目录（默认含音乐下载 savedir）
|
||||
#[serde(default)]
|
||||
pub feiniu_local_dirs: Vec<String>,
|
||||
/// 播放缓存开关
|
||||
#[serde(default)]
|
||||
pub feiniu_cache_enabled: bool,
|
||||
/// 缓存上限（GB）
|
||||
#[serde(default)]
|
||||
pub feiniu_cache_max_gb: u32,
|
||||
/// 播放模式："stream" 直连流式 | "cache" 缓存后播放
|
||||
#[serde(default)]
|
||||
pub feiniu_play_mode: String,
|
||||
/// 飞牛曲库目标目录（NAS 绝对路径，如 vol1/1000/Music；上传到飞牛用）
|
||||
#[serde(default)]
|
||||
pub feiniu_library_nas_path: String,
|
||||
/// 下载完成后自动上传到飞牛曲库
|
||||
#[serde(default)]
|
||||
pub feiniu_auto_upload: bool,
|
||||
}
|
||||
|
||||
impl MusicSettings {
|
||||
/// 取激活连接：优先按 active_id，否则回退到第一条。
|
||||
pub fn feiniu_active(&self) -> Option<&FeiniuConnection> {
|
||||
self.feiniu_connections
|
||||
.iter()
|
||||
.find(|c| c.id == self.feiniu_active_id)
|
||||
.or_else(|| self.feiniu_connections.first())
|
||||
}
|
||||
|
||||
/// 兼容旧版单连接字段：若连接列表为空且存在旧 feiniu_* 字段，则迁移为一条默认连接。
|
||||
pub fn migrate_feiniu(&mut self) {
|
||||
if self.feiniu_connections.is_empty() {
|
||||
if !self.feiniu_base_url.trim().is_empty() {
|
||||
let base = self.feiniu_base_url.clone();
|
||||
self.feiniu_connections.push(FeiniuConnection {
|
||||
id: "default".to_string(),
|
||||
name: base.clone(),
|
||||
kind: "lan".to_string(),
|
||||
base_url: base,
|
||||
username: self.feiniu_username.clone(),
|
||||
token: self.feiniu_token.clone(),
|
||||
device_id: self.feiniu_device_id.clone(),
|
||||
access_code: self.feiniu_access_code.clone(),
|
||||
insecure: false,
|
||||
fn_id: String::new(),
|
||||
});
|
||||
self.feiniu_active_id = "default".to_string();
|
||||
}
|
||||
} else if self.feiniu_active_id.is_empty()
|
||||
|| !self.feiniu_connections.iter().any(|c| c.id == self.feiniu_active_id)
|
||||
{
|
||||
if let Some(c) = self.feiniu_connections.first() {
|
||||
self.feiniu_active_id = c.id.clone();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// settings 内存缓存条目（短时复用，避免高频调用反复读盘）
|
||||
struct SettingsCacheEntry {
|
||||
read_at: Instant,
|
||||
settings: MusicSettings,
|
||||
}
|
||||
|
||||
/// 音乐模块管理器
|
||||
pub struct MusicManager {
|
||||
root: PathBuf,
|
||||
client: reqwest::Client,
|
||||
/// 桥接进程（stdio 自管）
|
||||
bridge: Mutex<Option<BridgeEntry>>,
|
||||
/// 待响应请求表：id → oneshot（reader 线程按 id 分发）
|
||||
pending: Arc<Mutex<HashMap<u64, tokio::sync::oneshot::Sender<serde_json::Value>>>>,
|
||||
/// 请求 id 自增
|
||||
next_id: AtomicU64,
|
||||
/// 便携运行时安装/下载取消标志
|
||||
runtime_cancel: Arc<AtomicBool>,
|
||||
/// 正在执行的 pip/python 子进程 pid（取消时 taskkill）
|
||||
install_pid: Arc<AtomicU64>,
|
||||
/// 桥接启动互斥锁（防止并发 ensure_bridge 双重 spawn）
|
||||
start_lock: Mutex<()>,
|
||||
/// settings 内存缓存
|
||||
settings_cache: Mutex<Option<SettingsCacheEntry>>,
|
||||
/// 飞牛音乐(NAS)播放器运行期（连接 + 本地流代理）
|
||||
feiniu: Feiniu,
|
||||
/// AppHandle（桥接 reader 线程据此将事件转发给前端；setup 时设置）
|
||||
app: Mutex<Option<AppHandle>>,
|
||||
}
|
||||
|
||||
impl MusicManager {
|
||||
pub fn new(app_data_dir: PathBuf) -> Self {
|
||||
let root = app_data_dir.join("music");
|
||||
for d in ["runtime", "outputs"] {
|
||||
fs::create_dir_all(root.join(d)).ok();
|
||||
}
|
||||
let mut feiniu = Feiniu::default();
|
||||
feiniu.set_cache_root(&app_data_dir);
|
||||
Self {
|
||||
root,
|
||||
client: reqwest::Client::builder()
|
||||
// 默认 30s 兜底超时；流式下载按块推进，不受此限制
|
||||
.timeout(std::time::Duration::from_secs(30))
|
||||
.build()
|
||||
.unwrap_or_else(|_| reqwest::Client::new()),
|
||||
bridge: Mutex::new(None),
|
||||
pending: Arc::new(Mutex::new(HashMap::new())),
|
||||
next_id: AtomicU64::new(1),
|
||||
runtime_cancel: Arc::new(AtomicBool::new(false)),
|
||||
install_pid: Arc::new(AtomicU64::new(0)),
|
||||
start_lock: Mutex::new(()),
|
||||
settings_cache: Mutex::new(None),
|
||||
feiniu,
|
||||
app: Mutex::new(None),
|
||||
}
|
||||
}
|
||||
|
||||
/// 设置 AppHandle（setup 阶段调用；桥接 reader 线程据此转发事件到前端）
|
||||
pub fn set_app(&self, app: AppHandle) {
|
||||
if let Ok(mut guard) = self.app.lock() {
|
||||
*guard = Some(app);
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn app_handle(&self) -> Option<AppHandle> {
|
||||
self.app.lock().ok().and_then(|g| g.clone())
|
||||
}
|
||||
|
||||
// ---------- 设置 ----------
|
||||
/// 默认保存目录：系统「下载」目录（不可用时退回 {root}/outputs）
|
||||
fn default_savedir(&self) -> String {
|
||||
dirs::download_dir()
|
||||
.unwrap_or_else(|| self.outputs_dir())
|
||||
.to_string_lossy()
|
||||
.to_string()
|
||||
}
|
||||
|
||||
fn default_settings(&self) -> MusicSettings {
|
||||
MusicSettings {
|
||||
savedir: self.default_savedir(),
|
||||
sources: DEFAULT_SOURCES.iter().map(|s| s.to_string()).collect(),
|
||||
lyric_download: true,
|
||||
cover_download: true,
|
||||
use_proxy: false,
|
||||
max_concurrent: 4,
|
||||
download_engine: "musicdl".to_string(),
|
||||
select_quality_on_download: false,
|
||||
default_download_quality: "最高".to_string(), // 默认下载最高音质
|
||||
feiniu_base_url: String::new(),
|
||||
feiniu_token: String::new(),
|
||||
feiniu_username: String::new(),
|
||||
feiniu_device_id: String::new(),
|
||||
feiniu_access_code: String::new(),
|
||||
feiniu_connections: Vec::new(),
|
||||
feiniu_active_id: String::new(),
|
||||
feiniu_local_dirs: Vec::new(),
|
||||
feiniu_cache_enabled: false,
|
||||
feiniu_cache_max_gb: 5,
|
||||
feiniu_play_mode: "stream".to_string(),
|
||||
feiniu_library_nas_path: String::new(),
|
||||
feiniu_auto_upload: false,
|
||||
}
|
||||
}
|
||||
|
||||
fn settings_path(&self) -> PathBuf {
|
||||
self.root.join("settings.json")
|
||||
}
|
||||
|
||||
/// 读取设置（500ms 内存缓存；文件缺失/损坏时回退默认值）
|
||||
pub fn load_settings(&self) -> MusicSettings {
|
||||
if let Ok(cache) = self.settings_cache.lock() {
|
||||
if let Some(entry) = cache.as_ref() {
|
||||
if entry.read_at.elapsed() < Duration::from_millis(500) {
|
||||
return entry.settings.clone();
|
||||
}
|
||||
}
|
||||
}
|
||||
let defaults = self.default_settings();
|
||||
let settings = fs::read_to_string(self.settings_path())
|
||||
.ok()
|
||||
.and_then(|s| serde_json::from_str::<MusicSettings>(&s).ok())
|
||||
.unwrap_or_else(|| defaults.clone());
|
||||
// 自愈：保存目录为空 / 源为空时补默认值
|
||||
let mut settings = settings;
|
||||
if settings.savedir.trim().is_empty() {
|
||||
settings.savedir = defaults.savedir;
|
||||
}
|
||||
// 迁移：旧默认保存目录（{root}/outputs）→ 系统下载目录
|
||||
if settings.savedir == self.outputs_dir().to_string_lossy() {
|
||||
settings.savedir = self.default_savedir();
|
||||
}
|
||||
if settings.sources.is_empty() {
|
||||
settings.sources = defaults.sources;
|
||||
}
|
||||
// 飞牛音乐多连接迁移：旧单连接字段 → 连接列表
|
||||
settings.migrate_feiniu();
|
||||
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, settings: &MusicSettings) -> Result<(), String> {
|
||||
let json = serde_json::to_string_pretty(settings).map_err(|e| format!("序列化设置失败: {}", e))?;
|
||||
fs::write(self.settings_path(), json).map_err(|e| format!("写入设置失败: {}", e))?;
|
||||
if let Ok(mut cache) = self.settings_cache.lock() {
|
||||
*cache = Some(SettingsCacheEntry {
|
||||
read_at: Instant::now(),
|
||||
settings: settings.clone(),
|
||||
});
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// ---------- 目录 ----------
|
||||
pub fn runtime_dir(&self) -> PathBuf {
|
||||
self.root.join("runtime")
|
||||
}
|
||||
/// 默认音乐下载目录
|
||||
pub fn outputs_dir(&self) -> PathBuf {
|
||||
self.root.join("outputs")
|
||||
}
|
||||
pub fn bridge_script_path(&self) -> PathBuf {
|
||||
self.root.join("bridge.py")
|
||||
}
|
||||
pub fn bundled_python_exe(&self) -> PathBuf {
|
||||
self.runtime_dir().join("python").join("python.exe")
|
||||
}
|
||||
|
||||
// ---------- Python 探测 ----------
|
||||
/// 解析桥接要用的 Python 运行时。
|
||||
/// 便携版优先：musicdl 只装入便携运行时，系统 Python 无法保证装有 musicdl；
|
||||
/// 无便携版时退回系统 Python（此时 search 会报 musicdl 未安装，引导用户装便携版）。
|
||||
pub fn resolve_python(&self) -> Result<PythonEnv, String> {
|
||||
if let Some(env) = self.detect_bundled_python() {
|
||||
return Ok(env);
|
||||
}
|
||||
if let Some(env) = detect_system_python() {
|
||||
return Ok(env);
|
||||
}
|
||||
Err("未找到 Python 运行时：系统未安装 Python，且便携版未安装。请点击「安装便携版」".into())
|
||||
}
|
||||
|
||||
/// 便携 Python 是否可用（exe 存在且能跑 --version）
|
||||
pub fn detect_bundled_python(&self) -> Option<PythonEnv> {
|
||||
detect_bundled_python_at(&self.bundled_python_exe())
|
||||
}
|
||||
|
||||
// ---------- 环境状态 ----------
|
||||
/// 查询环境状态。子进程探测（python/musicdl/ffmpeg，便携 Python 冷启动可达数秒）
|
||||
/// 放入阻塞线程池执行，避免阻塞主线程导致 UI 冻结。
|
||||
pub async fn env_status(&self) -> Result<MusicEnvStatus, String> {
|
||||
let bundled_exe = self.bundled_python_exe();
|
||||
let bridge_running = self.bridge.lock().map(|b| b.is_some()).unwrap_or(false);
|
||||
let runtime_dir = self.root.to_string_lossy().to_string();
|
||||
let probe =
|
||||
tauri::async_runtime::spawn_blocking(move || probe_env_blocking(bundled_exe))
|
||||
.await
|
||||
.map_err(|e| format!("环境探测任务失败: {}", e))?;
|
||||
Ok(MusicEnvStatus {
|
||||
python: probe.python,
|
||||
python_source: probe.python_source.to_string(),
|
||||
bundled_python: probe.bundled_python,
|
||||
musicdl_installed: probe.musicdl_installed,
|
||||
musicdl_version: probe.musicdl_version,
|
||||
ffmpeg: probe.ffmpeg,
|
||||
bridge_running,
|
||||
runtime_dir,
|
||||
})
|
||||
}
|
||||
|
||||
// ---------- 退出清理 ----------
|
||||
/// 应用退出时停止桥接进程（stdin/stdout 随 child drop 关闭，reader 线程读到 EOF 自行退出）
|
||||
pub fn cleanup_on_exit(&self) {
|
||||
self.stop_bridge();
|
||||
}
|
||||
|
||||
// ---------- 内部工具 ----------
|
||||
pub(crate) fn cancel(&self) {
|
||||
self.runtime_cancel.store(true, Ordering::SeqCst);
|
||||
let pid = self.install_pid.load(Ordering::SeqCst);
|
||||
if pid != 0 {
|
||||
// 杀掉正在执行的 pip/python 子进程，避免安装流程挂住
|
||||
let _ = std::process::Command::new("taskkill")
|
||||
.args(["/F", "/T", "/PID", &pid.to_string()])
|
||||
.stdout(std::process::Stdio::null())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.status();
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn is_cancelled(&self) -> bool {
|
||||
self.runtime_cancel.load(Ordering::SeqCst)
|
||||
}
|
||||
|
||||
pub(crate) fn start_lock(&self) -> &Mutex<()> {
|
||||
&self.start_lock
|
||||
}
|
||||
}
|
||||
|
||||
/// 环境探测结果（spawn_blocking 跨线程返回）
|
||||
struct EnvProbe {
|
||||
python: Option<String>,
|
||||
python_source: &'static str,
|
||||
bundled_python: Option<String>,
|
||||
musicdl_installed: bool,
|
||||
musicdl_version: Option<String>,
|
||||
ffmpeg: Option<String>,
|
||||
}
|
||||
|
||||
/// 阻塞式环境探测（串行 spawn 多个子进程，必须在阻塞线程池执行，禁止占用主线程）
|
||||
fn probe_env_blocking(bundled_exe: PathBuf) -> EnvProbe {
|
||||
let bundled = detect_bundled_python_at(&bundled_exe);
|
||||
let sys_py = detect_system_python();
|
||||
// 便携版优先（与 resolve_python 一致）：musicdl 只装入便携运行时，
|
||||
// 若按系统优先检查，装好便携版后 UI 仍会误报 musicdl 未安装
|
||||
let python = bundled.as_ref().or(sys_py.as_ref());
|
||||
|
||||
let (musicdl_installed, musicdl_version) = match python {
|
||||
Some(env) => check_musicdl(&env.exe),
|
||||
None => (false, None),
|
||||
};
|
||||
EnvProbe {
|
||||
python: python.map(|e| e.version.clone()),
|
||||
python_source: match python {
|
||||
Some(e) => e.source,
|
||||
None => "none",
|
||||
},
|
||||
bundled_python: bundled.map(|e| e.exe.to_string_lossy().to_string()),
|
||||
musicdl_installed,
|
||||
musicdl_version,
|
||||
ffmpeg: check_ffmpeg(),
|
||||
}
|
||||
}
|
||||
|
||||
/// 指定路径的便携 Python 是否可用（exe 存在且能跑 --version）
|
||||
fn detect_bundled_python_at(exe: &PathBuf) -> Option<PythonEnv> {
|
||||
if !exe.exists() {
|
||||
return None;
|
||||
}
|
||||
let version = run_python_version(exe)?;
|
||||
Some(PythonEnv {
|
||||
source: "bundled",
|
||||
exe: exe.clone(),
|
||||
version,
|
||||
})
|
||||
}
|
||||
|
||||
/// 探测系统 Python：依次尝试 python / py / python3，解析 `--version` 输出。
|
||||
/// 注意：Windows 的「应用商店别名」python 会在无安装时打印提示并以非零码退出，会被自然过滤。
|
||||
fn detect_system_python() -> Option<PythonEnv> {
|
||||
for candidate in ["python", "py", "python3"] {
|
||||
let mut cmd = std::process::Command::new(candidate);
|
||||
cmd.arg("--version");
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::piped())
|
||||
.stdin(std::process::Stdio::null());
|
||||
let out = cmd.output().ok()?;
|
||||
let text = format!(
|
||||
"{}{}",
|
||||
String::from_utf8_lossy(&out.stdout),
|
||||
String::from_utf8_lossy(&out.stderr)
|
||||
);
|
||||
if let Some(version) = parse_python_version(&text) {
|
||||
return Some(PythonEnv {
|
||||
source: "system",
|
||||
exe: PathBuf::from(candidate),
|
||||
version,
|
||||
});
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// 运行 `python --version` 并解析版本号
|
||||
fn run_python_version(exe: &PathBuf) -> Option<String> {
|
||||
let mut cmd = std::process::Command::new(exe);
|
||||
cmd.arg("--version");
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::piped())
|
||||
.stdin(std::process::Stdio::null());
|
||||
let out = cmd.output().ok()?;
|
||||
let text = format!(
|
||||
"{}{}",
|
||||
String::from_utf8_lossy(&out.stdout),
|
||||
String::from_utf8_lossy(&out.stderr)
|
||||
);
|
||||
parse_python_version(&text)
|
||||
}
|
||||
|
||||
/// 从 "Python 3.14.5" 文本中提取 "3.14.5"
|
||||
fn parse_python_version(text: &str) -> Option<String> {
|
||||
text.split_whitespace().find_map(|w| {
|
||||
let mut parts = w.split('.');
|
||||
let major = parts.next()?.parse::<u32>().ok()?;
|
||||
let minor = parts.next()?.parse::<u32>().ok()?;
|
||||
if (major, minor) >= (3, 8) {
|
||||
Some(w.to_string())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// 检查指定 Python 能否导入 musicdl（同步子进程调用，仅在设置页触发）
|
||||
fn check_musicdl(exe: &PathBuf) -> (bool, Option<String>) {
|
||||
let mut cmd = std::process::Command::new(exe);
|
||||
cmd.args([
|
||||
"-c",
|
||||
"import musicdl; print(getattr(musicdl, '__version__', 'unknown'))",
|
||||
]);
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.stdin(std::process::Stdio::null());
|
||||
match cmd.output() {
|
||||
Ok(out) if out.status.success() => {
|
||||
let version = String::from_utf8_lossy(&out.stdout).trim().to_string();
|
||||
(true, Some(version))
|
||||
}
|
||||
_ => (false, None),
|
||||
}
|
||||
}
|
||||
|
||||
/// 检查 FFmpeg 是否可用（部分海外音源需要，非必需）
|
||||
fn check_ffmpeg() -> Option<String> {
|
||||
let mut cmd = std::process::Command::new("ffmpeg");
|
||||
cmd.arg("-version");
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.stdin(std::process::Stdio::null());
|
||||
cmd.output()
|
||||
.ok()
|
||||
.and_then(|o| String::from_utf8(o.stdout).ok())
|
||||
.and_then(|s| {
|
||||
s.lines()
|
||||
.next()
|
||||
.map(|l| l.trim().to_string())
|
||||
.filter(|l| !l.is_empty())
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,398 @@
|
||||
//! 便携 Python 运行时安装：流式下载 → 解压 → _pth 补丁 → get-pip 引导 → musicdl 安装。
|
||||
//! 子模块通过 `impl super::MusicManager` 追加方法。
|
||||
//!
|
||||
//! 依赖下载源（已验证）：
|
||||
//! - https://www.python.org/ftp/python/{ver}/python-{ver}-embed-amd64.zip
|
||||
//! - https://bootstrap.pypa.io/get-pip.py
|
||||
//!
|
||||
//! 取消：`MusicManager::cancel()` 置标志 + taskkill 当前 pip/python 子进程。
|
||||
|
||||
use std::fs;
|
||||
use std::io::{Read, Write};
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::Arc;
|
||||
|
||||
use futures_util::StreamExt;
|
||||
use tauri::{AppHandle, Emitter};
|
||||
|
||||
use super::{MusicInstallProgress, MusicManager, PIP_INDEX_URL};
|
||||
use crate::constants::events::MUSIC_RUNTIME_INSTALL_PROGRESS;
|
||||
|
||||
/// 用户主动取消安装的标记错误信息（前端据此静默处理）
|
||||
pub(crate) const RUNTIME_CANCELLED: &str = "安装已取消";
|
||||
|
||||
impl MusicManager {
|
||||
/// 安装便携 Python + musicdl（幂等：已就绪的步骤自动跳过），全程推送进度事件。
|
||||
pub async fn install_runtime(&self, app: &AppHandle) -> Result<(), String> {
|
||||
self.runtime_cancel.store(false, std::sync::atomic::Ordering::SeqCst);
|
||||
let result = self.install_runtime_inner(app).await;
|
||||
if let Err(ref e) = result {
|
||||
if e != RUNTIME_CANCELLED {
|
||||
let _ = app.emit(
|
||||
MUSIC_RUNTIME_INSTALL_PROGRESS,
|
||||
MusicInstallProgress {
|
||||
stage: "error".into(),
|
||||
percent: 0,
|
||||
downloaded_bytes: 0,
|
||||
total_bytes: None,
|
||||
message: e.clone(),
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
result
|
||||
}
|
||||
|
||||
async fn install_runtime_inner(&self, app: &AppHandle) -> Result<(), String> {
|
||||
let runtime_dir = self.runtime_dir();
|
||||
fs::create_dir_all(&runtime_dir).map_err(|e| e.to_string())?;
|
||||
|
||||
let python_exe = self.bundled_python_exe();
|
||||
|
||||
// ---------- 1. 便携 Python 已就绪则跳过下载/解压 ----------
|
||||
if !(python_exe.exists() && super::run_python_version(&python_exe).is_some()) {
|
||||
self.emit_progress(app, "download", 2, 0, None, "开始下载便携 Python...").await;
|
||||
|
||||
// 下载 embeddable zip（~11MB，流式写入）
|
||||
let zip_path = runtime_dir.join(format!("python-{}-embed.zip", super::BUNDLED_PY_VERSION));
|
||||
let zip_url = format!(
|
||||
"https://www.python.org/ftp/python/{}/python-{}-embed-amd64.zip",
|
||||
super::BUNDLED_PY_VERSION,
|
||||
super::BUNDLED_PY_VERSION
|
||||
);
|
||||
self.download_stream(app, &zip_url, &zip_path).await?;
|
||||
|
||||
// 解压到 runtime/python/
|
||||
self.emit_progress(app, "extract", 42, 0, None, "正在解压便携 Python...").await;
|
||||
let python_dir = runtime_dir.join("python");
|
||||
if python_dir.exists() {
|
||||
fs::remove_dir_all(&python_dir).ok();
|
||||
}
|
||||
fs::create_dir_all(&python_dir).map_err(|e| e.to_string())?;
|
||||
self.extract_zip(&zip_path, &python_dir)?;
|
||||
fs::remove_file(&zip_path).ok();
|
||||
|
||||
// _pth 补丁：启用 site（否则无法识别 site-packages 与 pip）
|
||||
self.emit_progress(app, "patch", 52, 0, None, "正在配置 Python 环境...").await;
|
||||
self.patch_pth(&python_dir)?;
|
||||
|
||||
// 下载 get-pip.py 并引导 pip（只装 pip 本体，走官方源，包很小）
|
||||
self.emit_progress(app, "pip", 54, 0, None, "正在引导 pip...").await;
|
||||
let get_pip = runtime_dir.join("get-pip.py");
|
||||
self.download_bytes(&"https://bootstrap.pypa.io/get-pip.py".to_string(), &get_pip)
|
||||
.await?;
|
||||
let pip_py = python_exe.clone();
|
||||
let pip_py2 = pip_py.clone(); // 供 setuptools 步骤闭包使用（先于 move 克隆）
|
||||
let get_pip2 = get_pip.clone();
|
||||
self.run_blocking_step(
|
||||
app,
|
||||
"pip",
|
||||
55,
|
||||
60,
|
||||
move |pid| {
|
||||
let mut cmd = std::process::Command::new(&pip_py);
|
||||
cmd.arg(&get_pip2).args(["--no-warn-script-location"]);
|
||||
run_cmd_blocking(cmd, pid)
|
||||
},
|
||||
"正在安装 pip...",
|
||||
)
|
||||
.await?;
|
||||
fs::remove_file(&get_pip).ok();
|
||||
|
||||
// 安装 setuptools（musicdl 的 setup.py 构建依赖 setuptools.build_meta，
|
||||
// 必须先于 musicdl 就位，否则构建阶段报 BackendUnavailable）
|
||||
self.run_blocking_step(
|
||||
app,
|
||||
"pip",
|
||||
62,
|
||||
66,
|
||||
move |pid| {
|
||||
let mut cmd = std::process::Command::new(&pip_py2);
|
||||
cmd.args([
|
||||
"-m", "pip", "install", "--no-warn-script-location",
|
||||
"--timeout", "60",
|
||||
"--index-url", PIP_INDEX_URL,
|
||||
"setuptools",
|
||||
]);
|
||||
run_cmd_blocking(cmd, pid)
|
||||
},
|
||||
"正在安装 setuptools...",
|
||||
)
|
||||
.await?;
|
||||
} else {
|
||||
self.emit_progress(app, "check", 2, 0, None, "便携 Python 已就绪").await;
|
||||
}
|
||||
|
||||
// ---------- 2. 安装 musicdl（幂等：已安装则跳过） ----------
|
||||
if !self.musicdl_ready(&python_exe).await {
|
||||
let pip_py = python_exe.clone();
|
||||
self.run_blocking_step(
|
||||
app,
|
||||
"musicdl",
|
||||
68,
|
||||
95,
|
||||
move |pid| {
|
||||
let mut cmd = std::process::Command::new(&pip_py);
|
||||
cmd.args([
|
||||
"-m", "pip", "install", "--no-warn-script-location",
|
||||
"--timeout", "60",
|
||||
"--index-url", PIP_INDEX_URL,
|
||||
&format!("musicdl=={}", super::MUSICDL_VERSION),
|
||||
]);
|
||||
run_cmd_blocking(cmd, pid)
|
||||
},
|
||||
"正在安装 musicdl（下载依赖较多，可能需几分钟）...",
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
|
||||
self.emit_progress(app, "done", 100, 0, None, "环境就绪").await;
|
||||
crate::logger::log_info("music", "便携 Python + musicdl 安装完成");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 检查便携 Python 能否导入 musicdl
|
||||
async fn musicdl_ready(&self, python_exe: &PathBuf) -> bool {
|
||||
let exe = python_exe.clone();
|
||||
let (ok, _) = super::check_musicdl(&exe);
|
||||
ok
|
||||
}
|
||||
|
||||
// ---------- 阶段工具 ----------
|
||||
async fn emit_progress(
|
||||
&self,
|
||||
app: &AppHandle,
|
||||
stage: &str,
|
||||
percent: u32,
|
||||
downloaded_bytes: u64,
|
||||
total_bytes: Option<u64>,
|
||||
message: &str,
|
||||
) {
|
||||
let _ = app.emit(
|
||||
MUSIC_RUNTIME_INSTALL_PROGRESS,
|
||||
MusicInstallProgress {
|
||||
stage: stage.into(),
|
||||
percent,
|
||||
downloaded_bytes,
|
||||
total_bytes,
|
||||
message: message.into(),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/// 流式下载（带取消 + 进度事件，percent 0-40 区间），复用内核下载模式
|
||||
async fn download_stream(
|
||||
&self,
|
||||
app: &AppHandle,
|
||||
url: &str,
|
||||
dest: &Path,
|
||||
) -> Result<(), String> {
|
||||
let resp = self
|
||||
.client
|
||||
.get(url)
|
||||
.timeout(std::time::Duration::from_secs(300))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("请求下载失败: {}", e))?;
|
||||
let status = resp.status();
|
||||
if !status.is_success() {
|
||||
return Err(format!("下载返回 HTTP {}", status.as_u16()));
|
||||
}
|
||||
let total: Option<u64> = 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: u32 = 0;
|
||||
while let Some(chunk) = stream.next().await {
|
||||
if self.is_cancelled() {
|
||||
drop(file);
|
||||
fs::remove_file(dest).ok();
|
||||
return Err(RUNTIME_CANCELLED.to_string());
|
||||
}
|
||||
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) * 38.0) as u32)
|
||||
.unwrap_or(0)
|
||||
.min(38);
|
||||
if percent >= last_percent + 1 {
|
||||
last_percent = percent;
|
||||
self.emit_progress(
|
||||
app,
|
||||
"download",
|
||||
percent,
|
||||
downloaded,
|
||||
total,
|
||||
&format!("正在下载便携 Python ({:.1} MB)", downloaded as f64 / 1048576.0),
|
||||
)
|
||||
.await;
|
||||
}
|
||||
}
|
||||
file.flush().ok();
|
||||
self.emit_progress(app, "download", 40, downloaded, total, "下载完成").await;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 小文件整体下载（get-pip.py），无进度
|
||||
async fn download_bytes(&self, url: &str, dest: &Path) -> Result<(), String> {
|
||||
let resp = self
|
||||
.client
|
||||
.get(url)
|
||||
.timeout(std::time::Duration::from_secs(120))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("请求下载失败: {}", e))?;
|
||||
let status = resp.status();
|
||||
if !status.is_success() {
|
||||
return Err(format!("下载返回 HTTP {}", status.as_u16()));
|
||||
}
|
||||
let bytes = resp.bytes().await.map_err(|e| format!("读取响应失败: {}", e))?;
|
||||
fs::write(dest, &bytes).map_err(|e| format!("写入文件失败: {}", e))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 解压 zip（复用内核解压逻辑）
|
||||
fn extract_zip(&self, zip_path: &Path, dest: &Path) -> Result<(), String> {
|
||||
let file = fs::File::open(zip_path).map_err(|e| format!("打开 zip 失败: {}", e))?;
|
||||
let mut archive = zip::ZipArchive::new(file).map_err(|e| format!("读取 zip 失败: {}", e))?;
|
||||
for i in 0..archive.len() {
|
||||
let mut entry = archive
|
||||
.by_index(i)
|
||||
.map_err(|e| format!("读取条目失败: {}", e))?;
|
||||
let outpath = match entry.enclosed_name() {
|
||||
Some(p) => dest.join(p),
|
||||
None => continue,
|
||||
};
|
||||
if entry.is_dir() {
|
||||
fs::create_dir_all(&outpath).map_err(|e| e.to_string())?;
|
||||
} else {
|
||||
if let Some(parent) = outpath.parent() {
|
||||
fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
||||
}
|
||||
let mut outfile = fs::File::create(&outpath).map_err(|e| e.to_string())?;
|
||||
let mut buf = [0u8; 8192];
|
||||
loop {
|
||||
let n = entry.read(&mut buf).map_err(|e| e.to_string())?;
|
||||
if n == 0 {
|
||||
break;
|
||||
}
|
||||
outfile.write_all(&buf[..n]).map_err(|e| e.to_string())?;
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 修改 pythonXY._pth：启用 `import site`（embeddable 默认注释掉，
|
||||
/// 不启用则无法识别 site-packages / pip 安装的包）
|
||||
fn patch_pth(&self, python_dir: &Path) -> Result<(), String> {
|
||||
let entries = fs::read_dir(python_dir).map_err(|e| e.to_string())?;
|
||||
let pth = entries
|
||||
.filter_map(|e| e.ok())
|
||||
.map(|e| e.path())
|
||||
.find(|p| {
|
||||
p.extension()
|
||||
.and_then(|e| e.to_str())
|
||||
.map(|e| e.eq_ignore_ascii_case("_pth"))
|
||||
.unwrap_or(false)
|
||||
})
|
||||
.ok_or_else(|| "解压目录中未找到 ._pth 文件".to_string())?;
|
||||
|
||||
let content = fs::read_to_string(&pth).map_err(|e| e.to_string())?;
|
||||
let mut patched = content.replace("#import site", "import site");
|
||||
if !patched.contains("import site") {
|
||||
patched.push_str("import site\n");
|
||||
}
|
||||
// 显式把 site-packages 加入 sys.path（pip 默认安装位置）
|
||||
if !patched.contains("Lib\\site-packages") && !patched.contains("Lib/site-packages") {
|
||||
patched.push_str("Lib\\site-packages\n");
|
||||
}
|
||||
fs::write(&pth, patched).map_err(|e| format!("写入 _pth 失败: {}", e))?;
|
||||
crate::logger::log_info("music", &format!("已补丁 _pth: {}", pth.display()));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 执行一个阻塞子进程步骤（get-pip / setuptools / musicdl），带进度推送、取消检查与超时看门狗。
|
||||
/// start_percent / end_percent：本步骤的进度区间（完成前推进到 end_percent）。
|
||||
/// run 闭包接收「子进程 pid 记录器」，供取消时 taskkill。
|
||||
async fn run_blocking_step<F>(
|
||||
&self,
|
||||
app: &AppHandle,
|
||||
stage: &str,
|
||||
start_percent: u32,
|
||||
end_percent: u32,
|
||||
run: F,
|
||||
msg: &str,
|
||||
) -> Result<(), String>
|
||||
where
|
||||
F: FnOnce(Arc<std::sync::atomic::AtomicU64>) -> Result<(), String> + Send + 'static,
|
||||
{
|
||||
if self.is_cancelled() {
|
||||
return Err(RUNTIME_CANCELLED.to_string());
|
||||
}
|
||||
let pid_ref = self.install_pid.clone();
|
||||
self.emit_progress(app, stage, start_percent, 0, None, msg).await;
|
||||
let result = tauri::async_runtime::spawn_blocking(move || run(pid_ref.clone()))
|
||||
.await
|
||||
.map_err(|e| format!("任务执行失败: {}", e))?;
|
||||
self.install_pid.store(0, std::sync::atomic::Ordering::SeqCst);
|
||||
if self.is_cancelled() {
|
||||
return Err(RUNTIME_CANCELLED.to_string());
|
||||
}
|
||||
result?;
|
||||
self.emit_progress(app, stage, end_percent, 0, None, "完成").await;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// 同步运行子进程，带超时看门狗（超时 taskkill），并记录 pid 供取消。
|
||||
/// 输出（stdout+stderr 尾部）写入日志；失败返回错误信息。
|
||||
fn run_cmd_blocking(
|
||||
mut cmd: std::process::Command,
|
||||
pid_ref: Arc<std::sync::atomic::AtomicU64>,
|
||||
) -> Result<(), String> {
|
||||
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 child = cmd.spawn().map_err(|e| format!("启动子进程失败: {}", e))?;
|
||||
pid_ref.store(child.id() as u64, std::sync::atomic::Ordering::SeqCst);
|
||||
|
||||
// 超时看门狗：30 分钟后仍未结束则强杀（慢网络下 pip 装 musicdl 依赖可能超过 10 分钟）
|
||||
let pid = child.id();
|
||||
let (tx, rx) = std::sync::mpsc::channel::<()>();
|
||||
let watcher = std::thread::spawn(move || {
|
||||
if rx.recv_timeout(std::time::Duration::from_secs(1800)).is_err() {
|
||||
let _ = std::process::Command::new("taskkill")
|
||||
.args(["/F", "/T", "/PID", &pid.to_string()])
|
||||
.stdout(std::process::Stdio::null())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.status();
|
||||
}
|
||||
});
|
||||
|
||||
let output = child.wait_with_output();
|
||||
let _ = tx.send(());
|
||||
let _ = watcher.join();
|
||||
|
||||
match output {
|
||||
Ok(out) => {
|
||||
let text = format!(
|
||||
"{}{}",
|
||||
String::from_utf8_lossy(&out.stdout),
|
||||
String::from_utf8_lossy(&out.stderr)
|
||||
);
|
||||
if out.status.success() {
|
||||
Ok(())
|
||||
} else {
|
||||
// 截取尾部 800 字符，便于定位 pip 报错
|
||||
let tail: String = text.chars().rev().take(800).collect::<String>().chars().rev().collect();
|
||||
Err(format!("子进程退出码 {}: {}", out.status.code().unwrap_or(-1), tail))
|
||||
}
|
||||
}
|
||||
Err(e) => Err(format!("读取子进程输出失败: {}", e)),
|
||||
}
|
||||
}
|
||||
@@ -127,8 +127,9 @@ pub fn setup_creation_flags(_cmd: &mut Command) {
|
||||
|
||||
/// 将已启动的子进程加入 Job Object（异常退出时自动清理）
|
||||
/// 在 Windows 上调用，非 Windows 平台为空操作
|
||||
/// pub(crate)：音乐模块的桥接进程（自管 stdio，不走 ProcessManager）也需加入 Job
|
||||
#[cfg(windows)]
|
||||
fn assign_to_job(child: &Child) {
|
||||
pub(crate) fn assign_to_job(child: &Child) {
|
||||
use std::os::windows::io::AsRawHandle;
|
||||
if let Some(job) = get_job_handle() {
|
||||
let child_handle = child.as_raw_handle() as winapi::HANDLE;
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
use std::sync::Mutex;
|
||||
use windows_sys::Win32::Foundation::{BOOL, HWND, POINT, RECT};
|
||||
use windows_sys::Win32::Graphics::Gdi::{
|
||||
BitBlt, CreateCompatibleBitmap, CreateCompatibleDC, DeleteDC, DeleteObject, GetDC, GetDIBits,
|
||||
PatBlt, ReleaseDC, SelectObject, BITMAPINFO, BITMAPINFOHEADER, BLACKNESS, DIB_RGB_COLORS,
|
||||
RGBQUAD, SRCCOPY,
|
||||
BitBlt, CombineRgn, CreateCompatibleBitmap, CreateCompatibleDC, CreateRectRgn, DeleteDC,
|
||||
DeleteObject, GetDC, GetDIBits, PatBlt, ReleaseDC, SelectObject, SetWindowRgn, BITMAPINFO,
|
||||
BITMAPINFOHEADER, BLACKNESS, DIB_RGB_COLORS, RGBQUAD, RGN_DIFF, SRCCOPY,
|
||||
};
|
||||
use windows_sys::Win32::Storage::Xps::PrintWindow;
|
||||
use windows_sys::Win32::System::DataExchange::{
|
||||
@@ -34,7 +34,7 @@ use windows_sys::Win32::UI::WindowsAndMessaging::{
|
||||
WS_EX_TOOLWINDOW,
|
||||
};
|
||||
|
||||
use super::{CaptureData, ScreenRect, WindowInfo};
|
||||
use super::{CaptureData, ScreenRect, ScrollRegion, WindowInfo};
|
||||
|
||||
/// 捕获结果（PNG 字节 + 原始 BGRA 像素，像素用于剪贴板 DIB 构造，避免重复解码）
|
||||
pub struct CapturedImage {
|
||||
@@ -406,6 +406,71 @@ pub fn disable_window_transitions(hwnd: isize) -> Result<(), String> {
|
||||
}
|
||||
}
|
||||
|
||||
/// 滚动截图模式：在覆盖层窗口上挖出选区带的"真孔"（内缩 INSET 保留蓝框），或清除恢复整窗。
|
||||
///
|
||||
/// 背景：Chromium 系浏览器（Edge/Chrome）的原生窗口遮挡检测（occlusion tracking）
|
||||
/// 会把被**完全覆盖**的窗口标记为 occluded 并暂停渲染合成——滚动截图时覆盖层
|
||||
/// 铺满全屏盖住目标窗口，网页"看起来完全不滚动"，PrintWindow 抓到的也是静止帧。
|
||||
/// 覆盖层并非 layered 窗口，即使其内容视觉透明，窗口矩形对遮挡检测仍算不透明覆盖。
|
||||
/// 挖孔后目标窗口仅部分被覆盖（Chromium 要求完全覆盖才判 occluded，实测 60x60
|
||||
/// 的小孔即可解除），恢复渲染与滚轮响应，拼接匹配随之正常。
|
||||
///
|
||||
/// - `region = Some`：孔 = 选区带内缩 INSET（保留 2px 蓝框 + 1px 白描边）；
|
||||
/// 选区过小（< 2*INSET+8）时不挖孔，避免退化区域
|
||||
/// - `region = None`：SetWindowRgn(NULL) 清除窗口区域（恢复整窗）
|
||||
///
|
||||
/// 坐标：region 为屏幕物理像素（与滚动会话同源），按覆盖层窗口原点换算成窗口坐标。
|
||||
/// 区域设置在窗口上持续有效，会话结束/新一轮截图开始时必须传 None 复位。
|
||||
pub fn set_scroll_hole(hwnd: isize, region: Option<ScrollRegion>) -> Result<(), String> {
|
||||
unsafe {
|
||||
match region {
|
||||
Some(r) => {
|
||||
let mut wr: RECT = std::mem::zeroed();
|
||||
if GetWindowRect(hwnd, &mut wr) == 0 {
|
||||
return Err("GetWindowRect 失败".into());
|
||||
}
|
||||
const INSET: i32 = 4;
|
||||
let hx1 = r.x - wr.left + INSET;
|
||||
let hy1 = r.y - wr.top + INSET;
|
||||
let hx2 = r.x + r.width - wr.left - INSET;
|
||||
let hy2 = r.y + r.height - wr.top - INSET;
|
||||
if hx2 - hx1 < 8 || hy2 - hy1 < 8 {
|
||||
// 选区太小：不挖孔（保持整窗）
|
||||
if SetWindowRgn(hwnd, 0, 1) == 0 {
|
||||
return Err("SetWindowRgn 失败".into());
|
||||
}
|
||||
return Ok(());
|
||||
}
|
||||
let full = CreateRectRgn(0, 0, wr.right - wr.left, wr.bottom - wr.top);
|
||||
let hole = CreateRectRgn(hx1, hy1, hx2, hy2);
|
||||
if full == 0 || hole == 0 {
|
||||
if full != 0 {
|
||||
DeleteObject(full);
|
||||
}
|
||||
if hole != 0 {
|
||||
DeleteObject(hole);
|
||||
}
|
||||
return Err("CreateRectRgn 失败".into());
|
||||
}
|
||||
CombineRgn(full, full, hole, RGN_DIFF);
|
||||
// 组合结果 full 归 SetWindowRgn 所有；hole 用完即删
|
||||
DeleteObject(hole);
|
||||
if SetWindowRgn(hwnd, full, 1) == 0 {
|
||||
DeleteObject(full);
|
||||
return Err("SetWindowRgn 失败".into());
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
None => {
|
||||
if SetWindowRgn(hwnd, 0, 1) == 0 {
|
||||
return Err("SetWindowRgn 失败".into());
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 枚举所有可见、有标题的顶层窗口（供窗口列表选择）
|
||||
pub fn enum_visible_windows() -> Vec<WindowInfo> {
|
||||
extern "system" fn enum_proc(hwnd: HWND, lparam: isize) -> i32 {
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
//! - screenshot_show_overlay：一次 IPC 完成覆盖层 show + focus（关键路径减少往返）
|
||||
//! - screenshot_enum_windows：枚举可见顶层窗口
|
||||
//! - screenshot_capture_window：按 hwnd 捕获指定窗口
|
||||
//! - screenshot_scroll_capture / screenshot_scroll_start / screenshot_scroll_finish /
|
||||
//! screenshot_scroll_cancel：滚动截图（同步一次调用 / 会话式：启动、完成、取消）
|
||||
//! - screenshot_set_scroll_hole：滚动模式遮罩挖孔（防 Chromium 遮挡检测冻结目标窗口）
|
||||
//! - screenshot_take_editor_image_raw：取出编辑器图片（raw IPC，滚动截图会话直接写入）
|
||||
//! - screenshot_compose_png / screenshot_compose_copy：raw RGBA → PNG（仅编码 / 剪贴板+编码）
|
||||
//! - screenshot_copy_image：写入剪贴板（CF_DIB）
|
||||
@@ -372,6 +375,54 @@ pub fn screenshot_scroll_cancel() -> Result<(), String> {
|
||||
}
|
||||
}
|
||||
|
||||
/// 滚动模式遮罩挖孔：在截图覆盖层窗口上挖出选区带的真孔（region = None 时复位整窗）。
|
||||
///
|
||||
/// Chromium 系浏览器（Edge/Chrome）的窗口遮挡检测会把被完全覆盖的窗口标记为
|
||||
/// occluded 并暂停渲染——滚动截图时覆盖层铺满全屏，网页"看起来完全不滚动"。
|
||||
/// 挖孔后目标窗口仅部分被覆盖，恢复渲染与滚轮响应（详见 capture::set_scroll_hole）。
|
||||
/// 进入滚动模式时带选区调用，会话结束/新一轮截图开始时必须传 None 复位。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn screenshot_set_scroll_hole(
|
||||
app: AppHandle,
|
||||
region: Option<super::ScrollRegion>,
|
||||
) -> Result<(), String> {
|
||||
#[cfg(windows)]
|
||||
{
|
||||
use raw_window_handle::HasWindowHandle;
|
||||
|
||||
let mut hwnds: Vec<isize> = Vec::new();
|
||||
for (label, win) in app.webview_windows() {
|
||||
if label.starts_with(crate::constants::windows::SCREENSHOT_OVERLAY) {
|
||||
let hwnd = win
|
||||
.window_handle()
|
||||
.ok()
|
||||
.and_then(|h| match h.as_raw() {
|
||||
raw_window_handle::RawWindowHandle::Win32(w) => {
|
||||
Some(w.hwnd.get() as isize)
|
||||
}
|
||||
_ => None,
|
||||
});
|
||||
if let Some(h) = hwnd {
|
||||
hwnds.push(h);
|
||||
}
|
||||
}
|
||||
}
|
||||
if hwnds.is_empty() {
|
||||
return Err("截图覆盖层窗口不存在".into());
|
||||
}
|
||||
for h in hwnds {
|
||||
super::capture::set_scroll_hole(h, region)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
#[cfg(not(windows))]
|
||||
{
|
||||
let _ = (app, region);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// 取出编辑器图片（原始 PNG 字节，raw IPC → 前端 ArrayBuffer → Blob URL，取出即清除）
|
||||
///
|
||||
/// 长图（滚动截图）可达数十 MB：raw IPC 相比 base64 JSON 事件传输省 ~33% 体积，
|
||||
|
||||
@@ -17,6 +17,7 @@ use crate::download_engine::{DownloadEngine, ExtensionServer};
|
||||
use crate::logger::LogManager;
|
||||
use crate::mihomo_manager::MihomoManager;
|
||||
use crate::monitor_kernel::{MonitorKernel, check_and_relaunch_if_needed};
|
||||
use crate::music::MusicManager;
|
||||
use crate::network_monitor::NetworkMonitor;
|
||||
use crate::process_manager::{ProcessManager, start_monitoring_thread};
|
||||
|
||||
@@ -53,6 +54,13 @@ pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
|
||||
let monitor = MonitorKernel::new(app_data_dir.clone());
|
||||
app.manage(monitor);
|
||||
|
||||
// ===== 音乐模块：MusicManager（Python 运行时 + 桥接进程） =====
|
||||
// 仅注册状态，不主动启动桥接（由前端模块激活/首次请求时按需拉起）
|
||||
let music = MusicManager::new(app_data_dir.clone());
|
||||
// 注入 AppHandle：桥接 reader 线程把下载事件行转发给前端
|
||||
music.set_app(app.handle().clone());
|
||||
app.manage(music);
|
||||
|
||||
// 网速采样不依赖提权，应用启动即开始
|
||||
let network_monitor = Arc::new(NetworkMonitor::new());
|
||||
app.manage(network_monitor.clone());
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "thing",
|
||||
"version": "26.8.5",
|
||||
"version": "26.9.1",
|
||||
"identifier": "thing.lfeng.me",
|
||||
"build": {
|
||||
"beforeDevCommand": "bun run dev",
|
||||
|
||||
+8
-1
@@ -5,8 +5,10 @@ import { getCurrentWindow } from '@tauri-apps/api/window'
|
||||
import TitleBar from '@/components/layout/TitleBar.vue'
|
||||
import Sidebar from '@/components/layout/Sidebar.vue'
|
||||
import ModuleContainer from '@/components/layout/ModuleContainer.vue'
|
||||
import NowPlayingDialog from '@/components/layout/NowPlayingDialog.vue'
|
||||
import { Toaster } from '@/components/ui/sonner'
|
||||
import { useAppStore } from '@/stores/appStore'
|
||||
import { useFeiniuStore } from '@/stores/feiniuStore'
|
||||
import { useScreenshotStore } from '@/stores/screenshotStore'
|
||||
import { useQuickPanelStore } from '@/stores/quickpanelStore'
|
||||
import { useMonitorStore } from '@/stores/monitorStore'
|
||||
@@ -19,6 +21,7 @@ import { EVENTS, STORAGE_KEYS, WINDOWS } from '@/lib/constants'
|
||||
import { commands } from '@/lib/bindings'
|
||||
|
||||
const appStore = useAppStore()
|
||||
const feiniuStore = useFeiniuStore()
|
||||
const screenshotStore = useScreenshotStore()
|
||||
const quickpanelStore = useQuickPanelStore()
|
||||
const monitorStore = useMonitorStore()
|
||||
@@ -197,6 +200,9 @@ const resolveDefaultModule = (): string => {
|
||||
onMounted(async () => {
|
||||
await appStore.init().catch(e => console.error('App init error:', e))
|
||||
|
||||
// 全局播放器：恢复队列/音量/播放模式等本地状态（幂等，音乐模块内会再次调用但不会重复执行）
|
||||
feiniuStore.init().catch(e => console.error('播放器初始化失败:', e))
|
||||
|
||||
// 初始化监控 store：订阅后端 monitor-data / monitor-network 等事件，
|
||||
// 使 OSD 窗口在应用启动后即可接收数据流，不依赖用户手动打开监控模块。
|
||||
// init() 幂等：MonitorModule 挂载时再次调用不会重复订阅。
|
||||
@@ -283,7 +289,7 @@ onUnmounted(() => {
|
||||
<TooltipProvider>
|
||||
<div class="flex flex-col h-screen w-screen overflow-hidden">
|
||||
<TitleBar :modules="availableModules" @search="handleSearch" />
|
||||
<div class="flex-1 flex overflow-hidden">
|
||||
<div class="flex-1 flex overflow-hidden min-h-0">
|
||||
<Sidebar
|
||||
:modules="availableModules"
|
||||
:active-module="activeModule"
|
||||
@@ -292,6 +298,7 @@ onUnmounted(() => {
|
||||
<ModuleContainer :active-component="activeComponent" :active-module="activeModule" :loading="moduleLoading" />
|
||||
</div>
|
||||
</div>
|
||||
<NowPlayingDialog />
|
||||
<Toaster position="bottom-right" rich-colors close-button :style="{ zIndex: 99999 }" />
|
||||
</TooltipProvider>
|
||||
</template>
|
||||
|
||||
@@ -0,0 +1,293 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
|
||||
/**
|
||||
* 通用拖拽进度条。
|
||||
*
|
||||
* 关键行为：拖动过程中**不**向外提交，只更新本地预览值；
|
||||
* 指针抬起（或键盘操作）时才 emit `seek`。
|
||||
* 这样流式音频不会因为拖动而反复中断并重建 Range 请求。
|
||||
*/
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
/** 当前进度 0~1 */
|
||||
value: number
|
||||
/** 已缓冲比例 0~1 */
|
||||
buffered?: number
|
||||
/** 总秒数：>0 时显示两侧时间与拖动气泡 */
|
||||
durationSec?: number
|
||||
/** 紧凑模式（音量条）：细轨道、无时间、无气泡 */
|
||||
compact?: boolean
|
||||
disabled?: boolean
|
||||
/** 无障碍标签 */
|
||||
label?: string
|
||||
}>(),
|
||||
{ buffered: 0, durationSec: 0, compact: false, disabled: false, label: '进度' }
|
||||
)
|
||||
|
||||
const emit = defineEmits<{ seek: [ratio: number] }>()
|
||||
|
||||
const rootRef = ref<HTMLElement | null>(null)
|
||||
const dragging = ref(false)
|
||||
const dragRatio = ref(0)
|
||||
const hoverRatio = ref<number | null>(null)
|
||||
|
||||
function clamp(v: number) {
|
||||
return Math.min(1, Math.max(0, Number.isFinite(v) ? v : 0))
|
||||
}
|
||||
function pct(v: number) {
|
||||
return `${clamp(v) * 100}%`
|
||||
}
|
||||
const activeRatio = computed(() => (dragging.value ? dragRatio.value : clamp(props.value)))
|
||||
const bubbleRatio = computed(() => (dragging.value ? dragRatio.value : hoverRatio.value))
|
||||
const showTime = computed(() => !props.compact && props.durationSec > 0)
|
||||
|
||||
function ratioFromClientX(clientX: number) {
|
||||
const el = rootRef.value
|
||||
if (!el) return 0
|
||||
const r = el.getBoundingClientRect()
|
||||
if (r.width <= 0) return 0
|
||||
return clamp((clientX - r.left) / r.width)
|
||||
}
|
||||
|
||||
function fmt(sec: number) {
|
||||
if (!Number.isFinite(sec) || sec < 0) return '--:--'
|
||||
const s = Math.floor(sec)
|
||||
const h = Math.floor(s / 3600)
|
||||
const m = Math.floor((s % 3600) / 60)
|
||||
const r = s % 60
|
||||
if (h > 0) return `${h}:${String(m).padStart(2, '0')}:${String(r).padStart(2, '0')}`
|
||||
return `${String(m).padStart(2, '0')}:${String(r).padStart(2, '0')}`
|
||||
}
|
||||
|
||||
function onDown(e: PointerEvent) {
|
||||
if (props.disabled) return
|
||||
const el = e.currentTarget as HTMLElement
|
||||
dragging.value = true
|
||||
dragRatio.value = ratioFromClientX(e.clientX)
|
||||
try {
|
||||
el.focus({ preventScroll: true })
|
||||
el.setPointerCapture(e.pointerId)
|
||||
} catch {
|
||||
/* 部分环境不支持指针捕获/聚焦，降级为普通拖动 */
|
||||
}
|
||||
e.preventDefault()
|
||||
}
|
||||
|
||||
function onMove(e: PointerEvent) {
|
||||
const r = ratioFromClientX(e.clientX)
|
||||
hoverRatio.value = r
|
||||
if (dragging.value) dragRatio.value = r
|
||||
}
|
||||
|
||||
function onUp(e: PointerEvent) {
|
||||
if (!dragging.value) return
|
||||
dragging.value = false
|
||||
dragRatio.value = ratioFromClientX(e.clientX)
|
||||
emit('seek', dragRatio.value)
|
||||
}
|
||||
|
||||
function onLeave() {
|
||||
if (!dragging.value) hoverRatio.value = null
|
||||
}
|
||||
|
||||
function onKey(e: KeyboardEvent) {
|
||||
if (props.disabled) return
|
||||
const step = e.shiftKey ? 0.1 : 0.02
|
||||
let next: number | null = null
|
||||
if (e.key === 'ArrowRight' || e.key === 'ArrowUp') next = clamp(props.value + step)
|
||||
else if (e.key === 'ArrowLeft' || e.key === 'ArrowDown') next = clamp(props.value - step)
|
||||
else if (e.key === 'Home') next = 0
|
||||
else if (e.key === 'End') next = 1
|
||||
if (next !== null) {
|
||||
emit('seek', next)
|
||||
e.preventDefault()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div
|
||||
class="scrub"
|
||||
:class="{ 'is-compact': compact, 'is-dragging': dragging, 'is-disabled': disabled }"
|
||||
>
|
||||
<span v-if="showTime" class="scrub-time">{{ fmt(activeRatio * durationSec) }}</span>
|
||||
|
||||
<div
|
||||
ref="rootRef"
|
||||
class="scrub-track"
|
||||
role="slider"
|
||||
:tabindex="disabled ? -1 : 0"
|
||||
:aria-label="label"
|
||||
:aria-valuenow="Math.round(activeRatio * 100)"
|
||||
aria-valuemin="0"
|
||||
aria-valuemax="100"
|
||||
:aria-disabled="disabled"
|
||||
@pointerdown="onDown"
|
||||
@pointermove="onMove"
|
||||
@pointerup="onUp"
|
||||
@pointercancel="onUp"
|
||||
@pointerleave="onLeave"
|
||||
@keydown="onKey"
|
||||
>
|
||||
<span class="scrub-buffered" :style="{ width: pct(buffered) }" />
|
||||
<span class="scrub-played" :style="{ width: pct(activeRatio) }" />
|
||||
<span class="scrub-thumb" :style="{ left: pct(activeRatio) }" />
|
||||
<span
|
||||
v-if="showTime && bubbleRatio !== null"
|
||||
class="scrub-bubble"
|
||||
:style="{ left: pct(bubbleRatio) }"
|
||||
>
|
||||
{{ fmt(bubbleRatio * durationSec) }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<span v-if="showTime" class="scrub-time">{{ fmt(durationSec) }}</span>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.scrub {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.scrub-time {
|
||||
font-size: 11px;
|
||||
color: var(--muted-foreground);
|
||||
font-variant-numeric: tabular-nums;
|
||||
flex: 0 0 auto;
|
||||
min-width: 38px;
|
||||
text-align: center;
|
||||
user-select: none;
|
||||
}
|
||||
.scrub-time:first-child {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.scrub-track {
|
||||
position: relative;
|
||||
flex: 1 1 auto;
|
||||
min-width: 0;
|
||||
height: 16px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
touch-action: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
/* 视觉轨道（高 4px，hover / 拖动时增到 7px） */
|
||||
.scrub-track::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: 4px;
|
||||
border-radius: 999px;
|
||||
background: var(--muted);
|
||||
transition: height 0.15s ease;
|
||||
}
|
||||
.scrub:hover .scrub-track::before,
|
||||
.scrub.is-dragging .scrub-track::before {
|
||||
height: 7px;
|
||||
}
|
||||
.scrub-track:focus-visible::before {
|
||||
box-shadow: 0 0 0 3px color-mix(in oklab, var(--ring) 45%, transparent);
|
||||
}
|
||||
|
||||
.scrub-buffered,
|
||||
.scrub-played {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
height: 4px;
|
||||
border-radius: 999px;
|
||||
transition: height 0.15s ease;
|
||||
}
|
||||
.scrub:hover .scrub-buffered,
|
||||
.scrub.is-dragging .scrub-buffered,
|
||||
.scrub:hover .scrub-played,
|
||||
.scrub.is-dragging .scrub-played {
|
||||
height: 7px;
|
||||
}
|
||||
.scrub-buffered {
|
||||
background: color-mix(in oklab, var(--muted-foreground) 28%, transparent);
|
||||
}
|
||||
.scrub-played {
|
||||
background: var(--primary);
|
||||
}
|
||||
|
||||
.scrub-thumb {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
margin: -6px 0 0 -6px;
|
||||
border-radius: 50%;
|
||||
background: var(--primary);
|
||||
box-shadow: 0 0 0 2px var(--background);
|
||||
opacity: 0;
|
||||
transition: opacity 0.15s ease, transform 0.15s ease;
|
||||
pointer-events: none;
|
||||
}
|
||||
.scrub:hover .scrub-thumb,
|
||||
.scrub.is-dragging .scrub-thumb,
|
||||
.scrub-track:focus-visible .scrub-thumb {
|
||||
opacity: 1;
|
||||
}
|
||||
.scrub.is-dragging .scrub-thumb {
|
||||
transform: scale(1.15);
|
||||
}
|
||||
|
||||
.scrub-bubble {
|
||||
position: absolute;
|
||||
bottom: 18px;
|
||||
transform: translateX(-50%);
|
||||
padding: 2px 6px;
|
||||
border-radius: 5px;
|
||||
background: var(--popover);
|
||||
color: var(--popover-foreground);
|
||||
border: 1px solid var(--border);
|
||||
font-size: 11px;
|
||||
font-variant-numeric: tabular-nums;
|
||||
pointer-events: none;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.scrub.is-compact .scrub-time {
|
||||
display: none;
|
||||
}
|
||||
.scrub.is-compact .scrub-track {
|
||||
height: 14px;
|
||||
}
|
||||
.scrub.is-compact .scrub-track::before,
|
||||
.scrub.is-compact .scrub-buffered,
|
||||
.scrub.is-compact .scrub-played {
|
||||
height: 4px;
|
||||
}
|
||||
.scrub.is-compact:hover .scrub-track::before,
|
||||
.scrub.is-compact:hover .scrub-buffered,
|
||||
.scrub.is-compact:hover .scrub-played,
|
||||
.scrub.is-compact.is-dragging .scrub-track::before,
|
||||
.scrub.is-compact.is-dragging .scrub-buffered,
|
||||
.scrub.is-compact.is-dragging .scrub-played {
|
||||
height: 6px;
|
||||
}
|
||||
|
||||
.scrub.is-disabled {
|
||||
opacity: 0.5;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.scrub-track::before,
|
||||
.scrub-buffered,
|
||||
.scrub-played,
|
||||
.scrub-thumb {
|
||||
transition: none;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,55 @@
|
||||
<script setup lang="ts">
|
||||
import type { Component } from 'vue'
|
||||
|
||||
export interface SegmentedItem {
|
||||
value: string
|
||||
label: string
|
||||
/** lucide 图标组件 */
|
||||
icon?: Component
|
||||
/** 右侧计数徽标 */
|
||||
count?: number
|
||||
}
|
||||
|
||||
/** 模块内统一的分段导航（替代此前并存的三套切换控件） */
|
||||
defineProps<{
|
||||
modelValue: string
|
||||
items: SegmentedItem[]
|
||||
/** 铺满容器宽度（等分） */
|
||||
block?: boolean
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{ 'update:modelValue': [value: string] }>()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div
|
||||
class="inline-flex items-center rounded-lg bg-muted p-0.5"
|
||||
:class="block ? 'flex w-full' : 'w-fit'"
|
||||
role="tablist"
|
||||
>
|
||||
<button
|
||||
v-for="item in items"
|
||||
:key="item.value"
|
||||
type="button"
|
||||
role="tab"
|
||||
:aria-selected="modelValue === item.value"
|
||||
class="flex min-w-0 flex-1 items-center justify-center gap-1.5 rounded-[7px] px-3 py-1.5 text-[13px] transition-colors duration-150 outline-none focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||
:class="
|
||||
modelValue === item.value
|
||||
? 'bg-background font-medium text-foreground shadow-sm'
|
||||
: 'text-muted-foreground hover:text-foreground'
|
||||
"
|
||||
@click="emit('update:modelValue', item.value)"
|
||||
>
|
||||
<component :is="item.icon" v-if="item.icon" class="size-3.5 shrink-0" />
|
||||
<span class="truncate">{{ item.label }}</span>
|
||||
<span
|
||||
v-if="item.count"
|
||||
class="shrink-0 rounded-full bg-muted px-1.5 text-[10px] tabular-nums text-muted-foreground"
|
||||
:class="modelValue === item.value ? 'bg-muted' : 'bg-background/70'"
|
||||
>
|
||||
{{ item.count }}
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,319 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { Music2, Pause, Play, Plus, Repeat, Repeat1, Shuffle, SkipBack, SkipForward, Trash2, X } from '@lucide/vue'
|
||||
import { useFeiniuStore } from '@/stores/feiniuStore'
|
||||
import ScrubBar from '@/components/common/ScrubBar.vue'
|
||||
import SegmentedNav from '@/components/common/SegmentedNav.vue'
|
||||
import { Dialog, DialogContent, DialogClose, DialogTitle } from '@/components/ui/dialog'
|
||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
|
||||
|
||||
const store = useFeiniuStore()
|
||||
|
||||
const coverUrl = computed(() => {
|
||||
const t = store.nowPlaying
|
||||
if (!t) return ''
|
||||
if (t.coverUrl) return t.coverUrl
|
||||
if (t.source === 'feiniu' && t.coverId && store.mediaPrefix) {
|
||||
return `${store.mediaPrefix}/cover?coverId=${encodeURIComponent(t.coverId)}&size=400`
|
||||
}
|
||||
return ''
|
||||
})
|
||||
const coverFailed = ref(false)
|
||||
watch(coverUrl, () => (coverFailed.value = false))
|
||||
|
||||
const isPreview = computed(() => store.nowPlaying?.source === 'preview')
|
||||
const hasTrack = computed(() => !!store.nowPlaying)
|
||||
|
||||
const modeIcon = computed(() => {
|
||||
if (store.playMode === 'loopOne') return Repeat1
|
||||
if (store.playMode === 'shuffle') return Shuffle
|
||||
return Repeat
|
||||
})
|
||||
const modeLabel = computed(() =>
|
||||
store.playMode === 'loopAll' ? '列表循环' : store.playMode === 'loopOne' ? '单曲循环' : '随机播放'
|
||||
)
|
||||
|
||||
const tabs = computed(() => [
|
||||
{ value: 'lyric', label: '歌词' },
|
||||
{ value: 'queue', label: `队列` }
|
||||
])
|
||||
const activeTab = computed({
|
||||
get: () => store.nowPlayingTab,
|
||||
set: (v: string) => (store.nowPlayingTab = v === 'queue' ? 'queue' : 'lyric')
|
||||
})
|
||||
|
||||
const currentLineIdx = computed(() => store.currentLine())
|
||||
|
||||
// ===== 歌词滚动跟随（用函数 ref 收集节点，避免每次全量 querySelectorAll） =====
|
||||
const lineEls: (HTMLElement | null)[] = []
|
||||
function setLineEl(el: Element | { $el?: Element } | null, idx: number) {
|
||||
lineEls[idx] = (el as HTMLElement) ?? null
|
||||
}
|
||||
const reduceMotion = typeof window !== 'undefined' && window.matchMedia
|
||||
? window.matchMedia('(prefers-reduced-motion: reduce)').matches
|
||||
: false
|
||||
watch(currentLineIdx, (idx) => {
|
||||
if (idx < 0) return
|
||||
lineEls[idx]?.scrollIntoView({ block: 'center', behavior: reduceMotion ? 'auto' : 'smooth' })
|
||||
})
|
||||
watch(
|
||||
() => store.lyricLines,
|
||||
() => {
|
||||
lineEls.length = 0
|
||||
}
|
||||
)
|
||||
|
||||
// ===== 队列：大列表增量渲染（避免上千行一次性挂载） =====
|
||||
const QUEUE_STEP = 200
|
||||
const queueLimit = ref(QUEUE_STEP)
|
||||
watch(
|
||||
() => store.queue.length,
|
||||
() => (queueLimit.value = QUEUE_STEP)
|
||||
)
|
||||
const visibleQueue = computed(() =>
|
||||
store.queue.slice(0, queueLimit.value).map((item, index) => ({ item, index }))
|
||||
)
|
||||
const hasMoreQueue = computed(() => store.queue.length > queueLimit.value)
|
||||
|
||||
function onSeek(ratio: number) {
|
||||
store.seek(ratio * store.duration)
|
||||
}
|
||||
|
||||
function playAt(index: number) {
|
||||
const item = store.queue[index]
|
||||
if (item) store.playItem(item)
|
||||
}
|
||||
|
||||
/** 暂停/继续当前曲目（不切换上下文） */
|
||||
function toggleAt(index: number) {
|
||||
if (index === store.queueIndex) store.toggle()
|
||||
else playAt(index)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Dialog v-model:open="store.nowPlayingOpen">
|
||||
<DialogContent
|
||||
class="max-w-5xl overflow-hidden border p-0 sm:max-w-5xl"
|
||||
:show-close-button="false"
|
||||
>
|
||||
<DialogTitle class="sr-only">正在播放</DialogTitle>
|
||||
|
||||
<div class="relative flex h-[min(78vh,600px)] flex-col">
|
||||
<!-- 背景：主题色轻渐变（不使用整图高斯模糊，避免持续 GPU 开销） -->
|
||||
<div
|
||||
class="pointer-events-none absolute inset-0"
|
||||
style="
|
||||
background:
|
||||
radial-gradient(120% 90% at 12% 0%, color-mix(in oklab, var(--muted) 92%, transparent), transparent 62%),
|
||||
linear-gradient(180deg, color-mix(in oklab, var(--muted) 55%, transparent), var(--background) 72%);
|
||||
"
|
||||
/>
|
||||
|
||||
<div class="relative flex min-h-0 flex-1">
|
||||
<!-- ===== 左：封面 + 控制 ===== -->
|
||||
<div class="flex w-[46%] min-w-0 flex-col justify-center gap-5 px-9 py-8">
|
||||
<div class="flex justify-center">
|
||||
<img
|
||||
v-if="coverUrl && !coverFailed"
|
||||
:src="coverUrl"
|
||||
class="aspect-square w-[min(240px,60%)] rounded-xl object-cover ring-1 ring-border/60"
|
||||
alt=""
|
||||
referrerpolicy="no-referrer"
|
||||
@error="coverFailed = true"
|
||||
/>
|
||||
<div
|
||||
v-else
|
||||
class="flex aspect-square w-[min(240px,60%)] items-center justify-center rounded-xl bg-muted/60 text-muted-foreground ring-1 ring-border/60"
|
||||
>
|
||||
<Music2 class="size-16" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="min-w-0 text-center">
|
||||
<div class="flex items-center justify-center gap-2">
|
||||
<h3 class="truncate text-[19px] font-semibold">{{ store.nowPlaying?.title || '未播放' }}</h3>
|
||||
<span
|
||||
v-if="isPreview"
|
||||
class="shrink-0 rounded bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground"
|
||||
>
|
||||
试听
|
||||
</span>
|
||||
</div>
|
||||
<p class="mt-1 truncate text-[13px] text-muted-foreground">
|
||||
{{ store.nowPlaying?.artistNames || '—'
|
||||
}}<template v-if="store.nowPlaying?.album"> · {{ store.nowPlaying.album }}</template>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-2">
|
||||
<ScrubBar
|
||||
:value="store.progress / 100"
|
||||
:buffered="store.bufferedPercent / 100"
|
||||
:duration-sec="store.duration"
|
||||
:disabled="!hasTrack"
|
||||
label="播放进度"
|
||||
@seek="onSeek"
|
||||
/>
|
||||
<div class="mt-1 flex items-center justify-center gap-6">
|
||||
<Tooltip>
|
||||
<TooltipTrigger as-child>
|
||||
<button
|
||||
type="button"
|
||||
class="text-muted-foreground transition-colors hover:text-foreground"
|
||||
:aria-label="modeLabel"
|
||||
@click="store.togglePlayMode()"
|
||||
>
|
||||
<component :is="modeIcon" class="size-4" />
|
||||
</button>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent>{{ modeLabel }}</TooltipContent>
|
||||
</Tooltip>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="text-muted-foreground transition-colors hover:text-foreground disabled:opacity-40"
|
||||
:disabled="!store.queue.length"
|
||||
aria-label="上一首"
|
||||
@click="store.prev()"
|
||||
>
|
||||
<SkipBack class="size-6" />
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="flex size-14 items-center justify-center rounded-full bg-primary text-primary-foreground transition-opacity hover:opacity-90 disabled:opacity-40"
|
||||
:disabled="!hasTrack"
|
||||
:aria-label="store.playing ? '暂停' : '播放'"
|
||||
@click="store.toggle()"
|
||||
>
|
||||
<span
|
||||
v-if="store.loadingPlay"
|
||||
class="size-5 animate-spin rounded-full border-2 border-current border-t-transparent"
|
||||
/>
|
||||
<Pause v-else-if="store.playing" class="size-6" />
|
||||
<Play v-else class="size-6 translate-x-px" />
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="text-muted-foreground transition-colors hover:text-foreground disabled:opacity-40"
|
||||
:disabled="!store.queue.length"
|
||||
aria-label="下一首"
|
||||
@click="store.next()"
|
||||
>
|
||||
<SkipForward class="size-6" />
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="text-muted-foreground transition-colors hover:text-foreground"
|
||||
:class="{ 'text-foreground': store.nowPlayingTab === 'queue' }"
|
||||
aria-label="播放队列"
|
||||
@click="store.nowPlayingTab = 'queue'"
|
||||
>
|
||||
<Plus class="size-4" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ===== 右：歌词 / 队列 ===== -->
|
||||
<div class="flex min-w-0 flex-1 flex-col border-l border-border px-6 py-7">
|
||||
<div class="mb-4 flex items-center">
|
||||
<SegmentedNav v-model="activeTab" :items="tabs" />
|
||||
</div>
|
||||
|
||||
<ScrollArea class="min-h-0 flex-1">
|
||||
<div v-if="activeTab === 'lyric'" class="flex flex-col gap-0.5 px-1 pb-6" data-slot="lyric-list">
|
||||
<p v-if="!store.lyricLines.length" class="py-8 text-center text-[13px] text-muted-foreground">
|
||||
{{ isPreview ? '试听不加载歌词' : store.nowPlaying?.source === 'local' ? '本地文件无歌词' : '暂无歌词' }}
|
||||
</p>
|
||||
<button
|
||||
v-for="(line, idx) in store.lyricLines"
|
||||
:key="idx"
|
||||
:ref="(el) => setLineEl(el as Element | null, idx)"
|
||||
type="button"
|
||||
class="rounded-md px-3 py-1.5 text-left text-[14px] leading-7 transition-all duration-200"
|
||||
:class="
|
||||
idx === currentLineIdx
|
||||
? 'bg-accent/60 text-[16px] font-medium text-foreground'
|
||||
: idx < currentLineIdx
|
||||
? 'text-muted-foreground/45 hover:text-muted-foreground'
|
||||
: 'text-muted-foreground/75 hover:text-foreground'
|
||||
"
|
||||
@click="store.seek(line.t)"
|
||||
>
|
||||
{{ line.text }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div v-else class="flex flex-col gap-0.5 px-1 pb-6">
|
||||
<div v-if="!store.queue.length" class="py-8 text-center text-[13px] text-muted-foreground">
|
||||
队列为空
|
||||
</div>
|
||||
<div
|
||||
v-for="row in visibleQueue"
|
||||
:key="`${row.item.source}:${row.item.guid ?? row.index}`"
|
||||
class="group flex items-center gap-3 rounded-md px-2 py-1.5 transition-colors"
|
||||
:class="row.index === store.queueIndex && !isPreview ? 'bg-accent/60' : 'hover:bg-accent/40'"
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
class="flex size-6 shrink-0 items-center justify-center text-[11px] tabular-nums text-muted-foreground"
|
||||
:aria-label="row.index === store.queueIndex ? '暂停/继续' : '播放'"
|
||||
@click="toggleAt(row.index)"
|
||||
>
|
||||
<span v-if="row.index === store.queueIndex && !isPreview" class="music-eq" :class="{ 'is-paused': !store.playing }">
|
||||
<i /><i /><i />
|
||||
</span>
|
||||
<template v-else>
|
||||
<Play class="size-3.5 opacity-0 transition-opacity group-hover:opacity-100" />
|
||||
<span class="group-hover:hidden">{{ row.index + 1 }}</span>
|
||||
</template>
|
||||
</button>
|
||||
<div class="min-w-0 flex-1">
|
||||
<div
|
||||
class="truncate text-[13px]"
|
||||
:class="row.index === store.queueIndex && !isPreview ? 'font-medium' : ''"
|
||||
>
|
||||
{{ row.item.title }}
|
||||
</div>
|
||||
<div class="truncate text-[11.5px] text-muted-foreground">{{ row.item.artistNames || '—' }}</div>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
class="shrink-0 text-muted-foreground opacity-0 transition-opacity hover:text-destructive group-hover:opacity-100"
|
||||
aria-label="从队列移除"
|
||||
@click="store.removeFromQueue(row.index)"
|
||||
>
|
||||
<Trash2 class="size-3.5" />
|
||||
</button>
|
||||
</div>
|
||||
<button
|
||||
v-if="hasMoreQueue"
|
||||
type="button"
|
||||
class="mt-1 rounded-md py-2 text-[12px] text-muted-foreground hover:bg-accent/40"
|
||||
@click="queueLimit += QUEUE_STEP"
|
||||
>
|
||||
显示更多（{{ store.queue.length - queueLimit }}）
|
||||
</button>
|
||||
</div>
|
||||
</ScrollArea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<DialogClose as-child>
|
||||
<button
|
||||
type="button"
|
||||
class="absolute right-4 top-4 z-10 rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
aria-label="关闭"
|
||||
>
|
||||
<X class="size-5" />
|
||||
</button>
|
||||
</DialogClose>
|
||||
</div>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</template>
|
||||
@@ -2,6 +2,7 @@
|
||||
import { ref, computed, onMounted, onUnmounted, nextTick, watch } from 'vue'
|
||||
import { Search, Settings, ChevronRight, ArrowUp, Check, Loader2 } from '@lucide/vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import TitleBarMusic from '@/components/layout/TitleBarMusic.vue'
|
||||
import { invoke } from '@tauri-apps/api/core'
|
||||
import { getCurrentWindow } from '@tauri-apps/api/window'
|
||||
import { useSearchStore, type SearchItem } from '@/stores/searchStore'
|
||||
@@ -363,6 +364,11 @@ const handleBlur = () => {
|
||||
保存设置
|
||||
</button>
|
||||
</Transition>
|
||||
<!-- 音乐栏：唱片图标 + 歌名（点击弹出方形播放控制窗），位于搜索框左侧 -->
|
||||
<div class="pointer-events-auto">
|
||||
<TitleBarMusic />
|
||||
</div>
|
||||
|
||||
<div class="relative max-w-xs mr-3 pointer-events-auto">
|
||||
<Search
|
||||
class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground"
|
||||
|
||||
@@ -0,0 +1,296 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { toast } from 'vue-sonner'
|
||||
import {
|
||||
Disc3,
|
||||
ListMusic,
|
||||
Maximize2,
|
||||
MicVocal,
|
||||
Pause,
|
||||
Play,
|
||||
Repeat,
|
||||
Repeat1,
|
||||
Shuffle,
|
||||
SkipBack,
|
||||
SkipForward,
|
||||
Volume2,
|
||||
VolumeX
|
||||
} from '@lucide/vue'
|
||||
import { useFeiniuStore } from '@/stores/feiniuStore'
|
||||
import ScrubBar from '@/components/common/ScrubBar.vue'
|
||||
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
|
||||
|
||||
const store = useFeiniuStore()
|
||||
|
||||
const open = ref(false)
|
||||
|
||||
const coverUrl = computed(() => {
|
||||
const t = store.nowPlaying
|
||||
if (!t) return ''
|
||||
if (t.coverUrl) return t.coverUrl
|
||||
if (t.source === 'feiniu' && t.coverId && store.mediaPrefix) {
|
||||
return `${store.mediaPrefix}/cover?coverId=${encodeURIComponent(t.coverId)}&size=96`
|
||||
}
|
||||
return ''
|
||||
})
|
||||
const bigCoverUrl = computed(() => {
|
||||
const t = store.nowPlaying
|
||||
if (!t) return ''
|
||||
if (t.coverUrl) return t.coverUrl
|
||||
if (t.source === 'feiniu' && t.coverId && store.mediaPrefix) {
|
||||
return `${store.mediaPrefix}/cover?coverId=${encodeURIComponent(t.coverId)}&size=320`
|
||||
}
|
||||
return ''
|
||||
})
|
||||
const coverFailed = ref(false)
|
||||
watch(coverUrl, () => (coverFailed.value = false))
|
||||
|
||||
/** 是否已播放过（未播放过时不展示歌名，只留唱片图标） */
|
||||
const hasTrack = computed(() => !!store.nowPlaying)
|
||||
const title = computed(() => store.nowPlaying?.title ?? '')
|
||||
const subtitle = computed(() => {
|
||||
const t = store.nowPlaying
|
||||
if (!t) return ''
|
||||
return t.artistNames || (t.source === 'local' ? '本地文件' : '')
|
||||
})
|
||||
const isPreview = computed(() => store.nowPlaying?.source === 'preview')
|
||||
|
||||
const modeIcon = computed(() => {
|
||||
if (store.playMode === 'loopOne') return Repeat1
|
||||
if (store.playMode === 'shuffle') return Shuffle
|
||||
return Repeat
|
||||
})
|
||||
const modeLabel = computed(() =>
|
||||
store.playMode === 'loopAll' ? '列表循环' : store.playMode === 'loopOne' ? '单曲循环' : '随机播放'
|
||||
)
|
||||
const volumePercent = computed(() => (store.muted ? 0 : store.volume))
|
||||
|
||||
function onSeek(ratio: number) {
|
||||
store.seek(ratio * store.duration)
|
||||
}
|
||||
|
||||
function openLyrics(tab: 'lyric' | 'queue') {
|
||||
store.nowPlayingTab = tab
|
||||
store.nowPlayingOpen = true
|
||||
open.value = false
|
||||
}
|
||||
|
||||
// 播放失败统一在这里提示（store 只记录原因）
|
||||
watch(
|
||||
() => store.playError,
|
||||
(msg) => {
|
||||
if (!msg) return
|
||||
toast.error(msg)
|
||||
store.clearPlayError()
|
||||
}
|
||||
)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Popover v-model:open="open">
|
||||
<PopoverTrigger as-child>
|
||||
<!-- 音乐栏：唱片图标 + 歌名（未播放过时只显示图标） -->
|
||||
<button
|
||||
type="button"
|
||||
class="mr-2 flex h-7 max-w-[210px] items-center gap-2 rounded-md px-1.5 text-left transition-colors hover:bg-secondary/60"
|
||||
:title="hasTrack ? `${title}${subtitle ? ' · ' + subtitle : ''}` : '未在播放'"
|
||||
:aria-label="hasTrack ? `音乐控制：${title}` : '音乐控制'"
|
||||
@mousedown.stop
|
||||
>
|
||||
<span
|
||||
class="disc flex size-5 shrink-0 items-center justify-center overflow-hidden rounded-full"
|
||||
:class="{ 'is-playing': store.playing }"
|
||||
>
|
||||
<img
|
||||
v-if="coverUrl && !coverFailed"
|
||||
:src="coverUrl"
|
||||
class="size-full object-cover"
|
||||
alt=""
|
||||
referrerpolicy="no-referrer"
|
||||
@error="coverFailed = true"
|
||||
/>
|
||||
<Disc3 v-else class="size-4 text-muted-foreground" />
|
||||
</span>
|
||||
<span v-if="hasTrack" class="min-w-0 flex-1 truncate text-xs text-foreground/90">
|
||||
{{ title }}
|
||||
</span>
|
||||
</button>
|
||||
</PopoverTrigger>
|
||||
|
||||
<!-- 方形播放控制窗 -->
|
||||
<PopoverContent
|
||||
align="end"
|
||||
:side-offset="8"
|
||||
class="w-[300px] p-3"
|
||||
@mousedown.stop
|
||||
>
|
||||
<div class="flex flex-col items-center gap-3">
|
||||
<!-- 封面 -->
|
||||
<button
|
||||
type="button"
|
||||
class="group relative aspect-square w-[132px] overflow-hidden rounded-lg bg-muted ring-1 ring-border/60"
|
||||
:title="'打开歌词与大屏'"
|
||||
@click="openLyrics('lyric')"
|
||||
>
|
||||
<img
|
||||
v-if="bigCoverUrl"
|
||||
:src="bigCoverUrl"
|
||||
class="size-full object-cover transition-transform duration-300 group-hover:scale-105"
|
||||
alt=""
|
||||
referrerpolicy="no-referrer"
|
||||
@error="($event.target as HTMLImageElement).style.display = 'none'"
|
||||
/>
|
||||
<span v-else class="flex size-full items-center justify-center text-muted-foreground">
|
||||
<Disc3 class="size-10" />
|
||||
</span>
|
||||
<span
|
||||
class="absolute inset-0 hidden items-center justify-center bg-foreground/35 text-primary-foreground group-hover:flex"
|
||||
>
|
||||
<Maximize2 class="size-5" />
|
||||
</span>
|
||||
</button>
|
||||
|
||||
<!-- 曲目信息 -->
|
||||
<div class="w-full min-w-0 text-center">
|
||||
<div class="flex items-center justify-center gap-1.5">
|
||||
<span class="truncate text-[13px] font-medium">{{ title || '未播放' }}</span>
|
||||
<span
|
||||
v-if="isPreview"
|
||||
class="shrink-0 rounded bg-muted px-1 py-px text-[10px] text-muted-foreground"
|
||||
>
|
||||
试听
|
||||
</span>
|
||||
</div>
|
||||
<p class="mt-0.5 truncate text-[11.5px] text-muted-foreground">
|
||||
{{ subtitle || '—' }}<template v-if="store.nowPlaying?.album"> · {{ store.nowPlaying.album }}</template>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- 进度 -->
|
||||
<ScrubBar
|
||||
class="w-full"
|
||||
:value="store.progress / 100"
|
||||
:buffered="store.bufferedPercent / 100"
|
||||
:duration-sec="store.duration"
|
||||
:disabled="!hasTrack"
|
||||
label="播放进度"
|
||||
@seek="onSeek"
|
||||
/>
|
||||
|
||||
<!-- 控制 -->
|
||||
<div class="flex w-full items-center justify-center gap-5">
|
||||
<button
|
||||
type="button"
|
||||
class="text-muted-foreground transition-colors hover:text-foreground"
|
||||
:title="modeLabel"
|
||||
:aria-label="modeLabel"
|
||||
@click="store.togglePlayMode()"
|
||||
>
|
||||
<component :is="modeIcon" class="size-3.5" />
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="text-muted-foreground transition-colors hover:text-foreground disabled:opacity-40"
|
||||
:disabled="!store.queue.length"
|
||||
aria-label="上一首"
|
||||
@click="store.prev()"
|
||||
>
|
||||
<SkipBack class="size-5" />
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="flex size-10 items-center justify-center rounded-full bg-primary text-primary-foreground transition-opacity hover:opacity-90 disabled:opacity-40"
|
||||
:disabled="!hasTrack"
|
||||
:aria-label="store.playing ? '暂停' : '播放'"
|
||||
@click="store.toggle()"
|
||||
>
|
||||
<span
|
||||
v-if="store.loadingPlay"
|
||||
class="size-4 animate-spin rounded-full border-2 border-current border-t-transparent"
|
||||
/>
|
||||
<Pause v-else-if="store.playing" class="size-4" />
|
||||
<Play v-else class="size-4 translate-x-px" />
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="text-muted-foreground transition-colors hover:text-foreground disabled:opacity-40"
|
||||
:disabled="!store.queue.length"
|
||||
aria-label="下一首"
|
||||
@click="store.next()"
|
||||
>
|
||||
<SkipForward class="size-5" />
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="text-muted-foreground transition-colors hover:text-foreground disabled:opacity-40"
|
||||
:disabled="isPreview"
|
||||
:title="`播放队列（${store.queue.length}）`"
|
||||
aria-label="播放队列"
|
||||
@click="openLyrics('queue')"
|
||||
>
|
||||
<ListMusic class="size-3.5" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- 音量 + 入口 -->
|
||||
<div class="flex w-full items-center gap-2 border-t pt-2.5">
|
||||
<button
|
||||
type="button"
|
||||
class="shrink-0 text-muted-foreground transition-colors hover:text-foreground"
|
||||
:aria-label="store.muted ? '取消静音' : '静音'"
|
||||
@click="store.toggleMute()"
|
||||
>
|
||||
<VolumeX v-if="volumePercent === 0" class="size-3.5" />
|
||||
<Volume2 v-else class="size-3.5" />
|
||||
</button>
|
||||
<div class="w-16 shrink-0">
|
||||
<ScrubBar compact :value="volumePercent" label="音量" @seek="store.setVolume($event)" />
|
||||
</div>
|
||||
<div class="ml-auto flex items-center gap-1">
|
||||
<button
|
||||
type="button"
|
||||
class="flex items-center gap-1 rounded-md px-1.5 py-1 text-[11.5px] text-muted-foreground transition-colors hover:bg-secondary/60 hover:text-foreground"
|
||||
@click="openLyrics('lyric')"
|
||||
>
|
||||
<MicVocal class="size-3.5" />
|
||||
歌词
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="flex items-center gap-1 rounded-md px-1.5 py-1 text-[11.5px] text-muted-foreground transition-colors hover:bg-secondary/60 hover:text-foreground"
|
||||
:disabled="isPreview"
|
||||
@click="openLyrics('queue')"
|
||||
>
|
||||
<ListMusic class="size-3.5" />
|
||||
队列
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 唱片图标：播放时旋转（暂停保持当前角度继续待命） */
|
||||
.disc {
|
||||
animation: discSpin 8s linear infinite;
|
||||
animation-play-state: paused;
|
||||
background: var(--muted);
|
||||
}
|
||||
.disc.is-playing {
|
||||
animation-play-state: running;
|
||||
}
|
||||
|
||||
@keyframes discSpin {
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.disc {
|
||||
animation: none;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -241,6 +241,21 @@ export const commands = {
|
||||
downloaderInspect: (input: string) => __TAURI_INVOKE<TorrentInfo>("downloader_inspect", { input }),
|
||||
/** 磁力任务：元数据解析成功后，用户勾选文件并确认开始下载 */
|
||||
downloaderSelectBtFiles: (id: string, onlyFiles: number[]) => __TAURI_INVOKE<null>("downloader_select_bt_files", { id, onlyFiles }),
|
||||
/**
|
||||
* 查询环境状态（Python / musicdl / FFmpeg / 桥接进程），设置页「环境检查」面板调用。
|
||||
* 异步命令：子进程探测在阻塞线程池执行，避免冻结主线程/UI。
|
||||
*/
|
||||
musicEnvStatus: () => __TAURI_INVOKE<MusicEnvStatus>("music_env_status"),
|
||||
/** 安装便携 Python + musicdl（幂等），全程推送 music-runtime-install-progress 事件 */
|
||||
musicInstallRuntime: () => __TAURI_INVOKE<MusicEnvStatus>("music_install_runtime"),
|
||||
/** 取消便携运行时安装/下载 */
|
||||
musicCancelRuntimeInstall: () => __TAURI_INVOKE<null>("music_cancel_runtime_install"),
|
||||
/** 停止桥接进程 */
|
||||
musicStopBridge: () => __TAURI_INVOKE<null>("music_stop_bridge"),
|
||||
/** 读取音乐模块设置 */
|
||||
musicGetSettings: () => __TAURI_INVOKE<MusicSettings>("music_get_settings"),
|
||||
/** 保存音乐模块设置（立即生效） */
|
||||
musicSaveSettings: (settings: MusicSettings) => __TAURI_INVOKE<null>("music_save_settings", { settings }),
|
||||
/** 禁用指定窗口（按 label 查找）的显示/隐藏过渡动画，消除覆盖层出现/消失时的缩放动画 */
|
||||
screenshotDisableTransitions: (label: string) => __TAURI_INVOKE<null>("screenshot_disable_transitions", { label }),
|
||||
/** 一次 IPC 完成指定窗口的显示与聚焦（截图覆盖层显示关键路径，减少串行往返） */
|
||||
@@ -305,6 +320,20 @@ export const commands = {
|
||||
width: number,
|
||||
height: number,
|
||||
} | null, auto: boolean) => __TAURI_INVOKE<null>("screenshot_scroll_start", { hwnd, region, auto }),
|
||||
/**
|
||||
* 滚动模式遮罩挖孔：在截图覆盖层窗口上挖出选区带的真孔（region = None 时复位整窗）。
|
||||
*
|
||||
* Chromium 系浏览器（Edge/Chrome）的窗口遮挡检测会把被完全覆盖的窗口标记为
|
||||
* occluded 并暂停渲染——滚动截图时覆盖层铺满全屏，网页"看起来完全不滚动"。
|
||||
* 挖孔后目标窗口仅部分被覆盖，恢复渲染与滚轮响应（详见 capture::set_scroll_hole）。
|
||||
* 进入滚动模式时带选区调用，会话结束/新一轮截图开始时必须传 None 复位。
|
||||
*/
|
||||
screenshotSetScrollHole: (region: {
|
||||
x: number,
|
||||
y: number,
|
||||
width: number,
|
||||
height: number,
|
||||
} | null) => __TAURI_INVOKE<null>("screenshot_set_scroll_hole", { region }),
|
||||
/** 将 PNG base64 写入系统剪贴板（转 CF_DIB） */
|
||||
screenshotCopyImage: (pngBase64: string) => __TAURI_INVOKE<null>("screenshot_copy_image", { pngBase64 }),
|
||||
/** 将 PNG base64 写入文件 */
|
||||
@@ -522,6 +551,24 @@ export type ExtractResult = {
|
||||
error: string,
|
||||
};
|
||||
|
||||
/** 一条飞牛音乐连接（持久化在 `MusicSettings`）。 */
|
||||
export type FeiniuConnection = {
|
||||
id: string,
|
||||
name: string,
|
||||
/** "lan" | "frp" | "fnconnect"（fnconnect 预留） */
|
||||
kind: string,
|
||||
/** 服务器地址（http://192.168.x.x:5666 或 https://域名） */
|
||||
baseUrl: string,
|
||||
username: string,
|
||||
token: string,
|
||||
deviceId: string,
|
||||
accessCode: string,
|
||||
/** https 遇到自签证书时忽略校验 */
|
||||
insecure: boolean,
|
||||
/** fnconnect 连接的 fnId（如 fnos.net/<id> 或裸 id） */
|
||||
fnId?: string,
|
||||
};
|
||||
|
||||
export type FileEntry = {
|
||||
name: string,
|
||||
path: string,
|
||||
@@ -564,6 +611,74 @@ export type KernelUpdateInfo = {
|
||||
hasUpdate: boolean,
|
||||
};
|
||||
|
||||
/** 环境状态（返回前端，设置页「环境检查」面板展示） */
|
||||
export type MusicEnvStatus = {
|
||||
/** 系统 Python 版本（如 "3.14.5"），无则 None */
|
||||
python: string | null,
|
||||
/** python 来源："system" | "bundled" | "none" */
|
||||
pythonSource: string,
|
||||
/** 便携 Python 可执行文件路径（未安装则 None） */
|
||||
bundledPython: string | null,
|
||||
/** musicdl 是否可导入 */
|
||||
musicdlInstalled: boolean,
|
||||
/** musicdl 版本 */
|
||||
musicdlVersion: string | null,
|
||||
/** FFmpeg 是否可用（部分音源需要，非必需） */
|
||||
ffmpeg: string | null,
|
||||
/** 桥接进程是否在运行 */
|
||||
bridgeRunning: boolean,
|
||||
/** 运行时目录（{app_data_dir}/music） */
|
||||
runtimeDir: string,
|
||||
};
|
||||
|
||||
/** 音乐模块设置（settings.json 持久化；变更即时生效） */
|
||||
export type MusicSettings = {
|
||||
/** 下载保存目录 */
|
||||
savedir: string,
|
||||
/** 搜索源（musicdl 客户端名，如 NeteaseMusicClient） */
|
||||
sources: string[],
|
||||
/** 下载时同步保存歌词 */
|
||||
lyricDownload: boolean,
|
||||
/** 下载时同步保存封面 */
|
||||
coverDownload: boolean,
|
||||
/** 搜索/下载请求是否走代理模块（mihomo mixed 端口） */
|
||||
useProxy: boolean,
|
||||
/** 最大并发下载数 */
|
||||
maxConcurrent: number,
|
||||
/** 下载引擎："musicdl" | "rust"（P2 生效） */
|
||||
downloadEngine: string,
|
||||
/** 下载时是否弹窗选择音质（默认关；开启后点下载弹出所选歌曲档位并集选择） */
|
||||
selectQualityOnDownload: boolean,
|
||||
/** 下载时默认音质："" 表示最高；否则为搜索音质档位 label（如 "无损"、"320K"） */
|
||||
defaultDownloadQuality: string,
|
||||
/** 飞牛音乐(NAS)连接：服务器地址（如 http://192.168.1.10:5666，空=未配置） */
|
||||
feiniuBaseUrl?: string,
|
||||
/** 飞牛音乐登录 token（登录成功后保存） */
|
||||
feiniuToken?: string,
|
||||
/** 飞牛音乐登录账号（展示 + 重新登录回填用） */
|
||||
feiniuUsername?: string,
|
||||
/** 飞牛音乐设备 ID（32 位 hex，登录签名用，一次生成复用） */
|
||||
feiniuDeviceId?: string,
|
||||
/** 飞牛音乐访问安全码（可选；仅需访问码的库才填，LAN 通常为空） */
|
||||
feiniuAccessCode?: string,
|
||||
/** 飞牛音乐连接列表（多连接：本地 / frp / 预留 fnconnect） */
|
||||
feiniuConnections?: FeiniuConnection[],
|
||||
/** 当前激活连接的 id */
|
||||
feiniuActiveId?: string,
|
||||
/** 本地曲库扫描目录（默认含音乐下载 savedir） */
|
||||
feiniuLocalDirs?: string[],
|
||||
/** 播放缓存开关 */
|
||||
feiniuCacheEnabled?: boolean,
|
||||
/** 缓存上限（GB） */
|
||||
feiniuCacheMaxGb?: number,
|
||||
/** 播放模式："stream" 直连流式 | "cache" 缓存后播放 */
|
||||
feiniuPlayMode?: string,
|
||||
/** 飞牛曲库目标目录（NAS 绝对路径，如 vol1/1000/Music；上传到飞牛用） */
|
||||
feiniuLibraryNasPath?: string,
|
||||
/** 下载完成后自动上传到飞牛曲库 */
|
||||
feiniuAutoUpload?: boolean,
|
||||
};
|
||||
|
||||
/** 进程信息（返回给前端） */
|
||||
export type ProcessInfo = {
|
||||
id: string,
|
||||
|
||||
@@ -0,0 +1,157 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { ArrowLeft, Search } from '@lucide/vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Card, CardContent } from '@/components/ui/card'
|
||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||
import { Separator } from '@/components/ui/separator'
|
||||
import { useSearchStore } from '@/stores/searchStore'
|
||||
import { registerAllTools, TOOLS_META } from './tools'
|
||||
import {
|
||||
getAllTools, getTool, searchTools,
|
||||
CATEGORY_ORDER, CATEGORY_LABEL, type DevTool
|
||||
} from './registry'
|
||||
|
||||
const searchStore = useSearchStore()
|
||||
|
||||
registerAllTools()
|
||||
|
||||
const allTools = getAllTools()
|
||||
|
||||
// ===== 列表视图：搜索 + 分类筛选 =====
|
||||
const query = ref('')
|
||||
const category = ref<'all' | DevTool['category']>('all')
|
||||
|
||||
const filteredTools = computed(() => {
|
||||
const list = searchTools(query.value)
|
||||
if (category.value === 'all') return list
|
||||
return list.filter(t => t.category === category.value)
|
||||
})
|
||||
|
||||
interface ToolGroup {
|
||||
category: DevTool['category']
|
||||
label: string
|
||||
tools: DevTool[]
|
||||
}
|
||||
|
||||
const groupedTools = computed<ToolGroup[]>(() => {
|
||||
if (category.value !== 'all') {
|
||||
return [{
|
||||
category: category.value as DevTool['category'],
|
||||
label: CATEGORY_LABEL[category.value as DevTool['category']],
|
||||
tools: filteredTools.value
|
||||
}]
|
||||
}
|
||||
const groups: ToolGroup[] = []
|
||||
for (const cat of CATEGORY_ORDER) {
|
||||
const tools = filteredTools.value.filter(t => t.category === cat)
|
||||
if (tools.length > 0) groups.push({ category: cat, label: CATEGORY_LABEL[cat], tools })
|
||||
}
|
||||
return groups
|
||||
})
|
||||
|
||||
// ===== 详情视图 =====
|
||||
const selectedId = ref<string | null>(null)
|
||||
const selectedTool = computed<DevTool | null>(() => {
|
||||
if (!selectedId.value) return null
|
||||
return getTool(selectedId.value) ?? null
|
||||
})
|
||||
|
||||
function openTool(id: string) {
|
||||
selectedId.value = id
|
||||
}
|
||||
|
||||
// ===== 全局搜索跳转：工具索引 → 打开对应工具 =====
|
||||
onMounted(() => {
|
||||
const actions = new Map<number, () => void>()
|
||||
TOOLS_META.forEach((t, i) => {
|
||||
actions.set(i, () => openTool(t.id))
|
||||
})
|
||||
searchStore.registerActions('devtools', actions)
|
||||
})
|
||||
|
||||
watch(selectedId, () => {
|
||||
query.value = ''
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="h-full p-6 overflow-hidden flex flex-col">
|
||||
<!-- 列表视图 -->
|
||||
<template v-if="!selectedTool">
|
||||
<div class="flex items-center gap-3 mb-4 shrink-0 flex-wrap">
|
||||
<div class="relative flex-1 min-w-[180px] max-w-xs">
|
||||
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
|
||||
<Input v-model="query" placeholder="搜索工具..." class="h-8 pl-8 text-sm" />
|
||||
</div>
|
||||
<Button
|
||||
v-for="cat in (['all', ...CATEGORY_ORDER] as const)"
|
||||
:key="cat"
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
class="h-7 px-2.5 text-xs"
|
||||
:class="category === cat ? 'bg-secondary text-foreground' : 'text-muted-foreground'"
|
||||
@click="category = cat as typeof category"
|
||||
>
|
||||
{{ cat === 'all' ? '全部' : CATEGORY_LABEL[cat as DevTool['category']] }}
|
||||
</Button>
|
||||
<span class="text-xs text-muted-foreground ml-auto">{{ (category === 'all' ? allTools : filteredTools).length }} 个工具</span>
|
||||
</div>
|
||||
|
||||
<ScrollArea class="flex-1 min-h-0 -mr-3 pr-3">
|
||||
<div v-if="filteredTools.length === 0" class="h-full flex items-center justify-center text-muted-foreground text-sm">
|
||||
没有找到匹配的工具
|
||||
</div>
|
||||
|
||||
<!-- 按分类分组 -->
|
||||
<div v-for="group in groupedTools" :key="group.category" class="mb-5">
|
||||
<div class="flex items-center gap-2 mb-2">
|
||||
<span class="text-xs font-medium text-muted-foreground">{{ group.label }}</span>
|
||||
<Separator class="flex-1" />
|
||||
</div>
|
||||
<div class="grid grid-cols-2 md:grid-cols-3 xl:grid-cols-4 gap-3">
|
||||
<Card
|
||||
v-for="tool in group.tools"
|
||||
:key="tool.id"
|
||||
class="cursor-pointer transition-all hover:border-primary/50 hover:shadow-sm !py-0 !gap-0"
|
||||
@click="openTool(tool.id)"
|
||||
>
|
||||
<CardContent class="p-4 flex flex-col gap-2">
|
||||
<div class="size-9 rounded-lg bg-primary/10 text-primary flex items-center justify-center">
|
||||
<component :is="tool.icon" class="size-5" />
|
||||
</div>
|
||||
<div class="flex flex-col gap-0.5">
|
||||
<span class="text-sm font-medium leading-tight">{{ tool.name }}</span>
|
||||
<span class="text-xs text-muted-foreground leading-snug line-clamp-2">{{ tool.description }}</span>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
</div>
|
||||
</ScrollArea>
|
||||
</template>
|
||||
|
||||
<!-- 工具详情视图 -->
|
||||
<template v-else>
|
||||
<div class="flex items-center gap-3 mb-4 shrink-0">
|
||||
<Button size="sm" variant="ghost" class="gap-1 h-8" @click="selectedId = null">
|
||||
<ArrowLeft class="size-4" />
|
||||
返回
|
||||
</Button>
|
||||
<div class="size-8 rounded-lg bg-primary/10 text-primary flex items-center justify-center">
|
||||
<component :is="selectedTool.icon" class="size-4" />
|
||||
</div>
|
||||
<div class="flex flex-col">
|
||||
<span class="text-sm font-medium leading-tight">{{ selectedTool.name }}</span>
|
||||
<span class="text-xs text-muted-foreground leading-snug">{{ selectedTool.description }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<ScrollArea class="flex-1 min-h-0 -mr-3 pr-3">
|
||||
<div class="max-w-3xl px-1 pb-6">
|
||||
<component :is="selectedTool.component" />
|
||||
</div>
|
||||
</ScrollArea>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,75 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Check, Copy } from '@lucide/vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Button } from '@/components/ui/button'
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
text: string
|
||||
editable?: boolean
|
||||
placeholder?: string
|
||||
label?: string
|
||||
minHeight?: string
|
||||
}>(),
|
||||
{ editable: false, placeholder: '结果...', label: '结果', minHeight: '120px' }
|
||||
)
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:text', v: string): void
|
||||
(e: 'copy', text: string): void
|
||||
}>()
|
||||
|
||||
const copied = ref(false)
|
||||
let copyTimer: number
|
||||
|
||||
const lineCount = computed(() => (props.text ? props.text.split('\n').length : 0))
|
||||
const charCount = computed(() => props.text.length)
|
||||
|
||||
const copy = async () => {
|
||||
try {
|
||||
await navigator.clipboard.writeText(props.text)
|
||||
emit('copy', props.text)
|
||||
copied.value = true
|
||||
window.clearTimeout(copyTimer)
|
||||
copyTimer = window.setTimeout(() => (copied.value = false), 1500)
|
||||
} catch {
|
||||
/* 复制失败静默 */
|
||||
}
|
||||
}
|
||||
|
||||
const onInput = (v: string | number) => {
|
||||
if (props.editable) emit('update:text', String(v))
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<div class="flex items-center justify-between">
|
||||
<span class="text-xs font-medium">{{ label }}</span>
|
||||
<div class="flex items-center gap-2 text-[11px] text-muted-foreground">
|
||||
<span>{{ lineCount }} 行</span>
|
||||
<span>{{ charCount }} 字符</span>
|
||||
<Button
|
||||
v-if="!editable"
|
||||
size="icon"
|
||||
variant="ghost"
|
||||
class="size-6"
|
||||
:title="copied ? '已复制' : '复制'"
|
||||
@click="copy"
|
||||
>
|
||||
<Check v-if="copied" class="size-3.5 text-green-500" />
|
||||
<Copy v-else class="size-3.5" />
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
<Textarea
|
||||
:model-value="props.text"
|
||||
:readonly="!editable"
|
||||
:placeholder="placeholder"
|
||||
:style="{ minHeight }"
|
||||
class="font-mono text-xs leading-relaxed resize-y"
|
||||
@update:model-value="onInput"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,40 @@
|
||||
<script setup lang="ts">
|
||||
export interface SegmentedOption {
|
||||
value: string
|
||||
label: string
|
||||
}
|
||||
|
||||
defineProps<{
|
||||
options: SegmentedOption[]
|
||||
modelValue: string
|
||||
label?: string
|
||||
size?: 'xs' | 'sm'
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', v: string): void
|
||||
}>()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex items-center gap-2 shrink-0">
|
||||
<span v-if="label" class="text-sm text-muted-foreground">{{ label }}</span>
|
||||
<div class="inline-flex rounded-md border border-border bg-muted/40 p-1">
|
||||
<button
|
||||
v-for="o in options"
|
||||
:key="o.value"
|
||||
type="button"
|
||||
class="rounded px-3 font-medium transition-colors cursor-pointer"
|
||||
:class="[
|
||||
size === 'sm' ? 'py-1.5 text-sm' : 'py-1 text-sm',
|
||||
modelValue === o.value
|
||||
? 'bg-background text-foreground shadow-sm'
|
||||
: 'text-muted-foreground hover:text-foreground'
|
||||
]"
|
||||
@click="emit('update:modelValue', o.value)"
|
||||
>
|
||||
{{ o.label }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,27 @@
|
||||
import type { ModuleConfig } from '@/types/module'
|
||||
import type { SearchIndexItem } from '@/stores/searchIndex'
|
||||
import { TOOLS_META } from './tools'
|
||||
|
||||
/** 开发者工具模块：聚合大量轻量文本/编码/转换工具 */
|
||||
|
||||
const searchItems: SearchIndexItem[] = TOOLS_META.map((t) => ({
|
||||
title: t.name,
|
||||
description: t.description,
|
||||
keywords: [t.name, ...t.keywords]
|
||||
}))
|
||||
|
||||
export const moduleConfig: ModuleConfig = {
|
||||
id: 'devtools',
|
||||
name: '开发者工具',
|
||||
icon: 'devtools',
|
||||
description: 'JSON / Base64 / 时间戳 / 正则 / 颜色 / Cron / 密码等 20 个常用开发工具',
|
||||
category: 'tool',
|
||||
defaultEnabled: true,
|
||||
loader: () => import('./DevToolsModule.vue'),
|
||||
searchItems,
|
||||
lifecycle: {
|
||||
onEnable: async () => {},
|
||||
onDisable: async () => {}
|
||||
},
|
||||
order: 60
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import type { Component } from 'vue'
|
||||
|
||||
export type DevToolCategory = 'encoding' | 'transform' | 'text' | 'generate' | 'reference'
|
||||
|
||||
export interface DevTool {
|
||||
id: string
|
||||
name: string
|
||||
description: string
|
||||
category: DevToolCategory
|
||||
keywords: string[]
|
||||
icon: Component
|
||||
component: Component
|
||||
}
|
||||
|
||||
/** 分类展示顺序 */
|
||||
export const CATEGORY_ORDER: DevToolCategory[] = ['transform', 'encoding', 'text', 'generate', 'reference']
|
||||
export const CATEGORY_LABEL: Record<DevToolCategory, string> = {
|
||||
transform: '转换',
|
||||
encoding: '编码',
|
||||
text: '文本',
|
||||
generate: '生成',
|
||||
reference: '速查'
|
||||
}
|
||||
|
||||
const allTools: DevTool[] = []
|
||||
const registry = new Map<string, DevTool>()
|
||||
|
||||
export function registerTool(tool: DevTool): void {
|
||||
if (registry.has(tool.id)) return
|
||||
registry.set(tool.id, tool)
|
||||
allTools.push(tool)
|
||||
}
|
||||
|
||||
export function getTool(id: string): DevTool | undefined {
|
||||
return registry.get(id)
|
||||
}
|
||||
|
||||
export function getAllTools(): DevTool[] {
|
||||
return [...allTools]
|
||||
}
|
||||
|
||||
export function getToolsByCategory(): Record<DevToolCategory, DevTool[]> {
|
||||
const result = {} as Record<DevToolCategory, DevTool[]>
|
||||
for (const cat of CATEGORY_ORDER) result[cat] = []
|
||||
for (const tool of allTools) {
|
||||
result[tool.category].push(tool)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
export function searchTools(query: string): DevTool[] {
|
||||
if (!query.trim()) return allTools
|
||||
const q = query.trim().toLowerCase()
|
||||
return allTools.filter(t =>
|
||||
t.name.toLowerCase().includes(q) ||
|
||||
t.description.toLowerCase().includes(q) ||
|
||||
t.keywords.some(k => k.toLowerCase().includes(q))
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,166 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { ArrowDownUp, Upload } from '@lucide/vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
type Tab = 'convert' | 'file'
|
||||
|
||||
const tab = ref<Tab>('convert')
|
||||
const mode = ref<'encode' | 'decode'>('encode')
|
||||
const input = ref('')
|
||||
const error = ref('')
|
||||
|
||||
function encode(s: string): string {
|
||||
const bytes = new TextEncoder().encode(s)
|
||||
let bin = ''
|
||||
for (const b of bytes) bin += String.fromCharCode(b)
|
||||
return btoa(bin)
|
||||
}
|
||||
|
||||
function decode(s: string): string {
|
||||
const cleaned = s.replace(/[\r\n\s]/g, '')
|
||||
const bin = atob(cleaned)
|
||||
const bytes = Uint8Array.from(bin, ch => ch.charCodeAt(0))
|
||||
return new TextDecoder().decode(bytes)
|
||||
}
|
||||
|
||||
const output = computed(() => {
|
||||
error.value = ''
|
||||
const v = input.value
|
||||
if (!v) return ''
|
||||
try {
|
||||
return mode.value === 'encode' ? encode(v) : decode(v)
|
||||
} catch (e) {
|
||||
error.value = '解码失败：' + String(e)
|
||||
return ''
|
||||
}
|
||||
})
|
||||
|
||||
const swap = () => {
|
||||
if (output.value) {
|
||||
input.value = output.value
|
||||
mode.value = mode.value === 'encode' ? 'decode' : 'encode'
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 文件转 Base64 =====
|
||||
const file = ref<File | null>(null)
|
||||
const fileInput = ref<HTMLInputElement | null>(null)
|
||||
const fileBase64 = ref('')
|
||||
const fileError = ref('')
|
||||
const fileLoading = ref(false)
|
||||
const FILE_SIZE_LIMIT = 64 * 1024 * 1024 // 64MB 保护上限（Base64 展示本身就很占内存）
|
||||
|
||||
function formatSize(bytes: number): string {
|
||||
if (bytes < 1024) return `${bytes} B`
|
||||
if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
|
||||
return `${(bytes / 1024 / 1024).toFixed(1)} MB`
|
||||
}
|
||||
|
||||
const mime = computed(() => file.value?.type || 'application/octet-stream')
|
||||
|
||||
async function onFileChange(e: Event) {
|
||||
const el = e.target as HTMLInputElement
|
||||
const f = el.files?.[0] ?? null
|
||||
fileError.value = ''
|
||||
fileBase64.value = ''
|
||||
file.value = f
|
||||
if (!f) return
|
||||
if (f.size > FILE_SIZE_LIMIT) {
|
||||
fileError.value = `文件过大（${formatSize(f.size)}），请使用 64MB 以内的文件`
|
||||
return
|
||||
}
|
||||
fileLoading.value = true
|
||||
try {
|
||||
const buf = await f.arrayBuffer()
|
||||
const bytes = new Uint8Array(buf)
|
||||
let bin = ''
|
||||
const CHUNK = 0x8000
|
||||
for (let i = 0; i < bytes.length; i += CHUNK) {
|
||||
bin += String.fromCharCode(...bytes.subarray(i, i + CHUNK))
|
||||
}
|
||||
fileBase64.value = btoa(bin)
|
||||
} catch (e) {
|
||||
fileError.value = '读取失败：' + String(e)
|
||||
} finally {
|
||||
fileLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function clearFile() {
|
||||
file.value = null
|
||||
fileBase64.value = ''
|
||||
fileError.value = ''
|
||||
if (fileInput.value) fileInput.value.value = ''
|
||||
}
|
||||
|
||||
const dataUrl = computed(() =>
|
||||
fileBase64.value ? `data:${mime.value};base64,${fileBase64.value}` : ''
|
||||
)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<Segmented
|
||||
v-model="tab"
|
||||
:options="[
|
||||
{ value: 'convert', label: '文本互转' },
|
||||
{ value: 'file', label: '文件转 Base64' }
|
||||
]"
|
||||
/>
|
||||
|
||||
<!-- 文本互转 -->
|
||||
<template v-if="tab === 'convert'">
|
||||
<div class="flex items-center justify-between flex-wrap gap-2">
|
||||
<Segmented
|
||||
v-model="mode"
|
||||
label="操作"
|
||||
:options="[
|
||||
{ value: 'encode', label: '编码' },
|
||||
{ value: 'decode', label: '解码' }
|
||||
]"
|
||||
/>
|
||||
<Button size="sm" variant="outline" class="h-8 text-sm gap-1" :disabled="!output" @click="swap">
|
||||
<ArrowDownUp class="size-3.5" />
|
||||
结果回填
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">{{ mode === 'encode' ? '原文' : 'Base64 字符串' }}</Label>
|
||||
<Textarea v-model="input" placeholder="在此输入..." class="min-h-[120px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<ResultArea :text="output" placeholder="结果" />
|
||||
<p v-if="error" class="text-xs text-destructive">{{ error }}</p>
|
||||
</template>
|
||||
|
||||
<!-- 文件转 Base64 -->
|
||||
<template v-else>
|
||||
<div class="flex items-center gap-2 flex-wrap">
|
||||
<Button size="sm" variant="outline" class="h-8 text-sm gap-1.5" @click="fileInput?.click()">
|
||||
<Upload class="size-3.5" />
|
||||
选择文件
|
||||
</Button>
|
||||
<input ref="fileInput" type="file" class="hidden" @change="onFileChange" />
|
||||
<template v-if="file">
|
||||
<span class="text-xs font-mono text-muted-foreground">{{ file.name }}（{{ formatSize(file.size) }}，{{ mime }}）</span>
|
||||
<Button size="sm" variant="ghost" class="h-7 text-xs" @click="clearFile">移除</Button>
|
||||
</template>
|
||||
</div>
|
||||
<p v-if="fileError" class="text-xs text-destructive">{{ fileError }}</p>
|
||||
|
||||
<template v-if="fileBase64">
|
||||
<ResultArea :text="fileBase64" label="Base64" placeholder="Base64" minHeight="100px" />
|
||||
<ResultArea :text="dataUrl" label="Data URL" placeholder="Data URL" minHeight="100px" />
|
||||
<p class="text-xs text-muted-foreground">Base64 体积约为原文件的 4/3（{{ formatSize(fileBase64.length) }}）。</p>
|
||||
</template>
|
||||
<p v-else-if="!fileLoading" class="text-xs text-muted-foreground">选择文件后自动生成 Base64 与 Data URL。</p>
|
||||
<p v-else class="text-xs text-muted-foreground">读取中...</p>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,87 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
type CaseMode =
|
||||
| 'camel' | 'pascal' | 'snake' | 'kebab'
|
||||
| 'upper' | 'lower' | 'title'
|
||||
| 'spaceToDash' | 'trimLines' | 'collapseSpace'
|
||||
|
||||
const modes: { value: CaseMode; label: string }[] = [
|
||||
{ value: 'camel', label: 'camelCase' },
|
||||
{ value: 'pascal', label: 'PascalCase' },
|
||||
{ value: 'snake', label: 'snake_case' },
|
||||
{ value: 'kebab', label: 'kebab-case' },
|
||||
{ value: 'upper', label: '全大写' },
|
||||
{ value: 'lower', label: '全小写' },
|
||||
{ value: 'title', label: '标题式' },
|
||||
{ value: 'spaceToDash', label: '空格转下划线' },
|
||||
{ value: 'collapseSpace', label: '合并空行空白' },
|
||||
{ value: 'trimLines', label: '每行去首尾空格' }
|
||||
]
|
||||
|
||||
const mode = ref<CaseMode>('camel')
|
||||
const input = ref('')
|
||||
|
||||
function toWords(s: string): string[] {
|
||||
// 拆分 camelCase / snake_case / kebab-case / 空格，得到词
|
||||
return s
|
||||
.replace(/([a-z0-9])([A-Z])/g, '$1 $2')
|
||||
.replace(/[_\-\s]+/g, ' ')
|
||||
.trim()
|
||||
.split(' ')
|
||||
.filter(Boolean)
|
||||
}
|
||||
|
||||
const output = computed(() => {
|
||||
const v = input.value
|
||||
if (!v) return ''
|
||||
switch (mode.value) {
|
||||
case 'upper':
|
||||
return v.toUpperCase()
|
||||
case 'lower':
|
||||
return v.toLowerCase()
|
||||
case 'title':
|
||||
return v.replace(/\b\w/g, ch => ch.toUpperCase())
|
||||
case 'spaceToDash':
|
||||
return v.replace(/\s+/g, '_')
|
||||
case 'collapseSpace':
|
||||
return v.split(/\n+/).map(l => l.trim()).filter(Boolean).join('\n')
|
||||
case 'trimLines':
|
||||
return v.split('\n').map(l => l.trim()).join('\n')
|
||||
case 'camel': // fallthrough
|
||||
case 'pascal':
|
||||
case 'snake':
|
||||
case 'kebab':
|
||||
break
|
||||
}
|
||||
const words = toWords(v).filter(Boolean)
|
||||
if (words.length === 0) return ''
|
||||
if (mode.value === 'camel') {
|
||||
return words[0].toLowerCase() + words.slice(1).map(w => cap(w)).join('')
|
||||
}
|
||||
if (mode.value === 'pascal') {
|
||||
return words.map(cap).join('')
|
||||
}
|
||||
const sep = mode.value === 'snake' ? '_' : '-'
|
||||
return words.map(w => w.toLowerCase()).join(sep)
|
||||
})
|
||||
|
||||
function cap(w: string): string {
|
||||
return w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<Segmented v-model="mode" :options="modes" />
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">原文</Label>
|
||||
<Textarea v-model="input" placeholder="在此输入..." class="min-h-[140px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
<ResultArea :text="output" placeholder="结果" />
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,129 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Switch } from '@/components/ui/switch'
|
||||
|
||||
const input = ref('')
|
||||
const showFrequency = ref(true)
|
||||
|
||||
function utf8Bytes(s: string): number {
|
||||
return new TextEncoder().encode(s).length
|
||||
}
|
||||
|
||||
/** 统计词：中文按字、英文按单词 */
|
||||
function countWords(s: string): number {
|
||||
const cjk = (s.match(/[\u4e00-\u9fff\u3400-\u4dbf]/g) ?? []).length
|
||||
const latin = (s.match(/[a-zA-Z0-9]+(?:[-'’][a-zA-Z0-9]+)*/g) ?? []).length
|
||||
return cjk + latin
|
||||
}
|
||||
|
||||
interface Stats {
|
||||
chars: number
|
||||
charsNoSpace: number
|
||||
bytes: number
|
||||
words: number
|
||||
lines: number
|
||||
nonEmptyLines: number
|
||||
sentences: number
|
||||
paragraphs: number
|
||||
}
|
||||
|
||||
const stats = computed<Stats>(() => {
|
||||
const v = input.value
|
||||
const lines = v === '' ? 0 : v.split('\n').length
|
||||
const nonEmpty = v.split('\n').filter(l => l.trim()).length
|
||||
// 句子：以 。！？.!?;； 结尾的段落片段
|
||||
const sentences = (v.match(/[^。！？!?\n]+[。！？!?]?/g) ?? []).filter(s => s.trim()).length
|
||||
const paragraphs = v.split(/\n\s*\n/).filter(p => p.trim()).length
|
||||
return {
|
||||
chars: v.length,
|
||||
charsNoSpace: v.replace(/\s/g, '').length,
|
||||
bytes: utf8Bytes(v),
|
||||
words: countWords(v),
|
||||
lines,
|
||||
nonEmptyLines: nonEmpty,
|
||||
sentences,
|
||||
paragraphs
|
||||
}
|
||||
})
|
||||
|
||||
const FIELDS: Array<{ key: keyof Stats; label: string }> = [
|
||||
{ key: 'chars', label: '字符数' },
|
||||
{ key: 'charsNoSpace', label: '字符数（不含空白）' },
|
||||
{ key: 'bytes', label: '字节数（UTF-8）' },
|
||||
{ key: 'words', label: '词数（中文按字/英文按词）' },
|
||||
{ key: 'lines', label: '行数' },
|
||||
{ key: 'nonEmptyLines', label: '非空行数' },
|
||||
{ key: 'sentences', label: '句子数' },
|
||||
{ key: 'paragraphs', label: '段落数（空行分隔）' }
|
||||
]
|
||||
|
||||
/** 高频字符 / 高频词 top 10 */
|
||||
const topChars = computed(() => {
|
||||
if (!showFrequency.value || !input.value) return []
|
||||
const map = new Map<string, number>()
|
||||
for (const ch of input.value) {
|
||||
if (/\s/.test(ch)) continue
|
||||
map.set(ch, (map.get(ch) ?? 0) + 1)
|
||||
}
|
||||
return [...map.entries()].sort((a, b) => b[1] - a[1]).slice(0, 10)
|
||||
})
|
||||
|
||||
const topWords = computed(() => {
|
||||
if (!showFrequency.value || !input.value) return []
|
||||
const tokens = input.value.match(/[\u4e00-\u9fff]|[a-zA-Z0-9]+(?:[-'’][a-zA-Z0-9]+)*/g) ?? []
|
||||
const map = new Map<string, number>()
|
||||
for (const t of tokens) {
|
||||
map.set(t, (map.get(t) ?? 0) + 1)
|
||||
}
|
||||
return [...map.entries()].sort((a, b) => b[1] - a[1]).slice(0, 10)
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<div class="flex items-center justify-between">
|
||||
<Label class="text-xs">文本</Label>
|
||||
<label class="flex items-center gap-2 text-xs text-muted-foreground cursor-pointer">
|
||||
显示高频统计
|
||||
<Switch v-model="showFrequency" />
|
||||
</label>
|
||||
</div>
|
||||
<Textarea v-model="input" placeholder="粘贴或输入文本，实时统计..." class="min-h-[160px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div v-for="f in FIELDS" :key="f.key" class="flex justify-between px-3 py-1.5">
|
||||
<span class="text-muted-foreground">{{ f.label }}</span>
|
||||
<span class="font-mono">{{ stats[f.key].toLocaleString() }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="showFrequency && input">
|
||||
<div class="grid grid-cols-2 gap-3">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">高频字符 Top 10</Label>
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div v-for="([ch, n], i) in topChars" :key="i" class="flex justify-between px-3 py-1">
|
||||
<span class="font-mono w-8 text-center rounded bg-muted">{{ ch }}</span>
|
||||
<span class="font-mono text-muted-foreground">{{ n }} 次</span>
|
||||
</div>
|
||||
<div v-if="topChars.length === 0" class="px-3 py-2 text-muted-foreground">无内容</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">高频词 Top 10</Label>
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div v-for="([w, n], i) in topWords" :key="i" class="flex justify-between px-3 py-1">
|
||||
<span class="font-mono">{{ w }}</span>
|
||||
<span class="font-mono text-muted-foreground">{{ n }} 次</span>
|
||||
</div>
|
||||
<div v-if="topWords.length === 0" class="px-3 py-2 text-muted-foreground">无内容</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,211 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
const input = ref('#3b82f6')
|
||||
const alpha = ref(1)
|
||||
|
||||
interface Rgb {
|
||||
r: number
|
||||
g: number
|
||||
b: number
|
||||
}
|
||||
|
||||
function clampByte(v: number): number {
|
||||
return Math.min(255, Math.max(0, Math.round(v)))
|
||||
}
|
||||
|
||||
function parseColor(s: string): Rgb | null {
|
||||
const v = s.trim().toLowerCase()
|
||||
if (!v) return null
|
||||
// #rgb / #rgba / #rrggbb / #rrggbbaa
|
||||
const hex = v.match(/^#?([0-9a-f]{3,8})$/)
|
||||
if (hex) {
|
||||
const h = hex[1]
|
||||
if (h.length === 3 || h.length === 4) {
|
||||
const [r, g, b] = [h[0], h[1], h[2]].map(c => parseInt(c + c, 16))
|
||||
return { r, g, b }
|
||||
}
|
||||
if (h.length === 6 || h.length === 8) {
|
||||
return {
|
||||
r: parseInt(h.slice(0, 2), 16),
|
||||
g: parseInt(h.slice(2, 4), 16),
|
||||
b: parseInt(h.slice(4, 6), 16)
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
// rgb() / rgba()
|
||||
const rgb = v.match(/^rgba?\(\s*(\d{1,3})[\s,]+(\d{1,3})[\s,]+(\d{1,3})/)
|
||||
if (rgb) {
|
||||
return { r: clampByte(Number(rgb[1])), g: clampByte(Number(rgb[2])), b: clampByte(Number(rgb[3])) }
|
||||
}
|
||||
// hsl() / hsla()
|
||||
const hsl = v.match(/^hsla?\(\s*(\d{1,3}(?:\.\d+)?)\s*[,\s]\s*(\d{1,3})%\s*[,\s]\s*(\d{1,3})%/)
|
||||
if (hsl) {
|
||||
return hslToRgb(Number(hsl[1]), Number(hsl[2]) / 100, Number(hsl[3]) / 100)
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
function hslToRgb(h: number, s: number, l: number): Rgb {
|
||||
h = ((h % 360) + 360) % 360
|
||||
const c = (1 - Math.abs(2 * l - 1)) * s
|
||||
const x = c * (1 - Math.abs(((h / 60) % 2) - 1))
|
||||
const m = l - c / 2
|
||||
let r = 0, g = 0, b = 0
|
||||
if (h < 60) { r = c; g = x }
|
||||
else if (h < 120) { r = x; g = c }
|
||||
else if (h < 180) { g = c; b = x }
|
||||
else if (h < 240) { g = x; b = c }
|
||||
else if (h < 300) { r = x; b = c }
|
||||
else { r = c; b = x }
|
||||
return { r: clampByte((r + m) * 255), g: clampByte((g + m) * 255), b: clampByte((b + m) * 255) }
|
||||
}
|
||||
|
||||
function rgbToHsl({ r, g, b }: Rgb): { h: number; s: number; l: number } {
|
||||
const rn = r / 255, gn = g / 255, bn = b / 255
|
||||
const max = Math.max(rn, gn, bn)
|
||||
const min = Math.min(rn, gn, bn)
|
||||
const l = (max + min) / 2
|
||||
let h = 0
|
||||
let s = 0
|
||||
if (max !== min) {
|
||||
const d = max - min
|
||||
s = l > 0.5 ? d / (2 - max - min) : d / (max + min)
|
||||
if (max === rn) h = ((gn - bn) / d + (gn < bn ? 6 : 0)) * 60
|
||||
else if (max === gn) h = ((bn - rn) / d + 2) * 60
|
||||
else h = ((rn - gn) / d + 4) * 60
|
||||
}
|
||||
return { h: Math.round(h), s: Math.round(s * 100), l: Math.round(l * 100) }
|
||||
}
|
||||
|
||||
function rgbToHsv({ r, g, b }: Rgb): { h: number; s: number; v: number } {
|
||||
const rn = r / 255, gn = g / 255, bn = b / 255
|
||||
const max = Math.max(rn, gn, bn)
|
||||
const min = Math.min(rn, gn, bn)
|
||||
const d = max - min
|
||||
let h = 0
|
||||
if (d !== 0) {
|
||||
if (max === rn) h = (((gn - bn) / d) % 6) * 60
|
||||
else if (max === gn) h = ((bn - rn) / d + 2) * 60
|
||||
else h = ((rn - gn) / d + 4) * 60
|
||||
}
|
||||
h = Math.round(((h % 360) + 360) % 360)
|
||||
return { h, s: Math.round((max === 0 ? 0 : d / max) * 100), v: Math.round(max * 100) }
|
||||
}
|
||||
|
||||
function toHex({ r, g, b }: Rgb): string {
|
||||
return '#' + [r, g, b].map(x => x.toString(16).padStart(2, '0')).join('')
|
||||
}
|
||||
|
||||
const rgb = computed<Rgb | null>(() => parseColor(input.value))
|
||||
|
||||
const alphaInput = computed(() => {
|
||||
const a = Math.min(1, Math.max(0, alpha.value))
|
||||
return Math.round(a * 255)
|
||||
.toString(16)
|
||||
.padStart(2, '0')
|
||||
})
|
||||
|
||||
const formats = computed(() => {
|
||||
const c = rgb.value
|
||||
if (!c) return null
|
||||
const hsl = rgbToHsl(c)
|
||||
const hsv = rgbToHsv(c)
|
||||
return {
|
||||
hex: toHex(c),
|
||||
hexA: `${toHex(c)}${alphaInput.value}`,
|
||||
rgb: `rgb(${c.r}, ${c.g}, ${c.b})`,
|
||||
rgba: `rgba(${c.r}, ${c.g}, ${c.b}, ${alpha.value})`,
|
||||
hsl: `hsl(${hsl.h}, ${hsl.s}%, ${hsl.l}%)`,
|
||||
hsla: `hsla(${hsl.h}, ${hsl.s}%, ${hsl.l}%, ${alpha.value})`,
|
||||
hsv: `hsv(${hsv.h}, ${hsv.s}%, ${hsv.v}%)`,
|
||||
cmyk: rgbToCmyk(c)
|
||||
}
|
||||
})
|
||||
|
||||
function rgbToCmyk({ r, g, b }: Rgb): string {
|
||||
const rn = r / 255, gn = g / 255, bn = b / 255
|
||||
const k = 1 - Math.max(rn, gn, bn)
|
||||
if (k === 1) return 'cmyk(0%, 0%, 0%, 100%)'
|
||||
const c = (1 - rn - k) / (1 - k)
|
||||
const m = (1 - gn - k) / (1 - k)
|
||||
const y = (1 - bn - k) / (1 - k)
|
||||
const p = (x: number) => Math.round(x * 100)
|
||||
return `cmyk(${p(c)}%, ${p(m)}%, ${p(y)}%, ${p(k)}%)`
|
||||
}
|
||||
|
||||
// 亮度判断（W3C 公式），用于预览色上的文字颜色
|
||||
const previewTextLight = computed(() => {
|
||||
const c = rgb.value
|
||||
if (!c) return true
|
||||
return (c.r * 0.299 + c.g * 0.587 + c.b * 0.114) < 140
|
||||
})
|
||||
|
||||
// 明暗梯度
|
||||
const shades = computed(() => {
|
||||
const c = rgb.value
|
||||
if (!c) return []
|
||||
const hsl = rgbToHsl(c)
|
||||
return [-60, -40, -20, 0, 20, 40, 60].map(delta => {
|
||||
const l = Math.min(96, Math.max(4, hsl.l + delta))
|
||||
const rgb2 = hslToRgb(hsl.h, hsl.s / 100, l / 100)
|
||||
return { label: delta === 0 ? `${l}%` : `${l}%`, color: toHex(rgb2) }
|
||||
})
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex items-end gap-3 flex-wrap">
|
||||
<div class="flex flex-col gap-1.5 flex-1 min-w-[200px]">
|
||||
<Label class="text-xs">颜色（支持 #hex / rgb() / hsl()）</Label>
|
||||
<Input v-model="input" placeholder="#3b82f6 或 rgb(59,130,246) 或 hsl(217,91%,60%)" class="font-mono text-sm" />
|
||||
</div>
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">透明度 {{ alpha.toFixed(2) }}</Label>
|
||||
<input v-model.number="alpha" type="range" min="0" max="1" step="0.01" class="w-40 accent-primary" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="formats && rgb">
|
||||
<!-- 预览 -->
|
||||
<div
|
||||
class="rounded-md border border-border h-20 flex items-center justify-center font-mono text-sm"
|
||||
:style="{ backgroundColor: `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${alpha})`, color: previewTextLight ? '#ffffff' : '#000000' }"
|
||||
>
|
||||
{{ formats.hex }} {{ alpha < 1 ? `（透明度 ${alpha.toFixed(2)}）` : '' }}
|
||||
</div>
|
||||
|
||||
<ResultArea :text="formats.hex" label="HEX" placeholder="HEX" minHeight="60px" />
|
||||
<ResultArea v-if="alpha < 1" :text="formats.hexA" label="HEX + Alpha" placeholder="HEX" minHeight="60px" />
|
||||
<ResultArea :text="formats.rgb" label="RGB" placeholder="RGB" minHeight="60px" />
|
||||
<ResultArea v-if="alpha < 1" :text="formats.rgba" label="RGBA" placeholder="RGBA" minHeight="60px" />
|
||||
<ResultArea :text="formats.hsl" label="HSL" placeholder="HSL" minHeight="60px" />
|
||||
<ResultArea v-if="alpha < 1" :text="formats.hsla" label="HSLA" placeholder="HSLA" minHeight="60px" />
|
||||
<ResultArea :text="formats.hsv" label="HSV" placeholder="HSV" minHeight="60px" />
|
||||
<ResultArea :text="formats.cmyk" label="CMYK" placeholder="CMYK" minHeight="60px" />
|
||||
|
||||
<!-- 明暗梯度 -->
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">明暗梯度</Label>
|
||||
<div class="flex rounded-md overflow-hidden border border-border h-10">
|
||||
<div
|
||||
v-for="(s, i) in shades"
|
||||
:key="i"
|
||||
class="flex-1 flex items-center justify-center text-[10px] font-mono cursor-pointer"
|
||||
:style="{ backgroundColor: s.color, color: i < 3 ? '#fff' : '#000' }"
|
||||
:title="s.color"
|
||||
@click="input = s.color"
|
||||
>
|
||||
{{ s.label }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<p v-else-if="input" class="text-xs text-destructive">无法识别的颜色格式，支持 #hex / rgb() / rgba() / hsl() / hsla()。</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,228 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
const expr = ref('*/5 * * * *')
|
||||
|
||||
interface FieldMatcher {
|
||||
/** 该字段是否为非通配（受限） */
|
||||
restricted: boolean
|
||||
match(v: number): boolean
|
||||
}
|
||||
|
||||
function parseField(field: string, min: number, max: number): FieldMatcher {
|
||||
const values = new Set<number>()
|
||||
let restricted = false
|
||||
for (const part of field.split(',')) {
|
||||
const [rangePart, stepPart] = part.split('/')
|
||||
const step = stepPart ? Number(stepPart) : 1
|
||||
if (!Number.isFinite(step) || step < 1) throw new Error(`非法步长：${part}`)
|
||||
let lo: number
|
||||
let hi: number
|
||||
if (rangePart === '*') {
|
||||
if (!stepPart) {
|
||||
// 纯通配：匹配任意值（不受限）
|
||||
return { restricted: false, match: () => true }
|
||||
}
|
||||
lo = min
|
||||
hi = max
|
||||
} else if (rangePart.includes('-')) {
|
||||
const [a, b] = rangePart.split('-').map(Number)
|
||||
if (!Number.isFinite(a) || !Number.isFinite(b) || a < min || b > max || a > b) {
|
||||
throw new Error(`非法范围：${part}（应在 ${min}-${max} 内）`)
|
||||
}
|
||||
lo = a
|
||||
hi = b
|
||||
} else {
|
||||
const n = Number(rangePart)
|
||||
if (!Number.isFinite(n) || n < min || n > max) {
|
||||
throw new Error(`非法值：${part}（应在 ${min}-${max} 内）`)
|
||||
}
|
||||
lo = n
|
||||
hi = n
|
||||
}
|
||||
restricted = true
|
||||
for (let v = lo; v <= hi; v += step) values.add(v)
|
||||
}
|
||||
if (values.size === 0) throw new Error(`空字段：${field}`)
|
||||
return { restricted, match: v => values.has(v) }
|
||||
}
|
||||
|
||||
const FIELD_NAMES = ['分钟', '小时', '日', '月', '星期'] as const
|
||||
// 星期允许 0-7（0 与 7 均为周日）
|
||||
const FIELD_RANGES: Array<[number, number]> = [[0, 59], [0, 23], [1, 31], [1, 12], [0, 7]]
|
||||
const DOW_NAMES = ['日', '一', '二', '三', '四', '五', '六']
|
||||
|
||||
/** 支持英文别名（星期/月份）与中文星期 */
|
||||
function normalizeExpr(s: string): string {
|
||||
const DOW_MAP: Record<string, string> = {
|
||||
sun: '0', mon: '1', tue: '2', wed: '3', thu: '4', fri: '5', sat: '6',
|
||||
'日': '0', '一': '1', '二': '2', '三': '3', '四': '4', '五': '5', '六': '6'
|
||||
}
|
||||
const MON_MAP: Record<string, string> = {
|
||||
jan: '1', feb: '2', mar: '3', apr: '4', may: '5', jun: '6',
|
||||
jul: '7', aug: '8', sep: '9', oct: '10', nov: '11', dec: '12'
|
||||
}
|
||||
let out = s.trim().toLowerCase()
|
||||
for (const [k, v] of Object.entries(MON_MAP)) {
|
||||
out = out.split(k).join(v)
|
||||
}
|
||||
for (const [k, v] of Object.entries(DOW_MAP)) {
|
||||
out = out.split(k).join(v)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
interface CronParsed {
|
||||
minute: FieldMatcher
|
||||
hour: FieldMatcher
|
||||
dom: FieldMatcher
|
||||
month: FieldMatcher
|
||||
dow: FieldMatcher
|
||||
domRestricted: boolean
|
||||
dowRestricted: boolean
|
||||
}
|
||||
|
||||
function parseCron(s: string): CronParsed {
|
||||
const parts = normalizeExpr(s).split(/\s+/)
|
||||
if (parts.length !== 5) {
|
||||
throw new Error(`应为 5 个字段（分 时 日 月 周），当前 ${parts.length} 个`)
|
||||
}
|
||||
const [minute, hour, dom, month, dowRaw] = parts.map((p, i) => parseField(p, FIELD_RANGES[i][0], FIELD_RANGES[i][1]))
|
||||
// cron 标准允许星期用 0-7，其中 0 与 7 均为周日
|
||||
const dow: FieldMatcher = {
|
||||
restricted: dowRaw.restricted,
|
||||
match: v => dowRaw.match(v) || (v === 0 && dowRaw.match(7))
|
||||
}
|
||||
return {
|
||||
minute, hour, dom, month, dow,
|
||||
domRestricted: dom.restricted,
|
||||
dowRestricted: dow.restricted
|
||||
}
|
||||
}
|
||||
|
||||
/** 标准 cron 语义：日 与 星期 都受限时，任一匹配即可 */
|
||||
function matches(p: CronParsed, d: Date): boolean {
|
||||
if (!p.minute.match(d.getMinutes())) return false
|
||||
if (!p.hour.match(d.getHours())) return false
|
||||
if (!p.month.match(d.getMonth() + 1)) return false
|
||||
const domOk = p.dom.match(d.getDate())
|
||||
const dowOk = p.dow.match(d.getDay())
|
||||
if (p.domRestricted && p.dowRestricted) return domOk || dowOk
|
||||
return domOk && dowOk
|
||||
}
|
||||
|
||||
function nextRuns(p: CronParsed, from: Date, n: number): Date[] {
|
||||
const out: Date[] = []
|
||||
const t = new Date(from.getTime())
|
||||
t.setSeconds(0, 0)
|
||||
t.setMinutes(t.getMinutes() + 1)
|
||||
// 最多向前扫描 5 年（处理 2 月 29 日等罕见窗口）
|
||||
const limit = new Date(from.getTime() + 5 * 365.25 * 24 * 3600 * 1000)
|
||||
while (out.length < n && t < limit) {
|
||||
if (matches(p, t)) out.push(new Date(t.getTime()))
|
||||
t.setMinutes(t.getMinutes() + 1)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
const pad = (x: number) => String(x).padStart(2, '0')
|
||||
function fmt(d: Date): string {
|
||||
const week = `周${DOW_NAMES[d.getDay()]}`
|
||||
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())} ${week}`
|
||||
}
|
||||
|
||||
const parsed = computed<{ runs: string[]; fields: string[] } | null>(() => {
|
||||
const s = expr.value.trim()
|
||||
if (!s) return null
|
||||
try {
|
||||
const p = parseCron(s)
|
||||
const runs = nextRuns(p, new Date(), 6)
|
||||
const fields = s.split(/\s+/)
|
||||
return { runs: runs.map(fmt), fields }
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
})
|
||||
|
||||
const error = computed(() => {
|
||||
const s = expr.value.trim()
|
||||
if (!s) return ''
|
||||
try {
|
||||
parseCron(s)
|
||||
return ''
|
||||
} catch (e) {
|
||||
return String(e instanceof Error ? e.message : e)
|
||||
}
|
||||
})
|
||||
|
||||
/** 人类可读的字段说明 */
|
||||
const fieldDesc = computed<string[]>(() => {
|
||||
const s = expr.value.trim()
|
||||
if (!s || error.value) return []
|
||||
const fields = normalizeExpr(s).split(/\s+/)
|
||||
return fields.map((f, i) => {
|
||||
if (f === '*') return `${FIELD_NAMES[i]}：任意`
|
||||
return `${FIELD_NAMES[i]}：${f}`
|
||||
})
|
||||
})
|
||||
|
||||
const EXAMPLES = [
|
||||
{ expr: '*/5 * * * *', desc: '每 5 分钟' },
|
||||
{ expr: '0 * * * *', desc: '每小时整点' },
|
||||
{ expr: '30 9 * * 1-5', desc: '工作日 9:30' },
|
||||
{ expr: '0 0 1 * *', desc: '每月 1 日零点' },
|
||||
{ expr: '0 12 */2 * *', desc: '每 2 天的 12:00' }
|
||||
]
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">Cron 表达式（分 时 日 月 周，支持英文/中文星期与英文月份）</Label>
|
||||
<Input v-model="expr" placeholder="*/5 * * * *" class="font-mono text-sm" :class="{ 'border-destructive': !!error }" />
|
||||
<div class="flex items-center gap-2 flex-wrap">
|
||||
<button
|
||||
v-for="ex in EXAMPLES"
|
||||
:key="ex.expr"
|
||||
type="button"
|
||||
class="text-xs px-2 py-0.5 rounded border border-border text-muted-foreground hover:text-foreground cursor-pointer transition-colors"
|
||||
@click="expr = ex.expr"
|
||||
>
|
||||
{{ ex.desc }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p v-if="error" class="text-xs text-destructive">{{ error }}</p>
|
||||
|
||||
<template v-if="parsed">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">字段拆解</Label>
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div v-for="(f, i) in parsed.fields" :key="i" class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-12 shrink-0 text-muted-foreground">{{ FIELD_NAMES[i] }}</span>
|
||||
<span class="font-mono">{{ f }}</span>
|
||||
<span class="ml-auto text-muted-foreground">{{ fieldDesc[i]?.split('：')[1] ?? '' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">接下来 6 次执行时间</Label>
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs font-mono">
|
||||
<div v-for="(r, i) in parsed.runs" :key="i" class="px-3 py-1.5 flex gap-3">
|
||||
<span class="text-muted-foreground w-4">+{{ i + 1 }}</span>
|
||||
<span>{{ r }}</span>
|
||||
</div>
|
||||
<div v-if="parsed.runs.length === 0" class="px-3 py-2 text-muted-foreground">5 年内无执行时间（表达式可能过严，如 2 月 30 日）。</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ResultArea :text="parsed.runs.join('\n')" label="执行时间列表（可复制）" placeholder="执行时间" />
|
||||
</template>
|
||||
<p v-else-if="!expr" class="text-xs text-muted-foreground">输入 5 段式 cron 表达式，自动计算接下来 6 次执行时间。</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,146 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
const oldText = ref('')
|
||||
const newText = ref('')
|
||||
|
||||
type Op = 'equal' | 'del' | 'add'
|
||||
interface DiffLine {
|
||||
op: Op
|
||||
oldLine: string
|
||||
line: string
|
||||
newLine: string
|
||||
}
|
||||
|
||||
// LCS DP 为 O(n·m)，行数过大会卡死 UI；超过上限停止计算并提示
|
||||
const MAX_LINES = 3000
|
||||
|
||||
// 先裁剪公共前缀/后缀，LCS 只算中间差异部分（典型场景提速明显）
|
||||
function diffLines(a: string[], b: string[]): DiffLine[] {
|
||||
const out: DiffLine[] = []
|
||||
let start = 0
|
||||
while (start < a.length && start < b.length && a[start] === b[start]) {
|
||||
out.push({ op: 'equal', oldLine: a[start], line: a[start], newLine: b[start] })
|
||||
start++
|
||||
}
|
||||
let endA = a.length, endB = b.length
|
||||
while (endA > start && endB > start && a[endA - 1] === b[endB - 1]) {
|
||||
endA--
|
||||
endB--
|
||||
}
|
||||
const mid = lcsDiff(a.slice(start, endA), b.slice(start, endB))
|
||||
// 后缀公共部分：a[endA..] 与 b[endB..] 逐行配对
|
||||
const suffix: DiffLine[] = []
|
||||
for (let i = a.length - 1; i >= endA; i--) {
|
||||
const j = endB + (i - endA)
|
||||
suffix.unshift({ op: 'equal', oldLine: a[i], line: a[i], newLine: b[j] })
|
||||
}
|
||||
return [...out, ...mid, ...suffix]
|
||||
}
|
||||
|
||||
function lcsDiff(a: string[], b: string[]): DiffLine[] {
|
||||
const n = a.length
|
||||
const m = b.length
|
||||
if (n === 0) return b.map(line => ({ op: 'add' as const, oldLine: '', line, newLine: '' }))
|
||||
if (m === 0) return a.map(line => ({ op: 'del' as const, oldLine: line, line, newLine: '' }))
|
||||
// LCS DP
|
||||
const dp: number[][] = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0))
|
||||
for (let i = n - 1; i >= 0; i--) {
|
||||
for (let j = m - 1; j >= 0; j--) {
|
||||
dp[i][j] = a[i] === b[j] ? dp[i + 1][j + 1] + 1 : Math.max(dp[i + 1][j], dp[i][j + 1])
|
||||
}
|
||||
}
|
||||
const out: DiffLine[] = []
|
||||
let i = 0
|
||||
let j = 0
|
||||
while (i < n && j < m) {
|
||||
if (a[i] === b[j]) {
|
||||
out.push({ op: 'equal', oldLine: a[i], line: a[i], newLine: b[j] })
|
||||
i++
|
||||
j++
|
||||
} else if (dp[i + 1][j] >= dp[i][j + 1]) {
|
||||
out.push({ op: 'del', oldLine: a[i], line: a[i], newLine: '' })
|
||||
i++
|
||||
} else {
|
||||
out.push({ op: 'add', oldLine: '', line: b[j], newLine: b[j] })
|
||||
j++
|
||||
}
|
||||
}
|
||||
while (i < n) {
|
||||
out.push({ op: 'del', oldLine: a[i], line: a[i], newLine: '' })
|
||||
i++
|
||||
}
|
||||
while (j < m) {
|
||||
out.push({ op: 'add', oldLine: '', line: b[j], newLine: b[j] })
|
||||
j++
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
const tooLarge = computed(() =>
|
||||
oldText.value.split('\n').length > MAX_LINES || newText.value.split('\n').length > MAX_LINES
|
||||
)
|
||||
|
||||
const lines = computed(() => {
|
||||
if (tooLarge.value) return []
|
||||
return diffLines(oldText.value.split('\n'), newText.value.split('\n'))
|
||||
})
|
||||
|
||||
const stats = computed(() => {
|
||||
let adds = 0
|
||||
let dels = 0
|
||||
for (const l of lines.value) {
|
||||
if (l.op === 'add') adds++
|
||||
else if (l.op === 'del') dels++
|
||||
}
|
||||
return { adds, dels }
|
||||
})
|
||||
|
||||
const unifiedText = computed(() => {
|
||||
if (lines.value.length === 0) return ''
|
||||
return lines.value
|
||||
.map(l => (l.op === 'add' ? '+' : l.op === 'del' ? '-' : ' ') + l.line)
|
||||
.join('\n')
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="grid grid-cols-2 gap-3">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs text-red-500">旧文本（删除 {{ stats.dels }} 行）</Label>
|
||||
<Textarea v-model="oldText" placeholder="旧文本..." class="min-h-[140px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs text-green-500">新文本（新增 {{ stats.adds }} 行）</Label>
|
||||
<Textarea v-model="newText" placeholder="新文本..." class="min-h-[140px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">差异预览</Label>
|
||||
<div class="rounded-md border border-border max-h-64 overflow-auto font-mono text-xs leading-relaxed">
|
||||
<div v-if="tooLarge" class="p-3 text-destructive">文本超过 {{ MAX_LINES }} 行，差异计算已停止（LCS 算法复杂度 O(n·m)），请缩减输入。</div>
|
||||
<div v-else-if="lines.length === 0 || (oldText === '' && newText === '')" class="p-3 text-muted-foreground">输入两边文本查看差异。</div>
|
||||
<div
|
||||
v-for="(l, i) in lines"
|
||||
:key="i"
|
||||
class="flex whitespace-pre px-2 py-0.5"
|
||||
:class="{
|
||||
'bg-red-500/10 text-red-600 dark:text-red-400': l.op === 'del',
|
||||
'bg-green-500/10 text-green-600 dark:text-green-400': l.op === 'add',
|
||||
'text-muted-foreground': l.op === 'equal'
|
||||
}"
|
||||
>
|
||||
<span class="w-5 shrink-0 select-none">{{ l.op === 'add' ? '+' : l.op === 'del' ? '-' : ' ' }}</span>
|
||||
<span class="break-all">{{ l.line }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ResultArea :text="unifiedText" label="统一格式（可复制）" placeholder="unified diff" />
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,64 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
type Eol = 'CRLF' | 'LF' | 'CR'
|
||||
|
||||
const target = ref<Eol>('LF')
|
||||
const input = ref('')
|
||||
|
||||
const detectEol = computed<Eol | 'mixed' | 'none'>(() => {
|
||||
const v = input.value
|
||||
if (!v) return 'none'
|
||||
// 注意：\r\n 中的 \n 也会命中 /\n/，必须用负向后顾排除 CRLF 中的 LF
|
||||
const hasCrlf = v.includes('\r\n')
|
||||
const hasLfOnly = /(?<!\r)\n/.test(v)
|
||||
const hasCrOnly = /\r(?!\n)/.test(v)
|
||||
if (!hasCrlf && !hasLfOnly && !hasCrOnly) return 'none'
|
||||
if (hasCrlf && !hasLfOnly && !hasCrOnly) return 'CRLF'
|
||||
if (!hasCrlf && hasLfOnly && !hasCrOnly) return 'LF'
|
||||
if (!hasCrlf && !hasLfOnly && hasCrOnly) return 'CR'
|
||||
return 'mixed'
|
||||
})
|
||||
|
||||
const detectLabel: Record<string, string> = {
|
||||
CRLF: 'CRLF（Windows）',
|
||||
LF: 'LF（Unix / macOS）',
|
||||
CR: 'CR（旧 Mac）',
|
||||
mixed: '混合',
|
||||
none: '未检测到换行符'
|
||||
}
|
||||
|
||||
const output = computed(() => {
|
||||
const v = input.value
|
||||
if (!v) return ''
|
||||
const sep = target.value === 'CRLF' ? '\r\n' : target.value === 'LF' ? '\n' : '\r'
|
||||
return v.replace(/\r\n|\r|\n/g, sep)
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<Segmented
|
||||
v-model="target"
|
||||
label="目标行尾符"
|
||||
:options="[
|
||||
{ value: 'CRLF', label: 'CRLF (\\r\\n)' },
|
||||
{ value: 'LF', label: 'LF (\\n)' },
|
||||
{ value: 'CR', label: 'CR (\\r)' }
|
||||
]"
|
||||
/>
|
||||
|
||||
<p class="text-xs text-muted-foreground">当前检测：<span class="font-medium">{{ detectLabel[detectEol] }}</span></p>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">原文</Label>
|
||||
<Textarea v-model="input" placeholder="在此输入..." class="min-h-[160px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<ResultArea :text="output" placeholder="结果" />
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,103 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { ArrowDownUp } from '@lucide/vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
const type = ref<'html' | 'json'>('html')
|
||||
const mode = ref<'encode' | 'decode'>('encode')
|
||||
const input = ref('')
|
||||
|
||||
function htmlEncode(s: string): string {
|
||||
return s
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''')
|
||||
}
|
||||
|
||||
function htmlDecode(s: string): string {
|
||||
return s
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'|'/g, "'")
|
||||
.replace(/ | /g, ' ')
|
||||
}
|
||||
|
||||
function jsonEncode(s: string): string {
|
||||
return JSON.stringify(s).slice(1, -1)
|
||||
}
|
||||
|
||||
function jsonDecode(s: string): string {
|
||||
// 粘贴的原文可能含真实换行等控制字符，直接拼进 JSON 字符串会解析失败；
|
||||
// 仅转义控制字符（已转义的反斜杠序列不受影响，其中的控制字符不是裸的）
|
||||
const escaped = s.replace(/[\u0000-\u001f]/g, c => {
|
||||
const map: Record<string, string> = { '\n': '\\n', '\r': '\\r', '\t': '\\t', '\b': '\\b', '\f': '\\f' }
|
||||
return map[c] ?? '\\u' + c.charCodeAt(0).toString(16).padStart(4, '0')
|
||||
})
|
||||
return JSON.parse('"' + escaped + '"')
|
||||
}
|
||||
|
||||
const output = computed(() => {
|
||||
const v = input.value
|
||||
if (!v) return { text: '', error: '' }
|
||||
try {
|
||||
if (type.value === 'html') {
|
||||
return { text: mode.value === 'encode' ? htmlEncode(v) : htmlDecode(v), error: '' }
|
||||
}
|
||||
return { text: mode.value === 'encode' ? jsonEncode(v) : jsonDecode(v), error: '' }
|
||||
} catch (e) {
|
||||
return { text: '', error: '转换失败：' + String(e) }
|
||||
}
|
||||
})
|
||||
|
||||
const swap = () => {
|
||||
if (output.value.text) {
|
||||
input.value = output.value.text
|
||||
mode.value = mode.value === 'encode' ? 'decode' : 'encode'
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex items-center justify-between flex-wrap gap-3">
|
||||
<div class="flex items-center gap-3 flex-wrap">
|
||||
<Segmented
|
||||
v-model="type"
|
||||
label="类型"
|
||||
:options="[
|
||||
{ value: 'html', label: 'HTML' },
|
||||
{ value: 'json', label: 'JSON 字符串' }
|
||||
]"
|
||||
/>
|
||||
<Segmented
|
||||
v-model="mode"
|
||||
label="操作"
|
||||
:options="[
|
||||
{ value: 'encode', label: '转义' },
|
||||
{ value: 'decode', label: '反转义' }
|
||||
]"
|
||||
/>
|
||||
</div>
|
||||
<Button size="sm" variant="outline" class="h-8 text-sm gap-1" :disabled="!output.text" @click="swap">
|
||||
<ArrowDownUp class="size-3.5" />
|
||||
结果回填
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">原文 / 已转义文本</Label>
|
||||
<Textarea v-model="input" placeholder="在此输入..." class="min-h-[120px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<ResultArea :text="output.text" placeholder="结果" />
|
||||
<p v-if="output.error" class="text-xs text-destructive">{{ output.error }}</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,249 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { Upload } from '@lucide/vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Switch } from '@/components/ui/switch'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
type HashAlgo = 'MD5' | 'SHA-1' | 'SHA-256' | 'SHA-384' | 'SHA-512'
|
||||
type Source = 'text' | 'file'
|
||||
|
||||
const algos: { value: HashAlgo; label: string }[] = [
|
||||
{ value: 'MD5', label: 'MD5' },
|
||||
{ value: 'SHA-1', label: 'SHA-1' },
|
||||
{ value: 'SHA-256', label: 'SHA-256' },
|
||||
{ value: 'SHA-384', label: 'SHA-384' },
|
||||
{ value: 'SHA-512', label: 'SHA-512' }
|
||||
]
|
||||
|
||||
const algo = ref<HashAlgo>('SHA-256')
|
||||
const source = ref<Source>('text')
|
||||
const uppercase = ref(false)
|
||||
const useHmac = ref(false)
|
||||
const hmacKey = ref('')
|
||||
|
||||
const input = ref('')
|
||||
const output = ref('')
|
||||
const loading = ref(false)
|
||||
const error = ref('')
|
||||
|
||||
// ===== 文件 =====
|
||||
const file = ref<File | null>(null)
|
||||
const fileInput = ref<HTMLInputElement | null>(null)
|
||||
const fileError = ref('')
|
||||
const FILE_SIZE_LIMIT = 512 * 1024 * 1024 // 512MB 保护上限
|
||||
|
||||
function formatSize(bytes: number): string {
|
||||
if (bytes < 1024) return `${bytes} B`
|
||||
if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
|
||||
if (bytes < 1024 * 1024 * 1024) return `${(bytes / 1024 / 1024).toFixed(1)} MB`
|
||||
return `${(bytes / 1024 / 1024 / 1024).toFixed(2)} GB`
|
||||
}
|
||||
|
||||
async function onFileChange(e: Event) {
|
||||
const el = e.target as HTMLInputElement
|
||||
fileError.value = ''
|
||||
file.value = el.files?.[0] ?? null
|
||||
await compute()
|
||||
}
|
||||
|
||||
function clearFile() {
|
||||
file.value = null
|
||||
if (fileInput.value) fileInput.value.value = ''
|
||||
void compute()
|
||||
}
|
||||
|
||||
// ===== MD5（WebCrypto 不支持，自行实现）=====
|
||||
function md5(input: Uint8Array): string {
|
||||
const S = [
|
||||
7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
|
||||
5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
|
||||
4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
|
||||
6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21
|
||||
]
|
||||
const K = new Uint32Array(64)
|
||||
for (let i = 0; i < 64; i++) K[i] = Math.floor(Math.abs(Math.sin(i + 1)) * 4294967296)
|
||||
|
||||
const len = input.length
|
||||
const bitLenLo = (len * 8) >>> 0
|
||||
const bitLenHi = Math.floor(len / 536870912) // len*8 / 2^32
|
||||
const paddedLen = (((len + 8) >> 6) + 1) * 64
|
||||
const msg = new Uint8Array(paddedLen)
|
||||
msg.set(input)
|
||||
msg[len] = 0x80
|
||||
const dv = new DataView(msg.buffer)
|
||||
dv.setUint32(paddedLen - 8, bitLenLo, true)
|
||||
dv.setUint32(paddedLen - 4, bitLenHi, true)
|
||||
|
||||
let a0 = 0x67452301
|
||||
let b0 = 0xefcdab89
|
||||
let c0 = 0x98badcfe
|
||||
let d0 = 0x10325476
|
||||
const M = new Uint32Array(16)
|
||||
for (let off = 0; off < paddedLen; off += 64) {
|
||||
for (let i = 0; i < 16; i++) M[i] = dv.getUint32(off + i * 4, true)
|
||||
let A = a0, B = b0, C = c0, D = d0
|
||||
for (let i = 0; i < 64; i++) {
|
||||
let F: number
|
||||
let g: number
|
||||
if (i < 16) { F = (B & C) | (~B & D); g = i }
|
||||
else if (i < 32) { F = (D & B) | (~D & C); g = (5 * i + 1) % 16 }
|
||||
else if (i < 48) { F = B ^ C ^ D; g = (3 * i + 5) % 16 }
|
||||
else { F = C ^ (B | ~D); g = (7 * i) % 16 }
|
||||
F = (F + A + K[i] + M[g]) >>> 0
|
||||
A = D
|
||||
D = C
|
||||
C = B
|
||||
B = (B + ((F << S[i]) | (F >>> (32 - S[i])))) >>> 0
|
||||
}
|
||||
a0 = (a0 + A) >>> 0
|
||||
b0 = (b0 + B) >>> 0
|
||||
c0 = (c0 + C) >>> 0
|
||||
d0 = (d0 + D) >>> 0
|
||||
}
|
||||
const out = new Uint8Array(16)
|
||||
const odv = new DataView(out.buffer)
|
||||
odv.setUint32(0, a0, true)
|
||||
odv.setUint32(4, b0, true)
|
||||
odv.setUint32(8, c0, true)
|
||||
odv.setUint32(12, d0, true)
|
||||
return Array.from(out, b => b.toString(16).padStart(2, '0')).join('')
|
||||
}
|
||||
|
||||
function toHex(buf: ArrayBuffer): string {
|
||||
return Array.from(new Uint8Array(buf), b => b.toString(16).padStart(2, '0')).join('')
|
||||
}
|
||||
|
||||
async function compute() {
|
||||
error.value = ''
|
||||
fileError.value = ''
|
||||
output.value = ''
|
||||
if (source.value === 'text') {
|
||||
const text = input.value
|
||||
if (!text) return
|
||||
loading.value = true
|
||||
try {
|
||||
const data = new TextEncoder().encode(text)
|
||||
output.value = await digest(algo.value, data)
|
||||
} catch (e) {
|
||||
error.value = '计算失败：' + String(e)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
} else {
|
||||
const f = file.value
|
||||
if (!f) return
|
||||
if (f.size > FILE_SIZE_LIMIT) {
|
||||
fileError.value = `文件过大（${formatSize(f.size)}），请使用 512MB 以内的文件`
|
||||
return
|
||||
}
|
||||
loading.value = true
|
||||
try {
|
||||
const data = new Uint8Array(await f.arrayBuffer())
|
||||
output.value = await digest(algo.value, data)
|
||||
} catch (e) {
|
||||
error.value = '计算失败：' + String(e)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function digest(algorithm: HashAlgo, data: Uint8Array): Promise<string> {
|
||||
let hex: string
|
||||
if (algorithm === 'MD5') {
|
||||
hex = md5(data)
|
||||
} else {
|
||||
hex = toHex(await crypto.subtle.digest(algorithm, data))
|
||||
}
|
||||
if (useHmac.value) {
|
||||
if (algorithm === 'MD5') {
|
||||
throw new Error('HMAC 不支持 MD5，请选择 SHA 系列算法')
|
||||
}
|
||||
const enc = new TextEncoder()
|
||||
const key = await crypto.subtle.importKey(
|
||||
'raw', enc.encode(hmacKey.value),
|
||||
{ name: 'HMAC', hash: { name: algorithm } },
|
||||
false, ['sign']
|
||||
)
|
||||
hex = toHex(await crypto.subtle.sign('HMAC', key, data))
|
||||
}
|
||||
return hex
|
||||
}
|
||||
|
||||
const displayOutput = computed(() =>
|
||||
uppercase.value ? output.value.toUpperCase() : output.value
|
||||
)
|
||||
|
||||
// 输入、算法、选项、文件变化时自动重算
|
||||
watch([input, algo, source, uppercase, useHmac, hmacKey], () => {
|
||||
void compute()
|
||||
})
|
||||
|
||||
// 首次挂载如有初始值则计算（通常为空）
|
||||
void compute()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex items-center gap-3 flex-wrap">
|
||||
<Segmented
|
||||
v-model="source"
|
||||
:options="[
|
||||
{ value: 'text', label: '文本' },
|
||||
{ value: 'file', label: '文件' }
|
||||
]"
|
||||
/>
|
||||
<Segmented v-model="algo" label="算法" :options="algos" />
|
||||
<label class="flex items-center gap-2 text-xs text-muted-foreground cursor-pointer">
|
||||
大写
|
||||
<Switch v-model="uppercase" />
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div v-if="algo === 'MD5'" class="text-xs text-muted-foreground">
|
||||
注：MD5 与 SHA-1 已不推荐用于安全场景，仅用于兼容旧系统或校验比对。
|
||||
</div>
|
||||
|
||||
<!-- HMAC -->
|
||||
<div class="flex flex-col gap-2 rounded-md border border-border p-3">
|
||||
<label class="flex items-center gap-2 text-xs cursor-pointer w-fit">
|
||||
<Switch v-model="useHmac" />
|
||||
<span class="font-medium">HMAC（密钥签名）</span>
|
||||
</label>
|
||||
<div v-if="useHmac" class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">密钥</Label>
|
||||
<Input v-model="hmacKey" placeholder="HMAC 密钥（仅支持 SHA 系列）" class="font-mono text-sm" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 文本输入 -->
|
||||
<div v-if="source === 'text'" class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">原文（文本）</Label>
|
||||
<Textarea v-model="input" placeholder="在此输入文本..." class="min-h-[120px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<!-- 文件输入 -->
|
||||
<div v-else class="flex flex-col gap-2">
|
||||
<Label class="text-xs">选择文件</Label>
|
||||
<div class="flex items-center gap-2 flex-wrap">
|
||||
<Button size="sm" variant="outline" class="h-8 text-sm gap-1.5" @click="fileInput?.click()">
|
||||
<Upload class="size-3.5" />
|
||||
选择文件
|
||||
</Button>
|
||||
<input ref="fileInput" type="file" class="hidden" @change="onFileChange" />
|
||||
<template v-if="file">
|
||||
<span class="text-xs font-mono text-muted-foreground">{{ file.name }}（{{ formatSize(file.size) }}）</span>
|
||||
<Button size="sm" variant="ghost" class="h-7 text-xs" @click="clearFile">移除</Button>
|
||||
</template>
|
||||
</div>
|
||||
<p v-if="fileError" class="text-xs text-destructive">{{ fileError }}</p>
|
||||
</div>
|
||||
|
||||
<ResultArea :text="loading ? '计算中...' : displayOutput" :label="useHmac ? 'HMAC 摘要（十六进制）' : '摘要（十六进制）'" placeholder="摘要" />
|
||||
<p v-if="error" class="text-xs text-destructive">{{ error }}</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,195 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Badge } from '@/components/ui/badge'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
|
||||
type Tab = 'status' | 'mime'
|
||||
|
||||
const tab = ref<Tab>('status')
|
||||
const query = ref('')
|
||||
|
||||
interface StatusDef {
|
||||
code: number
|
||||
name: string
|
||||
desc: string
|
||||
}
|
||||
|
||||
const STATUSES: StatusDef[] = [
|
||||
// 1xx
|
||||
{ code: 100, name: 'Continue', desc: '客户端应继续请求，常用于 Expect: 100-continue 大文件上传前探测' },
|
||||
{ code: 101, name: 'Switching Protocols', desc: '服务器同意切换协议（如升级 WebSocket）' },
|
||||
{ code: 102, name: 'Processing', desc: '服务器已收到请求，仍在处理（WebDAV）' },
|
||||
{ code: 103, name: 'Early Hints', desc: '预加载提示，主响应前先返回 Link 头' },
|
||||
// 2xx
|
||||
{ code: 200, name: 'OK', desc: '请求成功' },
|
||||
{ code: 201, name: 'Created', desc: '请求成功并创建了新资源（POST 之后常见）' },
|
||||
{ code: 202, name: 'Accepted', desc: '请求已受理，但尚未处理完成（异步任务）' },
|
||||
{ code: 204, name: 'No Content', desc: '成功但无返回体（DELETE / PUT 常见）' },
|
||||
{ code: 206, name: 'Partial Content', desc: '范围请求成功（断点续传 / 视频拖动）' },
|
||||
// 3xx
|
||||
{ code: 301, name: 'Moved Permanently', desc: '永久重定向，搜索引擎更新链接（GET 保持、POST 可能转 GET）' },
|
||||
{ code: 302, name: 'Found', desc: '临时重定向，浏览器可能将 POST 改为 GET' },
|
||||
{ code: 303, name: 'See Other', desc: '临时重定向，强制使用 GET 访问新地址' },
|
||||
{ code: 304, name: 'Not Modified', desc: '缓存有效（协商缓存命中，无返回体）' },
|
||||
{ code: 307, name: 'Temporary Redirect', desc: '临时重定向，严格保持原请求方法与体' },
|
||||
{ code: 308, name: 'Permanent Redirect', desc: '永久重定向，严格保持原请求方法与体' },
|
||||
// 4xx
|
||||
{ code: 400, name: 'Bad Request', desc: '请求语法错误 / 参数校验失败' },
|
||||
{ code: 401, name: 'Unauthorized', desc: '未认证（缺少或无效的凭证，应带 WWW-Authenticate 头）' },
|
||||
{ code: 402, name: 'Payment Required', desc: '要求付费（保留状态码，实际很少使用）' },
|
||||
{ code: 403, name: 'Forbidden', desc: '已认证但无权限访问该资源' },
|
||||
{ code: 404, name: 'Not Found', desc: '资源不存在' },
|
||||
{ code: 405, name: 'Method Not Allowed', desc: '方法不被允许（应返回 Allow 头）' },
|
||||
{ code: 406, name: 'Not Acceptable', desc: '请求的 Accept 头无法满足内容协商' },
|
||||
{ code: 408, name: 'Request Timeout', desc: '客户端请求超时' },
|
||||
{ code: 409, name: 'Conflict', desc: '请求与当前资源状态冲突（并发编辑 / 版本冲突）' },
|
||||
{ code: 410, name: 'Gone', desc: '资源已永久消失（区别于 404）' },
|
||||
{ code: 412, name: 'Precondition Failed', desc: '前置条件失败（If-Match / If-None-Match 校验不过）' },
|
||||
{ code: 413, name: 'Content Too Large', desc: '请求体超过服务器限制' },
|
||||
{ code: 415, name: 'Unsupported Media Type', desc: 'Content-Type 不支持' },
|
||||
{ code: 418, name: "I'm a teapot", desc: '愚人节彩蛋：我是茶壶' },
|
||||
{ code: 422, name: 'Unprocessable Content', desc: '语义正确但校验失败（表单校验常用）' },
|
||||
{ code: 425, name: 'Too Early', desc: '过早重放（防重放攻击）' },
|
||||
{ code: 428, name: 'Precondition Required', desc: '要求带条件请求头（防丢失更新）' },
|
||||
{ code: 429, name: 'Too Many Requests', desc: '请求频率超限（限流，应带 Retry-After 头）' },
|
||||
{ code: 431, name: 'Request Header Fields Too Large', desc: '请求头过大（Cookie 太多常见）' },
|
||||
{ code: 451, name: 'Unavailable For Legal Reasons', desc: '因法律原因不可提供（审查）' },
|
||||
// 5xx
|
||||
{ code: 500, name: 'Internal Server Error', desc: '服务器内部错误（后端异常兜底）' },
|
||||
{ code: 501, name: 'Not Implemented', desc: '服务器不支持该功能' },
|
||||
{ code: 502, name: 'Bad Gateway', desc: '网关收到上游无效响应（后端挂了 / 崩溃）' },
|
||||
{ code: 503, name: 'Service Unavailable', desc: '服务不可用（过载 / 维护中，可带 Retry-After）' },
|
||||
{ code: 504, name: 'Gateway Timeout', desc: '网关等待上游超时（后端太慢）' },
|
||||
{ code: 505, name: 'HTTP Version Not Supported', desc: 'HTTP 版本不支持' },
|
||||
{ code: 507, name: 'Insufficient Storage', desc: '存储不足（WebDAV）' },
|
||||
{ code: 508, name: 'Loop Detected', desc: '检测到无限循环（WebDAV）' },
|
||||
{ code: 511, name: 'Network Authentication Required', desc: '需要网络认证（公共 Wi-Fi 门户）' }
|
||||
]
|
||||
|
||||
interface MimeDef {
|
||||
mime: string
|
||||
ext: string
|
||||
desc: string
|
||||
}
|
||||
|
||||
const MIMES: MimeDef[] = [
|
||||
{ mime: 'text/html', ext: '.html .htm', desc: 'HTML 文档' },
|
||||
{ mime: 'text/plain', ext: '.txt', desc: '纯文本' },
|
||||
{ mime: 'text/css', ext: '.css', desc: '样式表' },
|
||||
{ mime: 'text/javascript', ext: '.js .mjs', desc: 'JavaScript（旧写法 application/javascript）' },
|
||||
{ mime: 'application/json', ext: '.json', desc: 'JSON 数据（API 最常用）' },
|
||||
{ mime: 'application/xml', ext: '.xml', desc: 'XML 数据' },
|
||||
{ mime: 'application/yaml', ext: '.yaml .yml', desc: 'YAML 配置' },
|
||||
{ mime: 'application/toml', ext: '.toml', desc: 'TOML 配置' },
|
||||
{ mime: 'text/csv', ext: '.csv', desc: '逗号分隔表格' },
|
||||
{ mime: 'text/markdown', ext: '.md', desc: 'Markdown 文档' },
|
||||
{ mime: 'image/jpeg', ext: '.jpg .jpeg', desc: 'JPEG 图片（有损压缩）' },
|
||||
{ mime: 'image/png', ext: '.png', desc: 'PNG 图片（无损，支持透明）' },
|
||||
{ mime: 'image/gif', ext: '.gif', desc: 'GIF 动图' },
|
||||
{ mime: 'image/webp', ext: '.webp', desc: 'WebP 图片（现代格式，体积小）' },
|
||||
{ mime: 'image/svg+xml', ext: '.svg', desc: 'SVG 矢量图' },
|
||||
{ mime: 'image/avif', ext: '.avif', desc: 'AVIF 图片（新一代压缩）' },
|
||||
{ mime: 'image/x-icon', ext: '.ico', desc: '网站图标' },
|
||||
{ mime: 'audio/mpeg', ext: '.mp3', desc: 'MP3 音频' },
|
||||
{ mime: 'audio/ogg', ext: '.ogg', desc: 'OGG 音频' },
|
||||
{ mime: 'audio/wav', ext: '.wav', desc: 'WAV 无损音频' },
|
||||
{ mime: 'video/mp4', ext: '.mp4', desc: 'MP4 视频' },
|
||||
{ mime: 'video/webm', ext: '.webm', desc: 'WebM 视频' },
|
||||
{ mime: 'video/x-matroska', ext: '.mkv', desc: 'MKV 视频' },
|
||||
{ mime: 'application/pdf', ext: '.pdf', desc: 'PDF 文档' },
|
||||
{ mime: 'application/zip', ext: '.zip', desc: 'ZIP 压缩包' },
|
||||
{ mime: 'application/x-7z-compressed', ext: '.7z', desc: '7z 压缩包' },
|
||||
{ mime: 'application/x-rar-compressed', ext: '.rar', desc: 'RAR 压缩包' },
|
||||
{ mime: 'application/gzip', ext: '.gz', desc: 'GZip 压缩' },
|
||||
{ mime: 'application/x-tar', ext: '.tar', desc: 'TAR 归档' },
|
||||
{ mime: 'application/octet-stream', ext: '（默认）', desc: '未知二进制（浏览器会下载）' },
|
||||
{ mime: 'application/wasm', ext: '.wasm', desc: 'WebAssembly 模块' },
|
||||
{ mime: 'font/woff', ext: '.woff', desc: 'Web 字体（压缩）' },
|
||||
{ mime: 'font/woff2', ext: '.woff2', desc: 'Web 字体（现代格式）' },
|
||||
{ mime: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', ext: '.docx', desc: 'Word 文档' },
|
||||
{ mime: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', ext: '.xlsx', desc: 'Excel 表格' },
|
||||
{ mime: 'application/vnd.openxmlformats-officedocument.presentationml.presentation', ext: '.pptx', desc: 'PPT 演示文稿' },
|
||||
{ mime: 'application/msword', ext: '.doc', desc: 'Word 旧格式' },
|
||||
{ mime: 'application/vnd.ms-excel', ext: '.xls', desc: 'Excel 旧格式' },
|
||||
{ mime: 'multipart/form-data', ext: '（表单）', desc: '文件上传表单（带 boundary）' },
|
||||
{ mime: 'application/x-www-form-urlencoded', ext: '（表单）', desc: 'URL 编码表单（默认）' },
|
||||
{ mime: 'application/grpc', ext: '（RPC）', desc: 'gRPC 请求（配合 proto）' }
|
||||
]
|
||||
|
||||
const STATUS_CLASS: Record<string, string> = {
|
||||
'1xx': 'bg-sky-500/10 text-sky-600 dark:text-sky-400 border-sky-500/30',
|
||||
'2xx': 'bg-green-500/10 text-green-600 dark:text-green-400 border-green-500/30',
|
||||
'3xx': 'bg-blue-500/10 text-blue-600 dark:text-blue-400 border-blue-500/30',
|
||||
'4xx': 'bg-amber-500/10 text-amber-600 dark:text-amber-400 border-amber-500/30',
|
||||
'5xx': 'bg-red-500/10 text-red-600 dark:text-red-400 border-red-500/30'
|
||||
}
|
||||
|
||||
const statusGroups = computed(() => {
|
||||
const q = query.value.trim().toLowerCase()
|
||||
const filtered = q
|
||||
? STATUSES.filter(s => String(s.code).includes(q) || s.name.toLowerCase().includes(q) || s.desc.toLowerCase().includes(q))
|
||||
: STATUSES
|
||||
const groups: Array<{ label: string; class: string; items: StatusDef[] }> = []
|
||||
for (const [label, cls] of Object.entries(STATUS_CLASS)) {
|
||||
const items = filtered.filter(s => String(s.code).startsWith(label[0]))
|
||||
if (items.length > 0) groups.push({ label: `${label} ${label === '1xx' ? '信息' : label === '2xx' ? '成功' : label === '3xx' ? '重定向' : label === '4xx' ? '客户端错误' : '服务器错误'}`, class: cls, items })
|
||||
}
|
||||
return groups
|
||||
})
|
||||
|
||||
const filteredMimes = computed(() => {
|
||||
const q = query.value.trim().toLowerCase()
|
||||
if (!q) return MIMES
|
||||
return MIMES.filter(m => m.mime.includes(q) || m.ext.includes(q) || m.desc.toLowerCase().includes(q))
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex items-center gap-3 flex-wrap">
|
||||
<Segmented
|
||||
v-model="tab"
|
||||
:options="[
|
||||
{ value: 'status', label: 'HTTP 状态码' },
|
||||
{ value: 'mime', label: 'MIME 类型' }
|
||||
]"
|
||||
/>
|
||||
<div class="relative flex-1 min-w-[160px] max-w-xs">
|
||||
<Input v-model="query" placeholder="搜索…" class="h-8 text-sm" />
|
||||
</div>
|
||||
<span class="text-xs text-muted-foreground ml-auto">
|
||||
{{ tab === 'status' ? `${STATUSES.length} 个状态码` : `${MIMES.length} 个常用类型` }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<!-- 状态码 -->
|
||||
<template v-if="tab === 'status'">
|
||||
<div v-for="group in statusGroups" :key="group.label" class="flex flex-col gap-2">
|
||||
<span class="text-xs font-medium text-muted-foreground">{{ group.label }}</span>
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div v-for="s in group.items" :key="s.code" class="flex items-start gap-3 px-3 py-2">
|
||||
<Badge variant="outline" :class="['py-0 shrink-0 font-mono', group.class]">{{ s.code }}</Badge>
|
||||
<div class="flex flex-col gap-0.5 min-w-0">
|
||||
<span class="font-medium">{{ s.name }}</span>
|
||||
<span class="text-muted-foreground leading-snug">{{ s.desc }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p v-if="statusGroups.length === 0" class="text-xs text-muted-foreground">没有匹配的状态码。</p>
|
||||
</template>
|
||||
|
||||
<!-- MIME -->
|
||||
<template v-else>
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div v-for="m in filteredMimes" :key="m.mime" class="flex items-start gap-3 px-3 py-2">
|
||||
<span class="font-mono text-primary break-all w-64 shrink-0">{{ m.mime }}</span>
|
||||
<span class="font-mono text-muted-foreground w-20 shrink-0">{{ m.ext }}</span>
|
||||
<span class="text-muted-foreground min-w-0">{{ m.desc }}</span>
|
||||
</div>
|
||||
<div v-if="filteredMimes.length === 0" class="px-3 py-2 text-muted-foreground">没有匹配的 MIME 类型。</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,189 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
type Tab = 'cidr' | 'convert'
|
||||
|
||||
const tab = ref<Tab>('cidr')
|
||||
|
||||
// ===== CIDR 计算 =====
|
||||
const cidrInput = ref('192.168.1.0/24')
|
||||
|
||||
function parseIPv4(s: string): bigint | null {
|
||||
const parts = s.trim().split('.')
|
||||
if (parts.length !== 4) return null
|
||||
let n = 0n
|
||||
for (const p of parts) {
|
||||
if (!/^\d{1,3}$/.test(p)) return null
|
||||
const v = Number(p)
|
||||
if (v > 255) return null
|
||||
n = (n << 8n) | BigInt(v)
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
function ipToString(n: bigint): string {
|
||||
return [24n, 16n, 8n, 0n].map(shift => String((n >> shift) & 0xffn)).join('.')
|
||||
}
|
||||
|
||||
const cidr = computed(() => {
|
||||
const s = cidrInput.value.trim()
|
||||
if (!s) return null
|
||||
const [ipPart, maskPart] = s.split('/')
|
||||
const ip = parseIPv4(ipPart)
|
||||
if (ip === null) return { error: 'IPv4 地址格式不正确' }
|
||||
let prefix: number
|
||||
if (maskPart === undefined) {
|
||||
prefix = 24
|
||||
} else {
|
||||
prefix = Number(maskPart)
|
||||
if (!Number.isInteger(prefix) || prefix < 0 || prefix > 32) {
|
||||
return { error: '前缀长度应在 0-32 之间' }
|
||||
}
|
||||
}
|
||||
const mask = prefix === 0 ? 0n : (0xffffffffn << BigInt(32 - prefix)) & 0xffffffffn
|
||||
const network = ip & mask
|
||||
const broadcast = network | (~mask & 0xffffffffn)
|
||||
const total = 1n << BigInt(32 - prefix)
|
||||
// 主机数：/31 无主机位（点对点），/32 单主机
|
||||
const hosts = prefix >= 31 ? total : total - 2n
|
||||
const firstHost = prefix >= 31 ? network : network + 1n
|
||||
const lastHost = prefix >= 31 ? broadcast : broadcast - 1n
|
||||
const wildcard = ~mask & 0xffffffffn
|
||||
// 私有地址判断
|
||||
const privateNote =
|
||||
(ip >> 24n) === 10n ? 'A 类私有（10.0.0.0/8）'
|
||||
: (ip >> 20n) === 0xac1n ? 'B 类私有（172.16.0.0/12）'
|
||||
: (ip >> 16n) === 0xc0a8n ? 'C 类私有（192.168.0.0/16）'
|
||||
: (ip >> 28n) === 14n ? '环回/保留（240.0.0.0/4）'
|
||||
: ip === 0n ? '未指定地址'
|
||||
: (ip >> 24n) === 127n ? '环回地址（127.0.0.0/8）'
|
||||
: (ip >> 24n) === 169n && (ip >> 16n) === 0xa9fen ? '链路本地（169.254.0.0/16）'
|
||||
: '公网地址'
|
||||
return {
|
||||
error: '',
|
||||
network: ipToString(network),
|
||||
broadcast: ipToString(broadcast),
|
||||
mask: ipToString(mask),
|
||||
wildcard: ipToString(wildcard),
|
||||
firstHost: ipToString(firstHost),
|
||||
lastHost: ipToString(lastHost),
|
||||
hosts: hosts.toLocaleString(),
|
||||
total: total.toLocaleString(),
|
||||
prefix,
|
||||
isAligned: (ip & mask) === network,
|
||||
ipIsNetwork: ip === network,
|
||||
privateNote,
|
||||
binaryMask: ipToString(mask).split('.').map(p => Number(p).toString(2).padStart(8, '0')).join('.')
|
||||
}
|
||||
})
|
||||
|
||||
// ===== IP ↔ 整数互转 =====
|
||||
const convertInput = ref('192.168.1.1')
|
||||
|
||||
const converted = computed(() => {
|
||||
const s = convertInput.value.trim()
|
||||
if (!s) return null
|
||||
const ip = parseIPv4(s)
|
||||
if (ip !== null) {
|
||||
return {
|
||||
dec: ip.toString(),
|
||||
hex: '0x' + ip.toString(16).padStart(8, '0').toUpperCase(),
|
||||
oct: ip.toString(8),
|
||||
bin: ip.toString(2).padStart(32, '0').replace(/(.{8})(?=.)/g, '$1 '),
|
||||
binaryMask: ''
|
||||
}
|
||||
}
|
||||
// 尝试十进制整数
|
||||
if (/^\d+$/.test(s)) {
|
||||
const n = BigInt(s)
|
||||
if (n <= 0xffffffffn) {
|
||||
return { dec: s, hex: '0x' + n.toString(16).padStart(8, '0').toUpperCase(), oct: n.toString(8), bin: n.toString(2).padStart(32, '0').replace(/(.{8})(?=.)/g, '$1 '), binaryMask: '' }
|
||||
}
|
||||
}
|
||||
return null
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<Segmented
|
||||
v-model="tab"
|
||||
:options="[
|
||||
{ value: 'cidr', label: 'CIDR 子网计算' },
|
||||
{ value: 'convert', label: 'IP ↔ 整数' }
|
||||
]"
|
||||
/>
|
||||
|
||||
<!-- CIDR -->
|
||||
<template v-if="tab === 'cidr'">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">IPv4 地址 / 前缀（如 192.168.1.100/26）</Label>
|
||||
<Input v-model="cidrInput" placeholder="192.168.1.0/24" class="font-mono text-sm" />
|
||||
</div>
|
||||
|
||||
<template v-if="cidr">
|
||||
<p v-if="cidr.error" class="text-xs text-destructive">{{ cidr.error }}</p>
|
||||
<template v-else>
|
||||
<p v-if="!cidr.ipIsNetwork" class="text-xs text-amber-600 dark:text-amber-400">
|
||||
注意：输入地址不是该子网的网络地址，已按网络 {{ cidr.network }}/{{ cidr.prefix }} 计算。
|
||||
</p>
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-24 shrink-0 text-muted-foreground">网络地址</span>
|
||||
<span class="font-mono">{{ cidr.network }}/{{ cidr.prefix }}</span>
|
||||
</div>
|
||||
<div class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-24 shrink-0 text-muted-foreground">子网掩码</span>
|
||||
<span class="font-mono">{{ cidr.mask }}</span>
|
||||
</div>
|
||||
<div class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-24 shrink-0 text-muted-foreground">掩码二进制</span>
|
||||
<span class="font-mono break-all">{{ cidr.binaryMask }}</span>
|
||||
</div>
|
||||
<div class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-24 shrink-0 text-muted-foreground">反掩码</span>
|
||||
<span class="font-mono">{{ cidr.wildcard }}</span>
|
||||
</div>
|
||||
<div class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-24 shrink-0 text-muted-foreground">广播地址</span>
|
||||
<span class="font-mono">{{ cidr.broadcast }}</span>
|
||||
</div>
|
||||
<div class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-24 shrink-0 text-muted-foreground">可用主机范围</span>
|
||||
<span class="font-mono">{{ cidr.firstHost }} ~ {{ cidr.lastHost }}</span>
|
||||
</div>
|
||||
<div class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-24 shrink-0 text-muted-foreground">可用主机数</span>
|
||||
<span class="font-mono">{{ cidr.hosts }}（地址总数 {{ cidr.total }}）</span>
|
||||
</div>
|
||||
<div class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-24 shrink-0 text-muted-foreground">地址类型</span>
|
||||
<span>{{ cidr.privateNote }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
<p v-else class="text-xs text-muted-foreground">输入 IPv4 地址与 CIDR 前缀，自动计算子网信息。</p>
|
||||
</template>
|
||||
|
||||
<!-- IP ↔ 整数 -->
|
||||
<template v-else>
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">IP 地址或无符号整数</Label>
|
||||
<Input v-model="convertInput" placeholder="192.168.1.1 或 3232235777" class="font-mono text-sm" />
|
||||
</div>
|
||||
|
||||
<template v-if="converted">
|
||||
<ResultArea :text="converted.dec" label="十进制整数" placeholder="十进制" minHeight="60px" />
|
||||
<ResultArea :text="converted.hex" label="十六进制" placeholder="十六进制" minHeight="60px" />
|
||||
<ResultArea :text="converted.oct" label="八进制" placeholder="八进制" minHeight="60px" />
|
||||
<ResultArea :text="converted.bin" label="二进制" placeholder="二进制" minHeight="60px" />
|
||||
</template>
|
||||
<p v-else-if="convertInput" class="text-xs text-destructive">无法识别的输入（支持 IPv4 地址或 0-4294967295 整数）。</p>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,96 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
const mode = ref<'format' | 'minify'>('format')
|
||||
const indent = ref('2')
|
||||
const sortKeys = ref(false)
|
||||
const input = ref('')
|
||||
|
||||
const result = computed<{ text: string; error: string }>(() => {
|
||||
const v = input.value.trim()
|
||||
if (!v) return { text: '', error: '' }
|
||||
try {
|
||||
const parsed = JSON.parse(v)
|
||||
if (mode.value === 'minify') {
|
||||
return { text: JSON.stringify(parsed), error: '' }
|
||||
}
|
||||
return { text: JSON.stringify(parsed, normalizeReplacer(sortKeys.value), Number(indent.value)), error: '' }
|
||||
} catch (e) {
|
||||
return { text: '', error: 'JSON 解析失败：' + String(e) }
|
||||
}
|
||||
})
|
||||
|
||||
const output = computed(() => result.value.text)
|
||||
const error = computed(() => result.value.error)
|
||||
|
||||
const isValid = computed<boolean | null>(() => {
|
||||
if (!input.value.trim()) return null
|
||||
try {
|
||||
JSON.parse(input.value)
|
||||
return true
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
})
|
||||
|
||||
/** 深浅不一：sortKeys 时按 key 排序输出 */
|
||||
function normalizeReplacer(sort: boolean): (this: unknown, key: string, value: unknown) => unknown {
|
||||
if (!sort) return undefined as never
|
||||
return function (this: unknown, _key: string, value: unknown) {
|
||||
if (Array.isArray(value)) return value
|
||||
if (value && typeof value === 'object') {
|
||||
const obj = value as Record<string, unknown>
|
||||
const sorted: Record<string, unknown> = {}
|
||||
Object.keys(obj)
|
||||
.sort()
|
||||
.forEach(k => { sorted[k] = obj[k] })
|
||||
return sorted
|
||||
}
|
||||
return value
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex items-center justify-between flex-wrap gap-3">
|
||||
<div class="flex items-center gap-3 flex-wrap">
|
||||
<Segmented
|
||||
v-model="mode"
|
||||
:options="[
|
||||
{ value: 'format', label: '美化' },
|
||||
{ value: 'minify', label: '压缩' }
|
||||
]"
|
||||
/>
|
||||
<Segmented
|
||||
v-model="indent"
|
||||
label="缩进"
|
||||
:options="[
|
||||
{ value: '2', label: '2' },
|
||||
{ value: '4', label: '4' },
|
||||
{ value: '8', label: '8' }
|
||||
]"
|
||||
/>
|
||||
<label class="flex items-center gap-1.5 text-xs text-muted-foreground cursor-pointer">
|
||||
<input v-model="sortKeys" type="checkbox" class="accent-primary size-3.5" />
|
||||
键排序
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">原始 JSON</Label>
|
||||
<Textarea v-model="input" placeholder='输入 JSON，如 {"a":1,"b":[true,null]}' class="min-h-[160px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<div v-if="isValid !== false" class="flex items-center gap-2 text-xs">
|
||||
<span v-if="isValid === true" class="text-green-600 dark:text-green-400">✓ 合法 JSON</span>
|
||||
</div>
|
||||
<ResultArea :text="output" placeholder="结果" />
|
||||
<p v-if="error" class="text-xs text-destructive break-all">{{ error }}</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,131 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Badge } from '@/components/ui/badge'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
const token = ref('')
|
||||
const error = ref('')
|
||||
|
||||
function base64UrlDecode(s: string): string {
|
||||
const cleaned = s.replace(/-/g, '+').replace(/_/g, '/')
|
||||
const pad = cleaned.length % 4
|
||||
const normalized = pad ? cleaned + '='.repeat(4 - pad) : cleaned
|
||||
const bin = atob(normalized)
|
||||
const bytes = Uint8Array.from(bin, ch => ch.charCodeAt(0))
|
||||
return new TextDecoder().decode(bytes)
|
||||
}
|
||||
|
||||
interface TimeClaim {
|
||||
name: string
|
||||
value: string
|
||||
local: string
|
||||
status: 'ok' | 'expired' | 'not-yet' | 'unknown'
|
||||
}
|
||||
|
||||
const parsed = computed<{
|
||||
header: string
|
||||
payload: string
|
||||
signature: string
|
||||
timeClaims: TimeClaim[]
|
||||
} | null>(() => {
|
||||
error.value = ''
|
||||
const t = token.value.trim()
|
||||
if (!t) return null
|
||||
const parts = t.split('.')
|
||||
if (parts.length < 2) {
|
||||
error.value = 'JWT 格式不正确（应为 header.payload.signature）'
|
||||
return null
|
||||
}
|
||||
try {
|
||||
const header = formatJson(base64UrlDecode(parts[0]))
|
||||
const payload = formatJson(base64UrlDecode(parts[1]))
|
||||
const signature = parts[2] ?? ''
|
||||
return { header, payload, signature, timeClaims: parseTimeClaims(payload) }
|
||||
} catch (e) {
|
||||
error.value = '解码失败：' + String(e)
|
||||
return null
|
||||
}
|
||||
})
|
||||
|
||||
function formatJson(s: string): string {
|
||||
let pretty = s
|
||||
try {
|
||||
pretty = JSON.stringify(JSON.parse(s), null, 2)
|
||||
} catch {
|
||||
/* 非 JSON（如已损毁），原样展示 */
|
||||
}
|
||||
return pretty
|
||||
}
|
||||
|
||||
/** 解读 iat / nbf / exp 等时间声明（秒级时间戳） */
|
||||
function parseTimeClaims(payload: string): TimeClaim[] {
|
||||
let obj: unknown
|
||||
try {
|
||||
obj = JSON.parse(payload)
|
||||
} catch {
|
||||
return []
|
||||
}
|
||||
if (!obj || typeof obj !== 'object') return []
|
||||
const p = obj as Record<string, unknown>
|
||||
const claims: TimeClaim[] = []
|
||||
const now = Math.floor(Date.now() / 1000)
|
||||
const NAMES: Record<string, string> = { iat: 'iat（签发时间）', nbf: 'nbf（生效时间）', exp: 'exp（过期时间）' }
|
||||
const pad = (x: number) => String(x).padStart(2, '0')
|
||||
for (const key of ['iat', 'nbf', 'exp']) {
|
||||
const v = p[key]
|
||||
if (typeof v !== 'number' || !Number.isFinite(v)) continue
|
||||
const d = new Date(v * 1000)
|
||||
if (Number.isNaN(d.getTime())) continue
|
||||
const local = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`
|
||||
let status: TimeClaim['status'] = 'ok'
|
||||
if (key === 'exp' && v < now) status = 'expired'
|
||||
else if (key === 'nbf' && v > now) status = 'not-yet'
|
||||
else if (key === 'iat' && v > now + 60) status = 'unknown'
|
||||
claims.push({ name: NAMES[key], value: String(v), local, status })
|
||||
}
|
||||
return claims
|
||||
}
|
||||
|
||||
const STATUS_BADGE: Record<TimeClaim['status'], { label: string; class: string } | null> = {
|
||||
ok: null,
|
||||
expired: { label: '已过期', class: 'bg-red-500/10 text-red-600 dark:text-red-400 border-red-500/30' },
|
||||
'not-yet': { label: '尚未生效', class: 'bg-amber-500/10 text-amber-600 dark:text-amber-400 border-amber-500/30' },
|
||||
unknown: { label: '签发时间在未来（时钟偏差？）', class: 'bg-amber-500/10 text-amber-600 dark:text-amber-400 border-amber-500/30' }
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">JWT Token</Label>
|
||||
<Textarea
|
||||
v-model="token"
|
||||
placeholder="eyJhbGciOi...（header.payload.signature）"
|
||||
class="min-h-[70px] font-mono text-xs resize-y break-all"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<template v-if="parsed">
|
||||
<ResultArea :text="parsed.header" label="Header" placeholder="Header" />
|
||||
<ResultArea :text="parsed.payload" label="Payload（载荷）" placeholder="Payload" />
|
||||
<ResultArea :text="parsed.signature" label="Signature（签名）" placeholder="Signature" />
|
||||
|
||||
<div v-if="parsed.timeClaims.length > 0" class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">时间声明解读</Label>
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div v-for="c in parsed.timeClaims" :key="c.name" class="flex items-center gap-3 px-3 py-2 flex-wrap">
|
||||
<span class="font-mono text-muted-foreground">{{ c.name }}</span>
|
||||
<span class="font-mono">{{ c.local }}</span>
|
||||
<Badge v-if="STATUS_BADGE[c.status]" variant="outline" :class="['py-0 text-[10px] ml-auto', STATUS_BADGE[c.status]!.class]">
|
||||
{{ STATUS_BADGE[c.status]!.label }}
|
||||
</Badge>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<p v-else-if="!token" class="text-xs text-muted-foreground">在左侧粘贴 JWT，下方将自动解析 Header 与 Payload。</p>
|
||||
<p v-else class="text-xs text-destructive">{{ error }}</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,165 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from 'vue'
|
||||
import { Copy, RefreshCw } from '@lucide/vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Switch } from '@/components/ui/switch'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
|
||||
const CHARSETS = {
|
||||
lower: 'abcdefghijklmnopqrstuvwxyz',
|
||||
upper: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
|
||||
digits: '0123456789',
|
||||
symbols: '!@#$%^&*_-+=?',
|
||||
// 易混淆字符：l/1/I、O/0、等等
|
||||
ambiguous: 'Il1O0o`\'"|'
|
||||
}
|
||||
|
||||
const length = ref('16')
|
||||
const count = ref('5')
|
||||
const useLower = ref(true)
|
||||
const useUpper = ref(true)
|
||||
const useDigits = ref(true)
|
||||
const useSymbols = ref(false)
|
||||
const excludeAmbiguous = ref(true)
|
||||
|
||||
const passwords = ref<string[]>([])
|
||||
const error = ref('')
|
||||
|
||||
const lengthNum = computed(() => {
|
||||
const n = Math.floor(Number(length.value))
|
||||
if (!Number.isFinite(n)) return 16
|
||||
return Math.min(Math.max(n || 0, 4), 128)
|
||||
})
|
||||
|
||||
const countNum = computed(() => {
|
||||
const n = Math.floor(Number(count.value))
|
||||
if (!Number.isFinite(n)) return 5
|
||||
return Math.min(Math.max(n || 0, 1), 100)
|
||||
})
|
||||
|
||||
const charset = computed(() => {
|
||||
let s = ''
|
||||
if (useLower.value) s += CHARSETS.lower
|
||||
if (useUpper.value) s += CHARSETS.upper
|
||||
if (useDigits.value) s += CHARSETS.digits
|
||||
if (useSymbols.value) s += CHARSETS.symbols
|
||||
if (excludeAmbiguous.value) {
|
||||
for (const c of CHARSETS.ambiguous) s = s.split(c).join('')
|
||||
}
|
||||
return s
|
||||
})
|
||||
|
||||
/** 用 crypto.getRandomValues 生成无偏随机整数 [0, max) */
|
||||
function randomInt(max: number): number {
|
||||
// 拒绝采样消除模偏差
|
||||
const limit = Math.floor(0x100000000 / max) * max
|
||||
const buf = new Uint32Array(1)
|
||||
let v: number
|
||||
do {
|
||||
crypto.getRandomValues(buf)
|
||||
v = buf[0]
|
||||
} while (v >= limit)
|
||||
return v % max
|
||||
}
|
||||
|
||||
/** 熵估算：log2(charsetSize^length) = length * log2(size) */
|
||||
const entropy = computed(() => {
|
||||
const size = charset.value.length
|
||||
if (size === 0) return 0
|
||||
return Math.round(lengthNum.value * Math.log2(size))
|
||||
})
|
||||
|
||||
const strength = computed(() => {
|
||||
const e = entropy.value
|
||||
if (e >= 128) return { label: '极强（128+ bit）', class: 'text-green-600 dark:text-green-400' }
|
||||
if (e >= 80) return { label: '强（80-127 bit）', class: 'text-green-600 dark:text-green-400' }
|
||||
if (e >= 60) return { label: '中等（60-79 bit）', class: 'text-amber-600 dark:text-amber-400' }
|
||||
return { label: '弱（<60 bit）', class: 'text-red-600 dark:text-red-400' }
|
||||
})
|
||||
|
||||
function generate() {
|
||||
error.value = ''
|
||||
if (charset.value.length === 0) {
|
||||
error.value = '请至少选择一种字符集'
|
||||
passwords.value = []
|
||||
return
|
||||
}
|
||||
const list: string[] = []
|
||||
for (let i = 0; i < countNum.value; i++) {
|
||||
let pw = ''
|
||||
for (let j = 0; j < lengthNum.value; j++) {
|
||||
pw += charset.value[randomInt(charset.value.length)]
|
||||
}
|
||||
list.push(pw)
|
||||
}
|
||||
passwords.value = list
|
||||
}
|
||||
|
||||
const allText = computed(() => passwords.value.join('\n'))
|
||||
|
||||
function copyAll() {
|
||||
void navigator.clipboard.writeText(allText.value)
|
||||
}
|
||||
|
||||
onMounted(generate)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex items-center gap-6 flex-wrap">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">长度（4-128）</Label>
|
||||
<Input v-model="length" type="number" min="4" max="128" class="w-24 font-mono text-sm" />
|
||||
</div>
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">数量（1-100）</Label>
|
||||
<Input v-model="count" type="number" min="1" max="100" class="w-24 font-mono text-sm" />
|
||||
</div>
|
||||
<Button size="sm" class="gap-1 self-end" @click="generate">
|
||||
<RefreshCw class="size-3.5" />
|
||||
重新生成
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center gap-4 flex-wrap">
|
||||
<label class="flex items-center gap-2 text-xs cursor-pointer">
|
||||
<Switch v-model="useLower" /> 小写 a-z
|
||||
</label>
|
||||
<label class="flex items-center gap-2 text-xs cursor-pointer">
|
||||
<Switch v-model="useUpper" /> 大写 A-Z
|
||||
</label>
|
||||
<label class="flex items-center gap-2 text-xs cursor-pointer">
|
||||
<Switch v-model="useDigits" /> 数字 0-9
|
||||
</label>
|
||||
<label class="flex items-center gap-2 text-xs cursor-pointer">
|
||||
<Switch v-model="useSymbols" /> 符号 !@#$%
|
||||
</label>
|
||||
<label class="flex items-center gap-2 text-xs cursor-pointer">
|
||||
<Switch v-model="excludeAmbiguous" /> 排除易混淆字符
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<p v-if="error" class="text-xs text-destructive">{{ error }}</p>
|
||||
|
||||
<template v-if="passwords.length">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<div class="flex items-center justify-between">
|
||||
<Label class="text-xs">生成结果</Label>
|
||||
<span class="text-xs" :class="strength.class">熵约 {{ entropy }} bit · {{ strength.label }}</span>
|
||||
</div>
|
||||
<Textarea
|
||||
readonly
|
||||
:model-value="allText"
|
||||
class="min-h-[120px] font-mono text-xs resize-y"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Button size="sm" variant="outline" class="gap-1 w-fit" @click="copyAll">
|
||||
<Copy class="size-3.5" />
|
||||
复制全部（{{ passwords.length }} 个）
|
||||
</Button>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,192 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Badge } from '@/components/ui/badge'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
const pattern = ref('')
|
||||
const testText = ref('')
|
||||
const flags = ref({ g: true, i: false, m: false, s: false, u: false })
|
||||
|
||||
interface MatchInfo {
|
||||
index: number
|
||||
full: string
|
||||
groups: string[]
|
||||
groupsLabel: string
|
||||
}
|
||||
|
||||
const raw = computed<{ matches: MatchInfo[]; error: string }>(() => {
|
||||
if (!pattern.value) return { matches: [], error: '' }
|
||||
// 防卡 UI：同步 exec 无超时保护，超长文本截断测试（灾难性回溯正则仍可能慢，限制输入规模是主要防线）
|
||||
const MAX_TEXT = 200_000
|
||||
const text = testText.value.length > MAX_TEXT ? testText.value.slice(0, MAX_TEXT) : testText.value
|
||||
const truncated = testText.value.length > MAX_TEXT
|
||||
let fl = ''
|
||||
const f = flags.value
|
||||
if (f.g) fl += 'g'
|
||||
if (f.i) fl += 'i'
|
||||
if (f.m) fl += 'm'
|
||||
if (f.s) fl += 's'
|
||||
if (f.u) fl += 'u'
|
||||
try {
|
||||
const re = new RegExp(pattern.value, fl)
|
||||
const list: MatchInfo[] = []
|
||||
let m: RegExpExecArray | null
|
||||
let guard = 0
|
||||
while ((m = re.exec(text)) !== null) {
|
||||
const groups = m.slice(1)
|
||||
list.push({
|
||||
index: m.index,
|
||||
full: m[0],
|
||||
groups,
|
||||
groupsLabel: groups && groups.length > 0
|
||||
? groups.map((g, i) => `$${i + 1}=${g === undefined ? '∅' : g}`).join(', ')
|
||||
: ''
|
||||
})
|
||||
if (!f.g) break
|
||||
if (list.length >= 5000) break // 匹配数上限，防止大文本 + 极宽正则刷爆列表
|
||||
if (m[0] === '') {
|
||||
if (++guard > 100000) break
|
||||
re.lastIndex++
|
||||
}
|
||||
}
|
||||
if (list.length >= 5000) {
|
||||
const extra = truncated ? `（文本超过 ${MAX_TEXT} 字符，仅测试前 ${MAX_TEXT} 字符）` : ''
|
||||
return { matches: list, error: `匹配数已达 5000 上限，已停止${extra}` }
|
||||
}
|
||||
return { matches: list, error: '' }
|
||||
} catch (e) {
|
||||
return { matches: [], error: '正则语法错误：' + String(e) }
|
||||
}
|
||||
})
|
||||
|
||||
const matches = computed(() => raw.value.matches)
|
||||
const error = computed(() => raw.value.error)
|
||||
const isValidPattern = computed(() => {
|
||||
if (!pattern.value) return null
|
||||
try {
|
||||
new RegExp(pattern.value, flags.value.g ? 'g' : '')
|
||||
return true
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
})
|
||||
|
||||
const matchesText = computed(() => {
|
||||
if (matches.value.length === 0) return ''
|
||||
return matches.value
|
||||
.map((m, i) => `[${i}] @${m.index}: ${m.full}` + (m.groupsLabel ? ` (${m.groupsLabel})` : ''))
|
||||
.join('\n')
|
||||
})
|
||||
|
||||
const flagDefs = [
|
||||
{ key: 'g' as const, label: 'g', title: '全局' },
|
||||
{ key: 'i' as const, label: 'i', title: '忽略大小写' },
|
||||
{ key: 'm' as const, label: 'm', title: '多行' },
|
||||
{ key: 's' as const, label: 's', title: '点匹配换行' },
|
||||
{ key: 'u' as const, label: 'u', title: 'Unicode' }
|
||||
]
|
||||
|
||||
// ===== 替换预览 =====
|
||||
const showReplace = ref(false)
|
||||
const replacement = ref('')
|
||||
const replaceError = computed(() => {
|
||||
if (!showReplace.value || !pattern.value) return ''
|
||||
try {
|
||||
new RegExp(pattern.value, flags.value.g ? 'g' : '')
|
||||
return ''
|
||||
} catch (e) {
|
||||
return '正则语法错误：' + String(e)
|
||||
}
|
||||
})
|
||||
|
||||
const replacedText = computed<{ text: string; count: number }>(() => {
|
||||
if (!showReplace.value || !pattern.value || !testText.value) return { text: '', count: 0 }
|
||||
const text = testText.value.length > 200_000 ? testText.value.slice(0, 200_000) : testText.value
|
||||
try {
|
||||
const fl = (flags.value.g ? 'g' : '') + (flags.value.i ? 'i' : '') + (flags.value.m ? 'm' : '') + (flags.value.s ? 's' : '') + (flags.value.u ? 'u' : '')
|
||||
const re = new RegExp(pattern.value, fl)
|
||||
const all = (text.match(new RegExp(pattern.value, fl.includes('g') ? fl : fl + 'g')) ?? []).length
|
||||
return { text: text.replace(re, replacement.value), count: flags.value.g ? all : Math.min(all, 1) }
|
||||
} catch {
|
||||
return { text: '', count: 0 }
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">正则表达式</Label>
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="text-muted-foreground font-mono text-sm">/</span>
|
||||
<Input v-model="pattern" placeholder="如 \b\w+@\w+\.\w+\b" class="font-mono text-sm flex-1" :class="{ 'border-destructive': isValidPattern === false }" />
|
||||
<span class="text-muted-foreground font-mono text-sm">/</span>
|
||||
</div>
|
||||
<div class="flex items-center gap-1 flex-wrap">
|
||||
<button
|
||||
v-for="fd in flagDefs"
|
||||
:key="fd.key"
|
||||
type="button"
|
||||
class="h-6 px-2 rounded font-mono text-xs border transition-colors cursor-pointer"
|
||||
:class="flags[fd.key] ? 'border-primary text-primary bg-primary/10' : 'border-border text-muted-foreground hover:text-foreground'"
|
||||
:title="fd.title"
|
||||
@click="flags[fd.key] = !flags[fd.key]"
|
||||
>
|
||||
{{ fd.label }}
|
||||
</button>
|
||||
<span v-if="matches.length" class="ml-auto text-xs text-muted-foreground">匹配 {{ matches.length }} 处</span>
|
||||
<span v-else-if="pattern && testText && !error" class="ml-auto text-xs text-muted-foreground">无匹配</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">测试文本</Label>
|
||||
<Textarea v-model="testText" placeholder="在此输入文本..." class="min-h-[120px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">匹配结果</Label>
|
||||
<div class="rounded-md border border-border max-h-56 overflow-y-auto divide-y divide-border">
|
||||
<div v-if="matches.length === 0 && !error" class="p-3 text-xs text-muted-foreground">输入正则与文本查看匹配。</div>
|
||||
<div v-for="(m, i) in matches" :key="i" class="flex items-start gap-2 p-2 text-xs font-mono">
|
||||
<Badge variant="outline" class="shrink-0 py-0 px-1.5 text-[10px]">@{{ m.index }}</Badge>
|
||||
<span class="break-all min-w-0">{{ m.full }}</span>
|
||||
<span v-if="m.groupsLabel" class="text-muted-foreground break-all ml-auto pl-2">{{ m.groupsLabel }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ResultArea :text="matchesText" label="匹配列表（可复制）" placeholder="匹配列表" />
|
||||
|
||||
<!-- 替换预览 -->
|
||||
<div class="rounded-md border border-border">
|
||||
<button
|
||||
type="button"
|
||||
class="w-full flex items-center justify-between px-3 py-2 text-xs font-medium cursor-pointer hover:bg-muted/40 transition-colors"
|
||||
@click="showReplace = !showReplace"
|
||||
>
|
||||
<span>替换预览（支持 $1、$<name> 引用分组）</span>
|
||||
<span class="text-muted-foreground">{{ showReplace ? '收起' : '展开' }}</span>
|
||||
</button>
|
||||
<div v-if="showReplace" class="flex flex-col gap-3 p-3 border-t border-border">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">替换为</Label>
|
||||
<Input v-model="replacement" placeholder="如 [$1]（留空则删除匹配内容）" class="font-mono text-sm" />
|
||||
</div>
|
||||
<ResultArea
|
||||
v-if="replacedText.text"
|
||||
:text="replacedText.text"
|
||||
:label="`替换结果（已替换 ${replacedText.count} 处）`"
|
||||
placeholder="替换结果"
|
||||
/>
|
||||
<p v-else-if="replacement" class="text-xs text-muted-foreground">替换后无内容或无匹配。</p>
|
||||
<p v-if="replaceError" class="text-xs text-destructive">{{ replaceError }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p v-if="error" class="text-xs text-destructive">{{ error }}</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,82 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Switch } from '@/components/ui/switch'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
const input = ref('')
|
||||
const find = ref('')
|
||||
const replacement = ref('')
|
||||
const useRegex = ref(false)
|
||||
const caseInsensitive = ref(false)
|
||||
const multiline = ref(false)
|
||||
|
||||
const result = computed<{ text: string; count: number; error: string }>(() => {
|
||||
const v = input.value
|
||||
if (!v || !find.value) return { text: '', count: 0, error: '' }
|
||||
try {
|
||||
let re: RegExp
|
||||
let replacementText: string
|
||||
if (useRegex.value) {
|
||||
const flags = 'g' + (caseInsensitive.value ? 'i' : '') + (multiline.value ? 'm' : '')
|
||||
re = new RegExp(find.value, flags)
|
||||
// 正则模式：原生支持 $1、$<name> 等引用
|
||||
replacementText = replacement.value
|
||||
} else {
|
||||
// 纯文本模式：查找与替换都按字面处理，需转义正则元字符与替换串中的 $
|
||||
const esc = find.value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
|
||||
re = new RegExp(esc, 'g' + (caseInsensitive.value ? 'i' : ''))
|
||||
replacementText = replacement.value.replace(/\$/g, '$$$$')
|
||||
}
|
||||
const count = (v.match(re) ?? []).length
|
||||
return { text: v.replace(re, replacementText), count, error: '' }
|
||||
} catch (e) {
|
||||
return { text: '', count: 0, error: '正则语法错误：' + String(e) }
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">原文</Label>
|
||||
<Textarea v-model="input" placeholder="在此输入文本..." class="min-h-[140px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-2 gap-3">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">查找</Label>
|
||||
<Input v-model="find" :placeholder="useRegex ? '正则表达式' : '纯文本'" class="font-mono text-sm" />
|
||||
</div>
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">替换为（留空删除匹配）</Label>
|
||||
<Input v-model="replacement" :placeholder="useRegex ? '支持 $1、$<name>' : '纯文本'" class="font-mono text-sm" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center gap-4 flex-wrap">
|
||||
<label class="flex items-center gap-2 text-xs cursor-pointer">
|
||||
<Switch v-model="useRegex" /> 正则模式
|
||||
</label>
|
||||
<label class="flex items-center gap-2 text-xs cursor-pointer">
|
||||
<Switch v-model="caseInsensitive" /> 忽略大小写
|
||||
</label>
|
||||
<label class="flex items-center gap-2 text-xs cursor-pointer" :class="{ 'opacity-50': !useRegex }">
|
||||
<Switch v-model="multiline" :disabled="!useRegex" /> 多行模式（^$ 匹配行首尾）
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<p v-if="result.error" class="text-xs text-destructive">{{ result.error }}</p>
|
||||
|
||||
<ResultArea
|
||||
v-if="result.text"
|
||||
:text="result.text"
|
||||
:label="`替换结果（已替换 ${result.count} 处）`"
|
||||
placeholder="替换结果"
|
||||
/>
|
||||
<p v-else-if="input && find" class="text-xs text-muted-foreground">无匹配或替换后为空。</p>
|
||||
<p v-else class="text-xs text-muted-foreground">输入原文与查找内容，实时预览替换结果。</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,138 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onUnmounted, ref } from 'vue'
|
||||
import { Clock } from '@lucide/vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Separator } from '@/components/ui/separator'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
type Unit = 'auto' | 's' | 'ms'
|
||||
|
||||
const unit = ref<Unit>('auto')
|
||||
const numberInput = ref('')
|
||||
const dateInput = ref('')
|
||||
|
||||
const toNumber = (v: string): number | null => {
|
||||
const n = Number(v.trim())
|
||||
return Number.isFinite(n) ? n : null
|
||||
}
|
||||
|
||||
/** 自动识别：13 位（>1e11）视为毫秒，10 位（>1e8）视为秒，其他按数值范围推断 */
|
||||
function resolveUnit(n: number): 's' | 'ms' {
|
||||
if (unit.value !== 'auto') return unit.value
|
||||
if (Math.abs(n) >= 1e11) return 'ms'
|
||||
return 's'
|
||||
}
|
||||
|
||||
const unixToDate = (n: number, u: 's' | 'ms'): Date =>
|
||||
new Date(u === 's' ? n * 1000 : n)
|
||||
|
||||
const formatLocal = (d: Date): string => {
|
||||
const pad = (x: number) => String(x).padStart(2, '0')
|
||||
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`
|
||||
}
|
||||
|
||||
const formatUtc = (d: Date): string => {
|
||||
const pad = (x: number) => String(x).padStart(2, '0')
|
||||
return `${d.getUTCFullYear()}-${pad(d.getUTCMonth() + 1)}-${pad(d.getUTCDate())} ${pad(d.getUTCHours())}:${pad(d.getUTCMinutes())}:${pad(d.getUTCSeconds())} UTC`
|
||||
}
|
||||
|
||||
const fromNumber = computed<{ local: string; utc: string; iso: string; ts: string; unitUsed: 's' | 'ms' } | null>(() => {
|
||||
const n = toNumber(numberInput.value)
|
||||
if (n === null) return null
|
||||
const u = resolveUnit(n)
|
||||
const d = unixToDate(n, u)
|
||||
if (Number.isNaN(d.getTime())) return null
|
||||
return {
|
||||
local: formatLocal(d),
|
||||
utc: formatUtc(d),
|
||||
iso: d.toISOString(),
|
||||
ts: String(n),
|
||||
unitUsed: u
|
||||
}
|
||||
})
|
||||
|
||||
const fromDate = computed<string>(() => {
|
||||
if (!dateInput.value) return ''
|
||||
const d = new Date(dateInput.value)
|
||||
if (Number.isNaN(d.getTime())) return ''
|
||||
// 日期输入统一同时给出秒与毫秒
|
||||
return `${Math.floor(d.getTime() / 1000)}（秒）\n${d.getTime()}（毫秒）`
|
||||
})
|
||||
|
||||
// ===== 当前时间戳 =====
|
||||
const nowTick = ref(0)
|
||||
const timer = window.setInterval(() => (nowTick.value++), 1000)
|
||||
onUnmounted(() => window.clearInterval(timer))
|
||||
|
||||
const now = computed(() => {
|
||||
void nowTick.value
|
||||
const d = new Date()
|
||||
return {
|
||||
s: String(Math.floor(d.getTime() / 1000)),
|
||||
ms: String(d.getTime()),
|
||||
local: formatLocal(d)
|
||||
}
|
||||
})
|
||||
|
||||
function copy(text: string) {
|
||||
void navigator.clipboard.writeText(text)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<Segmented
|
||||
v-model="unit"
|
||||
label="单位"
|
||||
:options="[
|
||||
{ value: 'auto', label: '自动' },
|
||||
{ value: 's', label: '秒' },
|
||||
{ value: 'ms', label: '毫秒' }
|
||||
]"
|
||||
/>
|
||||
|
||||
<!-- 时间戳 → 时间 -->
|
||||
<div class="flex flex-col gap-3">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">Unix 时间戳 → 日期时间</Label>
|
||||
<Input v-model="numberInput" placeholder="例如 1757419200 或 1757419200000" class="font-mono text-sm" />
|
||||
</div>
|
||||
<template v-if="fromNumber">
|
||||
<ResultArea :text="fromNumber.local" label="本地时间" placeholder="本地时间" />
|
||||
<ResultArea :text="fromNumber.utc" label="UTC 时间" placeholder="UTC 时间" />
|
||||
<ResultArea :text="fromNumber.iso" label="ISO 8601" placeholder="ISO 8601" />
|
||||
<p class="text-xs text-muted-foreground">已识别为{{ fromNumber.unitUsed === 's' ? '秒级' : '毫秒级' }}时间戳</p>
|
||||
</template>
|
||||
<p v-else-if="numberInput" class="text-xs text-destructive">请输入有效的数字时间戳</p>
|
||||
</div>
|
||||
|
||||
<Separator />
|
||||
|
||||
<!-- 时间 → 时间戳 -->
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">日期时间 → Unix 时间戳</Label>
|
||||
<Input v-model="dateInput" type="datetime-local" class="font-mono text-sm" />
|
||||
<ResultArea v-if="fromDate" :text="fromDate" label="结果" placeholder="结果" />
|
||||
</div>
|
||||
|
||||
<Separator />
|
||||
|
||||
<!-- 当前时间戳 -->
|
||||
<div class="flex flex-col gap-2">
|
||||
<Label class="text-xs">当前时间（{{ now.local }}）</Label>
|
||||
<div class="flex items-center gap-2 flex-wrap">
|
||||
<Button size="sm" variant="outline" class="h-8 font-mono text-xs gap-1.5" @click="copy(now.s)">
|
||||
<Clock class="size-3.5" />
|
||||
{{ now.s }}（秒，点击复制）
|
||||
</Button>
|
||||
<Button size="sm" variant="outline" class="h-8 font-mono text-xs gap-1.5" @click="copy(now.ms)">
|
||||
<Clock class="size-3.5" />
|
||||
{{ now.ms }}（毫秒，点击复制）
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,187 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { ArrowDownUp } from '@lucide/vue'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Switch } from '@/components/ui/switch'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
type Tab = 'convert' | 'parse'
|
||||
|
||||
const tab = ref<Tab>('convert')
|
||||
const mode = ref<'encode' | 'decode'>('encode')
|
||||
const usePlus = ref(false)
|
||||
const input = ref('')
|
||||
|
||||
// ===== 编解码 =====
|
||||
const output = computed<{ text: string; error: string }>(() => {
|
||||
const v = input.value
|
||||
if (!v) return { text: '', error: '' }
|
||||
if (mode.value === 'encode') {
|
||||
const enc = encodeURIComponent(v)
|
||||
return { text: usePlus.value ? enc.replace(/%20/g, '+') : enc, error: '' }
|
||||
}
|
||||
// decode：先处理 + 与 %20 两种形式
|
||||
const normalized = usePlus.value ? v.replace(/\+/g, ' ') : v
|
||||
try {
|
||||
return { text: decodeURIComponent(normalized), error: '' }
|
||||
} catch (e) {
|
||||
return { text: '', error: '解码失败（存在非法百分号序列）：' + String(e) }
|
||||
}
|
||||
})
|
||||
|
||||
const swap = () => {
|
||||
if (output.value.text) {
|
||||
input.value = output.value.text
|
||||
mode.value = mode.value === 'encode' ? 'decode' : 'encode'
|
||||
}
|
||||
}
|
||||
|
||||
// ===== URL 解析 =====
|
||||
const parseInput = ref('https://user:pass@example.com:8080/path/to/page?a=1&b=hello%20world&c=3#section')
|
||||
|
||||
interface ParsedUrl {
|
||||
href: string
|
||||
protocol: string
|
||||
username: string
|
||||
password: string
|
||||
host: string
|
||||
hostname: string
|
||||
port: string
|
||||
pathname: string
|
||||
search: string
|
||||
hash: string
|
||||
origin: string
|
||||
params: Array<[string, string]>
|
||||
paramError: string
|
||||
}
|
||||
|
||||
const parsedUrl = computed<{ url: ParsedUrl | null; error: string }>(() => {
|
||||
const v = parseInput.value.trim()
|
||||
if (!v) return { url: null, error: '' }
|
||||
let u: URL
|
||||
try {
|
||||
u = new URL(v)
|
||||
} catch {
|
||||
// 无协议时尝试补 http:// 再解析
|
||||
try {
|
||||
u = new URL('http://' + v)
|
||||
} catch (e) {
|
||||
return { url: null, error: 'URL 解析失败：' + String(e) }
|
||||
}
|
||||
}
|
||||
const params: Array<[string, string]> = []
|
||||
let paramError = ''
|
||||
try {
|
||||
u.searchParams.forEach((value, key) => params.push([key, value]))
|
||||
} catch (e) {
|
||||
paramError = String(e)
|
||||
}
|
||||
return {
|
||||
url: {
|
||||
href: u.href,
|
||||
protocol: u.protocol,
|
||||
username: u.username,
|
||||
password: u.password,
|
||||
host: u.host,
|
||||
hostname: u.hostname,
|
||||
port: u.port,
|
||||
pathname: u.pathname,
|
||||
search: u.search,
|
||||
hash: u.hash,
|
||||
origin: u.origin,
|
||||
params,
|
||||
paramError
|
||||
},
|
||||
error: ''
|
||||
}
|
||||
})
|
||||
|
||||
const FIELDS: Array<{ key: keyof ParsedUrl; label: string }> = [
|
||||
{ key: 'protocol', label: '协议' },
|
||||
{ key: 'username', label: '用户名' },
|
||||
{ key: 'password', label: '密码' },
|
||||
{ key: 'hostname', label: '主机名' },
|
||||
{ key: 'port', label: '端口' },
|
||||
{ key: 'pathname', label: '路径' },
|
||||
{ key: 'search', label: '查询串' },
|
||||
{ key: 'hash', label: '锚点' },
|
||||
{ key: 'origin', label: 'Origin' }
|
||||
]
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<Segmented
|
||||
v-model="tab"
|
||||
:options="[
|
||||
{ value: 'convert', label: '编解码' },
|
||||
{ value: 'parse', label: 'URL 解析' }
|
||||
]"
|
||||
/>
|
||||
|
||||
<!-- 编解码 -->
|
||||
<template v-if="tab === 'convert'">
|
||||
<div class="flex items-center justify-between flex-wrap gap-3">
|
||||
<Segmented
|
||||
v-model="mode"
|
||||
label="操作"
|
||||
:options="[
|
||||
{ value: 'encode', label: '编码' },
|
||||
{ value: 'decode', label: '解码' }
|
||||
]"
|
||||
/>
|
||||
<label class="flex items-center gap-2 text-xs text-muted-foreground cursor-pointer">
|
||||
空格用
|
||||
<Switch v-model="usePlus" />
|
||||
<span class="font-mono">{{ usePlus ? '+(表单)' : '%20' }}</span>
|
||||
</label>
|
||||
<Button size="sm" variant="outline" class="h-8 text-sm gap-1" :disabled="!output.text" @click="swap">
|
||||
<ArrowDownUp class="size-3.5" />
|
||||
结果回填
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">{{ mode === 'encode' ? '待编码文本' : '待解码字符串' }}</Label>
|
||||
<Textarea v-model="input" placeholder="在此输入..." class="min-h-[120px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<ResultArea :text="output.text" placeholder="结果" />
|
||||
<p v-if="output.error" class="text-xs text-destructive">{{ output.error }}</p>
|
||||
</template>
|
||||
|
||||
<!-- URL 解析 -->
|
||||
<template v-else>
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">URL</Label>
|
||||
<Textarea v-model="parseInput" placeholder="https://example.com/path?a=1#hash" class="min-h-[70px] font-mono text-xs resize-y" />
|
||||
</div>
|
||||
|
||||
<template v-if="parsedUrl.url">
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div v-for="f in FIELDS" :key="f.key" class="flex gap-3 px-3 py-1.5">
|
||||
<span class="w-16 shrink-0 text-muted-foreground">{{ f.label }}</span>
|
||||
<span class="font-mono break-all">{{ (parsedUrl.url[f.key] as string) || '—' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="parsedUrl.url.params.length > 0" class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">查询参数（{{ parsedUrl.url.params.length }} 个）</Label>
|
||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||
<div v-for="([k, v], i) in parsedUrl.url.params" :key="i" class="flex gap-3 px-3 py-1.5">
|
||||
<span class="font-mono text-primary break-all">{{ k }}</span>
|
||||
<span class="font-mono break-all">{{ v }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p v-if="parsedUrl.url.paramError" class="text-xs text-destructive">{{ parsedUrl.url.paramError }}</p>
|
||||
<p v-else-if="parsedUrl.url.params.length === 0" class="text-xs text-muted-foreground">无查询参数。</p>
|
||||
</template>
|
||||
<p v-else-if="!parseInput" class="text-xs text-muted-foreground">输入 URL 查看解析结果。</p>
|
||||
<p v-else class="text-xs text-destructive">{{ parsedUrl.error }}</p>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,121 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { RefreshCw, Copy } from '@lucide/vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Switch } from '@/components/ui/switch'
|
||||
import Segmented from '../components/Segmented.vue'
|
||||
import ResultArea from '../components/ResultArea.vue'
|
||||
|
||||
const count = ref('5')
|
||||
const version = ref<'v4' | 'v7'>('v4')
|
||||
const uppercase = ref(false)
|
||||
const noDashes = ref(false)
|
||||
// 原始随机 UUID 与格式化后的展示
|
||||
const baseUuids = ref<string[]>([])
|
||||
|
||||
const batchCount = computed(() => {
|
||||
const n = Math.floor(Number(count.value))
|
||||
if (!Number.isFinite(n)) return 5
|
||||
return Math.min(Math.max(n || 0, 1), 100)
|
||||
})
|
||||
|
||||
function formatUuid(u: string): string {
|
||||
let out = uppercase.value ? u.toUpperCase() : u
|
||||
if (noDashes.value) out = out.replace(/-/g, '')
|
||||
return out
|
||||
}
|
||||
|
||||
const uuids = computed(() => baseUuids.value.map(formatUuid))
|
||||
|
||||
/** UUID v4：纯随机 */
|
||||
function uuidv4(): string {
|
||||
return crypto.randomUUID()
|
||||
}
|
||||
|
||||
/** UUID v7：毫秒时间戳前缀（48 bit）+ 随机，时间有序、适合数据库索引 */
|
||||
function uuidv7(): string {
|
||||
const ts = BigInt(Date.now())
|
||||
const b = crypto.getRandomValues(new Uint8Array(16))
|
||||
b[0] = Number((ts >> 40n) & 0xffn)
|
||||
b[1] = Number((ts >> 32n) & 0xffn)
|
||||
b[2] = Number((ts >> 24n) & 0xffn)
|
||||
b[3] = Number((ts >> 16n) & 0xffn)
|
||||
b[4] = Number((ts >> 8n) & 0xffn)
|
||||
b[5] = Number(ts & 0xffn)
|
||||
b[6] = (b[6] & 0x0f) | 0x70 // version 7
|
||||
b[8] = (b[8] & 0x3f) | 0x80 // variant 10xx
|
||||
const hex = Array.from(b, x => x.toString(16).padStart(2, '0')).join('')
|
||||
return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`
|
||||
}
|
||||
|
||||
function generate() {
|
||||
const gen = version.value === 'v4' ? uuidv4 : uuidv7
|
||||
baseUuids.value = Array.from({ length: batchCount.value }, gen)
|
||||
}
|
||||
|
||||
const allText = computed(() => uuids.value.join('\n'))
|
||||
|
||||
function copyAll() {
|
||||
try {
|
||||
void navigator.clipboard.writeText(allText.value)
|
||||
} catch {
|
||||
/* ignore */
|
||||
}
|
||||
}
|
||||
|
||||
// 切换版本时立即重新生成
|
||||
watch(version, generate)
|
||||
|
||||
onMounted(generate)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex items-center justify-between flex-wrap gap-3">
|
||||
<div class="flex items-center gap-4 flex-wrap">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">生成数量（1-100）</Label>
|
||||
<Input v-model="count" type="number" min="1" max="100" class="w-24 font-mono text-sm" />
|
||||
</div>
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">版本</Label>
|
||||
<div class="flex items-center gap-2">
|
||||
<Segmented
|
||||
v-model="version"
|
||||
:options="[
|
||||
{ value: 'v4', label: 'v4 随机' },
|
||||
{ value: 'v7', label: 'v7 时间有序' }
|
||||
]"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-4">
|
||||
<label class="flex items-center gap-2 text-xs text-muted-foreground cursor-pointer">
|
||||
大写
|
||||
<Switch v-model="uppercase" />
|
||||
</label>
|
||||
<label class="flex items-center gap-2 text-xs text-muted-foreground cursor-pointer">
|
||||
去除连字符
|
||||
<Switch v-model="noDashes" />
|
||||
</label>
|
||||
<Button size="sm" class="gap-1" @click="generate">
|
||||
<RefreshCw class="size-3.5" />
|
||||
重新生成
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ResultArea :text="allText" label="UUID 列表" placeholder="点击重新生成" />
|
||||
|
||||
<div class="flex items-center gap-2">
|
||||
<Button size="sm" variant="outline" class="gap-1" :disabled="!allText" @click="copyAll">
|
||||
<Copy class="size-3.5" />
|
||||
复制全部（{{ uuids.length }} 个）
|
||||
</Button>
|
||||
<span class="text-xs text-muted-foreground">{{ version === 'v4' ? 'UUID v4（纯随机）' : 'UUID v7（毫秒时间戳前缀，适合数据库主键索引）' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,77 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import Segmented from '../../components/Segmented.vue'
|
||||
import ResultArea from '../../components/ResultArea.vue'
|
||||
|
||||
type Radix = '2' | '8' | '10' | '16'
|
||||
|
||||
const bases: { value: Radix; label: string }[] = [
|
||||
{ value: '2', label: '二进制(2)' },
|
||||
{ value: '8', label: '八进制(8)' },
|
||||
{ value: '10', label: '十进制(10)' },
|
||||
{ value: '16', label: '十六进制(16)' }
|
||||
]
|
||||
|
||||
const from = ref<Radix>('10')
|
||||
const to = ref<Radix>('16')
|
||||
const input = ref('')
|
||||
const error = ref('')
|
||||
|
||||
const RADIX_MAP: Record<Radix, number> = { '2': 2, '8': 8, '10': 10, '16': 16 }
|
||||
|
||||
/** 按进制精确解析为 BigInt（大数字不丢精度），非法输入抛错 */
|
||||
function parseBigInt(s: string, radix: number): bigint {
|
||||
const digits = '0123456789abcdef'
|
||||
const trimmed = s.trim().toLowerCase()
|
||||
const negative = trimmed.startsWith('-')
|
||||
const body = trimmed.replace(/^[+-]/, '')
|
||||
if (!body) throw new Error('empty')
|
||||
let n = 0n
|
||||
for (const ch of body) {
|
||||
const d = digits.indexOf(ch)
|
||||
if (d === -1 || d >= radix) throw new Error('invalid digit')
|
||||
n = n * BigInt(radix) + BigInt(d)
|
||||
}
|
||||
return negative ? -n : n
|
||||
}
|
||||
|
||||
const result = computed(() => {
|
||||
error.value = ''
|
||||
const v = input.value.trim()
|
||||
if (!v) return { dec: null, output: '', outputUppercase: '' }
|
||||
try {
|
||||
const parsed = parseBigInt(v, RADIX_MAP[from.value])
|
||||
const out = parsed.toString(RADIX_MAP[to.value])
|
||||
return {
|
||||
dec: parsed,
|
||||
output: out,
|
||||
outputUppercase: to.value === '16' ? out.toUpperCase() : out
|
||||
}
|
||||
} catch {
|
||||
error.value = '输入不合法，请确认数字与当前进制匹配（如十六进制仅含 0-9a-f）'
|
||||
return { dec: null, output: '', outputUppercase: '' }
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex items-center gap-3 flex-wrap">
|
||||
<Segmented v-model="from" label="从" :options="bases" />
|
||||
<span class="text-xs text-muted-foreground">→</span>
|
||||
<Segmented v-model="to" label="到" :options="bases" />
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<Label class="text-xs">输入（{{ from === '2' ? '二进制' : from === '8' ? '八进制' : from === '10' ? '十进制' : '十六进制' }}）</Label>
|
||||
<Input v-model="input" placeholder="输入数字" class="font-mono text-sm" />
|
||||
</div>
|
||||
|
||||
<ResultArea :text="result.output" label="结果" placeholder="结果" />
|
||||
<ResultArea v-if="to === '16' && result.outputUppercase !== result.output" :text="result.outputUppercase" label="大写形式" placeholder="大写形式" />
|
||||
<div v-if="result.dec !== null" class="text-xs text-muted-foreground">十进制值：{{ result.dec.toString() }}</div>
|
||||
<p v-if="error" class="text-xs text-destructive">{{ error }}</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,171 @@
|
||||
import type { Component } from 'vue'
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
import {
|
||||
FileJson, Binary, Link, Clock, MoveHorizontal, Fingerprint,
|
||||
Wand2, KeyRound, CaseSensitive, Hash, Code, GitCompare, Shield,
|
||||
Palette, Lock, CalendarClock, Network, Sigma, Replace, Globe
|
||||
} from '@lucide/vue'
|
||||
import { registerTool, type DevTool } from '../registry'
|
||||
|
||||
/** 工具元数据（与组件解耦，供模块配置生成搜索项） */
|
||||
export const TOOLS_META: Array<Omit<DevTool, 'component' | 'icon'>> = [
|
||||
{
|
||||
id: 'json', name: 'JSON 格式化', category: 'transform',
|
||||
description: '格式化 / 压缩 / 校验，支持键排序',
|
||||
keywords: ['json', '格式化', '美化', '压缩', '校验', '排序']
|
||||
},
|
||||
{
|
||||
id: 'timestamp', name: '时间戳转换', category: 'transform',
|
||||
description: 'Unix 时间戳与日期时间互转，自动识别秒 / 毫秒',
|
||||
keywords: ['时间戳', 'timestamp', 'unix', '日期', '时间', '转换', '现在']
|
||||
},
|
||||
{
|
||||
id: 'base', name: '进制转换', category: 'transform',
|
||||
description: '二进制 / 八进制 / 十进制 / 十六进制互转',
|
||||
keywords: ['进制', '二进制', '十六进制', 'hex', 'bin', 'oct', 'dec', 'base']
|
||||
},
|
||||
{
|
||||
id: 'color', name: '颜色转换器', category: 'transform',
|
||||
description: 'HEX / RGB / HSL / HSV / CMYK 互转，明暗梯度',
|
||||
keywords: ['颜色', 'color', 'hex', 'rgb', 'hsl', 'hsv', 'cmyk', '调色', '取色']
|
||||
},
|
||||
{
|
||||
id: 'ip', name: 'IP / CIDR 计算', category: 'transform',
|
||||
description: '子网划分、掩码换算、IP 与整数互转',
|
||||
keywords: ['ip', 'cidr', '子网', '掩码', '网段', '广播', '网络', 'subnet', 'mask']
|
||||
},
|
||||
{
|
||||
id: 'cron', name: 'Cron 表达式', category: 'transform',
|
||||
description: '解析 Cron 表达式，预览接下来 6 次执行时间',
|
||||
keywords: ['cron', 'crontab', '定时', '计划任务', '表达式', 'schedule']
|
||||
},
|
||||
{
|
||||
id: 'base64', name: 'Base64 转换', category: 'encoding',
|
||||
description: '文本与 Base64 互转（支持中文），文件转 Base64 / Data URL',
|
||||
keywords: ['base64', '编码', '解码', 'encode', 'decode', 'dataurl', '文件']
|
||||
},
|
||||
{
|
||||
id: 'url', name: 'URL 编解码', category: 'encoding',
|
||||
description: 'URL 编码 / 解码，URL 结构解析',
|
||||
keywords: ['url', 'encode', 'decode', '编码', '解码', '链接', '解析', '参数', 'query']
|
||||
},
|
||||
{
|
||||
id: 'jwt', name: 'JWT 解码', category: 'encoding',
|
||||
description: '本地解析 JWT 的 Header 与 Payload，含过期时间提示',
|
||||
keywords: ['jwt', 'token', '解码', 'header', 'payload', '过期', 'exp']
|
||||
},
|
||||
{
|
||||
id: 'escape', name: '转义 / 反转义', category: 'encoding',
|
||||
description: 'HTML 实体与 JSON 字符串转义、反转义',
|
||||
keywords: ['转义', '反转义', 'html', 'entity', 'json', 'escape']
|
||||
},
|
||||
{
|
||||
id: 'case', name: '大小写 / 命名转换', category: 'text',
|
||||
description: 'camel / Pascal / snake / kebab 等命名转换',
|
||||
keywords: ['大小写', '命名', 'camel', 'snake', 'kebab', 'pascal', '转换']
|
||||
},
|
||||
{
|
||||
id: 'regex', name: '正则测试', category: 'text',
|
||||
description: '在线测试正则表达式，实时匹配、分组查看与替换预览',
|
||||
keywords: ['正则', 'regex', '匹配', 'test', 're', '替换']
|
||||
},
|
||||
{
|
||||
id: 'diff', name: '文本对比', category: 'text',
|
||||
description: '两段文本逐行差异对比',
|
||||
keywords: ['对比', '差异', 'diff', '比较', 'compare']
|
||||
},
|
||||
{
|
||||
id: 'eol', name: '行尾符转换', category: 'text',
|
||||
description: 'CRLF / LF / CR 行尾符统一',
|
||||
keywords: ['行尾', '换行', 'crlf', 'lf', 'cr', 'eol', '转行']
|
||||
},
|
||||
{
|
||||
id: 'replace', name: '批量查找替换', category: 'text',
|
||||
description: '纯文本 / 正则批量替换，支持分组引用',
|
||||
keywords: ['替换', '查找', 'replace', '批量', '正则替换']
|
||||
},
|
||||
{
|
||||
id: 'charcount', name: '字符统计', category: 'text',
|
||||
description: '字符 / 字节 / 词数 / 行数统计与高频分析',
|
||||
keywords: ['统计', '字数', '字符数', '词频', 'count', 'words', '字节数']
|
||||
},
|
||||
{
|
||||
id: 'uuid', name: 'UUID 生成', category: 'generate',
|
||||
description: '批量生成 UUID v4 / v7，支持大写与去连字符',
|
||||
keywords: ['uuid', 'guid', '生成', '随机', 'id', 'v4', 'v7']
|
||||
},
|
||||
{
|
||||
id: 'hash', name: '哈希计算', category: 'generate',
|
||||
description: 'MD5 / SHA-1 / SHA-256 / SHA-384 / SHA-512 与 HMAC，支持文件',
|
||||
keywords: ['哈希', 'hash', 'sha', '摘要', 'md5', 'hmac', '文件', '校验']
|
||||
},
|
||||
{
|
||||
id: 'password', name: '密码生成', category: 'generate',
|
||||
description: '随机密码批量生成，字符集可选，附熵值评估',
|
||||
keywords: ['密码', 'password', '随机', '生成', '安全', 'entropy']
|
||||
},
|
||||
{
|
||||
id: 'httpstatus', name: 'HTTP 速查', category: 'reference',
|
||||
description: 'HTTP 状态码与常用 MIME 类型速查',
|
||||
keywords: ['http', '状态码', 'status', 'mime', 'content-type', '速查', '429', '404']
|
||||
}
|
||||
]
|
||||
|
||||
/** 图标映射（按工具 id） */
|
||||
const TOOL_ICONS: Record<string, Component> = {
|
||||
json: FileJson,
|
||||
timestamp: Clock,
|
||||
base: Hash,
|
||||
color: Palette,
|
||||
ip: Network,
|
||||
cron: CalendarClock,
|
||||
base64: Binary,
|
||||
url: Link,
|
||||
jwt: KeyRound,
|
||||
escape: Code,
|
||||
case: CaseSensitive,
|
||||
regex: Wand2,
|
||||
diff: GitCompare,
|
||||
eol: MoveHorizontal,
|
||||
replace: Replace,
|
||||
charcount: Sigma,
|
||||
uuid: Fingerprint,
|
||||
hash: Shield,
|
||||
password: Lock,
|
||||
httpstatus: Globe
|
||||
}
|
||||
|
||||
// 工具组件（懒加载路径映射）
|
||||
const TOOL_COMPONENTS: Record<string, () => Promise<{ default: Component }>> = {
|
||||
json: () => import('./JsonTools.vue'),
|
||||
timestamp: () => import('./TimestampTools.vue'),
|
||||
base: () => import('./base/BaseTools.vue'),
|
||||
color: () => import('./ColorTools.vue'),
|
||||
ip: () => import('./IpTools.vue'),
|
||||
cron: () => import('./CronTools.vue'),
|
||||
base64: () => import('./Base64Tools.vue'),
|
||||
url: () => import('./UrlTools.vue'),
|
||||
jwt: () => import('./JwtTools.vue'),
|
||||
escape: () => import('./EscapeTools.vue'),
|
||||
case: () => import('./CaseTools.vue'),
|
||||
regex: () => import('./RegexTools.vue'),
|
||||
diff: () => import('./DiffTools.vue'),
|
||||
eol: () => import('./EolTools.vue'),
|
||||
replace: () => import('./ReplaceTools.vue'),
|
||||
charcount: () => import('./CharCountTools.vue'),
|
||||
uuid: () => import('./UuidTools.vue'),
|
||||
hash: () => import('./HashTools.vue'),
|
||||
password: () => import('./PasswordTools.vue'),
|
||||
httpstatus: () => import('./HttpStatusTools.vue')
|
||||
}
|
||||
|
||||
/** 将所有工具注册进注册表（幂等） */
|
||||
export function registerAllTools(): void {
|
||||
for (const meta of TOOLS_META) {
|
||||
registerTool({
|
||||
...meta,
|
||||
icon: TOOL_ICONS[meta.id],
|
||||
component: defineAsyncComponent(TOOL_COMPONENTS[meta.id])
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,9 @@ import {
|
||||
Camera,
|
||||
Activity,
|
||||
Download,
|
||||
Command
|
||||
Command,
|
||||
Wrench,
|
||||
Music
|
||||
} from '@lucide/vue'
|
||||
|
||||
/**
|
||||
@@ -23,7 +25,9 @@ export const moduleIconMap: Record<string, Component> = {
|
||||
screenshot: Camera,
|
||||
monitor: Activity,
|
||||
downloader: Download,
|
||||
quickpanel: Command
|
||||
quickpanel: Command,
|
||||
devtools: Wrench,
|
||||
music: Music
|
||||
}
|
||||
|
||||
/** 获取模块图标组件，未找到时回退到 Settings 图标 */
|
||||
|
||||
@@ -8,7 +8,9 @@ import { moduleConfig as screenshot } from './screenshot'
|
||||
import { moduleConfig as monitor } from './monitor'
|
||||
import { moduleConfig as downloader } from './downloader'
|
||||
import { moduleConfig as quickpanel } from './quickpanel'
|
||||
import { moduleConfig as devtools } from './devtools'
|
||||
import { moduleConfig as settings } from './settings'
|
||||
import { moduleConfig as music } from './music'
|
||||
|
||||
const allModules: ModuleConfig[] = [
|
||||
proxy,
|
||||
@@ -17,7 +19,9 @@ const allModules: ModuleConfig[] = [
|
||||
monitor,
|
||||
downloader,
|
||||
quickpanel,
|
||||
settings
|
||||
devtools,
|
||||
settings,
|
||||
music
|
||||
]
|
||||
|
||||
// 启动时注册所有模块
|
||||
|
||||
@@ -279,6 +279,7 @@ function fmtFixedValue(v: number | null, item: OsdItem): string {
|
||||
case 'temperature':
|
||||
return padNum(Math.round(v).toString(), 3) // 0-150 → 3 字符
|
||||
case 'power':
|
||||
return padNum(v.toFixed(2), 6) // 12.34 / 123.45 → 6 字符（支持三位数功耗）
|
||||
case 'voltage':
|
||||
return padNum(v.toFixed(2), 5) // 12.34 → 5 字符
|
||||
case 'clock':
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,91 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { ChevronDown } from '@lucide/vue'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Checkbox } from '@/components/ui/checkbox'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
|
||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||
import { sourceName } from './sources'
|
||||
|
||||
const props = defineProps<{
|
||||
modelValue: string[]
|
||||
/** 可选源（客户端名）列表 */
|
||||
options: string[]
|
||||
}>()
|
||||
const emit = defineEmits<{ 'update:model-value': [string[]] }>()
|
||||
|
||||
const open = ref(false)
|
||||
|
||||
const checked = computed(() => new Set(props.modelValue))
|
||||
|
||||
const toggle = (code: string) => {
|
||||
const next = new Set(checked.value)
|
||||
if (next.has(code)) next.delete(code)
|
||||
else next.add(code)
|
||||
emit('update:model-value', [...next])
|
||||
}
|
||||
|
||||
const selectAll = () => emit('update:model-value', [...props.options])
|
||||
const clearAll = () => emit('update:model-value', [])
|
||||
|
||||
const label = computed(() => {
|
||||
if (props.modelValue.length === 0) return '选择搜索源'
|
||||
if (props.modelValue.length === 1) return sourceName(props.modelValue[0])
|
||||
return `已选 ${props.modelValue.length} 个源`
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Popover v-model:open="open">
|
||||
<PopoverTrigger as-child>
|
||||
<Button variant="outline" size="sm" class="h-9 max-w-56 justify-between font-normal">
|
||||
<span class="truncate">{{ label }}</span>
|
||||
<ChevronDown class="size-3.5 shrink-0 opacity-50" />
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent class="w-64 p-2" align="start">
|
||||
<div class="mb-1 flex items-center justify-between px-1">
|
||||
<span class="text-[11px] text-muted-foreground">搜索源</span>
|
||||
<div class="flex items-center gap-2">
|
||||
<button
|
||||
type="button"
|
||||
class="text-[11px] text-muted-foreground hover:text-foreground disabled:opacity-40"
|
||||
:disabled="modelValue.length === options.length"
|
||||
@click="selectAll"
|
||||
>
|
||||
全选
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="text-[11px] text-muted-foreground hover:text-foreground disabled:opacity-40"
|
||||
:disabled="modelValue.length === 0"
|
||||
@click="clearAll"
|
||||
>
|
||||
清空
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- ScrollArea 的 viewport 为 h-full，需要根节点有确定高度才能滚动 -->
|
||||
<ScrollArea class="h-72">
|
||||
<div class="space-y-0.5 pr-2">
|
||||
<label
|
||||
v-for="code in options"
|
||||
:key="code"
|
||||
class="flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 hover:bg-accent/60"
|
||||
>
|
||||
<Checkbox :model-value="checked.has(code)" @update:model-value="toggle(code)" />
|
||||
<Label class="cursor-pointer truncate text-[13px]">{{ sourceName(code) }}</Label>
|
||||
</label>
|
||||
<p v-if="options.length === 0" class="px-2 py-3 text-[11.5px] text-muted-foreground">
|
||||
未获取到可用源，请先在「设置 → 环境与诊断」安装运行时。
|
||||
</p>
|
||||
</div>
|
||||
</ScrollArea>
|
||||
<div class="mt-1 flex items-center justify-between border-t px-1 pt-1.5">
|
||||
<span class="text-[11px] text-muted-foreground">{{ options.length }} 个可选源</span>
|
||||
<span class="text-[11px] text-muted-foreground">已选 {{ modelValue.length }}</span>
|
||||
</div>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
</template>
|
||||
@@ -0,0 +1,503 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
||||
import { toast } from 'vue-sonner'
|
||||
import {
|
||||
Cloud,
|
||||
FolderOpen,
|
||||
HardDrive,
|
||||
ListMusic,
|
||||
ListPlus,
|
||||
Loader2,
|
||||
Music2,
|
||||
Pencil,
|
||||
Play,
|
||||
Plus,
|
||||
RefreshCw,
|
||||
Search,
|
||||
Trash2
|
||||
} from '@lucide/vue'
|
||||
import { useFeiniuStore } from '@/stores/feiniuStore'
|
||||
import TrackItem from './TrackItem.vue'
|
||||
import PlaylistEditorDialog from './PlaylistEditorDialog.vue'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Empty, EmptyDescription, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
|
||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle
|
||||
} from '@/components/ui/dialog'
|
||||
|
||||
const store = useFeiniuStore()
|
||||
|
||||
/** 曲库视图：飞牛 / 本地 / 歌单 */
|
||||
type LibraryView = 'feiniu' | 'local' | 'playlists'
|
||||
const view = ref<LibraryView>('feiniu')
|
||||
|
||||
const needsLogin = computed(() => !store.config.loggedIn && !store.activeConn)
|
||||
|
||||
const sourceNav = computed(() => [
|
||||
{ value: 'feiniu' as const, label: '飞牛曲库', icon: Cloud, count: store.total || store.tracks.length },
|
||||
{ value: 'local' as const, label: '本地曲库', icon: HardDrive, count: store.localTracks.length },
|
||||
{ value: 'playlists' as const, label: '我的歌单', icon: ListMusic, count: store.playlists.length }
|
||||
])
|
||||
|
||||
// ===== 飞牛曲库：搜索（直接绑定 store.searchKeyword，此前绑定的是孤立局部变量，导致搜索完全无效）=====
|
||||
let searchTimer: ReturnType<typeof setTimeout> | undefined
|
||||
let searchSeq = 0
|
||||
function onSearchInput() {
|
||||
clearTimeout(searchTimer)
|
||||
searchTimer = setTimeout(async () => {
|
||||
const seq = ++searchSeq
|
||||
try {
|
||||
await store.loadTracks(1)
|
||||
} catch (e) {
|
||||
if (seq === searchSeq) toast.error(String(e))
|
||||
}
|
||||
}, 400)
|
||||
}
|
||||
|
||||
function refreshFeiniu() {
|
||||
store.loadTracks(1).catch((e) => toast.error(String(e)))
|
||||
}
|
||||
function refreshLocal() {
|
||||
store.scanLocal().catch((e) => toast.error(String(e)))
|
||||
}
|
||||
|
||||
function playFeiniu() {
|
||||
if (store.tracks.length) store.playQueue(store.tracks, 0)
|
||||
}
|
||||
function playLocal() {
|
||||
if (store.localTracks.length) store.playQueue(store.localTracks, 0)
|
||||
}
|
||||
function playActivePlaylist() {
|
||||
if (activePlaylist.value?.items.length) store.playQueue(activePlaylist.value.items, 0)
|
||||
}
|
||||
|
||||
// ===== 滚动加载更多（飞牛曲库分页）=====
|
||||
const loadMoreRef = ref<HTMLElement | null>(null)
|
||||
let loadMoreObserver: IntersectionObserver | null = null
|
||||
onMounted(() => {
|
||||
loadMoreObserver = new IntersectionObserver(
|
||||
(entries) => {
|
||||
if (!entries.some((e) => e.isIntersecting)) return
|
||||
store.loadMoreTracks().catch(() => {})
|
||||
},
|
||||
{ rootMargin: '400px' }
|
||||
)
|
||||
watch(
|
||||
loadMoreRef,
|
||||
(el) => {
|
||||
if (!loadMoreObserver) return
|
||||
loadMoreObserver.disconnect()
|
||||
if (el) loadMoreObserver.observe(el)
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
})
|
||||
onBeforeUnmount(() => {
|
||||
clearTimeout(searchTimer)
|
||||
loadMoreObserver?.disconnect()
|
||||
})
|
||||
|
||||
// ===== 歌单 =====
|
||||
const activePlaylistId = ref('')
|
||||
const activePlaylist = computed(() => store.playlists.find((p) => p.id === activePlaylistId.value) || null)
|
||||
|
||||
const createOpen = ref(false)
|
||||
const newName = ref('')
|
||||
const renameOpen = ref(false)
|
||||
const renameValue = ref('')
|
||||
/** 编辑歌单音乐（勾选加入 / 批量移出） */
|
||||
const editorOpen = ref(false)
|
||||
|
||||
// 切换歌单时关闭编辑器，避免对着已切换的目标继续编辑
|
||||
watch(activePlaylistId, () => (editorOpen.value = false))
|
||||
|
||||
// 切到歌单视图时自动选中第一个
|
||||
watch(
|
||||
[view, () => store.playlists.length],
|
||||
() => {
|
||||
if (view.value !== 'playlists') return
|
||||
if (activePlaylistId.value && store.playlists.some((p) => p.id === activePlaylistId.value)) return
|
||||
activePlaylistId.value = store.playlists[0]?.id ?? ''
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
function createPlaylist() {
|
||||
const name = newName.value.trim()
|
||||
if (!name) {
|
||||
toast.error('请输入歌单名称')
|
||||
return
|
||||
}
|
||||
activePlaylistId.value = store.createPlaylist(name)
|
||||
newName.value = ''
|
||||
createOpen.value = false
|
||||
view.value = 'playlists'
|
||||
}
|
||||
|
||||
function openRename() {
|
||||
if (!activePlaylist.value) return
|
||||
renameValue.value = activePlaylist.value.name
|
||||
renameOpen.value = true
|
||||
}
|
||||
function confirmRename() {
|
||||
const name = renameValue.value.trim()
|
||||
if (!name || !activePlaylist.value) return
|
||||
store.renamePlaylist(activePlaylist.value.id, name)
|
||||
renameOpen.value = false
|
||||
}
|
||||
|
||||
function removePlaylist() {
|
||||
if (!activePlaylist.value) return
|
||||
store.deletePlaylist(activePlaylist.value.id)
|
||||
activePlaylistId.value = ''
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
await store.init()
|
||||
if (store.config.loggedIn) store.loadTracks(1).catch(() => {})
|
||||
})
|
||||
|
||||
/** 表格表头与 TrackItem 行保持同一条网格 */
|
||||
const GRID = { gridTemplateColumns: '28px 36px minmax(0,1fr) 74px 28px' }
|
||||
|
||||
const listEmptyHint = computed(() => {
|
||||
if (view.value === 'feiniu') {
|
||||
if (store.searchKeyword.trim()) return '没有匹配「' + store.searchKeyword.trim() + '」的曲目'
|
||||
return store.config.loggedIn ? '曲库为空，试试刷新或检查 NAS 曲库目录' : '请先在「设置 → 飞牛音乐连接」登录'
|
||||
}
|
||||
return '暂无本地音乐，点击「扫描本地曲库」或先到「发现音乐」下载'
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex h-full min-h-0">
|
||||
<!-- ===== 左：来源导航 ===== -->
|
||||
<aside class="flex w-[168px] shrink-0 flex-col border-r">
|
||||
<ScrollArea class="min-h-0 flex-1">
|
||||
<div class="flex flex-col p-2">
|
||||
<p class="px-2 pb-1.5 pt-0.5 text-[11px] font-medium tracking-wide text-muted-foreground">曲库</p>
|
||||
|
||||
<!-- 来源：选中态与顶部 Tabs 一致（无容器底色，选中项为浮起胶囊） -->
|
||||
<div class="flex flex-col gap-0.5">
|
||||
<button
|
||||
v-for="nav in sourceNav"
|
||||
:key="nav.value"
|
||||
type="button"
|
||||
class="flex h-8 items-center gap-1.5 rounded-md px-2 text-[13px] transition-colors duration-150"
|
||||
:class="
|
||||
view === nav.value
|
||||
? 'bg-background font-medium text-foreground shadow-sm ring-1 ring-border'
|
||||
: 'text-muted-foreground hover:bg-accent/60 hover:text-foreground'
|
||||
"
|
||||
@click="view = nav.value"
|
||||
>
|
||||
<component :is="nav.icon" class="size-3.5 shrink-0" />
|
||||
<span class="min-w-0 flex-1 truncate">{{ nav.label }}</span>
|
||||
<!-- 数量始终渲染（无歌曲时显示 0），并固定宽度右对齐，保证数字列竖向对齐 -->
|
||||
<span
|
||||
class="min-w-[3ch] shrink-0 text-right text-[10.5px] tabular-nums"
|
||||
:class="view === nav.value ? 'text-muted-foreground' : 'text-muted-foreground/70'"
|
||||
>
|
||||
{{ nav.count > 999 ? '999+' : nav.count }}
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- 歌单列表（选中「我的歌单」时展开） -->
|
||||
<Transition name="pl-list">
|
||||
<div v-if="view === 'playlists'" class="mt-1.5 ml-1.5 flex flex-col gap-0.5 border-l pl-1.5">
|
||||
<button
|
||||
v-for="p in store.playlists"
|
||||
:key="p.id"
|
||||
type="button"
|
||||
class="flex h-7 items-center gap-1.5 rounded-md px-2 text-left text-[12.5px] transition-colors duration-150"
|
||||
:class="
|
||||
activePlaylistId === p.id
|
||||
? 'bg-background font-medium text-foreground shadow-sm ring-1 ring-border'
|
||||
: 'text-muted-foreground hover:bg-accent/60 hover:text-foreground'
|
||||
"
|
||||
@click="activePlaylistId = p.id"
|
||||
>
|
||||
<span class="min-w-0 flex-1 truncate">{{ p.name }}</span>
|
||||
<span class="min-w-[3ch] shrink-0 text-right text-[10.5px] tabular-nums">
|
||||
{{ p.items.length > 999 ? '999+' : p.items.length }}
|
||||
</span>
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="flex h-7 items-center gap-1.5 rounded-md px-2 text-[12.5px] text-muted-foreground transition-colors duration-150 hover:bg-accent/60 hover:text-foreground"
|
||||
@click="createOpen = true"
|
||||
>
|
||||
<Plus class="size-3.5 shrink-0" />
|
||||
<span class="min-w-0 flex-1 truncate">新建歌单</span>
|
||||
</button>
|
||||
<p v-if="!store.playlists.length" class="px-2 py-1 text-[11.5px] text-muted-foreground">
|
||||
还没有歌单
|
||||
</p>
|
||||
</div>
|
||||
</Transition>
|
||||
</div>
|
||||
</ScrollArea>
|
||||
</aside>
|
||||
|
||||
<!-- ===== 右：内容（key 随来源变化，复用全局 tab-animate 切换动画） ===== -->
|
||||
<section :key="view" class="tab-animate flex min-w-0 flex-1 flex-col">
|
||||
<!-- 未登录态 -->
|
||||
<div v-if="needsLogin" class="flex min-h-0 flex-1 items-center justify-center px-6">
|
||||
<Empty>
|
||||
<EmptyMedia>
|
||||
<Music2 class="size-8 text-muted-foreground" />
|
||||
</EmptyMedia>
|
||||
<EmptyTitle>还没有可用的飞牛音乐连接</EmptyTitle>
|
||||
<EmptyDescription>
|
||||
到「设置 → 飞牛音乐连接」添加并登录，或先到「发现音乐」下载歌曲到本地曲库。
|
||||
</EmptyDescription>
|
||||
</Empty>
|
||||
</div>
|
||||
|
||||
<template v-else>
|
||||
<!-- 工具栏 -->
|
||||
<header class="flex shrink-0 items-center gap-2 border-b px-4 py-2.5">
|
||||
<template v-if="view === 'feiniu'">
|
||||
<div class="relative w-full max-w-sm">
|
||||
<Search class="pointer-events-none absolute left-2.5 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" />
|
||||
<Input
|
||||
v-model="store.searchKeyword"
|
||||
class="h-8 pl-8"
|
||||
placeholder="搜索歌名 / 歌手 / 专辑"
|
||||
@input="onSearchInput"
|
||||
@keydown.enter="onSearchInput"
|
||||
/>
|
||||
</div>
|
||||
<Button variant="outline" size="sm" class="h-8" :disabled="store.loading" @click="refreshFeiniu">
|
||||
<RefreshCw :class="store.loading ? 'size-3.5 animate-spin' : 'size-3.5'" />
|
||||
刷新
|
||||
</Button>
|
||||
<span class="ml-1 text-[11.5px] text-muted-foreground">
|
||||
{{ store.tracks.length }}<template v-if="store.total > store.tracks.length"> / {{ store.total }}</template> 首
|
||||
</span>
|
||||
<Button size="sm" class="ml-auto h-8" :disabled="!store.tracks.length" @click="playFeiniu">
|
||||
<Play class="size-3.5" /> 播放全部
|
||||
</Button>
|
||||
</template>
|
||||
|
||||
<template v-else-if="view === 'local'">
|
||||
<Button variant="outline" size="sm" class="h-8" :disabled="store.localScanBusy" @click="refreshLocal">
|
||||
<Loader2 v-if="store.localScanBusy" class="size-3.5 animate-spin" />
|
||||
<FolderOpen v-else class="size-3.5" />
|
||||
扫描本地曲库
|
||||
</Button>
|
||||
<span class="text-[11.5px] text-muted-foreground">{{ store.localTracks.length }} 首</span>
|
||||
<Button size="sm" class="ml-auto h-8" :disabled="!store.localTracks.length" @click="playLocal">
|
||||
<Play class="size-3.5" /> 播放全部
|
||||
</Button>
|
||||
</template>
|
||||
|
||||
<template v-else>
|
||||
<template v-if="activePlaylist">
|
||||
<div class="min-w-0">
|
||||
<div class="truncate text-[13px] font-medium">{{ activePlaylist.name }}</div>
|
||||
<div class="text-[11.5px] text-muted-foreground">{{ activePlaylist.items.length }} 首</div>
|
||||
</div>
|
||||
<div class="ml-auto flex items-center gap-1.5">
|
||||
<Button variant="outline" size="sm" class="h-8" @click="editorOpen = true">
|
||||
<ListPlus class="size-3.5" />
|
||||
编辑音乐
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="size-8"
|
||||
aria-label="重命名歌单"
|
||||
@click="openRename"
|
||||
>
|
||||
<Pencil class="size-3.5" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="size-8 text-destructive hover:text-destructive"
|
||||
aria-label="删除歌单"
|
||||
@click="removePlaylist"
|
||||
>
|
||||
<Trash2 class="size-3.5" />
|
||||
</Button>
|
||||
<Button size="sm" class="h-8" :disabled="!activePlaylist.items.length" @click="playActivePlaylist">
|
||||
<Play class="size-3.5" /> 播放全部
|
||||
</Button>
|
||||
</div>
|
||||
</template>
|
||||
<span v-else class="text-[12.5px] text-muted-foreground">选择左侧歌单查看内容</span>
|
||||
</template>
|
||||
</header>
|
||||
|
||||
<!-- 列表 -->
|
||||
<ScrollArea class="min-h-0 flex-1">
|
||||
<div class="px-2 pb-4">
|
||||
<!-- 表头 -->
|
||||
<div
|
||||
v-if="
|
||||
(view === 'feiniu' && store.tracks.length) ||
|
||||
(view === 'local' && store.localTracks.length) ||
|
||||
(view === 'playlists' && activePlaylist?.items.length)
|
||||
"
|
||||
class="grid h-8 items-center gap-3 px-2 text-[11px] text-muted-foreground"
|
||||
:style="GRID"
|
||||
>
|
||||
<span class="text-center">#</span>
|
||||
<span />
|
||||
<span>标题</span>
|
||||
<span class="text-right">时长</span>
|
||||
<span />
|
||||
</div>
|
||||
|
||||
<!-- 飞牛曲库 -->
|
||||
<template v-if="view === 'feiniu'">
|
||||
<div v-if="store.loading" class="flex items-center justify-center gap-2 py-14 text-[12.5px] text-muted-foreground">
|
||||
<Loader2 class="size-4 animate-spin" /> 加载曲库…
|
||||
</div>
|
||||
<Empty v-else-if="!store.tracks.length">
|
||||
<EmptyMedia><Music2 class="size-8 text-muted-foreground" /></EmptyMedia>
|
||||
<EmptyTitle>{{ store.searchKeyword.trim() ? '没有匹配的曲目' : '曲库为空' }}</EmptyTitle>
|
||||
<EmptyDescription>{{ listEmptyHint }}</EmptyDescription>
|
||||
</Empty>
|
||||
<template v-else>
|
||||
<TrackItem
|
||||
v-for="(t, i) in store.tracks"
|
||||
:key="t.guid || i"
|
||||
:item="t"
|
||||
:index="i"
|
||||
:context="store.tracks"
|
||||
:active="store.current?.guid === t.guid"
|
||||
/>
|
||||
<div
|
||||
v-if="store.hasMoreTracks"
|
||||
ref="loadMoreRef"
|
||||
class="flex items-center justify-center gap-2 py-4 text-[12px] text-muted-foreground"
|
||||
>
|
||||
<Loader2 v-if="store.loadingMore" class="size-3.5 animate-spin" />
|
||||
正在加载更多…
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
<!-- 本地曲库 -->
|
||||
<template v-else-if="view === 'local'">
|
||||
<Empty v-if="!store.localTracks.length && !store.localScanBusy">
|
||||
<EmptyMedia><HardDrive class="size-8 text-muted-foreground" /></EmptyMedia>
|
||||
<EmptyTitle>暂无本地音乐</EmptyTitle>
|
||||
<EmptyDescription>{{ listEmptyHint }}</EmptyDescription>
|
||||
</Empty>
|
||||
<template v-else>
|
||||
<TrackItem
|
||||
v-for="(t, i) in store.localTracks"
|
||||
:key="t.guid || i"
|
||||
:item="t"
|
||||
:index="i"
|
||||
:context="store.localTracks"
|
||||
:active="store.current?.guid === t.guid"
|
||||
/>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
<!-- 歌单详情 -->
|
||||
<template v-else>
|
||||
<template v-if="activePlaylist">
|
||||
<Empty v-if="!activePlaylist.items.length">
|
||||
<EmptyMedia><ListMusic class="size-8 text-muted-foreground" /></EmptyMedia>
|
||||
<EmptyTitle>歌单还是空的</EmptyTitle>
|
||||
<EmptyDescription>
|
||||
点击「编辑音乐」从全部音乐里勾选加入，或在曲库列表中通过「⋯」菜单单首添加。
|
||||
</EmptyDescription>
|
||||
<Button size="sm" class="mt-1" @click="editorOpen = true">
|
||||
<ListPlus class="size-3.5" />
|
||||
编辑音乐
|
||||
</Button>
|
||||
</Empty>
|
||||
<TrackItem
|
||||
v-for="(t, i) in activePlaylist.items"
|
||||
:key="`${t.source}:${t.guid}:${i}`"
|
||||
:item="t"
|
||||
:index="i"
|
||||
:context="activePlaylist.items"
|
||||
:playlist-id="activePlaylist.id"
|
||||
:playlist-index="i"
|
||||
:active="store.current?.guid === t.guid"
|
||||
show-source
|
||||
/>
|
||||
</template>
|
||||
<Empty v-else>
|
||||
<EmptyMedia><ListMusic class="size-8 text-muted-foreground" /></EmptyMedia>
|
||||
<EmptyTitle>还没有歌单</EmptyTitle>
|
||||
<EmptyDescription>点击左侧「新建歌单」开始整理你的收藏。</EmptyDescription>
|
||||
</Empty>
|
||||
</template>
|
||||
</div>
|
||||
</ScrollArea>
|
||||
</template>
|
||||
</section>
|
||||
|
||||
<!-- 新建歌单 -->
|
||||
<Dialog v-model:open="createOpen">
|
||||
<DialogContent class="sm:max-w-sm">
|
||||
<DialogHeader>
|
||||
<DialogTitle>新建歌单</DialogTitle>
|
||||
<DialogDescription>歌单保存在本机，可混合飞牛 NAS 与本地曲目。</DialogDescription>
|
||||
</DialogHeader>
|
||||
<Input v-model="newName" placeholder="歌单名称" @keydown.enter="createPlaylist" />
|
||||
<DialogFooter>
|
||||
<Button variant="outline" @click="createOpen = false">取消</Button>
|
||||
<Button @click="createPlaylist">创建</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
<!-- 重命名歌单 -->
|
||||
<Dialog v-model:open="renameOpen">
|
||||
<DialogContent class="sm:max-w-sm">
|
||||
<DialogHeader>
|
||||
<DialogTitle>重命名歌单</DialogTitle>
|
||||
</DialogHeader>
|
||||
<Input v-model="renameValue" placeholder="歌单名称" @keydown.enter="confirmRename" />
|
||||
<DialogFooter>
|
||||
<Button variant="outline" @click="renameOpen = false">取消</Button>
|
||||
<Button @click="confirmRename">保存</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
<!-- 编辑歌单音乐：从全部音乐勾选加入 / 批量移出 -->
|
||||
<PlaylistEditorDialog
|
||||
v-if="activePlaylist"
|
||||
v-model:open="editorOpen"
|
||||
:playlist-id="activePlaylist.id"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 歌单子树展开 / 收起 */
|
||||
.pl-list-enter-active,
|
||||
.pl-list-leave-active {
|
||||
transition: opacity 0.18s ease, transform 0.18s ease;
|
||||
}
|
||||
.pl-list-enter-from,
|
||||
.pl-list-leave-to {
|
||||
opacity: 0;
|
||||
transform: translateY(-6px);
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.pl-list-enter-active,
|
||||
.pl-list-leave-active {
|
||||
transition: none;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,418 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { toast } from 'vue-sonner'
|
||||
import { Check, HardDrive, Loader2, Music2, Plus, FolderOpen, Minus } from '@lucide/vue'
|
||||
import { useFeiniuStore, type PlayableItem } from '@/stores/feiniuStore'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Checkbox } from '@/components/ui/checkbox'
|
||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle
|
||||
} from '@/components/ui/dialog'
|
||||
|
||||
const props = defineProps<{
|
||||
open: boolean
|
||||
playlistId: string
|
||||
}>()
|
||||
const emit = defineEmits<{ 'update:open': [value: boolean] }>()
|
||||
|
||||
const store = useFeiniuStore()
|
||||
|
||||
const playlist = computed(() => store.playlists.find((p) => p.id === props.playlistId) || null)
|
||||
const itemKey = (t: PlayableItem) => `${t.source}:${t.guid ?? ''}`
|
||||
|
||||
/** 歌单已有曲目 key 集合 */
|
||||
const inPlaylistKeys = computed(() => new Set((playlist.value?.items ?? []).map(itemKey)))
|
||||
|
||||
// ===== 状态 =====
|
||||
const tab = ref<'all' | 'inPlaylist'>('all')
|
||||
const sourceFilter = ref<'all' | 'feiniu' | 'local'>('all')
|
||||
const keyword = ref('')
|
||||
const checked = ref<Set<string>>(new Set())
|
||||
|
||||
function resetState() {
|
||||
tab.value = 'all'
|
||||
sourceFilter.value = 'all'
|
||||
keyword.value = ''
|
||||
checked.value = new Set()
|
||||
limit.value = LIMIT
|
||||
}
|
||||
|
||||
// 打开时重置并确保曲库有数据可挑
|
||||
watch(
|
||||
() => props.open,
|
||||
async (open) => {
|
||||
if (!open) return
|
||||
resetState()
|
||||
if (store.config.loggedIn && store.tracks.length === 0) {
|
||||
store.loadTracks(1).catch((e) => toast.error(String(e)))
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
// 切 tab / 切来源时清空选择，避免"看不到的项仍被选中"造成数量对不上
|
||||
watch([tab, sourceFilter], () => {
|
||||
checked.value = new Set()
|
||||
limit.value = LIMIT
|
||||
})
|
||||
|
||||
// ===== 数据源 =====
|
||||
const allTracks = computed<PlayableItem[]>(() => {
|
||||
if (sourceFilter.value === 'feiniu') return store.tracks
|
||||
if (sourceFilter.value === 'local') return store.localTracks
|
||||
return [...store.tracks, ...store.localTracks]
|
||||
})
|
||||
|
||||
const baseList = computed<PlayableItem[]>(() => {
|
||||
const list = tab.value === 'inPlaylist' ? playlist.value?.items ?? [] : allTracks.value
|
||||
const kw = keyword.value.trim().toLowerCase()
|
||||
if (!kw) return list
|
||||
return list.filter(
|
||||
(t) =>
|
||||
t.title.toLowerCase().includes(kw) ||
|
||||
t.artistNames.toLowerCase().includes(kw) ||
|
||||
(t.album ?? '').toLowerCase().includes(kw)
|
||||
)
|
||||
})
|
||||
|
||||
// 大列表增量渲染
|
||||
const LIMIT = 120
|
||||
const limit = ref(LIMIT)
|
||||
const visibleList = computed(() => baseList.value.slice(0, limit.value))
|
||||
const hasMore = computed(() => baseList.value.length > limit.value)
|
||||
watch(baseList, () => (limit.value = LIMIT))
|
||||
|
||||
/** 已在歌单的曲目在「全部音乐」里不可重复勾选 */
|
||||
function isAlreadyIn(item: PlayableItem): boolean {
|
||||
return tab.value === 'all' && inPlaylistKeys.value.has(itemKey(item))
|
||||
}
|
||||
function isSelectable(item: PlayableItem): boolean {
|
||||
return !isAlreadyIn(item)
|
||||
}
|
||||
|
||||
const selectableKeys = computed(() =>
|
||||
baseList.value.filter((t) => isSelectable(t)).map(itemKey)
|
||||
)
|
||||
const allChecked = computed(
|
||||
() => selectableKeys.value.length > 0 && selectableKeys.value.every((k) => checked.value.has(k))
|
||||
)
|
||||
|
||||
function toggle(key: string) {
|
||||
const next = new Set(checked.value)
|
||||
if (next.has(key)) next.delete(key)
|
||||
else next.add(key)
|
||||
checked.value = next
|
||||
}
|
||||
function toggleAll() {
|
||||
checked.value = allChecked.value ? new Set() : new Set(selectableKeys.value)
|
||||
}
|
||||
|
||||
const selectedItems = computed(() => {
|
||||
const map = new Map<string, PlayableItem>()
|
||||
for (const t of baseList.value) map.set(itemKey(t), t)
|
||||
for (const t of playlist.value?.items ?? []) map.set(itemKey(t), t)
|
||||
const out: PlayableItem[] = []
|
||||
for (const k of checked.value) {
|
||||
const t = map.get(k)
|
||||
if (t) out.push(t)
|
||||
}
|
||||
return out
|
||||
})
|
||||
|
||||
const selectedCount = computed(() => checked.value.size)
|
||||
|
||||
// ===== 执行 =====
|
||||
function apply() {
|
||||
if (!playlist.value) return
|
||||
const n = selectedCount.value
|
||||
if (n === 0) return
|
||||
if (tab.value === 'all') {
|
||||
store.addToPlaylist(playlist.value.id, selectedItems.value)
|
||||
toast.success(`已添加 ${n} 首到「${playlist.value.name}」`)
|
||||
} else {
|
||||
store.removeItemsFromPlaylist(playlist.value.id, [...checked.value])
|
||||
toast.success(`已从「${playlist.value.name}」移除 ${n} 首`)
|
||||
}
|
||||
emit('update:open', false)
|
||||
}
|
||||
|
||||
const localEmpty = computed(() => store.localTracks.length === 0)
|
||||
async function scanLocal() {
|
||||
try {
|
||||
await store.scanLocal()
|
||||
toast.success(`已扫描到 ${store.localTracks.length} 首本地音乐`)
|
||||
} catch (e) {
|
||||
toast.error(String(e))
|
||||
}
|
||||
}
|
||||
|
||||
const durationText = (ms?: number) => (ms ? store.fmtDuration(ms / 1000) : '')
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Dialog :open="open" @update:open="(v: boolean) => emit('update:open', v)">
|
||||
<DialogContent class="flex max-h-[80vh] flex-col overflow-hidden sm:max-w-2xl">
|
||||
<DialogHeader>
|
||||
<DialogTitle>编辑歌单 · {{ playlist?.name || '' }}</DialogTitle>
|
||||
<DialogDescription>
|
||||
从全部音乐里勾选加入歌单，或切换到「已在歌单」批量移出。
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<Tabs v-model="tab" class="flex flex-col">
|
||||
<div class="flex items-center gap-2">
|
||||
<TabsList class="grid w-[220px] shrink-0 grid-cols-2">
|
||||
<TabsTrigger value="all" class="gap-1.5">
|
||||
<Plus class="size-3.5" />全部音乐
|
||||
</TabsTrigger>
|
||||
<TabsTrigger value="inPlaylist" class="gap-1.5">
|
||||
<Minus class="size-3.5" />已在歌单
|
||||
<span class="text-xs text-muted-foreground">({{ playlist?.items.length ?? 0 }})</span>
|
||||
</TabsTrigger>
|
||||
</TabsList>
|
||||
|
||||
<Input
|
||||
v-model="keyword"
|
||||
class="h-8 max-w-56"
|
||||
placeholder="搜索歌名 / 歌手 / 专辑"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- ===== 全部音乐：来源筛选 ===== -->
|
||||
<div v-if="tab === 'all'" class="mt-2 flex items-center gap-1.5">
|
||||
<button
|
||||
v-for="opt in (['all', 'feiniu', 'local'] as const)"
|
||||
:key="opt"
|
||||
type="button"
|
||||
class="rounded-md border px-2 py-1 text-[11.5px] transition-colors"
|
||||
:class="
|
||||
sourceFilter === opt
|
||||
? 'border-primary bg-primary/10 text-foreground'
|
||||
: 'border-border text-muted-foreground hover:bg-accent/50'
|
||||
"
|
||||
@click="sourceFilter = opt"
|
||||
>
|
||||
{{ opt === 'all' ? '全部来源' : opt === 'feiniu' ? '飞牛曲库' : '本地曲库' }}
|
||||
</button>
|
||||
<span class="ml-1 text-[11.5px] text-muted-foreground">{{ baseList.length }} 首</span>
|
||||
|
||||
<label class="ml-auto flex cursor-pointer items-center gap-1.5 text-[11.5px] text-muted-foreground">
|
||||
<Checkbox
|
||||
:model-value="allChecked"
|
||||
:disabled="selectableKeys.length === 0"
|
||||
aria-label="全选当前列表"
|
||||
@update:model-value="toggleAll"
|
||||
/>
|
||||
全选当前列表
|
||||
</label>
|
||||
</div>
|
||||
<div v-else class="mt-2 flex items-center gap-2">
|
||||
<span class="text-[11.5px] text-muted-foreground">{{ baseList.length }} 首</span>
|
||||
<label class="ml-auto flex cursor-pointer items-center gap-1.5 text-[11.5px] text-muted-foreground">
|
||||
<Checkbox
|
||||
:model-value="allChecked"
|
||||
:disabled="selectableKeys.length === 0"
|
||||
aria-label="全选当前列表"
|
||||
@update:model-value="toggleAll"
|
||||
/>
|
||||
全选当前列表
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<TabsContent value="all" class="mt-2">
|
||||
<ScrollArea class="h-[min(320px,45vh)] rounded-md border">
|
||||
<div class="flex flex-col gap-0.5 p-1">
|
||||
<!-- 本地曲库未扫描 -->
|
||||
<div
|
||||
v-if="sourceFilter !== 'feiniu' && localEmpty"
|
||||
class="flex items-center gap-2 rounded-md border border-dashed px-3 py-2.5"
|
||||
>
|
||||
<FolderOpen class="size-4 shrink-0 text-muted-foreground" />
|
||||
<span class="text-[12px] text-muted-foreground">本地曲库尚未扫描，扫描后即可一起勾选。</span>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
class="ml-auto h-7 shrink-0"
|
||||
:disabled="store.localScanBusy"
|
||||
@click="scanLocal"
|
||||
>
|
||||
<Loader2 v-if="store.localScanBusy" class="size-3.5 animate-spin" />
|
||||
<span :class="store.localScanBusy ? 'ml-1.5' : ''">
|
||||
{{ store.localScanBusy ? '扫描中' : '扫描本地' }}
|
||||
</span>
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="store.loading && !store.tracks.length"
|
||||
class="flex items-center justify-center gap-2 py-10 text-[12px] text-muted-foreground"
|
||||
>
|
||||
<Loader2 class="size-4 animate-spin" /> 加载曲库…
|
||||
</div>
|
||||
|
||||
<p
|
||||
v-else-if="baseList.length === 0"
|
||||
class="py-10 text-center text-[12px] text-muted-foreground"
|
||||
>
|
||||
{{ keyword.trim() ? '没有匹配的曲目' : '没有可添加的曲目' }}
|
||||
</p>
|
||||
|
||||
<button
|
||||
v-for="item in visibleList"
|
||||
:key="itemKey(item)"
|
||||
type="button"
|
||||
class="flex h-11 items-center gap-3 rounded-md px-2 text-left transition-colors"
|
||||
:class="
|
||||
isSelectable(item)
|
||||
? 'hover:bg-accent/50'
|
||||
: 'cursor-not-allowed opacity-55'
|
||||
"
|
||||
:disabled="!isSelectable(item)"
|
||||
@click="toggle(itemKey(item))"
|
||||
>
|
||||
<span
|
||||
class="flex size-4 shrink-0 items-center justify-center rounded-[4px] border transition-colors"
|
||||
:class="
|
||||
checked.has(itemKey(item))
|
||||
? 'border-primary bg-primary text-primary-foreground'
|
||||
: 'border-input'
|
||||
"
|
||||
>
|
||||
<Check v-if="checked.has(itemKey(item))" class="size-3" />
|
||||
</span>
|
||||
|
||||
<span class="flex size-8 shrink-0 items-center justify-center rounded bg-muted text-muted-foreground">
|
||||
<HardDrive v-if="item.source === 'local'" class="size-3.5" />
|
||||
<Music2 v-else class="size-3.5" />
|
||||
</span>
|
||||
|
||||
<span class="min-w-0 flex-1">
|
||||
<span class="block truncate text-[13px]">{{ item.title }}</span>
|
||||
<span class="block truncate text-[11.5px] text-muted-foreground">
|
||||
{{ item.artistNames || '—' }}
|
||||
</span>
|
||||
</span>
|
||||
|
||||
<span
|
||||
v-if="isAlreadyIn(item)"
|
||||
class="shrink-0 rounded border border-border px-1.5 py-0.5 text-[10.5px] text-muted-foreground"
|
||||
>
|
||||
已加入
|
||||
</span>
|
||||
<span class="shrink-0 text-[11.5px] tabular-nums text-muted-foreground">
|
||||
{{ durationText(item.durationMs) }}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
<div class="flex items-center justify-center gap-2 py-2">
|
||||
<Button
|
||||
v-if="hasMore"
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
class="text-[11.5px] text-muted-foreground"
|
||||
@click="limit += LIMIT"
|
||||
>
|
||||
显示更多（还剩 {{ baseList.length - limit }} 首）
|
||||
</Button>
|
||||
<Button
|
||||
v-if="sourceFilter !== 'local' && store.hasMoreTracks"
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
class="text-[11.5px] text-muted-foreground"
|
||||
:disabled="store.loadingMore"
|
||||
@click="store.loadMoreTracks()"
|
||||
>
|
||||
<Loader2 v-if="store.loadingMore" class="size-3.5 animate-spin" />
|
||||
<span :class="store.loadingMore ? 'ml-1.5' : ''">
|
||||
{{ store.loadingMore ? '加载中' : '继续加载飞牛曲库' }}
|
||||
</span>
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</ScrollArea>
|
||||
</TabsContent>
|
||||
|
||||
<!-- ===== 已在歌单：批量移出 ===== -->
|
||||
<TabsContent value="inPlaylist" class="mt-2">
|
||||
<ScrollArea class="h-[min(320px,45vh)] rounded-md border">
|
||||
<div class="flex flex-col gap-0.5 p-1">
|
||||
<p
|
||||
v-if="baseList.length === 0"
|
||||
class="py-10 text-center text-[12px] text-muted-foreground"
|
||||
>
|
||||
{{ keyword.trim() ? '没有匹配的曲目' : '这个歌单还没有歌曲' }}
|
||||
</p>
|
||||
<button
|
||||
v-for="item in visibleList"
|
||||
:key="itemKey(item)"
|
||||
type="button"
|
||||
class="flex h-11 items-center gap-3 rounded-md px-2 text-left transition-colors hover:bg-accent/50"
|
||||
@click="toggle(itemKey(item))"
|
||||
>
|
||||
<span
|
||||
class="flex size-4 shrink-0 items-center justify-center rounded-[4px] border transition-colors"
|
||||
:class="
|
||||
checked.has(itemKey(item))
|
||||
? 'border-destructive bg-destructive text-white'
|
||||
: 'border-input'
|
||||
"
|
||||
>
|
||||
<Minus v-if="checked.has(itemKey(item))" class="size-3" />
|
||||
</span>
|
||||
|
||||
<span class="flex size-8 shrink-0 items-center justify-center rounded bg-muted text-muted-foreground">
|
||||
<HardDrive v-if="item.source === 'local'" class="size-3.5" />
|
||||
<Music2 v-else class="size-3.5" />
|
||||
</span>
|
||||
|
||||
<span class="min-w-0 flex-1">
|
||||
<span class="block truncate text-[13px]">{{ item.title }}</span>
|
||||
<span class="block truncate text-[11.5px] text-muted-foreground">
|
||||
{{ item.artistNames || '—' }}
|
||||
</span>
|
||||
</span>
|
||||
<span class="shrink-0 text-[11.5px] tabular-nums text-muted-foreground">
|
||||
{{ durationText(item.durationMs) }}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
<div v-if="hasMore" class="flex justify-center py-2">
|
||||
<Button
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
class="text-[11.5px] text-muted-foreground"
|
||||
@click="limit += LIMIT"
|
||||
>
|
||||
显示更多（还剩 {{ baseList.length - limit }} 首）
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</ScrollArea>
|
||||
</TabsContent>
|
||||
</Tabs>
|
||||
|
||||
<DialogFooter class="items-center gap-2 sm:justify-between">
|
||||
<span class="text-[12px] text-muted-foreground">
|
||||
已选 <span class="font-medium text-foreground">{{ selectedCount }}</span> 首
|
||||
</span>
|
||||
<div class="flex items-center gap-2">
|
||||
<Button variant="outline" @click="emit('update:open', false)">取消</Button>
|
||||
<Button
|
||||
:variant="tab === 'inPlaylist' ? 'destructive' : 'default'"
|
||||
:disabled="selectedCount === 0"
|
||||
@click="apply"
|
||||
>
|
||||
{{ tab === 'inPlaylist' ? `移除 ${selectedCount} 首` : `添加 ${selectedCount} 首` }}
|
||||
</Button>
|
||||
</div>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</template>
|
||||
@@ -0,0 +1,255 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { toast } from 'vue-sonner'
|
||||
import {
|
||||
ArrowDown,
|
||||
ArrowUp,
|
||||
Cloud,
|
||||
FolderOpen,
|
||||
HardDrive,
|
||||
ListPlus,
|
||||
MoreHorizontal,
|
||||
Music2,
|
||||
Play,
|
||||
Plus,
|
||||
Trash2
|
||||
} from '@lucide/vue'
|
||||
import type { PlayableItem } from '@/stores/feiniuStore'
|
||||
import { useFeiniuStore } from '@/stores/feiniuStore'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuContent,
|
||||
DropdownMenuItem,
|
||||
DropdownMenuLabel,
|
||||
DropdownMenuSeparator,
|
||||
DropdownMenuSub,
|
||||
DropdownMenuSubContent,
|
||||
DropdownMenuSubTrigger,
|
||||
DropdownMenuTrigger
|
||||
} from '@/components/ui/dropdown-menu'
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
item: PlayableItem
|
||||
/** 是否为当前播放项 */
|
||||
active?: boolean
|
||||
/** 列表内序号（从 0 开始） */
|
||||
index?: number
|
||||
/** 播放上下文：点击播放时以该列表建立队列 */
|
||||
context?: PlayableItem[]
|
||||
/** 显示专辑列 */
|
||||
showAlbum?: boolean
|
||||
/** 显示来源标识（歌单等混排列表） */
|
||||
showSource?: boolean
|
||||
/** 所属歌单 id（提供时可从菜单移除 / 移动） */
|
||||
playlistId?: string
|
||||
/** 歌单内的序号（用于移除 / 移动） */
|
||||
playlistIndex?: number
|
||||
}>(),
|
||||
{ active: false, index: 0, showAlbum: false, showSource: false }
|
||||
)
|
||||
|
||||
const store = useFeiniuStore()
|
||||
|
||||
const coverUrl = computed(() => {
|
||||
if (props.item.source === 'feiniu' && props.item.coverId && store.mediaPrefix) {
|
||||
return `${store.mediaPrefix}/cover?coverId=${encodeURIComponent(props.item.coverId)}&size=64`
|
||||
}
|
||||
return props.item.coverUrl ?? ''
|
||||
})
|
||||
const coverFailed = ref(false)
|
||||
|
||||
const durationText = computed(() =>
|
||||
store.fmtDuration(props.item.durationMs ? props.item.durationMs / 1000 : undefined)
|
||||
)
|
||||
/** 本地文件没有时长信息时，退化为展示文件大小 */
|
||||
const fallbackText = computed(() => {
|
||||
if (props.item.durationMs) return ''
|
||||
const n = props.item.size
|
||||
if (!n || n <= 0) return ''
|
||||
if (n >= 1048576) return `${(n / 1048576).toFixed(1)} MB`
|
||||
if (n >= 1024) return `${(n / 1024).toFixed(0)} KB`
|
||||
return `${n} B`
|
||||
})
|
||||
|
||||
const isCurrent = computed(
|
||||
() =>
|
||||
props.active ||
|
||||
(store.queueIndex >= 0 &&
|
||||
store.nowPlaying?.guid === props.item.guid &&
|
||||
store.nowPlaying?.source === props.item.source)
|
||||
)
|
||||
|
||||
const playlistLength = computed(
|
||||
() => (props.playlistId ? store.playlists.find((p) => p.id === props.playlistId)?.items.length ?? 1 : 1)
|
||||
)
|
||||
|
||||
function play() {
|
||||
store.playItem(props.item, props.context)
|
||||
}
|
||||
|
||||
function addToPlaylist(playlistId: string) {
|
||||
store.addToPlaylist(playlistId, [props.item])
|
||||
toast.success('已加入歌单')
|
||||
}
|
||||
|
||||
async function uploadToFeiniu() {
|
||||
try {
|
||||
await store.uploadLocalTrack(props.item)
|
||||
toast.success('已上传到飞牛曲库')
|
||||
} catch (e) {
|
||||
toast.error(String(e))
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div
|
||||
class="group grid h-11 items-center gap-3 rounded-md px-2 outline-none transition-colors focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||
:class="[
|
||||
showAlbum
|
||||
? 'grid-cols-[28px_36px_minmax(0,1fr)_minmax(0,0.75fr)_74px_28px]'
|
||||
: 'grid-cols-[28px_36px_minmax(0,1fr)_74px_28px]',
|
||||
isCurrent ? 'bg-accent/60' : 'hover:bg-accent/40'
|
||||
]"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@dblclick="play"
|
||||
@keydown.enter.prevent="play"
|
||||
>
|
||||
<!-- 序号 / 播放态指示：悬停时原位切换，不占用固定的空白列 -->
|
||||
<div class="flex size-7 items-center justify-center text-[11.5px] tabular-nums text-muted-foreground">
|
||||
<span v-if="isCurrent" class="music-eq" :class="{ 'is-paused': !store.playing }"><i /><i /><i /></span>
|
||||
<template v-else>
|
||||
<span class="group-hover:hidden">{{ index + 1 }}</span>
|
||||
<button
|
||||
type="button"
|
||||
class="hidden text-foreground group-hover:block"
|
||||
:aria-label="'播放 ' + item.title"
|
||||
@click.stop="play"
|
||||
>
|
||||
<Play class="size-3.5" />
|
||||
</button>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- 封面 -->
|
||||
<img
|
||||
v-if="coverUrl && !coverFailed"
|
||||
:src="coverUrl"
|
||||
class="size-9 rounded object-cover"
|
||||
alt=""
|
||||
loading="lazy"
|
||||
referrerpolicy="no-referrer"
|
||||
@error="coverFailed = true"
|
||||
/>
|
||||
<div v-else class="flex size-9 items-center justify-center rounded bg-muted text-muted-foreground">
|
||||
<Music2 class="size-4" />
|
||||
</div>
|
||||
|
||||
<!-- 标题 + 元信息 -->
|
||||
<div class="min-w-0">
|
||||
<div class="flex items-center gap-1.5">
|
||||
<span class="truncate text-[13px]" :class="isCurrent ? 'font-medium text-foreground' : ''">
|
||||
{{ item.title }}
|
||||
</span>
|
||||
<span
|
||||
v-if="showSource"
|
||||
class="shrink-0 text-muted-foreground"
|
||||
:title="item.source === 'local' ? '本地文件' : '飞牛 NAS'"
|
||||
>
|
||||
<HardDrive v-if="item.source === 'local'" class="size-3" />
|
||||
<Cloud v-else class="size-3" />
|
||||
</span>
|
||||
</div>
|
||||
<div class="truncate text-[11.5px] text-muted-foreground">{{ item.artistNames || '—' }}</div>
|
||||
</div>
|
||||
|
||||
<!-- 专辑 -->
|
||||
<div v-if="showAlbum" class="truncate text-[11.5px] text-muted-foreground">
|
||||
{{ item.album || '' }}
|
||||
</div>
|
||||
|
||||
<!-- 时长（本地无时长时退化为文件大小） -->
|
||||
<div class="text-right text-[11.5px] tabular-nums text-muted-foreground">
|
||||
<span v-if="item.durationMs">{{ durationText }}</span>
|
||||
<span v-else-if="fallbackText" class="text-[11px]">{{ fallbackText }}</span>
|
||||
<span v-else>--:--</span>
|
||||
</div>
|
||||
|
||||
<!-- 操作菜单 -->
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger as-child>
|
||||
<Button
|
||||
size="icon"
|
||||
variant="ghost"
|
||||
class="size-7 opacity-0 transition-opacity group-hover:opacity-100 data-[state=open]:opacity-100"
|
||||
:aria-label="'更多操作：' + item.title"
|
||||
>
|
||||
<MoreHorizontal class="size-4" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end" class="w-48">
|
||||
<DropdownMenuLabel class="truncate">{{ item.title }}</DropdownMenuLabel>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem @click="play">
|
||||
<Play class="size-4" /> 播放
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem @click="store.playNext(item); toast.success('已加入下一首')">
|
||||
<ListPlus class="size-4" /> 下一首播放
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem @click="store.addToQueue(item); toast.success('已加入队列')">
|
||||
<Plus class="size-4" /> 加入队列
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSub>
|
||||
<DropdownMenuSubTrigger>
|
||||
<Plus class="size-4" /> 加入歌单
|
||||
</DropdownMenuSubTrigger>
|
||||
<DropdownMenuSubContent class="max-h-64 w-48 overflow-y-auto">
|
||||
<DropdownMenuItem v-if="store.playlists.length === 0" disabled>还没有歌单</DropdownMenuItem>
|
||||
<DropdownMenuItem v-for="p in store.playlists" :key="p.id" @click="addToPlaylist(p.id)">
|
||||
{{ p.name }}
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuSubContent>
|
||||
</DropdownMenuSub>
|
||||
|
||||
<template v-if="item.source === 'local'">
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
v-if="store.webdavReady"
|
||||
:disabled="store.uploading"
|
||||
@click="uploadToFeiniu"
|
||||
>
|
||||
<Cloud class="size-4" /> 上传到飞牛曲库
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem disabled>
|
||||
<FolderOpen class="size-4" /> {{ item.dir || '未知目录' }}
|
||||
</DropdownMenuItem>
|
||||
</template>
|
||||
|
||||
<template v-if="playlistId">
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
:disabled="(playlistIndex ?? 0) <= 0"
|
||||
@click="store.moveInPlaylist(playlistId, playlistIndex ?? 0, (playlistIndex ?? 0) - 1)"
|
||||
>
|
||||
<ArrowUp class="size-4" /> 上移
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem
|
||||
:disabled="(playlistIndex ?? 0) >= playlistLength - 1"
|
||||
@click="store.moveInPlaylist(playlistId, playlistIndex ?? 0, (playlistIndex ?? 0) + 1)"
|
||||
>
|
||||
<ArrowDown class="size-4" /> 下移
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem
|
||||
class="text-destructive focus:text-destructive"
|
||||
@click="store.removeFromPlaylist(playlistId, playlistIndex ?? 0)"
|
||||
>
|
||||
<Trash2 class="size-4" /> 从歌单移除
|
||||
</DropdownMenuItem>
|
||||
</template>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,74 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted } from 'vue'
|
||||
import { toast } from 'vue-sonner'
|
||||
import { HardDriveDownload, Loader2, RefreshCw, Trash2 } from '@lucide/vue'
|
||||
import { useFeiniuStore } from '@/stores/feiniuStore'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Switch } from '@/components/ui/switch'
|
||||
|
||||
const store = useFeiniuStore()
|
||||
|
||||
/** 开关状态直接由 store.cacheMode 派生，避免与此前一样出现「开关显示关闭但实际在缓存」 */
|
||||
const cacheEnabled = computed({
|
||||
get: () => store.cacheMode === 'cache',
|
||||
set: (v: boolean) => store.setCacheMode(v ? 'cache' : 'stream')
|
||||
})
|
||||
|
||||
const usedMb = computed(() => Math.round((store.cacheStatus.usedMb ?? 0) * 10) / 10)
|
||||
|
||||
onMounted(() => {
|
||||
void store.ensureCacheStatus()
|
||||
})
|
||||
|
||||
async function refresh() {
|
||||
await store.ensureCacheStatus()
|
||||
toast.success('缓存状态已刷新')
|
||||
}
|
||||
|
||||
async function clearAll() {
|
||||
await store.clearCache()
|
||||
toast.success('缓存已清空')
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-3">
|
||||
<div class="flex items-start justify-between gap-4">
|
||||
<div class="min-w-0">
|
||||
<div class="flex items-center gap-2">
|
||||
<HardDriveDownload class="size-4 text-muted-foreground" />
|
||||
<Label class="font-medium">缓存后播放</Label>
|
||||
</div>
|
||||
<p class="mt-1 text-[11.5px] text-muted-foreground">
|
||||
开启后先把 NAS 音频缓存到本机再播放（首播需要等待整首下载完成）；关闭则直连流式播放，
|
||||
边下边播、拖动即时生效，但每次都要联网拉取。
|
||||
</p>
|
||||
</div>
|
||||
<Switch v-model="cacheEnabled" class="mt-0.5 shrink-0" />
|
||||
</div>
|
||||
|
||||
<div class="flex items-center justify-between gap-4 rounded-lg border bg-card px-3 py-2">
|
||||
<div class="flex items-center gap-2 text-[12.5px]">
|
||||
<span class="text-muted-foreground">当前占用</span>
|
||||
<span class="tabular-nums">{{ usedMb }} MB</span>
|
||||
<span class="text-muted-foreground">· {{ store.cacheStatus.count }} 首</span>
|
||||
<span class="text-[11.5px] text-muted-foreground/80">（超出上限按 LRU 自动淘汰）</span>
|
||||
</div>
|
||||
<div class="flex shrink-0 items-center gap-1.5">
|
||||
<Button variant="ghost" size="icon" class="size-8" title="刷新" @click="refresh">
|
||||
<RefreshCw class="size-3.5" />
|
||||
</Button>
|
||||
<Button variant="outline" size="sm" class="text-destructive" :disabled="!store.cacheStatus.count" @click="clearAll">
|
||||
<Trash2 class="size-3.5" />
|
||||
<span class="ml-1.5">清空缓存</span>
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="flex items-center gap-1.5 text-[11.5px] text-muted-foreground">
|
||||
<Loader2 class="size-3" />
|
||||
切换缓存模式不会中断当前播放，下一首起按新模式取流。
|
||||
</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,237 @@
|
||||
<script setup lang="ts">
|
||||
import { onMounted, ref } from 'vue'
|
||||
import { toast } from 'vue-sonner'
|
||||
import { Check, CircleCheck, Loader2, LogOut, Pencil, Plus, Trash2 } from '@lucide/vue'
|
||||
import { useFeiniuStore, type FeiniuConnection } from '@/stores/feiniuStore'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Switch } from '@/components/ui/switch'
|
||||
import { Badge } from '@/components/ui/badge'
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle
|
||||
} from '@/components/ui/dialog'
|
||||
|
||||
const store = useFeiniuStore()
|
||||
|
||||
const editing = ref<Partial<FeiniuConnection> | null>(null)
|
||||
const editOpen = ref(false)
|
||||
const password = ref('')
|
||||
const testing = ref(false)
|
||||
|
||||
function newForm() {
|
||||
editing.value = { name: '', kind: 'lan', baseUrl: '', username: '', accessCode: '', insecure: false, fnId: '' }
|
||||
password.value = ''
|
||||
editOpen.value = true
|
||||
}
|
||||
|
||||
function editForm(c: FeiniuConnection) {
|
||||
editing.value = { ...c }
|
||||
password.value = ''
|
||||
editOpen.value = true
|
||||
}
|
||||
|
||||
async function save() {
|
||||
if (!editing.value) return
|
||||
if (!editing.value.name?.trim() || !editing.value.baseUrl?.trim()) {
|
||||
toast.error('请填写名称与服务器地址')
|
||||
return
|
||||
}
|
||||
try {
|
||||
const id = await store.saveConnection({
|
||||
id: editing.value.id || '',
|
||||
name: editing.value.name.trim(),
|
||||
kind: editing.value.kind || 'lan',
|
||||
baseUrl: editing.value.baseUrl.trim(),
|
||||
username: editing.value.username || '',
|
||||
accessCode: editing.value.accessCode || '',
|
||||
insecure: !!editing.value.insecure,
|
||||
fnId: editing.value.fnId || ''
|
||||
})
|
||||
if (password.value) {
|
||||
await store.login(id, editing.value.username || '', password.value)
|
||||
}
|
||||
editOpen.value = false
|
||||
toast.success('已保存')
|
||||
} catch (e) {
|
||||
toast.error(String(e))
|
||||
}
|
||||
}
|
||||
|
||||
async function test(c: FeiniuConnection) {
|
||||
if (!password.value) {
|
||||
toast.error('请输入密码再测试')
|
||||
return
|
||||
}
|
||||
testing.value = true
|
||||
try {
|
||||
await store.testConnection(c.id, c.username, password.value)
|
||||
toast.success('连接成功')
|
||||
} catch (e) {
|
||||
toast.error(String(e))
|
||||
} finally {
|
||||
testing.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function activate(c: FeiniuConnection) {
|
||||
await store.activateConnection(c.id)
|
||||
toast.success('已切换为激活连接')
|
||||
}
|
||||
|
||||
async function logout(c: FeiniuConnection) {
|
||||
await store.logout(c.id)
|
||||
toast.success('已登出')
|
||||
}
|
||||
|
||||
async function remove(c: FeiniuConnection) {
|
||||
await store.deleteConnection(c.id)
|
||||
toast.success('已删除')
|
||||
}
|
||||
|
||||
function kindLabel(k: string) {
|
||||
return k === 'lan' ? '局域网' : k === 'frp' ? 'frp 域名' : 'FnConnect'
|
||||
}
|
||||
|
||||
onMounted(() => store.refreshConnections())
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="space-y-3">
|
||||
<div class="flex items-center justify-between">
|
||||
<Label class="text-muted-foreground">飞牛音乐连接</Label>
|
||||
<Button variant="outline" size="sm" @click="newForm">
|
||||
<Plus class="size-4" /> 新建
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-2">
|
||||
<div
|
||||
v-for="c in store.connections"
|
||||
:key="c.id"
|
||||
class="flex items-center gap-3 rounded-lg border bg-card px-3 py-2"
|
||||
>
|
||||
<div class="min-w-0 flex-1">
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="truncate text-sm font-medium">{{ c.name }}</span>
|
||||
<Badge variant="secondary" class="text-[10px]">{{ kindLabel(c.kind) }}</Badge>
|
||||
<Badge v-if="store.activeId === c.id" variant="default" class="text-[10px]">激活</Badge>
|
||||
</div>
|
||||
<div class="truncate text-xs text-muted-foreground">
|
||||
{{ c.baseUrl }}<template v-if="c.username"> · {{ c.username }}</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex shrink-0 items-center gap-1">
|
||||
<span v-if="c.loggedIn" class="mr-1 flex items-center gap-1 text-xs text-emerald-600">
|
||||
<Check class="size-3.5" /> 已登录
|
||||
</span>
|
||||
<Button
|
||||
v-if="store.activeId !== c.id"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="size-8"
|
||||
:title="`设为激活连接（${c.name}）`"
|
||||
:aria-label="`设为激活连接 ${c.name}`"
|
||||
@click="activate(c)"
|
||||
>
|
||||
<CircleCheck class="size-4" />
|
||||
</Button>
|
||||
<Button variant="ghost" size="icon" class="size-8" title="编辑连接" aria-label="编辑连接" @click="editForm(c)">
|
||||
<Pencil class="size-4" />
|
||||
</Button>
|
||||
<Button
|
||||
v-if="c.loggedIn"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="size-8"
|
||||
title="登出"
|
||||
aria-label="登出"
|
||||
@click="logout(c)"
|
||||
>
|
||||
<LogOut class="size-4" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="size-8 text-destructive"
|
||||
title="删除连接"
|
||||
aria-label="删除连接"
|
||||
@click="remove(c)"
|
||||
>
|
||||
<Trash2 class="size-4" />
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
<p v-if="!store.connections.length" class="text-xs text-muted-foreground">
|
||||
还没有连接。新建一个并填写 NAS 地址（局域网 http://192.168.x.x:5666、frp 域名或 FnConnect fnId）。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<Dialog v-model:open="editOpen">
|
||||
<DialogContent class="sm:max-w-md">
|
||||
<DialogHeader>
|
||||
<DialogTitle>{{ editing?.id ? '编辑连接' : '新建连接' }}</DialogTitle>
|
||||
</DialogHeader>
|
||||
<div class="flex flex-col gap-3">
|
||||
<div class="space-y-1.5">
|
||||
<Label>名称</Label>
|
||||
<Input v-model="editing!.name" placeholder="如：家里 NAS / frp 远程 / FnConnect" />
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label>类型</Label>
|
||||
<div class="flex gap-2">
|
||||
<Button
|
||||
v-for="k in (['lan', 'frp', 'fnconnect'] as const)"
|
||||
:key="k"
|
||||
type="button"
|
||||
size="sm"
|
||||
:variant="editing!.kind === k ? 'default' : 'outline'"
|
||||
@click="editing!.kind = k"
|
||||
>
|
||||
{{ kindLabel(k) }}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="editing!.kind === 'fnconnect'" class="space-y-1.5">
|
||||
<Label>FnConnect fnId（fnos.net/xxx 或裸 id）</Label>
|
||||
<Input v-model="editing!.fnId" placeholder="fnos.net/zy2060537" />
|
||||
<p class="text-xs text-muted-foreground">
|
||||
保存后点登录会自动解析到可达地址；服务器地址会回填。
|
||||
</p>
|
||||
</div>
|
||||
<div v-else class="space-y-1.5">
|
||||
<Label>服务器地址</Label>
|
||||
<Input v-model="editing!.baseUrl" placeholder="http://192.168.1.10:5666 或 https://xxx.xxx.com" />
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label>账号</Label>
|
||||
<Input v-model="editing!.username" placeholder="飞牛音乐账号" />
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label>密码{{ password ? '' : '（留空则保留已存 token）' }}</Label>
|
||||
<Input v-model="password" type="password" placeholder="登录密码" />
|
||||
</div>
|
||||
<div class="flex items-center justify-between">
|
||||
<Label class="text-muted-foreground">忽略 HTTPS 证书校验（自签证书时勾选）</Label>
|
||||
<Switch v-model:model-value="editing!.insecure" />
|
||||
</div>
|
||||
</div>
|
||||
<DialogFooter class="gap-2">
|
||||
<Button variant="outline" :disabled="testing" @click="test(editing as unknown as FeiniuConnection)">
|
||||
<Loader2 v-if="testing" class="size-4 animate-spin" /> 测试
|
||||
</Button>
|
||||
<Button @click="save">保存</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
<p class="text-xs text-muted-foreground">
|
||||
提示：上传音乐到 NAS（「下载到飞牛」/ 上传 / 删除）已改用 <strong class="font-medium">WebDAV</strong>，
|
||||
在「存储与上传」分组里配置，无需在此登录文件服务。
|
||||
</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -0,0 +1,48 @@
|
||||
import type { ModuleConfig } from '@/types/module'
|
||||
import type { SearchIndexItem } from '@/stores/searchIndex'
|
||||
|
||||
const searchItems: SearchIndexItem[] = [
|
||||
{
|
||||
title: '曲库',
|
||||
description: '飞牛 NAS 曲库 / 本地曲库 / 自定义歌单，标题栏播放控制',
|
||||
keywords: ['音乐', 'music', '曲库', '我的音乐', '飞牛', 'NAS', '歌单', '播放', '本地', '歌词', '队列'],
|
||||
tab: 'mymusic'
|
||||
},
|
||||
{
|
||||
title: '发现音乐',
|
||||
description: '多平台搜索歌曲并下载（本地 / 飞牛曲库）',
|
||||
keywords: ['发现音乐', '搜索', '下载', '聚合', '在线', '网易云', 'qq', '酷狗'],
|
||||
tab: 'discover'
|
||||
},
|
||||
{
|
||||
title: '音乐设置',
|
||||
description: '飞牛连接、播放缓存、下载目录与 Python 环境检查',
|
||||
keywords: ['音乐设置', '飞牛连接', '缓存', '下载目录', '环境', 'python', 'musicdl'],
|
||||
tab: 'settings'
|
||||
}
|
||||
]
|
||||
|
||||
export const moduleConfig: ModuleConfig = {
|
||||
id: 'music',
|
||||
name: '音乐',
|
||||
icon: 'music',
|
||||
description: '飞牛音乐客户端（NAS 曲库 + 本地曲库 + 发现添加）',
|
||||
category: 'media',
|
||||
defaultEnabled: true,
|
||||
loader: () => import('./MusicModule.vue'),
|
||||
searchItems,
|
||||
lifecycle: {
|
||||
onEnable: async () => {
|
||||
// 桥接进程按需拉起（首次搜索/环境检测时自动启动），此处无需预启动
|
||||
},
|
||||
onDisable: () => {
|
||||
// 禁用模块时停止桥接进程，释放 Python 进程
|
||||
// 直接 invoke 避免模块 index.ts 导入 store 造成循环依赖
|
||||
import('@tauri-apps/api/core')
|
||||
.then(({ invoke }) => invoke('music_stop_bridge'))
|
||||
.catch(() => {})
|
||||
}
|
||||
},
|
||||
// 默认排在「代理」之后、整体第二位（proxy=10、clipboard=20）
|
||||
order: 15
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
/**
|
||||
* 音乐源（musicdl MusicClient 名）→ 中文展示名映射。
|
||||
* 未收录的源回退显示原始客户端名。
|
||||
*/
|
||||
export const SOURCE_NAMES: Record<string, string> = {
|
||||
NeteaseMusicClient: '网易云',
|
||||
QQMusicClient: 'QQ音乐',
|
||||
KugouMusicClient: '酷狗',
|
||||
KuwoMusicClient: '酷我',
|
||||
MiguMusicClient: '咪咕',
|
||||
QianqianMusicClient: '千千',
|
||||
BilibiliMusicClient: 'B站音乐',
|
||||
SodaMusicClient: '汽水音乐',
|
||||
StreetVoiceMusicClient: '街声',
|
||||
FiveSingMusicClient: '5SING',
|
||||
BodianMusicClient: '波点音乐',
|
||||
JooxMusicClient: 'JOOX',
|
||||
MyFreeMP3MusicClient: 'MyFreeMP3',
|
||||
XiaoBaiMusicClient: '小白音乐',
|
||||
JBSouMusicClient: '煎饼搜',
|
||||
TuneHubMusicClient: 'TuneHub',
|
||||
MituMusicClient: '米兔音乐',
|
||||
GequbaoMusicClient: '歌曲宝',
|
||||
GequhaiMusicClient: '歌曲海',
|
||||
KkwsMusicClient: '开开无损',
|
||||
LivePOOMusicClient: '力音',
|
||||
LiziYYMusicClient: '梨子音乐',
|
||||
MGMP3MusicClient: '木瓜音乐',
|
||||
SgogoMusicClient: '搜歌网',
|
||||
TwoT58MusicClient: '爱听音乐',
|
||||
XiagebaMusicClient: '下歌吧',
|
||||
YinyuedaoMusicClient: '音乐岛',
|
||||
ZhuolinMusicClient: '音乐解析',
|
||||
FiveSongMusicClient: '5Song',
|
||||
HTQYYMusicClient: '好听轻音乐',
|
||||
ITingWaMusicClient: '听蛙纯音乐',
|
||||
XimalayaMusicClient: '喜马拉雅',
|
||||
QingtingMusicClient: '蜻蜓FM',
|
||||
LizhiMusicClient: '荔枝FM',
|
||||
LRTSMusicClient: '懒人听书',
|
||||
AppleMusicClient: '苹果音乐',
|
||||
ITunesMusicClient: '苹果播客',
|
||||
DeezerMusicClient: 'Deezer',
|
||||
QobuzMusicClient: 'Qobuz',
|
||||
TIDALMusicClient: 'TIDAL',
|
||||
SpotifyMusicClient: 'Spotify',
|
||||
SoundCloudMusicClient: 'SoundCloud',
|
||||
YouTubeMusicClient: '油管音乐',
|
||||
SunoMusicClient: 'Suno',
|
||||
MOOVMusicClient: '摩音符',
|
||||
JamendoMusicClient: '简音乐',
|
||||
FMAMusicClient: 'FMA',
|
||||
JioSaavnMusicClient: 'JioSaavn',
|
||||
OpenGameArtMusicClient: '开源游戏素材',
|
||||
WikimediaCommonsMusicClient: '维基共享',
|
||||
AudiusMusicClient: 'Audius',
|
||||
CCMixterMusicClient: 'ccMixter'
|
||||
}
|
||||
|
||||
export function sourceName(code: string): string {
|
||||
return SOURCE_NAMES[code] ?? code.replace(/MusicClient$/, '')
|
||||
}
|
||||
|
||||
/** 搜索页/设置页展示的常用源（中文平台为主，与已注册源求交后展示） */
|
||||
export const PICKER_SOURCES: string[] = [
|
||||
'NeteaseMusicClient',
|
||||
'QQMusicClient',
|
||||
'KugouMusicClient',
|
||||
'KuwoMusicClient',
|
||||
'MiguMusicClient',
|
||||
'QianqianMusicClient',
|
||||
'BilibiliMusicClient',
|
||||
'SodaMusicClient',
|
||||
'StreetVoiceMusicClient',
|
||||
'FiveSingMusicClient',
|
||||
'BodianMusicClient',
|
||||
'MyFreeMP3MusicClient',
|
||||
'XiaoBaiMusicClient',
|
||||
'JBSouMusicClient',
|
||||
'TuneHubMusicClient'
|
||||
]
|
||||
@@ -1,6 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, onMounted, onUnmounted, nextTick } from 'vue'
|
||||
import type { Component } from 'vue'
|
||||
import { getCurrentWindow, currentMonitor } from '@tauri-apps/api/window'
|
||||
import { LogicalSize } from '@tauri-apps/api/dpi'
|
||||
import { emit, listen, type UnlistenFn } from '@tauri-apps/api/event'
|
||||
@@ -11,7 +10,6 @@ import { commands } from '@/lib/bindings'
|
||||
import { save } from '@tauri-apps/plugin-dialog'
|
||||
import { toast } from 'vue-sonner'
|
||||
import {
|
||||
Square, Circle, MoveUpRight, ListOrdered, Pencil, Type, Grid3x3, Highlighter,
|
||||
Eraser, Undo2, Redo2, Trash2, Copy, Save, X, Image as ImageIcon,
|
||||
} from '@lucide/vue'
|
||||
import { Button } from '@/components/ui/button'
|
||||
@@ -20,43 +18,21 @@ import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover
|
||||
import { Slider } from '@/components/ui/slider'
|
||||
import { ScrollBar } from '@/components/ui/scroll-area'
|
||||
import { ScrollAreaCorner, ScrollAreaRoot, ScrollAreaViewport } from 'reka-ui'
|
||||
import { TOOL_KEYS, type CaptureData } from './types'
|
||||
import {
|
||||
TOOLS, TOOL_KEYS, COLORS, BLOCK_SIZES, ALPHAS, HANDLES,
|
||||
type ToolType, type Annotation, type DrawableAnnotation, type Point,
|
||||
type RectAnno, type EllipseAnno, type ArrowAnno, type PenAnno, type TextAnno,
|
||||
type MosaicAnno, type HighlightAnno, type NumberAnno, type HandleDir,
|
||||
type CaptureData,
|
||||
} from './types'
|
||||
import {
|
||||
annoHasColor, annoHasLineWidth, annoBBox, hitTestAnno, hitTestTextZone,
|
||||
isAnnoResizable, cloneAnno, applyMove, applyResize, drawSelectionBox,
|
||||
} from './annotations'
|
||||
|
||||
// ===== 标注数据结构 =====
|
||||
type ToolType = 'rect' | 'ellipse' | 'arrow' | 'number' | 'pen' | 'text' | 'mosaic' | 'highlight'
|
||||
// ===== 标注类型（types.ts 共享，与覆盖层一致） =====
|
||||
|
||||
interface Point { x: number; y: number }
|
||||
|
||||
interface RectAnno { type: 'rect'; x1: number; y1: number; x2: number; y2: number; color: string; lineWidth: number }
|
||||
interface EllipseAnno { type: 'ellipse'; x1: number; y1: number; x2: number; y2: number; color: string; lineWidth: number }
|
||||
interface ArrowAnno { type: 'arrow'; x1: number; y1: number; x2: number; y2: number; color: string; lineWidth: number }
|
||||
interface NumberAnno { type: 'number'; x: number; y: number; n: number; color: string; fontSize: number }
|
||||
interface PenAnno { type: 'pen'; points: Point[]; color: string; lineWidth: number }
|
||||
interface TextAnno { type: 'text'; x: number; y: number; text: string; color: string; fontSize: number }
|
||||
interface MosaicAnno { type: 'mosaic'; x1: number; y1: number; x2: number; y2: number; blockSize: number }
|
||||
interface HighlightAnno { type: 'highlight'; x1: number; y1: number; x2: number; y2: number; color: string; alpha: number }
|
||||
|
||||
type Annotation = RectAnno | EllipseAnno | ArrowAnno | NumberAnno | PenAnno | TextAnno | MosaicAnno | HighlightAnno
|
||||
|
||||
/** 可拖拽绘制的标注（不含文字/序号，文字与序号通过点击放置） */
|
||||
type DrawableAnnotation = RectAnno | EllipseAnno | ArrowAnno | PenAnno | MosaicAnno | HighlightAnno
|
||||
|
||||
// ===== 工具与选项（与普通截图编辑栏一致） =====
|
||||
const TOOLS: { value: ToolType; icon: Component; label: string }[] = [
|
||||
{ value: 'rect', icon: Square, label: '矩形' },
|
||||
{ value: 'ellipse', icon: Circle, label: '椭圆' },
|
||||
{ value: 'arrow', icon: MoveUpRight, label: '箭头' },
|
||||
{ value: 'number', icon: ListOrdered, label: '序号' },
|
||||
{ value: 'pen', icon: Pencil, label: '画笔' },
|
||||
{ value: 'text', icon: Type, label: '文字' },
|
||||
{ value: 'mosaic', icon: Grid3x3, label: '马赛克' },
|
||||
{ value: 'highlight', icon: Highlighter, label: '高亮' },
|
||||
]
|
||||
|
||||
/** 与普通截图一致的颜色预设 */
|
||||
const COLORS = ['#ef4444', '#f97316', '#eab308', '#22c55e', '#3b82f6', '#a855f7', '#000000', '#ffffff'] as const
|
||||
const BLOCK_SIZES = [8, 10, 14] as const
|
||||
const ALPHAS = [0.2, 0.4, 0.6] as const
|
||||
// ===== 工具与选项（types.ts 共享 TOOLS/COLORS 等，与普通截图编辑栏一致） =====
|
||||
|
||||
// ===== 状态 =====
|
||||
const canvasRef = ref<HTMLCanvasElement | null>(null)
|
||||
@@ -89,6 +65,19 @@ let loadUnlisten: UnlistenFn | null = null
|
||||
/** 马赛克结果缓存：标注参数不变时跳过重复像素化（长图上拖动其他标注不再卡顿） */
|
||||
let mosaicCache: { key: string; canvas: HTMLCanvasElement } | null = null
|
||||
|
||||
/** Canvas 分层：静态层缓存底图 + 已提交标注，动态层只画 draft + 选中框 + 裁剪遮罩。
|
||||
* 拖拽/调整标注时每帧只需 drawImage(静态层) + 少量动态元素，长图（数万像素高）不卡顿。 */
|
||||
let staticCanvas: HTMLCanvasElement | null = null
|
||||
let staticDirty = true
|
||||
|
||||
// 标注选中 / 拖拽 / 调整大小状态（与覆盖层一致）
|
||||
const selectedAnnoIdx = ref(-1)
|
||||
const draggingAnno = ref(false)
|
||||
const resizingAnno = ref(false)
|
||||
const annoResizeDir = ref<HandleDir | null>(null)
|
||||
const annoDragStart = ref<{ p: Point; orig: Annotation } | null>(null)
|
||||
const annoResizeStart = ref<{ p: Point; orig: Annotation } | null>(null)
|
||||
|
||||
// ===== 上下边界裁剪（长图场景，如滚动截图） =====
|
||||
/** 保留区上边界（像素，相对图片顶部） */
|
||||
const trimTop = ref(0)
|
||||
@@ -97,32 +86,157 @@ const trimBottom = ref(0)
|
||||
/** 正在拖动的裁剪手柄 */
|
||||
const trimming = ref<'top' | 'bottom' | null>(null)
|
||||
|
||||
// 文字输入浮层
|
||||
// 文字输入浮层（textarea 支持多行）
|
||||
const textInputPos = ref<Point | null>(null)
|
||||
const textInputValue = ref('')
|
||||
const textInputEl = ref<HTMLInputElement | null>(null)
|
||||
const textInputEl = ref<HTMLTextAreaElement | null>(null)
|
||||
/** 编辑已有文字标注时的索引（-1 = 新建） */
|
||||
const editingTextAnnoIdx = ref(-1)
|
||||
|
||||
const fontSizePx = computed(() => currentLineWidth.value * 3 + 14)
|
||||
const canUndo = computed(() => annotations.value.length > 0)
|
||||
const canRedo = computed(() => redoStack.value.length > 0)
|
||||
|
||||
// ===== 画布重绘 =====
|
||||
/** 颜色控件：双用途——选中标注时反映并修改其颜色，否则设置新标注默认色 */
|
||||
const effectiveColor = computed<string>({
|
||||
get() {
|
||||
const i = selectedAnnoIdx.value
|
||||
if (i >= 0 && i < annotations.value.length) {
|
||||
const a = annotations.value[i]
|
||||
if (annoHasColor(a)) return (a as { color: string }).color
|
||||
}
|
||||
return currentColor.value
|
||||
},
|
||||
set(v: string) {
|
||||
currentColor.value = v
|
||||
const i = selectedAnnoIdx.value
|
||||
if (i >= 0 && i < annotations.value.length) {
|
||||
const a = annotations.value[i]
|
||||
if (annoHasColor(a)) {
|
||||
(a as { color: string }).color = v
|
||||
markDirtyRedraw()
|
||||
}
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
/** 粗细控件：双用途——选中标注时反映并修改其 lineWidth，否则设置新标注默认粗细 */
|
||||
const effectiveLineWidth = computed<number>({
|
||||
get() {
|
||||
const i = selectedAnnoIdx.value
|
||||
if (i >= 0 && i < annotations.value.length) {
|
||||
const a = annotations.value[i]
|
||||
if (annoHasLineWidth(a)) return (a as { lineWidth: number }).lineWidth
|
||||
}
|
||||
return currentLineWidth.value
|
||||
},
|
||||
set(v: number) {
|
||||
currentLineWidth.value = v
|
||||
const i = selectedAnnoIdx.value
|
||||
if (i >= 0 && i < annotations.value.length) {
|
||||
const a = annotations.value[i]
|
||||
if (annoHasLineWidth(a)) {
|
||||
(a as { lineWidth: number }).lineWidth = v
|
||||
markDirtyRedraw()
|
||||
}
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
/** 控件是否可用（颜色/粗细），选中不支持该属性的标注时禁用 */
|
||||
const colorEnabled = computed(() => {
|
||||
const i = selectedAnnoIdx.value
|
||||
if (i < 0 || i >= annotations.value.length) return true
|
||||
return annoHasColor(annotations.value[i])
|
||||
})
|
||||
const lineWidthEnabled = computed(() => {
|
||||
const i = selectedAnnoIdx.value
|
||||
if (i < 0 || i >= annotations.value.length) return true
|
||||
return annoHasLineWidth(annotations.value[i])
|
||||
})
|
||||
/** 选中标注的 bounding box（画布 1:1 物理坐标，用于手柄定位） */
|
||||
const selectedAnnoBBox = computed(() => {
|
||||
const i = selectedAnnoIdx.value
|
||||
if (i < 0 || i >= annotations.value.length) return null
|
||||
return annoBBox(annotations.value[i])
|
||||
})
|
||||
/** 选中标注是否可调整大小（pen/text/number 仅支持移动） */
|
||||
const selectedAnnoResizable = computed(() => {
|
||||
const i = selectedAnnoIdx.value
|
||||
if (i < 0 || i >= annotations.value.length) return false
|
||||
return isAnnoResizable(annotations.value[i])
|
||||
})
|
||||
/** 文字输入浮层样式（编辑已有文字时用原标注颜色和字号） */
|
||||
const textInputStyle = computed(() => {
|
||||
const p = textInputPos.value
|
||||
if (!p) return {}
|
||||
const ei = editingTextAnnoIdx.value
|
||||
const anno = ei >= 0 ? annotations.value[ei] : null
|
||||
const color = anno && anno.type === 'text' ? anno.color : currentColor.value
|
||||
const fs = anno && anno.type === 'text' ? anno.fontSize : fontSizePx.value
|
||||
return {
|
||||
left: p.x + 'px',
|
||||
top: p.y + 'px',
|
||||
color,
|
||||
fontSize: fs + 'px',
|
||||
}
|
||||
})
|
||||
|
||||
// ===== 画布重绘（静态层 + 动态层） =====
|
||||
/** rAF 节流重绘：鼠标移动事件频率远高于 60fps，合并到下一帧统一重绘 */
|
||||
let redrawRaf = 0
|
||||
function scheduleRedraw() {
|
||||
if (!redrawRaf) {
|
||||
redrawRaf = requestAnimationFrame(() => {
|
||||
redrawRaf = 0
|
||||
redraw()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/** 标记静态层脏 + rAF 节流重绘（annotations 增删/修改后调用） */
|
||||
function markDirtyRedraw() {
|
||||
staticDirty = true
|
||||
scheduleRedraw()
|
||||
}
|
||||
|
||||
/** 重绘静态层（底图 + 已提交标注缓存）。annotations 增删/修改时标记脏。 */
|
||||
function redrawStatic() {
|
||||
const img = baseImage.value
|
||||
if (!img) return
|
||||
const canvas = canvasRef.value
|
||||
if (!canvas) return
|
||||
if (!staticCanvas) staticCanvas = document.createElement('canvas')
|
||||
if (staticCanvas.width !== canvas.width || staticCanvas.height !== canvas.height) {
|
||||
staticCanvas.width = canvas.width
|
||||
staticCanvas.height = canvas.height
|
||||
}
|
||||
const sctx = staticCanvas.getContext('2d')
|
||||
if (!sctx) return
|
||||
sctx.clearRect(0, 0, staticCanvas.width, staticCanvas.height)
|
||||
// 底图画在静态层：拖动标注时底图零成本复用
|
||||
sctx.drawImage(img, 0, 0)
|
||||
for (let i = 0; i < annotations.value.length; i++) {
|
||||
// 正在编辑的文字标注由 textarea 显示，跳过绘制避免重影
|
||||
if (i === editingTextAnnoIdx.value) continue
|
||||
drawAnnotation(sctx, annotations.value[i])
|
||||
}
|
||||
staticDirty = false
|
||||
}
|
||||
|
||||
function redraw() {
|
||||
const canvas = canvasRef.value
|
||||
const img = baseImage.value
|
||||
if (!canvas || !img) return
|
||||
const ctx = canvas.getContext('2d')
|
||||
if (!ctx) return
|
||||
if (staticDirty) redrawStatic()
|
||||
ctx.clearRect(0, 0, canvas.width, canvas.height)
|
||||
// 白色背景填充透明区
|
||||
ctx.fillStyle = '#ffffff'
|
||||
ctx.fillRect(0, 0, canvas.width, canvas.height)
|
||||
// 底图
|
||||
ctx.drawImage(img, 0, 0)
|
||||
// 已提交标注
|
||||
for (const anno of annotations.value) {
|
||||
drawAnnotation(ctx, anno)
|
||||
}
|
||||
// 静态层合成（O(1) drawImage，跳过遍历所有标注）
|
||||
if (staticCanvas) ctx.drawImage(staticCanvas, 0, 0)
|
||||
// 进行中的草稿
|
||||
if (draft.value) {
|
||||
if (draft.value.type === 'mosaic') {
|
||||
@@ -139,6 +253,11 @@ function redraw() {
|
||||
if (top > 0) ctx.fillRect(0, 0, canvas.width, top)
|
||||
if (bottom < canvas.height) ctx.fillRect(0, bottom, canvas.width, canvas.height - bottom)
|
||||
}
|
||||
// 选中标注：绘制虚线边框（手柄用 CSS DOM 定位，便于点击）
|
||||
const si = selectedAnnoIdx.value
|
||||
if (si >= 0 && si < annotations.value.length) {
|
||||
drawSelectionBox(ctx, annoBBox(annotations.value[si]))
|
||||
}
|
||||
}
|
||||
|
||||
function drawAnnotation(ctx: CanvasRenderingContext2D, anno: Annotation) {
|
||||
@@ -230,7 +349,10 @@ function drawText(ctx: CanvasRenderingContext2D, a: TextAnno) {
|
||||
ctx.font = `${a.fontSize}px sans-serif`
|
||||
ctx.fillStyle = a.color
|
||||
ctx.textBaseline = 'top'
|
||||
ctx.fillText(a.text, a.x, a.y)
|
||||
const lines = a.text.split('\n')
|
||||
lines.forEach((line, i) => {
|
||||
ctx.fillText(line, a.x, a.y + i * a.fontSize)
|
||||
})
|
||||
}
|
||||
|
||||
function drawHighlight(ctx: CanvasRenderingContext2D, a: HighlightAnno) {
|
||||
@@ -240,36 +362,54 @@ function drawHighlight(ctx: CanvasRenderingContext2D, a: HighlightAnno) {
|
||||
ctx.globalAlpha = 1
|
||||
}
|
||||
|
||||
/** 对区域做像素化（马赛克）：取块平均色填回。
|
||||
* 缓存：同一标注参数（位置/尺寸/块大小）重复 redraw 时直接 drawImage 复用，
|
||||
* 避免长图上每次重绘都重新 getImageData + 像素化。 */
|
||||
/** 马赛克 tmp 画布（复用，避免拖拽中反复创建） */
|
||||
let mosaicTmp: HTMLCanvasElement | null = null
|
||||
function getMosaicTmp(): HTMLCanvasElement {
|
||||
if (!mosaicTmp) mosaicTmp = document.createElement('canvas')
|
||||
return mosaicTmp
|
||||
}
|
||||
|
||||
/**
|
||||
* 马赛克：从**底图**取区域像素做块平均（与覆盖层一致）。
|
||||
* 从底图而非画布取：画布上已绘制的其他标注不会被二次像素化；
|
||||
* 且缓存命中时拖动其他标注零像素化开销（长图不卡顿）。
|
||||
*/
|
||||
function applyMosaic(ctx: CanvasRenderingContext2D, a: MosaicAnno) {
|
||||
const canvas = ctx.canvas
|
||||
const img = baseImage.value
|
||||
if (!img) return
|
||||
const block = Math.max(1, a.blockSize)
|
||||
const sx = Math.max(0, Math.floor(Math.min(a.x1, a.x2)))
|
||||
const sy = Math.max(0, Math.floor(Math.min(a.y1, a.y2)))
|
||||
const sw = Math.min(canvas.width - sx, Math.floor(Math.abs(a.x2 - a.x1)))
|
||||
const sh = Math.min(canvas.height - sy, Math.floor(Math.abs(a.y2 - a.y1)))
|
||||
if (sw <= 0 || sh <= 0) return
|
||||
const cacheKey = `${sx},${sy},${sw},${sh},${block}`
|
||||
const x1 = Math.min(a.x1, a.x2)
|
||||
const y1 = Math.min(a.y1, a.y2)
|
||||
const w = Math.abs(a.x2 - a.x1)
|
||||
const h = Math.abs(a.y2 - a.y1)
|
||||
if (w < 1 || h < 1) return
|
||||
const cw = Math.min(Math.ceil(w), img.naturalWidth - Math.floor(x1))
|
||||
const ch = Math.min(Math.ceil(h), img.naturalHeight - Math.floor(y1))
|
||||
if (cw < 1 || ch < 1) return
|
||||
const cacheKey = `${a.x1},${a.y1},${a.x2},${a.y2},${block}`
|
||||
if (mosaicCache?.key === cacheKey) {
|
||||
ctx.drawImage(mosaicCache.canvas, sx, sy)
|
||||
ctx.drawImage(mosaicCache.canvas, Math.floor(x1), Math.floor(y1))
|
||||
return
|
||||
}
|
||||
const imageData = ctx.getImageData(sx, sy, sw, sh)
|
||||
const tmp = getMosaicTmp()
|
||||
tmp.width = cw
|
||||
tmp.height = ch
|
||||
const tctx = tmp.getContext('2d')
|
||||
if (!tctx) return
|
||||
tctx.drawImage(img, Math.floor(x1), Math.floor(y1), cw, ch, 0, 0, cw, ch)
|
||||
const imageData = tctx.getImageData(0, 0, cw, ch)
|
||||
const data = imageData.data
|
||||
for (let by = 0; by < sh; by += block) {
|
||||
for (let bx = 0; bx < sw; bx += block) {
|
||||
let r = 0, g = 0, b = 0, alpha = 0, count = 0
|
||||
const maxJ = Math.min(by + block, sh)
|
||||
const maxI = Math.min(bx + block, sw)
|
||||
for (let by = 0; by < ch; by += block) {
|
||||
for (let bx = 0; bx < cw; bx += block) {
|
||||
let r = 0, g = 0, b = 0, count = 0
|
||||
const maxJ = Math.min(by + block, ch)
|
||||
const maxI = Math.min(bx + block, cw)
|
||||
for (let j = by; j < maxJ; j++) {
|
||||
for (let i = bx; i < maxI; i++) {
|
||||
const idx = (j * sw + i) * 4
|
||||
const idx = (j * cw + i) * 4
|
||||
r += data[idx]
|
||||
g += data[idx + 1]
|
||||
b += data[idx + 2]
|
||||
alpha += data[idx + 3]
|
||||
count++
|
||||
}
|
||||
}
|
||||
@@ -277,25 +417,25 @@ function applyMosaic(ctx: CanvasRenderingContext2D, a: MosaicAnno) {
|
||||
r = Math.round(r / count)
|
||||
g = Math.round(g / count)
|
||||
b = Math.round(b / count)
|
||||
alpha = Math.round(alpha / count)
|
||||
for (let j = by; j < maxJ; j++) {
|
||||
for (let i = bx; i < maxI; i++) {
|
||||
const idx = (j * sw + i) * 4
|
||||
const idx = (j * cw + i) * 4
|
||||
data[idx] = r
|
||||
data[idx + 1] = g
|
||||
data[idx + 2] = b
|
||||
data[idx + 3] = alpha
|
||||
data[idx + 3] = 255
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ctx.putImageData(imageData, sx, sy)
|
||||
// 缓存像素化结果（undo/redo/清空/新图加载时失效）
|
||||
tctx.putImageData(imageData, 0, 0)
|
||||
// 缓存结果（undo/redo/清空/新图加载时失效）
|
||||
const cached = document.createElement('canvas')
|
||||
cached.width = sw
|
||||
cached.height = sh
|
||||
cached.getContext('2d')?.putImageData(imageData, 0, 0)
|
||||
cached.width = cw
|
||||
cached.height = ch
|
||||
cached.getContext('2d')?.drawImage(tmp, 0, 0)
|
||||
mosaicCache = { key: cacheKey, canvas: cached }
|
||||
ctx.drawImage(cached, Math.floor(x1), Math.floor(y1))
|
||||
}
|
||||
|
||||
/** 马赛克拖拽中的虚线框预览（避免每帧像素化开销） */
|
||||
@@ -307,23 +447,88 @@ function drawMosaicDraft(ctx: CanvasRenderingContext2D, a: MosaicAnno) {
|
||||
ctx.setLineDash([])
|
||||
}
|
||||
|
||||
// ===== 鼠标交互 =====
|
||||
// ===== 鼠标交互（与覆盖层一致：选中 / 拖拽 / 调整大小 / 绘制） =====
|
||||
function getPoint(e: MouseEvent): Point {
|
||||
const canvas = canvasRef.value!
|
||||
const rect = canvas.getBoundingClientRect()
|
||||
const scaleX = canvas.width / rect.width
|
||||
const scaleY = canvas.height / rect.height
|
||||
return { x: (e.clientX - rect.left) * scaleX, y: (e.clientY - rect.top) * scaleY }
|
||||
return {
|
||||
x: Math.min(canvas.width, Math.max(0, (e.clientX - rect.left) * scaleX)),
|
||||
y: Math.min(canvas.height, Math.max(0, (e.clientY - rect.top) * scaleY)),
|
||||
}
|
||||
}
|
||||
|
||||
/** 标注手柄位置（画布 1:1，物理坐标 = CSS 偏移） */
|
||||
function annoHandleStyle(dir: HandleDir) {
|
||||
const bb = selectedAnnoBBox.value
|
||||
if (!bb) return { display: 'none' }
|
||||
let cx = 0
|
||||
let cy = 0
|
||||
switch (dir) {
|
||||
case 'nw': cx = bb.x; cy = bb.y; break
|
||||
case 'n': cx = bb.x + bb.w / 2; cy = bb.y; break
|
||||
case 'ne': cx = bb.x + bb.w; cy = bb.y; break
|
||||
case 'e': cx = bb.x + bb.w; cy = bb.y + bb.h / 2; break
|
||||
case 'se': cx = bb.x + bb.w; cy = bb.y + bb.h; break
|
||||
case 's': cx = bb.x + bb.w / 2; cy = bb.y + bb.h; break
|
||||
case 'sw': cx = bb.x; cy = bb.y + bb.h; break
|
||||
case 'w': cx = bb.x; cy = bb.y + bb.h / 2; break
|
||||
}
|
||||
return { left: cx + 'px', top: cy + 'px' }
|
||||
}
|
||||
|
||||
/** 标注手柄按下：进入调整大小模式 */
|
||||
function onAnnoHandleMouseDown(dir: HandleDir, e: MouseEvent) {
|
||||
if (selectedAnnoIdx.value < 0) return
|
||||
e.preventDefault()
|
||||
e.stopPropagation()
|
||||
const p = getPoint(e)
|
||||
const cur = annotations.value[selectedAnnoIdx.value]
|
||||
if (!cur) return
|
||||
resizingAnno.value = true
|
||||
annoResizeDir.value = dir
|
||||
annoResizeStart.value = { p: { ...p }, orig: cloneAnno(cur) }
|
||||
}
|
||||
|
||||
function onMouseDown(e: MouseEvent) {
|
||||
if (!baseImage.value || !loaded.value) return
|
||||
const p = getPoint(e)
|
||||
// 文字工具：阻止 mousedown 默认行为，防止浏览器抢占焦点导致 textarea 立即失焦
|
||||
if (currentTool.value === 'text') {
|
||||
startTextInput(p)
|
||||
e.preventDefault()
|
||||
}
|
||||
const p = getPoint(e)
|
||||
// 点击已有标注 → 选中并进入拖拽模式
|
||||
const idx = hitTestAnno(annotations.value, p)
|
||||
if (idx >= 0) {
|
||||
// 先提交未完成的文字输入（点击别处放置/选中时，旧输入框提交）
|
||||
if (textInputPos.value) commitText()
|
||||
// 文字工具 + 点击文字标注：内容区→编辑，边框区→移动
|
||||
if (currentTool.value === 'text' && annotations.value[idx].type === 'text') {
|
||||
const zone = hitTestTextZone(annotations.value[idx] as TextAnno, p)
|
||||
if (zone === 'core') {
|
||||
openTextInput(p, idx)
|
||||
return
|
||||
}
|
||||
// border → 选中并拖拽（移动），继续往下走
|
||||
}
|
||||
selectedAnnoIdx.value = idx
|
||||
draggingAnno.value = true
|
||||
annoDragStart.value = { p: { ...p }, orig: cloneAnno(annotations.value[idx]) }
|
||||
markDirtyRedraw()
|
||||
return
|
||||
}
|
||||
// 序号：点击即放置（自增），不进入拖拽
|
||||
// 点击空白处 → 取消选中，开始绘制新标注
|
||||
selectedAnnoIdx.value = -1
|
||||
beginDraft(p)
|
||||
}
|
||||
|
||||
function beginDraft(p: Point) {
|
||||
if (currentTool.value === 'text') {
|
||||
openTextInput(p)
|
||||
return
|
||||
}
|
||||
// 序号：点击即放置（自增），不进入拖拽；放置后自动选中便于移动
|
||||
if (currentTool.value === 'number') {
|
||||
annotations.value.push({
|
||||
type: 'number',
|
||||
@@ -335,45 +540,61 @@ function onMouseDown(e: MouseEvent) {
|
||||
})
|
||||
numberSeq.value++
|
||||
redoStack.value = []
|
||||
redraw()
|
||||
selectedAnnoIdx.value = annotations.value.length - 1
|
||||
markDirtyRedraw()
|
||||
return
|
||||
}
|
||||
isDrawing.value = true
|
||||
const color = currentColor.value
|
||||
const lw = currentLineWidth.value
|
||||
switch (currentTool.value) {
|
||||
case 'rect':
|
||||
draft.value = { type: 'rect', x1: p.x, y1: p.y, x2: p.x, y2: p.y, color: currentColor.value, lineWidth: currentLineWidth.value }
|
||||
draft.value = { type: 'rect', x1: p.x, y1: p.y, x2: p.x, y2: p.y, color, lineWidth: lw }
|
||||
break
|
||||
case 'ellipse':
|
||||
draft.value = { type: 'ellipse', x1: p.x, y1: p.y, x2: p.x, y2: p.y, color: currentColor.value, lineWidth: currentLineWidth.value }
|
||||
draft.value = { type: 'ellipse', x1: p.x, y1: p.y, x2: p.x, y2: p.y, color, lineWidth: lw }
|
||||
break
|
||||
case 'arrow':
|
||||
draft.value = { type: 'arrow', x1: p.x, y1: p.y, x2: p.x, y2: p.y, color: currentColor.value, lineWidth: currentLineWidth.value }
|
||||
draft.value = { type: 'arrow', x1: p.x, y1: p.y, x2: p.x, y2: p.y, color, lineWidth: lw }
|
||||
break
|
||||
case 'pen':
|
||||
draft.value = { type: 'pen', points: [p], color: currentColor.value, lineWidth: currentLineWidth.value }
|
||||
draft.value = { type: 'pen', points: [p], color, lineWidth: lw }
|
||||
break
|
||||
case 'mosaic':
|
||||
draft.value = { type: 'mosaic', x1: p.x, y1: p.y, x2: p.x, y2: p.y, blockSize: blockSize.value }
|
||||
break
|
||||
case 'highlight':
|
||||
draft.value = { type: 'highlight', x1: p.x, y1: p.y, x2: p.x, y2: p.y, color: currentColor.value, alpha: highlightAlpha.value }
|
||||
draft.value = { type: 'highlight', x1: p.x, y1: p.y, x2: p.x, y2: p.y, color, alpha: highlightAlpha.value }
|
||||
break
|
||||
}
|
||||
redraw()
|
||||
}
|
||||
|
||||
// ===== 画布重绘（rAF 节流） =====
|
||||
/** 连续鼠标移动时每帧最多重绘一次，避免 mousemove 高频事件（每帧多次）触发多次全量重绘 */
|
||||
let redrawRaf = 0
|
||||
function scheduleRedraw() {
|
||||
if (redrawRaf) return
|
||||
redrawRaf = requestAnimationFrame(() => {
|
||||
redrawRaf = 0
|
||||
redraw()
|
||||
})
|
||||
scheduleRedraw()
|
||||
}
|
||||
|
||||
function onMouseMove(e: MouseEvent) {
|
||||
if (resizingAnno.value && annoResizeStart.value) {
|
||||
// 调整选中标注大小
|
||||
const p = getPoint(e)
|
||||
const dx = p.x - annoResizeStart.value.p.x
|
||||
const dy = p.y - annoResizeStart.value.p.y
|
||||
const cur = annotations.value[selectedAnnoIdx.value]
|
||||
if (cur && annoResizeDir.value) {
|
||||
applyResize(cur, annoResizeStart.value.orig, annoResizeDir.value, dx, dy)
|
||||
markDirtyRedraw()
|
||||
}
|
||||
return
|
||||
}
|
||||
if (draggingAnno.value && annoDragStart.value) {
|
||||
// 移动选中标注
|
||||
const p = getPoint(e)
|
||||
const dx = p.x - annoDragStart.value.p.x
|
||||
const dy = p.y - annoDragStart.value.p.y
|
||||
const cur = annotations.value[selectedAnnoIdx.value]
|
||||
if (cur) {
|
||||
applyMove(cur, annoDragStart.value.orig, dx, dy)
|
||||
markDirtyRedraw()
|
||||
}
|
||||
return
|
||||
}
|
||||
if (!isDrawing.value || !draft.value) return
|
||||
const p = getPoint(e)
|
||||
const d = draft.value
|
||||
@@ -387,6 +608,19 @@ function onMouseMove(e: MouseEvent) {
|
||||
}
|
||||
|
||||
function onMouseUp() {
|
||||
if (resizingAnno.value) {
|
||||
// 调整大小结束
|
||||
resizingAnno.value = false
|
||||
annoResizeDir.value = null
|
||||
annoResizeStart.value = null
|
||||
return
|
||||
}
|
||||
if (draggingAnno.value) {
|
||||
// 拖拽结束（点击未移动时保持选中）
|
||||
draggingAnno.value = false
|
||||
annoDragStart.value = null
|
||||
return
|
||||
}
|
||||
if (!isDrawing.value || !draft.value) return
|
||||
const d = draft.value
|
||||
// 过滤无效（空）标注
|
||||
@@ -399,10 +633,14 @@ function onMouseUp() {
|
||||
if (valid) {
|
||||
annotations.value.push(d)
|
||||
redoStack.value = []
|
||||
// 自动选中新创建的标注，便于立即调整位置和大小
|
||||
selectedAnnoIdx.value = annotations.value.length - 1
|
||||
} else {
|
||||
selectedAnnoIdx.value = -1
|
||||
}
|
||||
draft.value = null
|
||||
isDrawing.value = false
|
||||
redraw()
|
||||
markDirtyRedraw()
|
||||
}
|
||||
|
||||
// ===== 上下边界裁剪拖拽 =====
|
||||
@@ -422,7 +660,7 @@ function onTrimMove(e: MouseEvent) {
|
||||
} else {
|
||||
trimBottom.value = Math.max(trimTop.value + 10, Math.min(Math.round(p.y), h))
|
||||
}
|
||||
redraw()
|
||||
scheduleRedraw()
|
||||
}
|
||||
|
||||
function onTrimUp() {
|
||||
@@ -431,11 +669,30 @@ function onTrimUp() {
|
||||
window.removeEventListener('mouseup', onTrimUp)
|
||||
}
|
||||
|
||||
// ===== 文字输入 =====
|
||||
function startTextInput(p: Point) {
|
||||
textInputPos.value = { x: p.x, y: p.y }
|
||||
// ===== 文字输入（textarea 多行，与覆盖层一致） =====
|
||||
function openTextInput(p: Point, editIdx: number = -1) {
|
||||
// 先提交当前未完成的文字（点击别处放置新文字时，旧输入框会失焦）
|
||||
commitText()
|
||||
if (editIdx >= 0 && editIdx < annotations.value.length) {
|
||||
const anno = annotations.value[editIdx]
|
||||
if (anno && anno.type === 'text') {
|
||||
editingTextAnnoIdx.value = editIdx
|
||||
textInputPos.value = { x: anno.x, y: anno.y }
|
||||
textInputValue.value = anno.text
|
||||
markDirtyRedraw() // 隐藏原文字，由 textarea 显示
|
||||
nextTick(() => {
|
||||
textInputEl.value?.focus()
|
||||
autoResizeTextarea()
|
||||
})
|
||||
return
|
||||
}
|
||||
}
|
||||
textInputPos.value = p
|
||||
textInputValue.value = ''
|
||||
nextTick(() => textInputEl.value?.focus())
|
||||
nextTick(() => {
|
||||
textInputEl.value?.focus()
|
||||
autoResizeTextarea()
|
||||
})
|
||||
}
|
||||
|
||||
function commitText() {
|
||||
@@ -444,6 +701,26 @@ function commitText() {
|
||||
textInputPos.value = null
|
||||
const value = textInputValue.value.trim()
|
||||
textInputValue.value = ''
|
||||
const editIdx = editingTextAnnoIdx.value
|
||||
editingTextAnnoIdx.value = -1
|
||||
// 编辑已有文字标注
|
||||
if (editIdx >= 0 && editIdx < annotations.value.length) {
|
||||
const anno = annotations.value[editIdx]
|
||||
if (anno && anno.type === 'text') {
|
||||
if (value) {
|
||||
anno.text = value
|
||||
selectedAnnoIdx.value = editIdx
|
||||
} else {
|
||||
// 空文字 → 删除
|
||||
annotations.value.splice(editIdx, 1)
|
||||
selectedAnnoIdx.value = -1
|
||||
redoStack.value = []
|
||||
}
|
||||
markDirtyRedraw()
|
||||
}
|
||||
return
|
||||
}
|
||||
// 新建文字标注
|
||||
if (value) {
|
||||
annotations.value.push({
|
||||
type: 'text',
|
||||
@@ -454,13 +731,37 @@ function commitText() {
|
||||
fontSize: fontSizePx.value,
|
||||
})
|
||||
redoStack.value = []
|
||||
redraw()
|
||||
// 自动选中新创建的文字
|
||||
selectedAnnoIdx.value = annotations.value.length - 1
|
||||
markDirtyRedraw()
|
||||
}
|
||||
}
|
||||
|
||||
function cancelText() {
|
||||
textInputPos.value = null
|
||||
textInputValue.value = ''
|
||||
editingTextAnnoIdx.value = -1
|
||||
markDirtyRedraw() // 恢复显示原文字标注
|
||||
}
|
||||
|
||||
/** 自动调整 textarea 高度以适应内容 */
|
||||
function autoResizeTextarea() {
|
||||
const el = textInputEl.value
|
||||
if (!el) return
|
||||
el.style.height = 'auto'
|
||||
el.style.height = el.scrollHeight + 'px'
|
||||
}
|
||||
|
||||
// ===== 删除选中标注 =====
|
||||
function deleteSelectedAnno() {
|
||||
const i = selectedAnnoIdx.value
|
||||
if (i < 0 || i >= annotations.value.length) return
|
||||
const a = annotations.value[i]
|
||||
if (a.type === 'number') numberSeq.value = Math.max(1, numberSeq.value - 1)
|
||||
annotations.value.splice(i, 1)
|
||||
selectedAnnoIdx.value = -1
|
||||
redoStack.value = []
|
||||
markDirtyRedraw()
|
||||
}
|
||||
|
||||
// ===== 撤销 / 重做 / 清空 =====
|
||||
@@ -470,8 +771,10 @@ function undo() {
|
||||
redoStack.value.push(last)
|
||||
// 撤销序号标注后回退序号，避免后续新增序号跳号
|
||||
if (last.type === 'number') numberSeq.value = Math.max(1, numberSeq.value - 1)
|
||||
// 撤销后选中可能失效，重置
|
||||
if (selectedAnnoIdx.value >= annotations.value.length) selectedAnnoIdx.value = -1
|
||||
mosaicCache = null
|
||||
redraw()
|
||||
markDirtyRedraw()
|
||||
}
|
||||
|
||||
function redo() {
|
||||
@@ -479,16 +782,18 @@ function redo() {
|
||||
const a = redoStack.value.pop()!
|
||||
annotations.value.push(a)
|
||||
if (a.type === 'number') numberSeq.value = a.n + 1
|
||||
selectedAnnoIdx.value = -1
|
||||
mosaicCache = null
|
||||
redraw()
|
||||
markDirtyRedraw()
|
||||
}
|
||||
|
||||
function clearAll() {
|
||||
annotations.value = []
|
||||
redoStack.value = []
|
||||
numberSeq.value = 1
|
||||
selectedAnnoIdx.value = -1
|
||||
mosaicCache = null
|
||||
redraw()
|
||||
markDirtyRedraw()
|
||||
}
|
||||
|
||||
// ===== 导出 =====
|
||||
@@ -589,7 +894,16 @@ async function closeWindow() {
|
||||
isDrawing.value = false
|
||||
annotations.value = []
|
||||
redoStack.value = []
|
||||
selectedAnnoIdx.value = -1
|
||||
draggingAnno.value = false
|
||||
resizingAnno.value = false
|
||||
annoDragStart.value = null
|
||||
annoResizeStart.value = null
|
||||
editingTextAnnoIdx.value = -1
|
||||
textInputPos.value = null
|
||||
mosaicCache = null
|
||||
mosaicTmp = null
|
||||
staticDirty = true
|
||||
if (objectUrl) {
|
||||
URL.revokeObjectURL(objectUrl)
|
||||
objectUrl = ''
|
||||
@@ -623,10 +937,10 @@ function onStorageChange(e: StorageEvent) {
|
||||
if (e.key === STORAGE_KEYS.appSettings) applyTheme()
|
||||
}
|
||||
|
||||
/** 自定义颜色选择：更新 customColor 并设为当前颜色 */
|
||||
/** 自定义颜色选择：更新 customColor 并设为当前颜色/选中标注颜色 */
|
||||
function onCustomColorPick(color: string) {
|
||||
customColor.value = color
|
||||
currentColor.value = color
|
||||
effectiveColor.value = color
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -657,6 +971,17 @@ function onKeyDown(e: KeyboardEvent) {
|
||||
// 输入控件（文字标注 / 取色器 / 滑杆）聚焦时不响应快捷键
|
||||
const t = e.target as HTMLElement | null
|
||||
if (t && (t.tagName === 'INPUT' || t.tagName === 'TEXTAREA' || t.isContentEditable)) return
|
||||
// 文字输入浮层激活时：Ctrl+Enter 提交，Esc 取消（普通 Enter 留给 textarea 换行）
|
||||
if (textInputPos.value) {
|
||||
if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
|
||||
e.preventDefault()
|
||||
commitText()
|
||||
} else if (e.key === 'Escape') {
|
||||
e.stopPropagation()
|
||||
cancelText()
|
||||
}
|
||||
return
|
||||
}
|
||||
const k = e.key.toLowerCase()
|
||||
const mod = e.ctrlKey || e.metaKey
|
||||
if (mod && !e.shiftKey && k === 'z') {
|
||||
@@ -679,6 +1004,12 @@ function onKeyDown(e: KeyboardEvent) {
|
||||
void saveToFile()
|
||||
return
|
||||
}
|
||||
// Delete/Backspace 删除选中的标注
|
||||
if ((e.key === 'Delete' || e.key === 'Backspace') && selectedAnnoIdx.value >= 0) {
|
||||
e.preventDefault()
|
||||
deleteSelectedAnno()
|
||||
return
|
||||
}
|
||||
if (k === 'enter') {
|
||||
e.preventDefault()
|
||||
void copyAndClose()
|
||||
@@ -686,7 +1017,13 @@ function onKeyDown(e: KeyboardEvent) {
|
||||
}
|
||||
if (k === 'escape') {
|
||||
e.preventDefault()
|
||||
void closeWindow()
|
||||
// 选中状态下 Esc 先取消选中，再次按才关闭窗口（与覆盖层一致）
|
||||
if (selectedAnnoIdx.value >= 0) {
|
||||
selectedAnnoIdx.value = -1
|
||||
markDirtyRedraw()
|
||||
} else {
|
||||
void closeWindow()
|
||||
}
|
||||
return
|
||||
}
|
||||
if (!mod && !e.altKey) {
|
||||
@@ -723,6 +1060,14 @@ async function loadPendingImage() {
|
||||
isDrawing.value = false
|
||||
numberSeq.value = 1
|
||||
mosaicCache = null
|
||||
staticDirty = true
|
||||
selectedAnnoIdx.value = -1
|
||||
draggingAnno.value = false
|
||||
resizingAnno.value = false
|
||||
annoDragStart.value = null
|
||||
annoResizeStart.value = null
|
||||
editingTextAnnoIdx.value = -1
|
||||
textInputPos.value = null
|
||||
loadError.value = false
|
||||
trimTop.value = 0
|
||||
trimBottom.value = img.naturalHeight
|
||||
@@ -825,13 +1170,15 @@ onUnmounted(() => {
|
||||
|
||||
<div class="h-6 w-px bg-border" />
|
||||
|
||||
<!-- 颜色：当前色 badge + 弹层（自定义取色 + 默认色板），与普通截图一致 -->
|
||||
<!-- 颜色：当前色 badge + 弹层（双用途：选中标注时修改其颜色），与普通截图一致 -->
|
||||
<Popover v-model:open="colorPickerOpen">
|
||||
<PopoverTrigger as-child>
|
||||
<button
|
||||
class="color-badge"
|
||||
:style="{ '--swatch-color': currentColor }"
|
||||
:aria-label="'当前颜色 ' + currentColor"
|
||||
:class="{ disabled: !colorEnabled }"
|
||||
:style="{ '--swatch-color': effectiveColor }"
|
||||
:aria-label="'当前颜色 ' + effectiveColor"
|
||||
:disabled="!colorEnabled"
|
||||
/>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent class="w-auto p-3" align="start">
|
||||
@@ -847,9 +1194,9 @@ onUnmounted(() => {
|
||||
<TooltipTrigger as-child>
|
||||
<button
|
||||
class="color-swatch-mini"
|
||||
:class="{ active: currentColor === c }"
|
||||
:class="{ active: effectiveColor === c }"
|
||||
:style="{ backgroundColor: c }"
|
||||
@click="currentColor = c"
|
||||
@click="effectiveColor = c"
|
||||
/>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent>{{ c }}</TooltipContent>
|
||||
@@ -859,24 +1206,25 @@ onUnmounted(() => {
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
|
||||
<!-- 粗细 badge + 弹层（Slider），与普通截图一致 -->
|
||||
<!-- 粗细 badge + 弹层（双用途：选中标注时修改其粗细），与普通截图一致 -->
|
||||
<Popover v-model:open="widthPickerOpen">
|
||||
<PopoverTrigger as-child>
|
||||
<button class="width-badge">{{ currentLineWidth }}</button>
|
||||
<button class="width-badge" :class="{ disabled: !lineWidthEnabled }" :disabled="!lineWidthEnabled">{{ effectiveLineWidth }}</button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent class="w-auto p-3" align="start">
|
||||
<div class="width-popover">
|
||||
<div class="width-popover-header">
|
||||
<span>粗细</span>
|
||||
<span class="width-popover-value">{{ currentLineWidth }}</span>
|
||||
<span class="width-popover-value">{{ effectiveLineWidth }}</span>
|
||||
</div>
|
||||
<Slider
|
||||
:model-value="[currentLineWidth]"
|
||||
:model-value="[effectiveLineWidth]"
|
||||
:min="1"
|
||||
:max="16"
|
||||
:step="1"
|
||||
:disabled="!lineWidthEnabled"
|
||||
class="width-slider"
|
||||
@update:model-value="(v: number[] | undefined) => { if (v && v.length) currentLineWidth = v[0] }"
|
||||
@update:model-value="(v: number[] | undefined) => { if (v && v.length) effectiveLineWidth = v[0] }"
|
||||
/>
|
||||
</div>
|
||||
</PopoverContent>
|
||||
@@ -1009,7 +1357,7 @@ onUnmounted(() => {
|
||||
<canvas
|
||||
ref="canvasRef"
|
||||
class="block max-w-none select-none"
|
||||
:style="{ cursor: currentTool === 'text' ? 'text' : 'crosshair' }"
|
||||
:style="{ cursor: draggingAnno || resizingAnno ? 'move' : currentTool === 'text' ? 'text' : 'crosshair' }"
|
||||
@mousedown="onMouseDown"
|
||||
/>
|
||||
<!-- 上下边界裁剪手柄（拖动调整保留区，导出按此裁切） -->
|
||||
@@ -1027,25 +1375,31 @@ onUnmounted(() => {
|
||||
>
|
||||
<span class="trim-grip">下 {{ Math.round(trimBottom) }}</span>
|
||||
</div>
|
||||
<input
|
||||
<!-- 选中标注的调整手柄（画布 1:1，物理坐标直接定位；pen/text/number 仅移动不显示） -->
|
||||
<template v-if="selectedAnnoIdx >= 0 && selectedAnnoResizable">
|
||||
<div
|
||||
v-for="dir in HANDLES"
|
||||
:key="'anno-h-' + dir"
|
||||
class="anno-handle"
|
||||
:class="'handle-' + dir"
|
||||
:style="annoHandleStyle(dir)"
|
||||
@mousedown.stop.prevent="onAnnoHandleMouseDown(dir, $event)"
|
||||
/>
|
||||
</template>
|
||||
<!-- 文字输入浮层：textarea 支持多行，Ctrl+Enter 提交 / Esc 取消 / blur 提交 -->
|
||||
<textarea
|
||||
v-if="textInputPos"
|
||||
id="screenshot-editor-text-input"
|
||||
ref="textInputEl"
|
||||
v-model="textInputValue"
|
||||
class="absolute z-10 bg-transparent outline-none"
|
||||
:style="{
|
||||
left: textInputPos.x + 'px',
|
||||
top: textInputPos.y + 'px',
|
||||
color: currentColor,
|
||||
fontSize: fontSizePx + 'px',
|
||||
fontFamily: 'sans-serif',
|
||||
lineHeight: '1',
|
||||
padding: '0 2px',
|
||||
border: '1px dashed ' + currentColor,
|
||||
}"
|
||||
placeholder="输入文字"
|
||||
@keydown.enter.prevent="commitText"
|
||||
@keydown.esc.prevent="cancelText"
|
||||
class="absolute z-10 bg-transparent outline-none resize-none overflow-hidden"
|
||||
:style="textInputStyle"
|
||||
placeholder="输入文字 (Ctrl+Enter 完成)"
|
||||
rows="1"
|
||||
@keydown.enter.ctrl.prevent="commitText"
|
||||
@keydown.esc.stop.prevent="cancelText"
|
||||
@blur="commitText"
|
||||
@input="autoResizeTextarea"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1074,6 +1428,48 @@ onUnmounted(() => {
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 文字输入浮层：textarea 多行（与覆盖层 .text-input 一致） */
|
||||
#screenshot-editor-text-input {
|
||||
position: absolute;
|
||||
z-index: 10;
|
||||
background: transparent;
|
||||
outline: none;
|
||||
border: 1px dashed currentColor;
|
||||
font-family: sans-serif;
|
||||
line-height: 1;
|
||||
padding: 0 2px;
|
||||
min-width: 20px;
|
||||
resize: none;
|
||||
overflow: hidden;
|
||||
white-space: pre;
|
||||
word-break: keep-all;
|
||||
box-sizing: border-box;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
/* 标注调整手柄（与覆盖层 .handle 一致；画布 1:1，物理坐标直接定位） */
|
||||
.anno-handle {
|
||||
position: absolute;
|
||||
width: 9px;
|
||||
height: 9px;
|
||||
background: #fff;
|
||||
border: 2px solid #3b82f6;
|
||||
border-radius: 2px;
|
||||
transform: translate(-50%, -50%);
|
||||
z-index: 15;
|
||||
}
|
||||
.handle-nw, .handle-se { cursor: nwse-resize; }
|
||||
.handle-ne, .handle-sw { cursor: nesw-resize; }
|
||||
.handle-n, .handle-s { cursor: ns-resize; }
|
||||
.handle-e, .handle-w { cursor: ew-resize; }
|
||||
|
||||
/* badge 禁用态（选中不支持该属性的标注时） */
|
||||
.color-badge.disabled, .width-badge.disabled {
|
||||
opacity: 0.4;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.color-badge.disabled:hover { transform: none; }
|
||||
|
||||
/* 上下边界裁剪手柄：跨画布宽度的可拖拽蓝线 + 居中数值标签 */
|
||||
.trim-bar {
|
||||
position: absolute;
|
||||
|
||||
@@ -20,6 +20,10 @@ import {
|
||||
type MosaicAnno, type HighlightAnno, type NumberAnno,
|
||||
type ScreenshotBeginPayload,
|
||||
} from './types'
|
||||
import {
|
||||
annoHasColor, annoHasLineWidth, annoBBox, hitTestAnno, hitTestTextZone,
|
||||
isAnnoResizable, cloneAnno, applyMove, applyResize, drawSelectionBox,
|
||||
} from './annotations'
|
||||
|
||||
// ===== 窗口 / 底图 =====
|
||||
const win = getCurrentWindow()
|
||||
@@ -129,7 +133,6 @@ const resizingAnno = ref(false)
|
||||
const annoResizeDir = ref<HandleDir | null>(null)
|
||||
const annoDragStart = ref<{ p: Point; orig: Annotation } | null>(null)
|
||||
const annoResizeStart = ref<{ p: Point; orig: Annotation } | null>(null)
|
||||
let measureCtx: CanvasRenderingContext2D | null = null
|
||||
|
||||
/** Canvas 分层：静态层缓存已提交标注，动态层只画 draft + 选中框。
|
||||
* 绘制 draft（画笔/矩形等）时 annotations 不变，只需 drawImage(静态层) + draft，O(1) 合成。 */
|
||||
@@ -208,18 +211,9 @@ const canUndo = computed(() => annotations.value.length > 0)
|
||||
const canRedo = computed(() => redoStack.value.length > 0)
|
||||
const fontSizePx = computed(() => currentLineWidth.value * 3 + 14)
|
||||
|
||||
/** 选中标注是否有可变颜色属性 */
|
||||
function annoHasColor(a: Annotation): boolean {
|
||||
return a.type !== 'mosaic'
|
||||
}
|
||||
/** 选中标注是否有粗细概念（lineWidth） */
|
||||
function annoHasLineWidth(a: Annotation): boolean {
|
||||
return a.type === 'rect' || a.type === 'ellipse' || a.type === 'arrow' || a.type === 'pen'
|
||||
}
|
||||
/** 选中标注是否有可变颜色属性 / 粗细概念：见 annotations.ts 共享实现 */
|
||||
|
||||
/**
|
||||
* 颜色控件：双用途——选中标注时反映并修改其颜色，否则设置新标注默认色
|
||||
*/
|
||||
/** 颜色控件：双用途——选中标注时反映并修改其颜色，否则设置新标注默认色 */
|
||||
const effectiveColor = computed<string>({
|
||||
get() {
|
||||
const i = selectedAnnoIdx.value
|
||||
@@ -819,7 +813,7 @@ function onRegionMouseDown(e: MouseEvent) {
|
||||
}
|
||||
const p = canvasPoint(e)
|
||||
// 点击已有标注 → 选中并进入拖拽模式
|
||||
const idx = hitTestAnno(p)
|
||||
const idx = hitTestAnno(annotations.value, p)
|
||||
if (idx >= 0) {
|
||||
// 先提交未完成的文字输入（点击别处放置/选中时，旧输入框提交）
|
||||
if (textInputPos.value) commitText()
|
||||
@@ -1333,220 +1327,8 @@ function drawMosaicDraft(ctx: CanvasRenderingContext2D, a: MosaicAnno) {
|
||||
}
|
||||
|
||||
// ===== 标注选中 / 编辑 =====
|
||||
/** 获取文字测量用的 canvas 上下文（惰性创建一次复用） */
|
||||
function getMeasureCtx(): CanvasRenderingContext2D | null {
|
||||
if (!measureCtx) {
|
||||
const c = document.createElement('canvas')
|
||||
measureCtx = c.getContext('2d')
|
||||
}
|
||||
return measureCtx
|
||||
}
|
||||
|
||||
/** 估算文字宽高（用 ctx.measureText 测宽，多行取最宽行，高 = 行数 × fontSize）
|
||||
* 结果缓存：相同 text+fontSize 的测量结果不变，避免 hitTest / annoBBox 重复调用开销 */
|
||||
const measureCache = new Map<string, { w: number; h: number }>()
|
||||
function measureText(text: string, fontSize: number): { w: number; h: number } {
|
||||
const key = `${fontSize}\0${text}`
|
||||
const cached = measureCache.get(key)
|
||||
if (cached) return cached
|
||||
const ctx = getMeasureCtx()
|
||||
const lines = text.split('\n')
|
||||
let result: { w: number; h: number }
|
||||
if (!ctx) {
|
||||
const maxLen = Math.max(1, ...lines.map(l => l.length))
|
||||
result = { w: fontSize * maxLen * 0.6, h: fontSize * lines.length }
|
||||
} else {
|
||||
ctx.font = `${fontSize}px sans-serif`
|
||||
let maxW = 0
|
||||
for (const line of lines) {
|
||||
const m = ctx.measureText(line)
|
||||
if (m.width > maxW) maxW = m.width
|
||||
}
|
||||
result = { w: Math.ceil(maxW), h: fontSize * lines.length }
|
||||
}
|
||||
measureCache.set(key, result)
|
||||
return result
|
||||
}
|
||||
|
||||
/** 标注 bounding box（物理像素坐标） */
|
||||
function annoBBox(anno: Annotation): { x: number; y: number; w: number; h: number } {
|
||||
switch (anno.type) {
|
||||
case 'rect':
|
||||
case 'ellipse':
|
||||
case 'mosaic':
|
||||
case 'highlight':
|
||||
case 'arrow': {
|
||||
const x = Math.min(anno.x1, anno.x2)
|
||||
const y = Math.min(anno.y1, anno.y2)
|
||||
return { x, y, w: Math.abs(anno.x2 - anno.x1), h: Math.abs(anno.y2 - anno.y1) }
|
||||
}
|
||||
case 'pen': {
|
||||
if (anno.points.length === 0) return { x: 0, y: 0, w: 0, h: 0 }
|
||||
let minX = Infinity
|
||||
let minY = Infinity
|
||||
let maxX = -Infinity
|
||||
let maxY = -Infinity
|
||||
for (const pt of anno.points) {
|
||||
if (pt.x < minX) minX = pt.x
|
||||
if (pt.y < minY) minY = pt.y
|
||||
if (pt.x > maxX) maxX = pt.x
|
||||
if (pt.y > maxY) maxY = pt.y
|
||||
}
|
||||
return { x: minX, y: minY, w: maxX - minX, h: maxY - minY }
|
||||
}
|
||||
case 'text': {
|
||||
const { w, h } = measureText(anno.text, anno.fontSize)
|
||||
return { x: anno.x, y: anno.y, w, h }
|
||||
}
|
||||
case 'number': {
|
||||
const r = anno.fontSize / 2
|
||||
return { x: anno.x - r, y: anno.y - r, w: anno.fontSize, h: anno.fontSize }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 点到线段的距离 */
|
||||
function distToSegment(p: Point, a: Point, b: Point): number {
|
||||
const dx = b.x - a.x
|
||||
const dy = b.y - a.y
|
||||
const len2 = dx * dx + dy * dy
|
||||
if (len2 === 0) return Math.hypot(p.x - a.x, p.y - a.y)
|
||||
let t = ((p.x - a.x) * dx + (p.y - a.y) * dy) / len2
|
||||
t = Math.max(0, Math.min(1, t))
|
||||
const cx = a.x + t * dx
|
||||
const cy = a.y + t * dy
|
||||
return Math.hypot(p.x - cx, p.y - cy)
|
||||
}
|
||||
|
||||
/** 文字标注区域检测：core=文字内容区(编辑)，border=边框区(移动)，null=未命中 */
|
||||
function hitTestTextZone(anno: TextAnno, p: Point): 'core' | 'border' | null {
|
||||
const { w, h } = measureText(anno.text, anno.fontSize)
|
||||
const x1 = anno.x, y1 = anno.y
|
||||
const x2 = anno.x + w, y2 = anno.y + h
|
||||
const pad = 8
|
||||
if (p.x < x1 - pad || p.x > x2 + pad || p.y < y1 - pad || p.y > y2 + pad) return null
|
||||
if (p.x >= x1 && p.x <= x2 && p.y >= y1 && p.y <= y2) return 'core'
|
||||
return 'border'
|
||||
}
|
||||
|
||||
/** 点击测试单个标注 */
|
||||
function hitTestSingle(anno: Annotation, p: Point): boolean {
|
||||
switch (anno.type) {
|
||||
case 'rect':
|
||||
case 'ellipse':
|
||||
case 'mosaic':
|
||||
case 'highlight': {
|
||||
const x1 = Math.min(anno.x1, anno.x2)
|
||||
const y1 = Math.min(anno.y1, anno.y2)
|
||||
const x2 = Math.max(anno.x1, anno.x2)
|
||||
const y2 = Math.max(anno.y1, anno.y2)
|
||||
const pad = Math.max(4, anno.type === 'rect' || anno.type === 'ellipse' ? anno.lineWidth : 2)
|
||||
return p.x >= x1 - pad && p.x <= x2 + pad && p.y >= y1 - pad && p.y <= y2 + pad
|
||||
}
|
||||
case 'arrow':
|
||||
return distToSegment(p, { x: anno.x1, y: anno.y1 }, { x: anno.x2, y: anno.y2 }) <= Math.max(6, anno.lineWidth)
|
||||
case 'pen': {
|
||||
for (let i = 1; i < anno.points.length; i++) {
|
||||
if (distToSegment(p, anno.points[i - 1], anno.points[i]) <= Math.max(6, anno.lineWidth)) return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
case 'text': {
|
||||
return hitTestTextZone(anno, p) !== null
|
||||
}
|
||||
case 'number': {
|
||||
const r = anno.fontSize / 2
|
||||
const dx = p.x - anno.x
|
||||
const dy = p.y - anno.y
|
||||
return dx * dx + dy * dy <= r * r
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 点击测试：返回命中的标注索引（-1 未命中），从后往前测试（后画的在上层） */
|
||||
function hitTestAnno(p: Point): number {
|
||||
for (let i = annotations.value.length - 1; i >= 0; i--) {
|
||||
if (hitTestSingle(annotations.value[i], p)) return i
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
/** 标注是否可调整大小（pen/text/number 仅支持移动） */
|
||||
function isAnnoResizable(anno: Annotation): boolean {
|
||||
return anno.type === 'rect' || anno.type === 'ellipse' || anno.type === 'arrow' || anno.type === 'mosaic' || anno.type === 'highlight'
|
||||
}
|
||||
|
||||
/** 深拷贝标注（用于拖拽/调整大小时保存原始快照） */
|
||||
function cloneAnno(a: Annotation): Annotation {
|
||||
if (a.type === 'pen') return { ...a, points: a.points.map(pt => ({ ...pt })) }
|
||||
return { ...a }
|
||||
}
|
||||
|
||||
/** 移动标注：基于原始快照 + 偏移量更新目标标注坐标 */
|
||||
function applyMove(target: Annotation, orig: Annotation, dx: number, dy: number) {
|
||||
switch (target.type) {
|
||||
case 'rect':
|
||||
case 'ellipse':
|
||||
case 'arrow':
|
||||
case 'mosaic':
|
||||
case 'highlight': {
|
||||
const o = orig as typeof target
|
||||
target.x1 = o.x1 + dx
|
||||
target.y1 = o.y1 + dy
|
||||
target.x2 = o.x2 + dx
|
||||
target.y2 = o.y2 + dy
|
||||
break
|
||||
}
|
||||
case 'pen': {
|
||||
const o = orig as typeof target
|
||||
target.points = o.points.map(pt => ({ x: pt.x + dx, y: pt.y + dy }))
|
||||
break
|
||||
}
|
||||
case 'text':
|
||||
case 'number': {
|
||||
const o = orig as typeof target
|
||||
target.x = o.x + dx
|
||||
target.y = o.y + dy
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 调整标注大小：根据手柄方向更新对应坐标（仅对可调整大小的标注有效） */
|
||||
function applyResize(target: Annotation, orig: Annotation, dir: HandleDir, dx: number, dy: number) {
|
||||
switch (target.type) {
|
||||
case 'rect':
|
||||
case 'ellipse':
|
||||
case 'arrow':
|
||||
case 'mosaic':
|
||||
case 'highlight': {
|
||||
const o = orig as typeof target
|
||||
let x1 = o.x1
|
||||
let y1 = o.y1
|
||||
let x2 = o.x2
|
||||
let y2 = o.y2
|
||||
if (dir.includes('e')) x2 = o.x2 + dx
|
||||
if (dir.includes('s')) y2 = o.y2 + dy
|
||||
if (dir.includes('w')) x1 = o.x1 + dx
|
||||
if (dir.includes('n')) y1 = o.y1 + dy
|
||||
target.x1 = x1
|
||||
target.y1 = y1
|
||||
target.x2 = x2
|
||||
target.y2 = y2
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 绘制选中标注的虚线边框 */
|
||||
function drawSelectionBox(ctx: CanvasRenderingContext2D, bb: { x: number; y: number; w: number; h: number }) {
|
||||
const pad = 2
|
||||
ctx.strokeStyle = '#3b82f6'
|
||||
ctx.lineWidth = 1
|
||||
ctx.setLineDash([4, 4])
|
||||
ctx.strokeRect(bb.x - pad, bb.y - pad, bb.w + pad * 2, bb.h + pad * 2)
|
||||
ctx.setLineDash([])
|
||||
}
|
||||
// 几何 / 命中 / 变换纯函数已抽到 annotations.ts，与编辑器共用，
|
||||
// 保证两处对同一标注数据的选中、拖拽、调整大小行为一致。
|
||||
|
||||
// ===== 标注交互 =====
|
||||
function beginDraft(e: MouseEvent) {
|
||||
@@ -1952,10 +1734,19 @@ async function startScroll() {
|
||||
width: Math.round(sp.w),
|
||||
height: Math.round(sp.h),
|
||||
}
|
||||
// 覆盖层挖孔（先于会话启动）：Chromium 系浏览器（Edge/Chrome）的遮挡检测会把
|
||||
// 被完全覆盖的窗口标记为 occluded 并暂停渲染（页面冻结、抓帧静止）。在选区带处
|
||||
// 挖出真孔，目标窗口仅部分被覆盖即可恢复渲染，滚轮与拼接恢复正常。
|
||||
// 先挖孔再启动，保证会话首帧与滚轮都发生在解除遮挡之后。
|
||||
await commands.screenshotSetScrollHole(region).catch((e) => {
|
||||
console.error('[screenshot] 覆盖层挖孔失败', e)
|
||||
})
|
||||
try {
|
||||
await commands.screenshotScrollStart(hwnd, region, true)
|
||||
} catch (e) {
|
||||
console.error('[screenshot] 滚动截图启动失败', e)
|
||||
// 启动失败：回滚挖孔，避免残留空洞
|
||||
void commands.screenshotSetScrollHole(null).catch(() => {})
|
||||
showScrollToast(String(e))
|
||||
return
|
||||
}
|
||||
@@ -1970,6 +1761,8 @@ async function startScroll() {
|
||||
function exitScrollMode() {
|
||||
scrollMode.value = false
|
||||
scrollProgress.value = null
|
||||
// 复位覆盖层挖孔（区域在窗口上持续有效，不复位会残留空洞）
|
||||
void commands.screenshotSetScrollHole(null).catch(() => {})
|
||||
}
|
||||
|
||||
/** 取消滚动会话并退出滚动模式（会话线程回滚窗口、丢弃画布） */
|
||||
@@ -2102,6 +1895,8 @@ async function beginCapture(payload?: ScreenshotBeginPayload) {
|
||||
scrollProgress.value = null
|
||||
// 新截图打断进行中的滚动会话 → 取消后台会话（避免残留占用）
|
||||
if (wasScrolling) void commands.screenshotScrollCancel().catch(() => {})
|
||||
// 复位覆盖层挖孔（无条件：异常路径也可能残留窗口区域，这里兜底清理）
|
||||
void commands.screenshotSetScrollHole(null).catch(() => {})
|
||||
winHighlight.value = null
|
||||
currentHwnd.value = 0
|
||||
sel.value = { x: 0, y: 0, w: 0, h: 0 }
|
||||
|
||||
@@ -0,0 +1,242 @@
|
||||
/**
|
||||
* 标注几何 / 命中测试 / 变换共享纯函数。
|
||||
* 覆盖层（ScreenshotOverlay）与编辑器（ScreenshotEditor）共用，
|
||||
* 保证两处对同一标注数据的选中、拖拽、调整大小行为严格一致。
|
||||
*/
|
||||
import type { Annotation, HandleDir, Point, TextAnno } from './types'
|
||||
|
||||
// ===== 文字测量 =====
|
||||
|
||||
/** 离屏测量上下文（惰性创建，供 measureText 使用） */
|
||||
let measureCtx: CanvasRenderingContext2D | null = null
|
||||
function getMeasureCtx(): CanvasRenderingContext2D | null {
|
||||
if (!measureCtx) {
|
||||
const c = document.createElement('canvas')
|
||||
c.width = 0
|
||||
c.height = 0
|
||||
measureCtx = c.getContext('2d')
|
||||
}
|
||||
return measureCtx
|
||||
}
|
||||
|
||||
/** 估算文字宽高（ctx.measureText 测宽，多行取最宽行，高 = 行数 × fontSize）。
|
||||
* 结果缓存：相同 text+fontSize 的测量结果不变，避免 hitTest / annoBBox 重复调用开销 */
|
||||
const measureCache = new Map<string, { w: number; h: number }>()
|
||||
export function measureText(text: string, fontSize: number): { w: number; h: number } {
|
||||
const key = `${fontSize}\0${text}`
|
||||
const cached = measureCache.get(key)
|
||||
if (cached) return cached
|
||||
const ctx = getMeasureCtx()
|
||||
const lines = text.split('\n')
|
||||
let result: { w: number; h: number }
|
||||
if (!ctx) {
|
||||
const maxLen = Math.max(1, ...lines.map(l => l.length))
|
||||
result = { w: fontSize * maxLen * 0.6, h: fontSize * lines.length }
|
||||
} else {
|
||||
ctx.font = `${fontSize}px sans-serif`
|
||||
let maxW = 0
|
||||
for (const line of lines) {
|
||||
const m = ctx.measureText(line)
|
||||
if (m.width > maxW) maxW = m.width
|
||||
}
|
||||
result = { w: Math.ceil(maxW), h: fontSize * lines.length }
|
||||
}
|
||||
measureCache.set(key, result)
|
||||
return result
|
||||
}
|
||||
|
||||
// ===== 几何 =====
|
||||
|
||||
/** 标注 bounding box（画布物理像素坐标） */
|
||||
export function annoBBox(anno: Annotation): { x: number; y: number; w: number; h: number } {
|
||||
switch (anno.type) {
|
||||
case 'rect':
|
||||
case 'ellipse':
|
||||
case 'mosaic':
|
||||
case 'highlight':
|
||||
case 'arrow': {
|
||||
const x = Math.min(anno.x1, anno.x2)
|
||||
const y = Math.min(anno.y1, anno.y2)
|
||||
return { x, y, w: Math.abs(anno.x2 - anno.x1), h: Math.abs(anno.y2 - anno.y1) }
|
||||
}
|
||||
case 'pen': {
|
||||
if (anno.points.length === 0) return { x: 0, y: 0, w: 0, h: 0 }
|
||||
let minX = Infinity
|
||||
let minY = Infinity
|
||||
let maxX = -Infinity
|
||||
let maxY = -Infinity
|
||||
for (const pt of anno.points) {
|
||||
if (pt.x < minX) minX = pt.x
|
||||
if (pt.y < minY) minY = pt.y
|
||||
if (pt.x > maxX) maxX = pt.x
|
||||
if (pt.y > maxY) maxY = pt.y
|
||||
}
|
||||
return { x: minX, y: minY, w: maxX - minX, h: maxY - minY }
|
||||
}
|
||||
case 'text': {
|
||||
const { w, h } = measureText(anno.text, anno.fontSize)
|
||||
return { x: anno.x, y: anno.y, w, h }
|
||||
}
|
||||
case 'number': {
|
||||
const r = anno.fontSize / 2
|
||||
return { x: anno.x - r, y: anno.y - r, w: anno.fontSize, h: anno.fontSize }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 点到线段的距离 */
|
||||
export function distToSegment(p: Point, a: Point, b: Point): number {
|
||||
const dx = b.x - a.x
|
||||
const dy = b.y - a.y
|
||||
const len2 = dx * dx + dy * dy
|
||||
if (len2 === 0) return Math.hypot(p.x - a.x, p.y - a.y)
|
||||
let t = ((p.x - a.x) * dx + (p.y - a.y) * dy) / len2
|
||||
t = Math.max(0, Math.min(1, t))
|
||||
const cx = a.x + t * dx
|
||||
const cy = a.y + t * dy
|
||||
return Math.hypot(p.x - cx, p.y - cy)
|
||||
}
|
||||
|
||||
// ===== 命中测试 =====
|
||||
|
||||
/** 文字标注区域检测：core=文字内容区(编辑)，border=边框区(移动)，null=未命中 */
|
||||
export function hitTestTextZone(anno: TextAnno, p: Point): 'core' | 'border' | null {
|
||||
const { w, h } = measureText(anno.text, anno.fontSize)
|
||||
const x1 = anno.x, y1 = anno.y
|
||||
const x2 = anno.x + w, y2 = anno.y + h
|
||||
const pad = 8
|
||||
if (p.x < x1 - pad || p.x > x2 + pad || p.y < y1 - pad || p.y > y2 + pad) return null
|
||||
if (p.x >= x1 && p.x <= x2 && p.y >= y1 && p.y <= y2) return 'core'
|
||||
return 'border'
|
||||
}
|
||||
|
||||
/** 点击测试单个标注 */
|
||||
export function hitTestSingle(anno: Annotation, p: Point): boolean {
|
||||
switch (anno.type) {
|
||||
case 'rect':
|
||||
case 'ellipse':
|
||||
case 'mosaic':
|
||||
case 'highlight': {
|
||||
const x1 = Math.min(anno.x1, anno.x2)
|
||||
const y1 = Math.min(anno.y1, anno.y2)
|
||||
const x2 = Math.max(anno.x1, anno.x2)
|
||||
const y2 = Math.max(anno.y1, anno.y2)
|
||||
const pad = Math.max(4, anno.type === 'rect' || anno.type === 'ellipse' ? anno.lineWidth : 2)
|
||||
return p.x >= x1 - pad && p.x <= x2 + pad && p.y >= y1 - pad && p.y <= y2 + pad
|
||||
}
|
||||
case 'arrow':
|
||||
return distToSegment(p, { x: anno.x1, y: anno.y1 }, { x: anno.x2, y: anno.y2 }) <= Math.max(6, anno.lineWidth)
|
||||
case 'pen': {
|
||||
for (let i = 1; i < anno.points.length; i++) {
|
||||
if (distToSegment(p, anno.points[i - 1], anno.points[i]) <= Math.max(6, anno.lineWidth)) return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
case 'text': {
|
||||
return hitTestTextZone(anno, p) !== null
|
||||
}
|
||||
case 'number': {
|
||||
const r = anno.fontSize / 2
|
||||
const dx = p.x - anno.x
|
||||
const dy = p.y - anno.y
|
||||
return dx * dx + dy * dy <= r * r
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 点击测试：返回命中的标注索引（-1 未命中），从后往前测试（后画的在上层） */
|
||||
export function hitTestAnno(annotations: Annotation[], p: Point): number {
|
||||
for (let i = annotations.length - 1; i >= 0; i--) {
|
||||
if (hitTestSingle(annotations[i], p)) return i
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
/** 标注是否可调整大小（pen/text/number 仅支持移动） */
|
||||
export function isAnnoResizable(anno: Annotation): boolean {
|
||||
return anno.type === 'rect' || anno.type === 'ellipse' || anno.type === 'arrow' || anno.type === 'mosaic' || anno.type === 'highlight'
|
||||
}
|
||||
|
||||
/** 选中标注是否有可变颜色属性 */
|
||||
export function annoHasColor(anno: Annotation): boolean {
|
||||
return anno.type !== 'mosaic'
|
||||
}
|
||||
|
||||
/** 选中标注是否有粗细概念（lineWidth） */
|
||||
export function annoHasLineWidth(anno: Annotation): boolean {
|
||||
return anno.type === 'rect' || anno.type === 'ellipse' || anno.type === 'arrow' || anno.type === 'pen'
|
||||
}
|
||||
|
||||
// ===== 变换 =====
|
||||
|
||||
/** 深拷贝标注（用于拖拽/调整大小时保存原始快照） */
|
||||
export function cloneAnno(a: Annotation): Annotation {
|
||||
if (a.type === 'pen') return { ...a, points: a.points.map(pt => ({ ...pt })) }
|
||||
return { ...a }
|
||||
}
|
||||
|
||||
/** 移动标注：基于原始快照 + 偏移量更新目标标注坐标 */
|
||||
export function applyMove(target: Annotation, orig: Annotation, dx: number, dy: number) {
|
||||
switch (target.type) {
|
||||
case 'rect':
|
||||
case 'ellipse':
|
||||
case 'arrow':
|
||||
case 'mosaic':
|
||||
case 'highlight': {
|
||||
const o = orig as typeof target
|
||||
target.x1 = o.x1 + dx
|
||||
target.y1 = o.y1 + dy
|
||||
target.x2 = o.x2 + dx
|
||||
target.y2 = o.y2 + dy
|
||||
break
|
||||
}
|
||||
case 'pen': {
|
||||
const o = orig as typeof target
|
||||
target.points = o.points.map(pt => ({ x: pt.x + dx, y: pt.y + dy }))
|
||||
break
|
||||
}
|
||||
case 'text':
|
||||
case 'number': {
|
||||
const o = orig as typeof target
|
||||
target.x = o.x + dx
|
||||
target.y = o.y + dy
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 调整标注大小：根据手柄方向更新对应坐标（仅对可调整大小的标注有效） */
|
||||
export function applyResize(target: Annotation, orig: Annotation, dir: HandleDir, dx: number, dy: number) {
|
||||
switch (target.type) {
|
||||
case 'rect':
|
||||
case 'ellipse':
|
||||
case 'arrow':
|
||||
case 'mosaic':
|
||||
case 'highlight': {
|
||||
const o = orig as typeof target
|
||||
let x1 = o.x1
|
||||
let y1 = o.y1
|
||||
let x2 = o.x2
|
||||
let y2 = o.y2
|
||||
if (dir.includes('e')) x2 = o.x2 + dx
|
||||
if (dir.includes('s')) y2 = o.y2 + dy
|
||||
if (dir.includes('w')) x1 = o.x1 + dx
|
||||
if (dir.includes('n')) y1 = o.y1 + dy
|
||||
target.x1 = x1
|
||||
target.y1 = y1
|
||||
target.x2 = x2
|
||||
target.y2 = y2
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 绘制选中标注的虚线边框 */
|
||||
export function drawSelectionBox(ctx: CanvasRenderingContext2D, bb: { x: number; y: number; w: number; h: number }) {
|
||||
const pad = 2
|
||||
ctx.strokeStyle = '#3b82f6'
|
||||
ctx.lineWidth = 1
|
||||
ctx.setLineDash([4, 4])
|
||||
ctx.strokeRect(bb.x - pad, bb.y - pad, bb.w + pad * 2, bb.h + pad * 2)
|
||||
ctx.setLineDash([])
|
||||
}
|
||||
+17
-1
@@ -59,6 +59,8 @@ export const useAppStore = defineStore('app', () => {
|
||||
const isAutoStart = ref(false)
|
||||
const silentAutoStart = ref(false)
|
||||
const isInitialized = ref(false)
|
||||
/** 模块排序一次性迁移标记（音乐 → 代理之后），随设置持久化 */
|
||||
let musicOrderMigrated = false
|
||||
const modules = ref<ModuleInfo[]>(initModulesFromRegistry())
|
||||
const moduleOrder = ref<string[]>(initModuleOrder())
|
||||
|
||||
@@ -111,6 +113,19 @@ export const useAppStore = defineStore('app', () => {
|
||||
const known = savedOrder.filter(id => allUserIds.includes(id))
|
||||
const newlyAdded = allUserIds.filter(id => !savedOrder.includes(id))
|
||||
moduleOrder.value = [...known, ...newlyAdded]
|
||||
|
||||
// 一次性迁移：音乐模块默认排序调整为「代理之后、整体第二位」。
|
||||
// 迁移后写入标记，尊重用户后续手动拖动的新排序。
|
||||
if (!settings.musicOrderMigrated) {
|
||||
const musicIdx = moduleOrder.value.indexOf('music')
|
||||
if (musicIdx !== -1) {
|
||||
moduleOrder.value.splice(musicIdx, 1)
|
||||
const proxyIdx = moduleOrder.value.indexOf('proxy')
|
||||
moduleOrder.value.splice(proxyIdx === -1 ? 0 : proxyIdx + 1, 0, 'music')
|
||||
}
|
||||
saveSettings()
|
||||
}
|
||||
musicOrderMigrated = true
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
@@ -132,7 +147,8 @@ export const useAppStore = defineStore('app', () => {
|
||||
isAutoStart: isAutoStart.value,
|
||||
silentAutoStart: silentAutoStart.value,
|
||||
modules: modulesData,
|
||||
moduleOrder: moduleOrder.value
|
||||
moduleOrder: moduleOrder.value,
|
||||
musicOrderMigrated
|
||||
}))
|
||||
} catch {
|
||||
console.error('Failed to save settings to localStorage')
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,615 @@
|
||||
import { defineStore } from 'pinia'
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { invoke } from '@tauri-apps/api/core'
|
||||
import { listen, type UnlistenFn } from '@tauri-apps/api/event'
|
||||
import { commands, type MusicEnvStatus, type MusicSettings } from '@/lib/bindings'
|
||||
import { useProxyStore } from '@/stores/proxyStore'
|
||||
import { createLogger } from '@/lib/logger'
|
||||
|
||||
/** 搜索结果中的单曲（与 bridge.py song_to_dict 字段对应） */
|
||||
export interface MusicSong {
|
||||
songName: string | null
|
||||
singers: string | null
|
||||
album: string | null
|
||||
duration: string | null
|
||||
durationS: number | null
|
||||
fileSize: string | null
|
||||
fileSizeBytes: number | null
|
||||
ext: string | null
|
||||
source: string | null
|
||||
rootSource: string | null
|
||||
downloadUrl: string | null
|
||||
valid: boolean
|
||||
coverUrl: string | null
|
||||
bitrate: number | null
|
||||
/** 下载所需：save_path 命名用 */
|
||||
identifier?: string | null
|
||||
/** 默认下载请求头（rust 引擎直传下载器模块用） */
|
||||
defaultDownloadHeaders?: Record<string, string> | null
|
||||
defaultDownloadCookies?: Record<string, string> | null
|
||||
/** 懒解析：官方搜索 API 的原始结果（resolve/下载前解析真实链接用） */
|
||||
rawSearch?: Record<string, unknown> | null
|
||||
/** 音质提示：true=具备无损（ext 或官方音质字段推断），null=未知；懒解析歌 ext/fileSize 为空时筛选依据 */
|
||||
lossless?: boolean | null
|
||||
/** 全音质档位（搜索阶段多档展示：label/ext/bitrate/sizeBytes/size/lossless）；懒解析歌为数组，急切解析/无数据为 null */
|
||||
qualities?: MusicQuality[] | null
|
||||
}
|
||||
|
||||
/** 单个音质档位（musicdl 官方接口搜索阶段批量取回的格式+大小+无损） */
|
||||
export interface MusicQuality {
|
||||
label: string | null
|
||||
ext: string | null
|
||||
bitrate: number | null
|
||||
sizeBytes: number | null
|
||||
size: string | null
|
||||
lossless: boolean | null
|
||||
}
|
||||
|
||||
/** 桥接下载事件（bridge.py 事件行，经 Rust 原样转发） */
|
||||
export interface MusicDownloadEvent {
|
||||
event: string
|
||||
taskId?: string
|
||||
type?: 'start' | 'progress' | 'done' | 'error' | 'cancelled' | 'finished' | 'resolving' | 'bridge-stopped'
|
||||
key?: string
|
||||
songName?: string
|
||||
singers?: string
|
||||
ext?: string
|
||||
/** 实际解析出的音质档位（start 事件回传，如 "无损"/"320K"） */
|
||||
quality?: string
|
||||
downloaded?: number
|
||||
total?: number
|
||||
done?: number
|
||||
message?: string
|
||||
}
|
||||
|
||||
/** 任务内单曲状态（key = "{source}|{idx}"） */
|
||||
export interface MusicDownloadSongState {
|
||||
key: string
|
||||
songName: string
|
||||
singers: string
|
||||
status: 'queued' | 'resolving' | 'downloading' | 'done' | 'error' | 'cancelled'
|
||||
downloaded: number
|
||||
total: number
|
||||
message?: string
|
||||
/** 实际解析出的音质档位（start 事件回传）；请求档位（如 "最高"）在任务级 task.quality */
|
||||
quality?: string
|
||||
}
|
||||
|
||||
/** 音乐下载任务（musicdl 引擎） */
|
||||
export interface MusicDownloadTask {
|
||||
taskId: string
|
||||
engine: 'musicdl' | 'rust'
|
||||
status: 'downloading' | 'cancelling' | 'done' | 'error' | 'cancelled' | 'interrupted'
|
||||
doneCount: number
|
||||
songs: MusicDownloadSongState[]
|
||||
/** 完整歌曲数据（localStorage 持久化，用于"重新下载"） */
|
||||
songsData: MusicSong[]
|
||||
/** 下载目录（打开文件夹用） */
|
||||
savedir?: string
|
||||
/** 本次下载的目标音质 label（"" 表示最高），用于任务标题展示 */
|
||||
quality?: string
|
||||
errorMessage?: string
|
||||
createdAt: number
|
||||
}
|
||||
|
||||
/** 运行时安装进度事件负载（事件类型非 specta 生成范围，本地定义） */
|
||||
export interface MusicInstallProgress {
|
||||
stage: string
|
||||
percent: number
|
||||
downloadedBytes: number
|
||||
totalBytes: number | null
|
||||
message: string
|
||||
}
|
||||
|
||||
/** 搜索返回（bridge search 结果结构） */
|
||||
export interface MusicSearchPayload {
|
||||
results: Record<string, MusicSong[]>
|
||||
total: number
|
||||
sources: string[]
|
||||
}
|
||||
|
||||
/** 桥接 ping 返回 */
|
||||
export interface MusicPingPayload {
|
||||
version: string
|
||||
python: string
|
||||
}
|
||||
|
||||
const logger = createLogger('music')
|
||||
|
||||
export const useMusicStore = defineStore('music', () => {
|
||||
const settings = ref<MusicSettings | null>(null)
|
||||
const env = ref<MusicEnvStatus | null>(null)
|
||||
/** musicdl 已注册的全部搜索源（客户端名） */
|
||||
const availableSources = ref<string[]>([])
|
||||
|
||||
// 搜索状态
|
||||
const searching = ref(false)
|
||||
const searchError = ref('')
|
||||
const results = ref<Record<string, MusicSong[]>>({})
|
||||
const resultTotal = ref(0)
|
||||
/** 已执行过一次搜索/歌单解析（用于空结果时展示"未找到"而非初始引导空态） */
|
||||
const searched = ref(false)
|
||||
|
||||
// 运行时安装状态
|
||||
const installing = ref(false)
|
||||
const installProgress = ref<MusicInstallProgress | null>(null)
|
||||
const installError = ref('')
|
||||
let progressUnlisten: UnlistenFn | null = null
|
||||
|
||||
async function init() {
|
||||
restoreTasks()
|
||||
await Promise.all([loadSettings(), refreshEnv()])
|
||||
}
|
||||
|
||||
async function loadSettings() {
|
||||
settings.value = await commands.musicGetSettings()
|
||||
}
|
||||
|
||||
/** 保存设置（调用方先修改 settings 再调用；前端用 400ms debounce） */
|
||||
async function saveSettings() {
|
||||
if (!settings.value) return
|
||||
await commands.musicSaveSettings(settings.value)
|
||||
}
|
||||
|
||||
async function refreshEnv() {
|
||||
env.value = await commands.musicEnvStatus()
|
||||
}
|
||||
|
||||
async function loadSources() {
|
||||
try {
|
||||
const v = (await invoke('music_get_sources')) as { sources: string[] }
|
||||
availableSources.value = v.sources ?? []
|
||||
} catch (e) {
|
||||
logger.error(`加载音乐源失败: ${e}`)
|
||||
availableSources.value = []
|
||||
}
|
||||
}
|
||||
|
||||
async function pingBridge(): Promise<MusicPingPayload> {
|
||||
return (await invoke('music_ping')) as MusicPingPayload
|
||||
}
|
||||
|
||||
async function search(keyword: string, sources: string[]) {
|
||||
searching.value = true
|
||||
searchError.value = ''
|
||||
try {
|
||||
const v = (await invoke('music_search', { keyword, sources })) as MusicSearchPayload
|
||||
results.value = v.results ?? {}
|
||||
resultTotal.value = v.total ?? 0
|
||||
searched.value = true
|
||||
} catch (e) {
|
||||
searchError.value = typeof e === 'string' ? e : JSON.stringify(e)
|
||||
throw e
|
||||
} finally {
|
||||
searching.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 歌单解析 =====
|
||||
const parsing = ref(false)
|
||||
const parseError = ref('')
|
||||
|
||||
/** 解析歌单链接，结果以首个歌曲来源为键写入 results（与搜索共用展示/下载） */
|
||||
async function parsePlaylist(url: string, sources: string[]) {
|
||||
parsing.value = true
|
||||
parseError.value = ''
|
||||
try {
|
||||
const v = (await invoke('music_parse_playlist', { url, sources })) as {
|
||||
songs: MusicSong[]
|
||||
count: number
|
||||
}
|
||||
const count = v.count ?? 0
|
||||
searched.value = true
|
||||
if (count > 0) {
|
||||
const srcKey = v.songs[0]?.source ?? 'playlist'
|
||||
results.value = { [srcKey]: v.songs }
|
||||
resultTotal.value = count
|
||||
} else {
|
||||
results.value = {}
|
||||
resultTotal.value = 0
|
||||
}
|
||||
return count
|
||||
} catch (e) {
|
||||
parseError.value = typeof e === 'string' ? e : JSON.stringify(e)
|
||||
throw e
|
||||
} finally {
|
||||
parsing.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 下载任务 =====
|
||||
const tasks = ref<MusicDownloadTask[]>([])
|
||||
let downloadUnlisten: UnlistenFn | null = null
|
||||
|
||||
// 任务历史持久化（localStorage，应用重启后保留记录；恢复时不尝试续传）
|
||||
const TASKS_KEY = 'thing.music.tasks'
|
||||
const MAX_TASKS = 30
|
||||
/** 单次持久化的体积上限：超过则剥离 rawSearch（懒解析字段）后重试，避免撑爆 localStorage 配额 */
|
||||
const MAX_PERSIST_CHARS = 1_500_000
|
||||
let persistTimer: ReturnType<typeof setTimeout> | null = null
|
||||
|
||||
/** 剥离仅解析期使用的重字段（只影响「重新下载」对懒解析歌曲的能力） */
|
||||
function stripHeavy(s: MusicSong): MusicSong {
|
||||
const { rawSearch, defaultDownloadHeaders, defaultDownloadCookies, ...rest } = s
|
||||
void rawSearch
|
||||
void defaultDownloadHeaders
|
||||
void defaultDownloadCookies
|
||||
return rest
|
||||
}
|
||||
|
||||
function persistTasks() {
|
||||
const base = tasks.value.slice(0, MAX_TASKS)
|
||||
try {
|
||||
let payload = JSON.stringify(base)
|
||||
if (payload.length > MAX_PERSIST_CHARS) {
|
||||
payload = JSON.stringify(base.map((t) => ({ ...t, songsData: t.songsData.map(stripHeavy) })))
|
||||
}
|
||||
localStorage.setItem(TASKS_KEY, payload)
|
||||
} catch {
|
||||
// localStorage 不可用/超限时静默降级（仅影响历史记录）
|
||||
}
|
||||
}
|
||||
function restoreTasks() {
|
||||
try {
|
||||
const raw = localStorage.getItem(TASKS_KEY)
|
||||
if (!raw) return
|
||||
const arr = JSON.parse(raw) as MusicDownloadTask[]
|
||||
if (!Array.isArray(arr)) return
|
||||
for (const t of arr) {
|
||||
// 重启后桥接已无下载状态：残留的"下载中"统一标记为中断；
|
||||
// "取消中"表明用户已请求取消，落定为已取消
|
||||
if (t.status === 'downloading') t.status = 'interrupted'
|
||||
else if (t.status === 'cancelling') t.status = 'cancelled'
|
||||
if (!Array.isArray(t.songs)) t.songs = []
|
||||
if (!Array.isArray(t.songsData)) t.songsData = []
|
||||
}
|
||||
tasks.value = arr.slice(0, MAX_TASKS)
|
||||
} catch {
|
||||
// 数据损坏则丢弃历史
|
||||
}
|
||||
}
|
||||
// 仅在结构性变化（任务增删 / 任务状态 / 完成数）时持久化：
|
||||
// 用轻量签名代替深度 watch，避免下载进度事件（每 300ms 修改 downloaded）
|
||||
// 触发 30 个任务（含 songsData）的全量 JSON 序列化
|
||||
const tasksSignature = computed(
|
||||
() => tasks.value.map((t) => `${t.taskId}:${t.status}:${t.doneCount}`).join('|')
|
||||
)
|
||||
watch(
|
||||
tasksSignature,
|
||||
() => {
|
||||
if (persistTimer) clearTimeout(persistTimer)
|
||||
persistTimer = setTimeout(persistTasks, 400)
|
||||
}
|
||||
)
|
||||
|
||||
async function ensureDownloadListener() {
|
||||
if (downloadUnlisten) return
|
||||
downloadUnlisten = await listen<MusicDownloadEvent>('music-download-event', (e) => {
|
||||
handleDownloadEvent(e.payload)
|
||||
})
|
||||
}
|
||||
|
||||
function handleDownloadEvent(ev: MusicDownloadEvent) {
|
||||
if (ev.type === 'bridge-stopped') {
|
||||
// 桥接进程被停止：活动任务标记为中断；取消中的任务落定为已取消
|
||||
for (const t of tasks.value) {
|
||||
if (t.status === 'downloading') t.status = 'interrupted'
|
||||
else if (t.status === 'cancelling') t.status = 'cancelled'
|
||||
}
|
||||
return
|
||||
}
|
||||
if (!ev.taskId) return
|
||||
const task = tasks.value.find((t) => t.taskId === ev.taskId)
|
||||
if (!task) return
|
||||
const type = ev.type
|
||||
if (type === 'resolving') {
|
||||
// 懒解析：下载 worker 正在解析真实下载链接（第三方 API + 官方音质阶梯）
|
||||
const st = task.songs.find((s) => s.key === ev.key)
|
||||
if (st) {
|
||||
st.status = 'resolving'
|
||||
st.songName = ev.songName ?? st.songName
|
||||
st.singers = ev.singers ?? st.singers
|
||||
}
|
||||
if (task.status !== 'cancelling') task.status = 'downloading'
|
||||
} else if (type === 'start') {
|
||||
const st = task.songs.find((s) => s.key === ev.key)
|
||||
if (st) {
|
||||
st.status = 'downloading'
|
||||
st.songName = ev.songName ?? st.songName
|
||||
st.singers = ev.singers ?? st.singers
|
||||
st.total = ev.total ?? st.total
|
||||
st.quality = ev.quality ?? st.quality
|
||||
}
|
||||
// 取消请求后桥接仍可能推送在途歌曲的 start 事件，不覆盖「取消中」状态
|
||||
if (task.status !== 'cancelling') task.status = 'downloading'
|
||||
} else if (type === 'progress') {
|
||||
const st = task.songs.find((s) => s.key === ev.key)
|
||||
if (st) {
|
||||
st.downloaded = ev.downloaded ?? 0
|
||||
st.total = ev.total ?? st.total
|
||||
}
|
||||
} else if (type === 'done') {
|
||||
const st = task.songs.find((s) => s.key === ev.key)
|
||||
if (st) {
|
||||
// 幂等：重复的 done 事件（断点续传/重发）不再累加 doneCount
|
||||
if (st.status !== 'done') task.doneCount++
|
||||
st.status = 'done'
|
||||
st.downloaded = st.total || st.downloaded
|
||||
}
|
||||
} else if (type === 'error') {
|
||||
const st = task.songs.find((s) => s.key === ev.key)
|
||||
if (st) {
|
||||
st.status = 'error'
|
||||
st.message = ev.message
|
||||
} else if (ev.key === undefined) {
|
||||
// 任务级错误（worker 初始化失败/监督线程异常）：桥接不会再发 finished，
|
||||
// 此处直接落定最终状态，避免任务永久停留在「下载中」
|
||||
task.errorMessage = ev.message
|
||||
task.status = task.status === 'cancelling' ? 'cancelled' : 'error'
|
||||
}
|
||||
} else if (type === 'cancelled') {
|
||||
const st = task.songs.find((s) => s.key === ev.key)
|
||||
if (st) st.status = 'cancelled'
|
||||
} else if (type === 'finished') {
|
||||
const anyError = task.songs.some((s) => s.status === 'error')
|
||||
const anyCancelled = task.songs.some((s) => s.status === 'cancelled')
|
||||
task.status = anyError ? 'error' : anyCancelled ? 'cancelled' : 'done'
|
||||
}
|
||||
}
|
||||
|
||||
/** 清洗文件名中的 Windows 非法字符（\ / : * ? " < > | 及控制字符），并去掉结尾空格/点 */
|
||||
function sanitizeFilename(name: string): string {
|
||||
return (
|
||||
name
|
||||
.replace(/[\\/:*?"<>|\x00-\x1f]/g, '')
|
||||
.replace(/\s+/g, ' ')
|
||||
.trim()
|
||||
.replace(/[. ]+$/, '') || 'music'
|
||||
)
|
||||
}
|
||||
|
||||
/** 懒解析：解析单首歌曲的真实下载链接（试听/上传前调用），成功后原地更新
|
||||
* 搜索结果并返回带链接的最新歌曲对象；失败返回 null。
|
||||
* `quality` 为音质档位 label（"" = 最高），解析时按「≤所选最优档」封顶。 */
|
||||
async function resolveSong(source: string, index: number, quality = ''): Promise<MusicSong | null> {
|
||||
const song = results.value[source]?.[index]
|
||||
if (!song) return null
|
||||
if (song.downloadUrl) return song
|
||||
if (!song.rawSearch) return null
|
||||
const v = (await invoke('music_resolve', { song, quality })) as {
|
||||
songs: (MusicSong | null)[]
|
||||
}
|
||||
const resolved = v.songs?.[0]
|
||||
if (!resolved?.downloadUrl) return null
|
||||
// 原地更新（索引未变，key 稳定）；保留 rawSearch 供后续重新解析
|
||||
if (results.value[source]?.[index] === song) {
|
||||
results.value[source][index] = { ...song, ...resolved }
|
||||
}
|
||||
return resolved
|
||||
}
|
||||
|
||||
/** 启动下载。engine='rust' 时交给下载器模块（任务在其列表中管理）；
|
||||
* 否则走 musicdl 桥接。返回实际使用的引擎与跳过的无链接歌曲数 */
|
||||
async function startDownload(
|
||||
songs: MusicSong[],
|
||||
opts: {
|
||||
savedir: string
|
||||
lyric: boolean
|
||||
cover: boolean
|
||||
proxyUrl: string
|
||||
engine: string
|
||||
maxConcurrent: number
|
||||
/** 目标音质 label（"" 表示最高）；解析下载时按「≤所选最优档」封顶 */
|
||||
quality?: string
|
||||
}
|
||||
): Promise<{ engine: 'musicdl' | 'rust'; skipped: number; taskId?: string }> {
|
||||
if (songs.length === 0) return { engine: 'musicdl', skipped: 0 }
|
||||
await ensureDownloadListener()
|
||||
const quality = opts.quality ?? ''
|
||||
|
||||
if (opts.engine === 'rust') {
|
||||
// 懒解析歌曲先批量解析出真实链接（桥接内并行），再交给下载器模块
|
||||
const lazy = songs.filter((s) => !s.downloadUrl && s.rawSearch)
|
||||
if (lazy.length > 0) {
|
||||
try {
|
||||
const v = (await invoke('music_resolve', { songs: lazy, quality })) as {
|
||||
songs: (MusicSong | null)[]
|
||||
}
|
||||
// 返回与输入顺序对齐，失败位为 null
|
||||
v.songs?.forEach((r, i) => {
|
||||
if (r && lazy[i]) Object.assign(lazy[i], r)
|
||||
})
|
||||
} catch (e) {
|
||||
logger.error(`批量解析下载链接失败: ${e}`)
|
||||
}
|
||||
}
|
||||
let skipped = 0
|
||||
for (const song of songs) {
|
||||
if (!song.downloadUrl) {
|
||||
skipped++
|
||||
continue
|
||||
}
|
||||
const ext = (song.ext ?? '').replace(/[\\/:*?"<>|\x00-\x1f]/g, '')
|
||||
const raw = `${song.songName ?? 'music'}${ext ? '.' + ext : ''}`
|
||||
try {
|
||||
await commands.downloaderAddTask(
|
||||
song.downloadUrl,
|
||||
sanitizeFilename(raw),
|
||||
opts.savedir,
|
||||
song.defaultDownloadHeaders ?? null,
|
||||
true,
|
||||
null
|
||||
)
|
||||
} catch (e) {
|
||||
logger.error(`下载失败 ${song.songName}: ${e}`)
|
||||
throw e
|
||||
}
|
||||
}
|
||||
return { engine: 'rust', skipped }
|
||||
}
|
||||
|
||||
const taskId = crypto.randomUUID()
|
||||
const task: MusicDownloadTask = {
|
||||
taskId,
|
||||
engine: 'musicdl',
|
||||
status: 'downloading',
|
||||
doneCount: 0,
|
||||
createdAt: Date.now(),
|
||||
songsData: songs,
|
||||
savedir: opts.savedir,
|
||||
quality,
|
||||
songs: songs.map((s, idx) => ({
|
||||
key: `${s.source ?? ''}|${idx}`,
|
||||
songName: s.songName ?? '',
|
||||
singers: s.singers ?? '',
|
||||
status: 'queued' as const,
|
||||
downloaded: 0,
|
||||
total: s.fileSizeBytes ?? 0
|
||||
}))
|
||||
}
|
||||
tasks.value.unshift(task)
|
||||
if (tasks.value.length > 30) tasks.value.length = 30
|
||||
try {
|
||||
await invoke('music_download', {
|
||||
taskId,
|
||||
// 有 rawSearch 时丢弃搜索阶段的 downloadUrl（CDN 链接有时效，
|
||||
// 交给桥接在下载 worker 里重新解析，顺带修复"隔夜链接过期"问题）
|
||||
songs: songs.map((s) => (s.rawSearch ? { ...s, downloadUrl: null } : s)),
|
||||
savedir: opts.savedir,
|
||||
lyric: opts.lyric,
|
||||
cover: opts.cover,
|
||||
proxyUrl: opts.proxyUrl,
|
||||
maxConcurrent: opts.maxConcurrent,
|
||||
quality
|
||||
})
|
||||
} catch (e) {
|
||||
task.status = 'error'
|
||||
task.errorMessage = String(e)
|
||||
throw e
|
||||
}
|
||||
return { engine: 'musicdl', skipped: 0, taskId }
|
||||
}
|
||||
|
||||
async function cancelDownload(taskId: string) {
|
||||
const task = tasks.value.find((t) => t.taskId === taskId)
|
||||
if (!task || (task.status !== 'downloading' && task.status !== 'cancelling')) return
|
||||
// 队列级取消：当前歌曲会完成，其余标记取消；最终状态由 finished 事件落定，
|
||||
// 此处先置「取消中」防止用户在剩余歌曲停止前误点「重新下载」产生重复任务
|
||||
task.status = 'cancelling'
|
||||
try {
|
||||
await invoke('music_download_cancel', { taskId })
|
||||
} catch {
|
||||
// 桥接不可用（进程已死，无后台下载）→ 直接落定为已取消，避免卡在取消中
|
||||
if (task.status === 'cancelling') task.status = 'cancelled'
|
||||
}
|
||||
}
|
||||
|
||||
function removeTask(taskId: string) {
|
||||
// 下载中/取消中的任务先请求队列级取消，防止移除后后台仍在下载
|
||||
const task = tasks.value.find((t) => t.taskId === taskId)
|
||||
if (task && (task.status === 'downloading' || task.status === 'cancelling')) {
|
||||
invoke('music_download_cancel', { taskId }).catch(() => {})
|
||||
}
|
||||
tasks.value = tasks.value.filter((t) => t.taskId !== taskId)
|
||||
}
|
||||
|
||||
/** 重新下载：用任务内保存的完整歌曲数据重新发起（error/cancelled/interrupted 状态可用） */
|
||||
async function redownloadTask(taskId: string) {
|
||||
const task = tasks.value.find((t) => t.taskId === taskId)
|
||||
if (
|
||||
!task ||
|
||||
task.status === 'downloading' ||
|
||||
task.status === 'cancelling' ||
|
||||
task.songsData.length === 0
|
||||
) {
|
||||
return
|
||||
}
|
||||
const s = settings.value
|
||||
if (!s) return
|
||||
// 代理 URL：惰性读取代理模块设置（避免 store 初始化时跨 store 依赖）
|
||||
let proxy = ''
|
||||
if (s.useProxy) {
|
||||
const port = useProxyStore().settings?.mixedPort
|
||||
proxy = port ? `http://127.0.0.1:${port}` : ''
|
||||
}
|
||||
await startDownload(task.songsData, {
|
||||
savedir: s.savedir,
|
||||
lyric: s.lyricDownload,
|
||||
cover: s.coverDownload,
|
||||
proxyUrl: proxy,
|
||||
engine: s.downloadEngine,
|
||||
maxConcurrent: s.maxConcurrent,
|
||||
// 沿用原任务的目标音质（"最高" 存为空串），而不是当前默认音质
|
||||
quality: task.quality ?? s.defaultDownloadQuality ?? ''
|
||||
})
|
||||
}
|
||||
|
||||
async function installRuntime() {
|
||||
if (installing.value) return
|
||||
installing.value = true
|
||||
installError.value = ''
|
||||
installProgress.value = null
|
||||
if (!progressUnlisten) {
|
||||
progressUnlisten = await listen<MusicInstallProgress>(
|
||||
'music-runtime-install-progress',
|
||||
(e) => {
|
||||
installProgress.value = e.payload
|
||||
}
|
||||
)
|
||||
}
|
||||
try {
|
||||
env.value = await commands.musicInstallRuntime()
|
||||
} catch (e) {
|
||||
// 保留失败原因供设置页面板展示；进度停在最后事件值，需清掉避免误导
|
||||
installError.value = typeof e === 'string' ? e : JSON.stringify(e)
|
||||
throw e
|
||||
} finally {
|
||||
installing.value = false
|
||||
if (progressUnlisten) {
|
||||
progressUnlisten()
|
||||
progressUnlisten = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function cancelInstall() {
|
||||
commands.musicCancelRuntimeInstall().catch(() => {})
|
||||
}
|
||||
|
||||
async function stopBridge() {
|
||||
await commands.musicStopBridge()
|
||||
}
|
||||
|
||||
return {
|
||||
settings,
|
||||
env,
|
||||
availableSources,
|
||||
searching,
|
||||
searchError,
|
||||
searched,
|
||||
parsing,
|
||||
parseError,
|
||||
results,
|
||||
resultTotal,
|
||||
installing,
|
||||
installProgress,
|
||||
installError,
|
||||
tasks,
|
||||
init,
|
||||
loadSettings,
|
||||
saveSettings,
|
||||
refreshEnv,
|
||||
loadSources,
|
||||
pingBridge,
|
||||
search,
|
||||
parsePlaylist,
|
||||
resolveSong,
|
||||
startDownload,
|
||||
cancelDownload,
|
||||
removeTask,
|
||||
redownloadTask,
|
||||
installRuntime,
|
||||
cancelInstall,
|
||||
stopBridge
|
||||
}
|
||||
})
|
||||
@@ -245,3 +245,40 @@ input, textarea, [contenteditable='true'] {
|
||||
0%, 100% { opacity: 1; }
|
||||
50% { opacity: 0.6; }
|
||||
}
|
||||
|
||||
/* 音乐：正在播放的跳动均衡器指示（列表行与播放队列共用） */
|
||||
.music-eq {
|
||||
display: inline-flex;
|
||||
align-items: flex-end;
|
||||
gap: 2px;
|
||||
height: 12px;
|
||||
}
|
||||
.music-eq > i {
|
||||
display: block;
|
||||
width: 2.5px;
|
||||
border-radius: 1px;
|
||||
background: var(--primary);
|
||||
animation: musicEqBounce 0.9s ease-in-out infinite;
|
||||
}
|
||||
.music-eq > i:nth-child(1) {
|
||||
height: 6px;
|
||||
animation-delay: -0.2s;
|
||||
}
|
||||
.music-eq > i:nth-child(2) {
|
||||
height: 12px;
|
||||
animation-delay: -0.5s;
|
||||
}
|
||||
.music-eq > i:nth-child(3) {
|
||||
height: 8px;
|
||||
animation-delay: -0.35s;
|
||||
}
|
||||
.music-eq.is-paused > i {
|
||||
animation-play-state: paused;
|
||||
}
|
||||
@keyframes musicEqBounce {
|
||||
0%, 100% { transform: scaleY(0.45); }
|
||||
50% { transform: scaleY(1); }
|
||||
}
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.music-eq > i { animation: none; }
|
||||
}
|
||||
Reference in New Issue
Block a user