Peach: Local-first video metadata scraper and media manager.
fix(jav-browser): 异步提交并提供任务进度与脚本取证
longmeidao5699407eb108
diff --git a/docs/JAV_BROWSER.md b/docs/JAV_BROWSER.mdindex 4d6cc7c00..6e0b2b2da 100644--- a/docs/JAV_BROWSER.md+++ b/docs/JAV_BROWSER.md@@ -22,7 +22,7 @@ CloudDrive2 分别返回提交云下载和管理离线任务的能力。支持4. 打开已登记站点,点击右下角「配置 Peach」或设置按钮,在「Peach 地址」中粘贴配对信息,自动填好地址与令牌,再保存设置。也可从脚本菜单「配置 Peach 地址与令牌」打开设置面板,分别填写地址和令牌。目标浏览器必须信任 Peach 的 HTTPS 证书;HTTP 只允许回环地址。5. 允许脚本管理器连接自己的 Peach 地址。远程设备填写该设备能访问的 Peach HTTPS 地址。-专用令牌仅允许查询作品添加状态和发起 JAV 添加,网盘账号仍由 Peach 管理。点击「关闭浏览器添加」会撤销令牌并停止队列里尚未提交的添加;已经提交的云下载从活动页取消。+专用令牌仅允许查询作品添加状态、发起 JAV 添加和写入受限的脚本错误记录,网盘账号仍由 Peach 管理。点击「关闭浏览器添加」会撤销令牌并停止队列里尚未开始提交的添加;正在提交或已经提交的云下载从活动页查看和取消。脚本从 GM 存储读取已保存配置,设置面板中令牌留空可保留,更换地址时须重新填写令牌。服务端只保存令牌哈希,不能读回明文。配对信息包含地址与专用令牌,应按令牌保管;导入仅填充表单,点击「保存设置」后生效。配置校验与选中番号的提示显示在页面内,浅色与暗色随系统切换。@@ -31,11 +31,17 @@ Peach 配置页通过同源桥接页检测脚本版本和是否已为当前地## 添加与查看进度1. 打开影片详情页,点击「加入 Peach 馆藏」。-2. 脚本显示排队、搜索磁力、云下载或已入库状态。馆藏已有的影片显示「馆藏已有该番号影片」,按钮显示「已有该影片」。同一番号的进行中任务会复用。+2. 脚本用整体进度显示排队、搜索、下载、入库与整理五个阶段,完成阶段打勾、当前阶段高亮,并显示提交网盘、文件可访问等具体状态。网盘百分比仅属于下载阶段,其他阶段按真实状态推进。馆藏已有的影片显示「馆藏已有该番号影片」,按钮显示「已有该影片」。同一番号的进行中任务会复用。3. 云下载提交后,在 Peach 活动页查看下载与入库后整理进度。搜索期间可以关闭源站页面,队列由 Peach 保存;Peach 重启后继续尚未完成的搜索。未找到资源和失败的添加,需要在原站点击「重试加入 Peach 馆藏」。网络超时只提供状态查询,确认服务器结果后再决定是否重试。+浮卡标题栏可折叠详情,也可收起为右下角的 Peach 标志小球。点击小球展开并查询现有任务,不会再次添加。设置面板打开时隐藏浮卡,关闭后恢复;开关过渡遵循系统的减少动效偏好。++添加请求只校验本机配置并保存队列;云盘能力探测与提交由后台执行,状态查询不等待远端提交。脚本单次请求上限为 60 秒,超时不表示下载失败,也不会自动重复添加。状态接口的可选 `download` 字段仅投影任务状态、标签、当前阶段 `phase`、下载进度、整理状态及更新时间;下载进度来自后台最近一次网盘对账,整体阶段来自任务里程碑。连接异常保留最近一次确认的阶段;未请求的整理显示跳过。++脚本通过专用令牌向 `POST /api/jav-browser/errors` 写入请求超时、连接失败、HTTP 拒绝和无效响应记录。记录只含发生时间、事件标识、脚本版本、站点标识、番号、操作类型、耗时和 HTTP 状态,不含令牌、账号、完整来源地址、页面正文或原始异常。每批最多 10 条、16 KiB,服务端每分钟最多接收 20 条并按事件标识去重;仅写本机 `errors-*.log`,随导出诊断包提供。脚本管理器暂存最多 20 条、保留 7 天,后续请求成功时按一分钟限频向原 Peach 地址补报;记录失败不重试添加,也不递归生成错误。+## 配置来源与显示条件| 内容 | 来源与显示条件 |diff --git a/docs/REUSE.md b/docs/REUSE.mdindex 61c577749..c26bb264e 100644--- a/docs/REUSE.md+++ b/docs/REUSE.md@@ -70,6 +70,12 @@ npm 安装沿用 Node.js 24 LTS 附带的官方 [`npm ci`](https://docs.npmjs.co持久元数据候选复用 `metadata.extract_peach_fields` 的原文取值和 `metadata_auto_apply` 的统一写入入口。r18 的纯拉丁字母标题需由同一作品快照的原文侧精确印证;缺少快照或只有英文译文时不进入自动结算,人工批准入口同样拒收。来源原文中的拉丁字母片名保留,不按字符集自动翻译。无新增依赖。+## 用户脚本的本机取证与进度++用户脚本的请求错误复用 Tampermonkey GM 存储与 `GM_xmlhttpRequest`,服务端复用 `error_reporting.local_event` 的脱敏与 `support_bundle` 的日志导出。独立的 `userscript` stage 仅写本机;受限字段、体积、频率和去重属于 Peach 协议策略,不接入外部遥测 SDK,不增加依赖。队列锁只保护内存与本机状态,网盘提交在锁外执行,提交幂等仍由现有 DownloadService 的共享提交锁处理。++脚本进度由 DownloadStore 的真实任务投影提供,复用 `STATE_LABELS` 与 `POSTPROCESS_LABELS`,不回传磁力、路径或网盘凭据。整体进度组合生产 `frontend/src/react/components/progress.tsx` 的 SVG、6px 高度、100 份比例和刻度,与 `library-processing/library-processing-notice.tsx` 的完成标记和当前阶段语义;BoardUI 明暗主题配色为同许可快照,固定来源为 Peach `44c347573e47cdd3b2294d35719f363ee5305246`。下载段仅填充实际百分比,其他段按里程碑推进;脚本保持零运行依赖,不嵌入 React。+## 浏览器错误的构建映射前端复用官方 [`@sentry/vite-plugin` 11.8.0](https://github.com/getsentry/sentry-javascript-bundler-plugins)(MIT,维护中,Node ≥23.2,与项目 Node 24 和 Vite 8 兼容)生成确定性 Debug ID 与 hidden source maps;[`@sentry/cli` 3.8.0](https://github.com/getsentry/sentry-cli)(FSL-1.1-MIT)仅用于构建期本地定位和显式上传。两者精确固定在前端开发依赖,纳入现有 Dependabot;不进入 Python 运行时或独立包依赖。diff --git a/docs/ROUTES.md b/docs/ROUTES.mdindex a37917365..d914127d7 100644--- a/docs/ROUTES.md+++ b/docs/ROUTES.md@@ -103,6 +103,8 @@设置分区可直接打开、刷新和用浏览器前进后退。偏好面板从当前页面打开时保留背景;配置分区复用配置页及其权限检查。配置分类导航停在搜索栏下方,切换分类时显示所选分区的开头。+用户脚本通过专用令牌调用 `POST /api/jav-browser/errors`,仅接收白名单错误字段并写入本机日志;批次、体积、限频与诊断包范围见 [浏览器添加 JAV](JAV_BROWSER.md)。状态接口 `GET /api/jav-browser` 同时投影真实下载与整理进度,不授予配置、账号或账本写入权限。+`GET /api/configuration/cloud-proxies` 返回已添加媒体库对应的 CloudDrive 账号及 API/数据代理、未匹配媒体库和账号修订号,不回显代理密码;尚未填写 CloudDrive2 地址时返回空列表与 `configured: false`。`POST` 接受账号 `id`、`revision` 和本次修改的 `api`/`data`,写回 CloudDrive 后返回该账号当前状态;配置冲突返回 409。这两条接口均限本机管理权限,写入还要求同源请求。`POST /api/configuration/smb/test` 接受共享地址及连接字段,验证只读目录访问,返回 `readable` 和最多 500 个可进入子目录名。接口要求本机管理权限与同源请求;地址无效返回 400,无读取权限返回 403,共享不可达返回 502,不回显密码。配置读取只返回账号、加密要求与密码是否已保存。diff --git a/frontend/e2e/jav-userscript.test.ts b/frontend/e2e/jav-userscript.test.tsindex 6e68681ec..62d6a0110 100644--- a/frontend/e2e/jav-userscript.test.ts+++ b/frontend/e2e/jav-userscript.test.ts@@ -20,6 +20,7 @@ type Call = { method: string; url: string; headers: Record<string, string>; anontype MockRequest = Call & { onload(value: unknown): void; ontimeout(): void; onerror(): void };type Mock = {calls: Call[];+ reports: MockRequest[];pending: MockRequest[];values: Record<string, string>;menu?: () => void;@@ -47,7 +48,7 @@ async function open(browser: Browser, options: {}));await page.addInitScript(({ configured, token, base, initial, resolved }) => {const mock: Mock = {- calls: [], pending: [], automatic: true, menus: {},+ calls: [], reports: [], pending: [], automatic: true, menus: {},values: configured ? { 'peach.jav.base': base, 'peach.jav.token': token } : {},reply(index, value, status = 200) {mock.pending[index]!.onload({ status, responseText: JSON.stringify(value) });@@ -59,6 +60,7 @@ async function open(browser: Browser, options: {GM_setValue: (key: string, value: string) => { mock.values[key] = value; },GM_registerMenuCommand: (label: string, callback: () => void) => { mock.menu = callback; mock.menus[label] = callback; },GM_xmlhttpRequest: (request: MockRequest) => {+ if (request.url.endsWith('/api/jav-browser/errors')) { mock.reports.push(request); return; }mock.calls.push({ method: request.method, url: request.url, headers: request.headers,anonymous: request.anonymous, ...(request.data ? { data: request.data } : {}) });mock.pending.push(request);@@ -505,6 +507,7 @@ describe('JAV 用户脚本', () => {await ready(page, '查询 Peach 状态');await page.clock.fastForward(30_000);assert.equal(await page.evaluate(() => window.javMock.calls.length), 2);+ assert.equal(await page.evaluate(() => window.javMock.reports.length), 1);await button(page).click();await pending(page, 3);await page.evaluate(() => window.javMock.pending[2]!.onerror());diff --git a/src/peach/jav_browser.py b/src/peach/jav_browser.pyindex ce6798581..40b0a0b66 100644--- a/src/peach/jav_browser.py+++ b/src/peach/jav_browser.py@@ -5,6 +5,7 @@ import hashlibimport hmacimport jsonimport logging+import mathimport reimport secretsimport threading@@ -14,7 +15,10 @@ from urllib.parse import parse_qsl, urlencode, urlsplitfrom .catalog_rules import is_jav_code, normalise_code_key, release_code_from_product, same_release_codefrom .config import PROJECT_ROOT-from .downloads import INGESTED, RESUBMITTABLE_STATES, submit_offline_download, parse_magnet+from .downloads import (+ CLOUDDRIVE_CREDENTIAL, INGESTED, POSTPROCESS_LABELS, REMOTE_RUNNING, RESUBMITTABLE_STATES,+ STATE_LABELS, submit_offline_download, parse_magnet,+)from .follow_secrets import CredentialErrorfrom .feeds import scan_codefrom .fsutil import atomic_write_text@@ -106,6 +110,21 @@ def identify_source(value: object, hint: str = "") -> str:return code+def _download_candidate(items, code):+ for item in items:+ name = str(item.get("name") or "")+ matches = (same_release_code(scan_code(name), code)+ or same_release_code(scan_code(name, product=True), code))+ if not matches or re.search(r"(?i)\b(?:sample|trailer|preview)\b|予告|预告|預告", name):+ continue+ try:+ parse_magnet(str(item.get("uri") or ""))+ except ValueError:+ continue+ return item+ return None++class JavBrowser:"""本机持久队列;搜索完成前退出时,下一次启动继续处理。"""@@ -119,6 +138,9 @@ class JavBrowser:self._wake = threading.Event()self._stop = threading.Event()self._thread = None+ self._submitting = set()+ from .jav_browser_diagnostics import BrowserDiagnostics+ self.diagnostics = BrowserDiagnostics()self.rows = self._load()def _load(self) -> dict:@@ -163,20 +185,22 @@ class JavBrowser:raise ValueError("请选择启用、更新令牌或关闭")if not self.downloads.available:raise ValueError("浏览器添加只在允许修改数据库的设备上可用")+ provider = str(body.get("provider") or "")+ if action != "disable":+ self._ready(provider)+ token = Nonewith self._lock:if action == "disable":self.credentials.clear(CREDENTIAL)- for row in self.rows.values():- if row["state"] in ACTIVE:+ for code, row in self.rows.items():+ if row["state"] in ACTIVE and code not in self._submitting:row.update(state="failed", message="浏览器添加已关闭")self._save()- return self.settings()- provider = str(body.get("provider") or "")- self._ready(provider)- token = secrets.token_urlsafe(32)- self.credentials.save(CREDENTIAL, {- "token_hash": hashlib.sha256(token.encode()).hexdigest(), "provider": provider})- return {**self.settings(), "token": token}+ else:+ token = secrets.token_urlsafe(32)+ self.credentials.save(CREDENTIAL, {+ "token_hash": hashlib.sha256(token.encode()).hexdigest(), "provider": provider})+ return {**self.settings(), **({"token": token} if token else {})}def authorized(self, supplied: str) -> bool:try:@@ -186,10 +210,17 @@ class JavBrowser:return bool(expected and supplied and len(supplied) <= 256 and hmac.compare_digest(expected, hashlib.sha256(supplied.encode()).hexdigest()))- def _ready(self, provider: str):+ def _ready(self, provider: str, *, remote=True):if not self.downloads.available:raise ValueError("浏览器添加只在允许修改数据库的设备上可用")- state = next((row for row in self.downloads.channel_snapshot()["providers"] if row["key"] == provider), None)+ if remote:+ state = next((row for row in self.downloads.channel_snapshot()["providers"] if row["key"] == provider), None)+ elif provider in {"115", "pikpak"}:+ state = self.downloads._provider_state(provider)+ else:+ state = {"target": provider.startswith("clouddrive:"), "configured": bool(+ self.downloads.config.clouddrive_address and "token" in+ self.credentials.describe(CLOUDDRIVE_CREDENTIAL)["fields"])}if not state or not state["configured"] or not state["target"]:raise ValueError("请先在下载渠道配置网盘账号和目标目录")@@ -212,17 +243,28 @@ class JavBrowser:code = code_key(value)with self._lock:row = dict(self.rows.get(code, {}))+ if not row.get("task_id") and code not in self._submitting:+ row.update(self._existing(code) or {})task = self.downloads.store.get(row["task_id"]) if row.get("task_id") else None+ detail = {}if task is not None:state = "ingested" if task.state == INGESTED else ("failed" if task.state in RESUBMITTABLE_STATES or task.blocked_at else "submitted")row.update(state=state, message=task.failure_detail or MESSAGES[state])if task.asset_id:row["asset_id"] = task.asset_id- else:- row.update(self._existing(code) or {})+ progress = task.progress+ detail["download"] = {"state": task.state, "label": STATE_LABELS.get(task.state, ""),+ "phase": "organize" if task.state == INGESTED else "ingest" if task.remote_done_at+ or task.state in {"remote_done", "landed"} else "download",+ "progress": min(1.0, max(0.0, progress)) if task.state in {REMOTE_RUNNING, "remote_done", "landed", INGESTED}+ and type(progress) in (int, float) and math.isfinite(progress) else None,+ "postprocess_state": task.postprocess_state,+ "postprocess_label": POSTPROCESS_LABELS.get(task.postprocess_state, ""),+ "updated_at": task.updated_at}state = row.get("state", "idle")- return {"ok": True, "code": code, **row, "state": state,+ return {"ok": True, "code": code, **row, **detail, "state": state,+ "stage": "submitting" if code in self._submitting else state,"message": row.get("message") or MESSAGES[state]}def add(self, body: dict) -> dict:@@ -234,7 +276,7 @@ class JavBrowser:status = self.status(code)if status["state"] in ACTIVE | {"owned", "submitted", "ingested"}:return status- self._ready(config.get("provider", ""))+ self._ready(config.get("provider", ""), remote=False)if code not in self.rows and len(self.rows) >= 200:completed = next((key for key, row in self.rows.items() if row["state"] not in ACTIVE), None)if completed is None:@@ -264,20 +306,8 @@ class JavBrowser:try:self._ready(provider)result = self.search(self.contract, {"code": code, "goal": "quality"})- candidate = None- for item in result.get("items", ()):- name = str(item.get("name") or "")- matches = (same_release_code(scan_code(name), code)- or same_release_code(scan_code(name, product=True), code))- if (not matches- or re.search(r"(?i)\b(?:sample|trailer|preview)\b|予告|预告|預告", name)):- continue- try:- parse_magnet(str(item.get("uri") or ""))- except ValueError:- continue- candidate = item- break+ candidate = _download_candidate(result.get("items", ()), code)+ should_submit = Falsewith self._lock:if row["state"] != "searching" or not self._config().get("token_hash"):return True@@ -290,16 +320,26 @@ class JavBrowser:row.update(state="failed" if failed else "no_match", message=("资源搜索暂不可用,请在 Peach 检查来源后重试" if failed else MESSAGES["no_match"]))else:+ self._submitting.add(code)+ should_submit = True+ self._save()+ if should_submit:+ try:submitted = submit_offline_download(self.downloads, magnet=candidate["uri"], provider=provider, code=code,origin="browser:" + row["source_url"], dedupe_code=True)task = submitted["task"]- row.update(state="failed" if submitted["outcome"] in {"failed", "refused"} else "submitted",- task_id=task["id"])- self._save()+ with self._lock:+ row.update(state="failed" if submitted["outcome"] in {"failed", "refused"} else "submitted",+ task_id=task["id"])+ self._save()+ finally:+ with self._lock:+ self._submitting.discard(code)except Exception as error:LOGGER.error("JAV 浏览器添加失败:%s (%s)", code, type(error).__name__)with self._lock:+ self._submitting.discard(code)if row["state"] == "searching":row.update(state="failed", message="搜索或云下载提交失败,请在 Peach 检查下载渠道后重试")self._save()diff --git a/src/peach/jav_browser_diagnostics.py b/src/peach/jav_browser_diagnostics.pynew file mode 100644index 000000000..821e9cb60--- /dev/null+++ b/src/peach/jav_browser_diagnostics.py@@ -0,0 +1,63 @@+"""专用令牌范围内的脚本错误取证,只写本机白名单字段。"""+from collections import deque+from datetime import datetime+import re+import threading+import time++from fastapi import HTTPException++from . import error_reporting++KINDS = {"timeout", "network", "abort", "http", "invalid_response", "client_exception"}+++def _validated_event(row, sites):+ from .jav_browser import code_key+ if not isinstance(row, dict):+ raise HTTPException(400, "错误记录格式无效")+ if (not all(isinstance(row.get(key), str) for key in ("kind", "operation", "site"))+ or row.get("kind") not in KINDS or row.get("operation") not in {"GET", "POST", "IDENTIFY"}+ or row.get("site") not in sites+ or not isinstance(row.get("id"), str) or not re.fullmatch(r"[a-f0-9-]{36}", row["id"])+ or not isinstance(row.get("script_version"), str)+ or not re.fullmatch(r"\d{1,3}\.\d{1,3}\.\d{1,3}", row["script_version"])+ or type(row.get("elapsed_ms")) is not int or not 0 <= row["elapsed_ms"] <= 3_600_000+ or type(row.get("status")) is not int or not 0 <= row["status"] <= 599):+ raise HTTPException(400, "错误记录字段无效")+ try:+ code = code_key(row["code"]) if row.get("code") else ""+ at = datetime.fromisoformat(str(row.get("at", "")))+ if at.tzinfo is None:+ raise ValueError()+ except (TypeError, ValueError):+ raise HTTPException(400, "错误记录身份或时间无效") from None+ return {**{key: row[key] for key in ("id", "kind", "operation", "site", "script_version",+ "elapsed_ms", "status")}, "code": code, "occurred_at": at.isoformat()}+++class BrowserDiagnostics:+ def __init__(self):+ self._lock = threading.Lock()+ self._recent = deque()++ def record(self, data):+ from .jav_browser import source_sites+ events = data.get("events") if isinstance(data, dict) else None+ if not isinstance(events, list) or not 1 <= len(events) <= 10:+ raise HTTPException(400, "错误记录格式无效")+ sites = {site["id"] for site in source_sites()}+ clean = [_validated_event(row, sites) for row in events]+ with self._lock:+ now = time.monotonic()+ while self._recent and now - self._recent[0][0] >= 60:+ self._recent.popleft()+ known = {identity for _, identity in self._recent}+ fresh = {row["id"]: row for row in clean if row["id"] not in known}+ if len(self._recent) + len(fresh) > 20:+ raise HTTPException(429, "错误记录过于频繁")+ for row in fresh.values():+ if error_reporting.local_event("userscript", **row) is None:+ raise HTTPException(503, "错误日志无法写入")+ self._recent.append((now, row["id"]))+ return {"recorded": len(fresh)}diff --git a/src/peach/routes_jav_browser.py b/src/peach/routes_jav_browser.pyindex 0672658dd..6e18ac124 100644--- a/src/peach/routes_jav_browser.py+++ b/src/peach/routes_jav_browser.py@@ -1,4 +1,6 @@"""JAV 用户脚本的专用权限端点与本机配对设置。"""+import json+from fastapi import APIRouter, Body, Depends, HTTPException, Requestfrom fastapi.responses import HTMLResponse, JSONResponse, Response@@ -52,6 +54,19 @@ def add(body: dict = Body(...), service=Depends(browser_client)):raise HTTPException(400, str(error)) from None+async def errors(request: Request, service=Depends(browser_client)):+ body = bytearray()+ async for part in request.stream():+ body.extend(part)+ if len(body) > 16 * 1024:+ raise HTTPException(413, "错误记录过长")+ try:+ data = json.loads(body)+ except (ValueError, UnicodeError):+ raise HTTPException(400, "错误记录格式无效") from None+ return JSONResponse(service.diagnostics.record(data), headers={"Cache-Control": "no-store"})++def settings(request: Request):return JSONResponse(request.app.state.jav_browser.settings(), headers={"Cache-Control": "no-store"})@@ -71,6 +86,7 @@ def create_router(local_only) -> APIRouter:router.add_api_route("/api/jav-browser", status, methods=["GET"])router.add_api_route("/api/jav-browser/identify", identify, methods=["GET"])router.add_api_route("/api/jav-browser", add, methods=["POST"])+ router.add_api_route("/api/jav-browser/errors", errors, methods=["POST"])permissions = [Depends(require_auth), Depends(local_only)]router.add_api_route("/api/configuration/jav-browser", settings, methods=["GET"], dependencies=permissions)router.add_api_route("/api/configuration/jav-browser", configure, methods=["POST"], dependencies=permissions)diff --git a/tests/test_downloads_jav_browser.py b/tests/test_downloads_jav_browser.pyindex 890fce5a6..0d28403a4 100644--- a/tests/test_downloads_jav_browser.py+++ b/tests/test_downloads_jav_browser.py@@ -162,6 +162,35 @@ class BrowserTests(unittest.TestCase):self.downloads.store.save(task)self.assertEqual(self.status().json()["state"], "failed")+ def test_status_projects_remote_progress_and_postprocessing_without_private_task_fields(self):+ self.add()+ self.service.process_one()+ task = self.downloads.store.get(self.status().json()["task_id"])+ for state, progress, label in ((dl.REMOTE_RUNNING, .425, "网盘下载中"),+ (dl.REMOTE_RUNNING, None, "网盘下载中"),+ (dl.REMOTE_DONE, 1.0, "网盘下载完成"),+ (dl.LANDED, 1.0, "文件已可访问"),+ (dl.INGESTED, 1.0, "已入库")):+ task.state, task.progress = state, progress+ task.postprocess_state = dl.POSTPROCESS_RUNNING+ self.downloads.store.save(task)+ status = self.status().json()+ detail = status["download"]+ self.assertEqual((detail["state"], detail["progress"], detail["label"]), (state, progress, label))+ self.assertEqual(detail["postprocess_label"], "整理中")+ self.assertEqual(detail["phase"], "organize" if state == dl.INGESTED else "ingest"+ if state in {dl.REMOTE_DONE, dl.LANDED} else "download")+ self.assertEqual(set(detail), {"state", "label", "phase", "progress", "postprocess_state", "postprocess_label", "updated_at"})+ tracked = self.service.rows.copy()+ self.service.rows.clear()+ task.state = dl.REMOTE_RUNNING+ self.downloads.store.save(task)+ self.assertEqual(self.status().json()["download"]["progress"], 1.0)+ self.service.rows.update(tracked)+ task.state, task.remote_done_at = dl.FAILED, "2026-10-24T13:25:00+00:00"+ self.downloads.store.save(task)+ self.assertEqual(self.status().json()["download"]["phase"], "ingest")+def test_disable_and_rotation_revoke_tokens(self):rotated = self.configure("rotate").json()["token"]self.assertEqual(self.status().status_code, 401)@@ -201,6 +230,96 @@ class BrowserTests(unittest.TestCase):self.assertEqual(self.configure("enable").status_code, 400)self.service.search.assert_not_called()+ def test_add_queues_without_remote_channel_probe_and_worker_validates(self):+ self.downloads.channel_catalog = Mock(side_effect=ValueError("channel unavailable"))+ self.assertEqual(self.add().json()["state"], "queued")+ self.downloads.channel_catalog.assert_not_called()+ self.service.process_one()+ self.assertEqual(self.status().json()["state"], "failed")+ self.service.search.assert_not_called()+ self.remote.submit.assert_not_called()++ def test_slow_submission_allows_status_and_retains_inflight_task_when_disabled(self):+ self.add()+ started, finish, queried = threading.Event(), threading.Event(), threading.Event()+ states = []+ def submit(*args):+ started.set()+ if not finish.wait(10):+ raise RuntimeError("submission fixture did not finish")+ return dl.RemoteStatus(dl.RUNNING, "remote-1", "ABC-123")+ def query():+ states.append(self.service.status("ABC-123")["state"])+ queried.set()+ self.remote.submit.side_effect = submit+ worker = threading.Thread(target=self.service.process_one)+ reader = threading.Thread(target=query)+ worker.start()+ try:+ self.assertTrue(started.wait(5))+ reader.start()+ self.assertTrue(queried.wait(2), "status waited for remote submission")+ self.assertEqual(states, ["searching"])+ self.assertEqual(self.service.status("ABC-123")["stage"], "submitting")+ self.assertEqual(self.add().json()["state"], "searching")+ self.assertEqual(self.configure("disable").status_code, 200)+ finally:+ finish.set()+ worker.join(5)+ if reader.ident is not None:+ reader.join(5)+ self.assertFalse(worker.is_alive())+ self.assertFalse(reader.is_alive())+ status = self.service.status("ABC-123")+ self.assertEqual(status["state"], "submitted")+ self.remote.submit.assert_called_once()+ self.assertEqual(len(self.downloads.store.submissions(status["task_id"])), 1)++ def report(self, events, **kwargs):+ return self.client.post("/api/jav-browser/errors", headers=self.script_headers,+ json={"events": events}, **kwargs)++ def diagnostic(self, **changes):+ return {"id": "7d58618d-b9b9-430e-bc28-1e9a81aa2e11", "at": "2026-10-24T13:25:00Z",+ "kind": "timeout", "operation": "POST", "site": "missav", "code": "ABC-123",+ "script_version": "0.4.1", "elapsed_ms": 60000, "status": 0, **changes}++ def test_script_reports_are_scoped_bounded_deduplicated_and_use_local_logs(self):+ import io+ import zipfile+ from peach import error_reporting, support_bundle+ path = "/api/jav-browser/errors"+ self.assertEqual(self.client.post(path, json={"events": [self.diagnostic()]}).status_code, 401)+ self.assertEqual(self.client.post(path, headers=self.script_headers, content=b"x" * 17000).status_code, 413)+ with patch.object(error_reporting, "_log_dir", self.root / "logs"), patch("peach.remote_reporting.capture") as remote:+ row = self.diagnostic(message="private-message", token="private-token", source_url=PAGE)+ self.assertEqual(self.report([row]).json(), {"recorded": 1})+ self.assertEqual(self.report([row]).json(), {"recorded": 0})+ remote.assert_not_called()+ log = next((self.root / "logs").glob("errors-*.log"))+ text = log.read_text(encoding="utf-8")+ value = json.loads(text)+ self.assertEqual((value["stage"], value["kind"], value["code"], value["elapsed_ms"]),+ ("userscript", "timeout", "ABC-123", 60000))+ for private in ("private-message", "private-token", PAGE, self.token, "cloud-secret"):+ self.assertNotIn(private, text)+ with zipfile.ZipFile(io.BytesIO(support_bundle.bundle_bytes())) as archive:+ content = archive.read(next(name for name in archive.namelist() if name.endswith(log.name))).decode()+ self.assertIn('"stage": "userscript"', content)+ for change in ({"kind": []}, {"site": "https://private.example"}, {"code": "not a code"},+ {"elapsed_ms": True}, {"status": 999}, {"script_version": "secret"}, {"at": "yesterday"}):+ self.assertEqual(self.report([self.diagnostic(**change)]).status_code, 400)+ self.assertEqual(self.report([self.diagnostic()] * 11).status_code, 400)+ with patch.object(error_reporting, "local_event", return_value=self.root / "log") as event:+ for number in range(20):+ row = self.diagnostic(id=f"00000000-0000-4000-8000-{number:012d}")+ response = self.report([row])+ if number < 19:+ self.assertEqual(response.status_code, 200)+ else:+ self.assertEqual(response.status_code, 429)+ self.assertEqual(event.call_count, 19)+def test_read_only_instance_cannot_accept_jobs(self):self.downloads.available = Falseself.assertEqual(self.add().status_code, 403)diff --git a/tests/test_fastapi_api.py b/tests/test_fastapi_api.pyindex a03ba567c..5271221b3 100644--- a/tests/test_fastapi_api.py+++ b/tests/test_fastapi_api.py@@ -3946,6 +3946,7 @@ class RouteAuthContractTests(unittest.TestCase):("GET", "/api/jav-browser"): routes_jav_browser.browser_client,("GET", "/api/jav-browser/identify"): routes_jav_browser.browser_client,("POST", "/api/jav-browser"): routes_jav_browser.browser_client,+ ("POST", "/api/jav-browser/errors"): routes_jav_browser.browser_client,}cls.routes = {(",".join(sorted(route.methods)), route.path):{dependency.call for dependency in route.dependant.dependencies}diff --git a/web/integrations/jav-userscript-release.json b/web/integrations/jav-userscript-release.jsonindex 6c41c15a1..bb164ed16 100644--- a/web/integrations/jav-userscript-release.json+++ b/web/integrations/jav-userscript-release.json@@ -1,12 +1,12 @@{- "version": "0.5.0",+ "version": "0.5.1","repository": "https://github.com/peach-mitao/peach-userscript",- "commit": "561f7f59012bab15a7720ba92329cd7caca14351",+ "commit": "ff208a66300e1d45edd9d475e88a5d6e9b48d263","install_url": "/integrations/peach-jav.user.js",- "bridge_min_version": "0.5.0",+ "bridge_min_version": "0.5.1","site_schema_version": 1,"files": {- "peach-jav.user.js": "40b00ba7d5ed987ff93ddb9dc1a6a0b5087aef0b011d9a53143f407749b171ec",+ "peach-jav.user.js": "0167a55bdc08e0ed5da126bf2abde4e02d9f12d0d903cd86ec235cdd2332f606","jav-sites.json": "74983ac48fb8dda583bd066f7dce7fbc01834137a8be07f5cbe779dcfb7b83db"}}diff --git a/web/integrations/peach-jav.user.js b/web/integrations/peach-jav.user.jsindex 686092456..351acd91a 100644--- a/web/integrations/peach-jav.user.js+++ b/web/integrations/peach-jav.user.js@@ -5,7 +5,7 @@// @supportURL https://github.com/peach-mitao/peach-userscript/issues// @homepageURL https://github.com/peach-mitao/peach-userscript// @license AGPL-3.0-or-later-// @version 0.5.0+// @version 0.5.1// @description 在 JAV 作品详情页识别或选中番号,交给 Peach 下载入库。// @match https://missav.ws/*// @match https://*.missav.ws/*@@ -252,8 +252,10 @@const SITE_RULES = {"version":1,"sites":[{"id":"missav","label":"MissAV","kind":"在线播放","domains":["missav.ws","missav.ai","missav.com","missav123.com","missav.live","missav.fans","missav.media"],"mode":"automatic","detail_pattern":"^/(?:dm[0-9]+/)?(?:(?:en|ja|zh|cn|tw)/)?([^/]+)/?$","selectors":["h1","[data-video-code]","dt",".video-info p",".video-detail p"]},{"id":"jable","label":"Jable","kind":"在线播放","domains":["jable.tv"],"mode":"automatic","detail_pattern":"^/videos/([^/]+)/?$","selectors":["h1",".video-info h4","[data-video-code]","dt",".video-info p"]},{"id":"supjav","label":"SupJAV","kind":"在线播放","domains":["supjav.com"],"mode":"selection"},{"id":"jav-guru","label":"JAV.guru","kind":"在线播放","domains":["jav.guru"],"mode":"automatic","detail_pattern":"^/[0-9]+/([^/]+)/?$","selectors":["h1.entry-title","h1"]},{"id":"njav","label":"NJAV / 123AV","kind":"在线播放","domains":["njav.tv","njavtv.com","123av.com","javgo.to"],"mode":"automatic","detail_pattern":"^/(?:en|ja|zh|cn|tw)/v/([^/]+)/?$","selectors":["h1","dt"]},{"id":"javtiful","label":"JAVtiful","kind":"在线播放","domains":["javtiful.com"],"mode":"automatic","detail_pattern":"^/(?:[a-z]{2}/)?video/[0-9]+/([^/]+)/?$","selectors":["h1","[data-video-code]"]},{"id":"javmost","label":"JAVMost","kind":"在线播放","domains":["javmost.com","javmost.ws","javmost.cx"],"mode":"selection"},{"id":"javgg","label":"JAVGG","kind":"在线播放","domains":["javgg.net"],"mode":"selection"},{"id":"7mmtv","label":"7mmtv","kind":"在线播放","domains":["7mmtv.sx"],"mode":"automatic","detail_pattern":"^/(?:ja|en|zh|cn|tw)/(?:censored|uncensored)_content/[0-9]+/([^/]+)\\.html$","selectors":["h1"]},{"id":"hpjav","label":"HPJAV","kind":"在线播放","domains":["hpjav.tv"],"mode":"selection"},{"id":"thisav","label":"ThisAV","kind":"在线播放","domains":["thisav.com"],"mode":"selection"},{"id":"javhd","label":"JAVHD","kind":"在线播放","domains":["javhd.com"],"mode":"selection"},{"id":"javdb","label":"JavDB","kind":"数据库","domains":["javdb.com"],"mode":"automatic","detail_pattern":"^/v/[A-Za-z0-9]+/?$","selectors":["h2.title",".panel-block strong"]},{"id":"javbus","label":"JavBus","kind":"数据库","domains":["javbus.com","dmmsee.casa","busfan.casa","busdmm.casa"],"mode":"automatic","detail_pattern":"^/(?:[a-z]{2}/)?([^/]+)/?$","selectors":["h3",".info p .header"]},{"id":"javlibrary","label":"JavLibrary","kind":"数据库","domains":["javlibrary.com","javlib.com","r86m.com","f101w.com","c99i.com","e100k.com"],"mode":"automatic","detail_pattern":"^/(?:cn|tw|en|ja)/?$","selectors":["#video_id .text","#video_title"],"query_keys":["v"]},{"id":"jav321","label":"Jav321","kind":"数据库","domains":["jav321.com"],"mode":"automatic","detail_pattern":"^/video/[A-Za-z0-9]+/?$","selectors":["h3",".panel-body b"]},{"id":"avbase","label":"AVBase","kind":"数据库","domains":["avbase.net"],"mode":"automatic","detail_pattern":"^/works/(?:[^/:]+:)?([^/:]+)/?$","selectors":["h1","#__NEXT_DATA__"]},{"id":"javdatabase","label":"JAVDatabase","kind":"数据库","domains":["javdatabase.com"],"mode":"automatic","detail_pattern":"^/movies/([^/]+)/?$","selectors":["h1",".movie-code"]},{"id":"jav-land","label":"JAV.land","kind":"数据库","domains":["jav.land"],"mode":"selection"},{"id":"avmoo","label":"AVMOO","kind":"数据库","domains":["avmoo.com"],"mode":"selection"},{"id":"avsox","label":"AVSOX","kind":"数据库","domains":["avsox.com","avsox.click"],"mode":"selection"},{"id":"av-wiki","label":"AV-Wiki","kind":"数据库","domains":["av-wiki.net"],"mode":"selection"},{"id":"fc2ppvdb","label":"FC2PPVDB","kind":"数据库","domains":["fc2ppv-db.com"],"mode":"selection"},{"id":"fc2cmadb","label":"FC2CmaDB","kind":"数据库","domains":["fc2cmadb.com"],"mode":"selection"},{"id":"javtrailers","label":"JAVTrailers","kind":"数据库","domains":["javtrailers.com"],"mode":"selection"},{"id":"javarchive","label":"JavArchive","kind":"数据库","domains":["javarchive.com"],"mode":"selection"},{"id":"javten","label":"JAVten","kind":"数据库","domains":["javten.com"],"mode":"selection"},{"id":"r18dev","label":"r18.dev","kind":"数据库","domains":["r18.dev"],"mode":"selection"},{"id":"dmm","label":"FANZA / DMM","kind":"发行平台","domains":["dmm.co.jp"],"mode":"automatic","identity":"peach","query_keys":["id"],"selectors":["th","dt","[data-video-code]"],"detail_pattern":"^/(?:av/content/?|(?:digital/(?:videoa|videoc)|mono/dvd)/-/detail/=/cid=([A-Za-z0-9_]+)/?)$"},{"id":"mgs","label":"MGS","kind":"发行平台","domains":["mgstage.com"],"mode":"automatic","identity":"peach","selectors":["th","dt","[data-video-code]"],"detail_pattern":"^/product/product_detail/([A-Za-z0-9_-]+)/?$"},{"id":"duga","label":"DUGA","kind":"发行平台","domains":["duga.jp"],"mode":"selection"},{"id":"prestige","label":"Prestige","kind":"发行平台","domains":["prestige-av.com"],"mode":"selection"},{"id":"sod","label":"SOD / SODprime","kind":"发行平台","domains":["sod.co.jp"],"mode":"selection"},{"id":"faleno","label":"FALENO","kind":"发行平台","domains":["faleno.jp"],"mode":"selection"},{"id":"fc2-market","label":"FC2 内容市场","kind":"发行平台","domains":["adult.contents.fc2.com"],"mode":"selection"},{"id":"s1","label":"S1","kind":"片商","domains":["s1s1s1.com"],"mode":"selection"},{"id":"moodyz","label":"MOODYZ","kind":"片商","domains":["moodyz.com"],"mode":"selection"},{"id":"ideapocket","label":"IdeaPocket","kind":"片商","domains":["ideapocket.com"],"mode":"selection"},{"id":"madonna","label":"Madonna","kind":"片商","domains":["madonna-av.com"],"mode":"selection"},{"id":"attackers","label":"Attackers","kind":"片商","domains":["attackers.net"],"mode":"selection"},{"id":"premium","label":"Premium","kind":"片商","domains":["premium-beauty.com"],"mode":"selection"},{"id":"kawaii","label":"Kawaii","kind":"片商","domains":["kawaiikawaii.jp"],"mode":"selection"},{"id":"max-a","label":"MAX-A","kind":"片商","domains":["max-a.co.jp"],"mode":"selection"},{"id":"maxing","label":"MAXING","kind":"片商","domains":["maxing.jp"],"mode":"selection"},{"id":"1pondo","label":"一本道","kind":"无码","domains":["1pondo.tv"],"mode":"selection"},{"id":"caribbeancom","label":"加勒比","kind":"无码","domains":["caribbeancom.com"],"mode":"selection"},{"id":"10musume","label":"天然むすめ","kind":"无码","domains":["10musume.com"],"mode":"selection"},{"id":"pacopacomama","label":"Pacopacomama","kind":"无码","domains":["pacopacomama.com"],"mode":"selection"},{"id":"heyzo","label":"HEYZO","kind":"无码","domains":["heyzo.com"],"mode":"selection"},{"id":"tokyo-hot","label":"Tokyo-Hot","kind":"无码","domains":["tokyo-hot.com"],"mode":"selection"},{"id":"manko","label":"manko.fun","kind":"资源","domains":["manko.fun"],"mode":"selection"},{"id":"sukebei","label":"Sukebei","kind":"资源","domains":["sukebei.nyaa.si"],"mode":"selection"},{"id":"onejav","label":"OneJAV","kind":"资源","domains":["onejav.com"],"mode":"selection"},{"id":"freejavtorrent","label":"Free JAV Torrent","kind":"资源","domains":["freejavtorrent.com"],"mode":"selection"},{"id":"16mag","label":"16mag","kind":"资源","domains":["16mag.com"],"mode":"selection"},{"id":"netflav","label":"NETFLAV","kind":"在线播放","domains":["netflav5.com","netflav.com"],"mode":"selection"},{"id":"bestjavporn","label":"BestJavPorn","kind":"在线播放","domains":["bestjavporn.com"],"mode":"selection"},{"id":"javmenu","label":"JAVMenu","kind":"数据库","domains":["javmenu.com"],"mode":"selection"},{"id":"avjoy","label":"AVJOY","kind":"在线播放","domains":["avjoy.me"],"mode":"selection"},{"id":"ggjav","label":"GGJAV","kind":"在线播放","domains":["ggjav.com"],"mode":"selection"},{"id":"av01","label":"AV01","kind":"在线播放","domains":["av01.tv","av01.media"],"mode":"selection"},{"id":"highporn","label":"HighPorn","kind":"在线播放","domains":["highporn.net"],"mode":"selection"},{"id":"evojav","label":"EvoJAV","kind":"在线播放","domains":["evojav.pro"],"mode":"selection"},{"id":"hayav","label":"HayAV","kind":"在线播放","domains":["hayav.com"],"mode":"selection"},{"id":"javhub","label":"JAVHub","kind":"在线播放","domains":["javhub.net"],"mode":"selection"},{"id":"141jav","label":"141JAV","kind":"资源","domains":["141jav.com"],"mode":"selection"},{"id":"141ppv","label":"141PPV","kind":"资源","domains":["141ppv.com"],"mode":"selection"},{"id":"freejavbt","label":"FreeJavBT","kind":"资源","domains":["freejavbt.com","freejavbt.xyz"],"mode":"selection"},{"id":"javrate","label":"JAVRate","kind":"在线播放","domains":["javrate.com"],"mode":"selection"},{"id":"sehuatang","label":"色花堂","kind":"资源","domains":["sehuatang.net","sehuatang.org"],"mode":"selection","query_keys":["tid"]},{"id":"169bbs","label":"SEX169","kind":"资源","domains":["169bbs.com"],"mode":"selection"},{"id":"hjd2048","label":"2048论坛","kind":"资源","domains":["hjd2048.com"],"mode":"selection"},{"id":"airav","label":"AirAV","kind":"数据库","domains":["airav.wiki","airav.fun","airav.io"],"mode":"selection"},{"id":"javbooks","label":"JavBooks","kind":"资源","domains":["javbooks.com","jmvbt.com"],"mode":"selection"},{"id":"javhd-today","label":"JavHD.today","kind":"在线播放","domains":["javhd.today"],"mode":"selection"},{"id":"javfree","label":"JavFree","kind":"资源","domains":["javfree.me"],"mode":"selection"},{"id":"javcv","label":"JavCV","kind":"数据库","domains":["javcv.com"],"mode":"selection"},{"id":"projectjav","label":"ProjectJav","kind":"资源","domains":["projectjav.com"],"mode":"selection"},{"id":"paipancon","label":"Paipancon","kind":"在线播放","domains":["paipancon.com"],"mode":"selection"}]};const STORAGE_BASE = 'peach.jav.base';const STORAGE_TOKEN = 'peach.jav.token';+ const STORAGE_ERRORS = 'peach.jav.errors';const ROOT_ID = 'peach-jav-action';- const SCRIPT_VERSION = "0.5.0";+ const SCRIPT_VERSION = "0.5.1";+ const PEACH_LOGO = "data:image/png;base64,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";if (location.pathname === '/integrations/peach-userscript-bridge') {let origin;try { origin = settings(location.origin, 'bridge-only').base; } catch { return; }@@ -282,22 +284,43 @@let refreshTimer;let selected = null;let settingsView = null;+ let panelMode = 'expanded';// Peach 控件快照:来源与适配范围见 docs/REUSE.md。const UI_STYLE = `:host{all:initial;--ground:#fff;--surface:#fafafa;--sunk:#f2f2f2;--ink:#171717;--ink-2:#4d4d4d;--muted:#666;--line:#e5e5e5;--line-soft:#ebebeb;--field-ring:#00000014;--field-ring-hover:#00000036;--field-ring-focus:#00000057;- --tungsten:#2563eb;--drop:#da2f35;--control-radius:6px;--surface-radius:8px;--floating-radius:12px;--control-h:38px;+ --tungsten:#2563eb;--drop:#da2f35;--task-accent:oklch(62.3% .214 259.815);--task-muted:oklch(70.8% 0 none);--icon-inline:1.2em;+ --modal-ease:cubic-bezier(0,0,.2,1);+ --control-radius:6px;--surface-radius:8px;--floating-radius:12px;--control-h:38px;--fs-sm:13px;--fs-md:14px;--fs-lg:16px;--fs-xl:20px;--fieldset-bar-h:52px;position:fixed;inset:auto max(16px,env(safe-area-inset-right)) max(16px,env(safe-area-inset-bottom)) auto;z-index:2147483647;width:min(320px,calc(100vw - 32px));font:400 14px/1.5 system-ui,sans-serif;color:var(--ink);color-scheme:light dark;text-align:left}@media(prefers-color-scheme:dark){:host{--ground:#080a0d;--surface:#0c0f14;--sunk:#0b0d11;--ink:#fff;--ink-2:#c9cdd4;--muted:#9aa0a8;- --line:#ffffff1a;--line-soft:#ffffff26;--field-ring:#ffffff26;--field-ring-hover:#ffffff42;--field-ring-focus:#ffffff66}}+ --line:#ffffff1a;--line-soft:#ffffff26;--field-ring:#ffffff26;--field-ring-hover:#ffffff42;--field-ring-focus:#ffffff66;--task-muted:oklch(43.9% 0 none)}}*,*::before,*::after{box-sizing:border-box} [hidden]{display:none!important}+ :host([data-panel-mode="minimized"]){width:48px}+ :host([data-settings-open]){visibility:hidden}h2,p{margin:0} h2{font-size:var(--fs-xl);line-height:26px;font-weight:600}.panel{background:var(--ground);border:1px solid var(--line);border-radius:var(--floating-radius);overflow:hidden}+ .task-progress{display:block;width:100%;height:6px;overflow:hidden;border-radius:9999px}+ .task-progress .track{fill:#ebebeb}.task-progress .fill{fill:var(--task-accent)}+ .task-progress .stop{fill:var(--ground)}+ .flow{display:grid;gap:10px}.flow-steps{list-style:none;margin:0;padding:0;display:grid;grid-template-columns:repeat(5,minmax(0,1fr));gap:4px}+ .flow-step{display:grid;justify-items:center;gap:4px;min-width:0;color:var(--task-muted);font-size:var(--fs-sm);line-height:1.4}+ .flow-step[data-state="complete"] .flow-label{text-decoration:line-through}.flow-step[data-state="current"]{color:var(--ink)}+ .flow-step[data-state="error"]{color:var(--drop)}.flow-mark{width:var(--icon-inline);height:var(--icon-inline);display:grid;place-items:center;line-height:1}+ .flow-mark svg{display:block;width:100%;height:100%;fill:currentColor}+ .flow-step[data-state="current"] .flow-mark{color:var(--task-accent)}+ @media(prefers-color-scheme:dark){.task-progress .track{fill:oklch(26.9% 0 none)}}.bar{min-height:var(--fieldset-bar-h);padding:8px 16px 8px 20px;display:flex;align-items:center;justify-content:space-between;gap:12px}.bar strong{font-weight:500;overflow-wrap:anywhere;font-variant-numeric:tabular-nums}+ .bar-heading{display:grid;min-width:0;gap:2px}.bar-summary{font-size:11px;line-height:16px;color:var(--ink-2);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}+ .bar-actions{display:flex;gap:4px;flex:none}+ .bar-actions [data-collapse-chevron]{transition:transform .2s ease-in-out}+ .bar-actions [aria-expanded="false"] [data-collapse-chevron]{transform:rotate(180deg)}+ .geist-button.launcher{width:48px;height:48px;padding:6px;border-radius:50%;background:var(--ground);transform-origin:bottom right}+ .launcher img{display:block;width:34px;height:34px;object-fit:contain}.body{padding:0 20px 20px;display:grid;gap:16px;min-width:0}.footer{display:flex;align-items:center;justify-content:flex-end;gap:8px;min-height:var(--fieldset-bar-h);padding:8px 16px;border-top:1px solid var(--line);background:var(--surface)}.geist-button{height:var(--control-h);padding:0 14px;border:0;border-radius:var(--control-radius);background:var(--ground);color:var(--ink);display:inline-flex;align-items:center;justify-content:center;gap:6px;font:inherit;font-size:var(--fs-md);font-weight:500;line-height:1;white-space:nowrap;cursor:pointer;box-shadow:0 0 0 1px var(--line-soft);touch-action:manipulation}@@ -321,8 +344,13 @@.geist-note[data-variant=error]{color:var(--drop)}dialog{position:fixed;inset:auto max(16px,env(safe-area-inset-right)) max(16px,env(safe-area-inset-bottom)) auto;margin:0;width:min(400px,calc(100vw - 32px));max-width:calc(100vw - 32px);max-height:calc(100dvh - 32px);padding:0;- background:var(--ground);color:var(--ink);border:1px solid var(--line);border-radius:var(--floating-radius);overflow:hidden}- dialog::backdrop{background:#000b}form{display:flex;flex-direction:column;max-height:calc(100dvh - 34px)}+ background:var(--ground);color:var(--ink);border:1px solid var(--line);border-radius:var(--floating-radius);overflow:hidden;+ opacity:1;transform:scale(1);transition:opacity 200ms var(--modal-ease),transform 200ms var(--modal-ease)}+ dialog::backdrop{background:#000b;opacity:1;transition:opacity 200ms var(--modal-ease)}+ dialog[data-closing],dialog[data-closing]::backdrop{opacity:0;transition-duration:120ms}+ dialog[data-closing]{transform:scale(.98)}+ @starting-style{dialog[open],dialog[open]::backdrop{opacity:0}dialog[open]{transform:scale(.98)}}+ form{display:flex;flex-direction:column;max-height:calc(100dvh - 34px)}dialog .bar{border-bottom:1px solid var(--line);flex:none}dialog .body{padding-top:20px;overflow:auto;overscroll-behavior:contain}dialog .footer{flex:none}@media(max-width:760px){.geist-input{font-size:var(--fs-lg)}}@media(prefers-reduced-motion:reduce){*,*::before,*::after{animation:none!important;transition:none!important}}@@ -335,6 +363,26 @@return node;}+ // Peach 任务列表的 Remix Icon 4.9.0 图形;Copyright (c) 2017–2026 Remix Design。+ // 图形遵循 Remix Icon License v1.0:https://github.com/Remix-Design/RemixIcon/blob/master/License。+ const STEP_ICON_PATHS = {+ check: 'M9.9997 15.1709L19.1921 5.97852L20.6063 7.39273L9.9997 17.9993L3.63574 11.6354L5.04996 10.2212L9.9997 15.1709Z',+ circle: 'M12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22ZM12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20Z',+ error: 'M12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22ZM12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20ZM11 15H13V17H11V15ZM11 7H13V13H11V7Z',+ skipped: 'M5 11V13H19V11H5Z',+ };++ function stepMark() {+ const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');+ svg.setAttribute('viewBox', '0 0 24 24');+ svg.setAttribute('aria-hidden', 'true');+ svg.setAttribute('focusable', 'false');+ const path = document.createElementNS(svg.namespaceURI, 'path');+ path.setAttribute('d', STEP_ICON_PATHS.circle);+ svg.append(path);+ return svg;+ }+function control(label, { primary = false, icon = '' } = {}) {const node = element('button', `geist-button${primary ? ' primary' : ''}${icon ? ' icon' : ''}`, icon ? '' : label);node.type = 'button';@@ -344,9 +392,10 @@svg.setAttribute('viewBox', '0 0 24 24');svg.setAttribute('aria-hidden', 'true');const path = document.createElementNS(svg.namespaceURI, 'path');- path.setAttribute('d', icon === 'close' ? 'M6 6l12 12M6 18L18 6'+ path.setAttribute('d', icon === 'close' ? 'M6 6l12 12M6 18L18 6' : icon === 'collapse' ? 'm6 9 6 6 6-6': 'M9.671 4.136a2.34 2.34 0 0 1 4.659 0 2.34 2.34 0 0 0 3.319 1.915 2.34 2.34 0 0 1 2.33 4.033 2.34 2.34 0 0 0 0 3.831 2.34 2.34 0 0 1-2.33 4.033 2.34 2.34 0 0 0-3.319 1.915 2.34 2.34 0 0 1-4.659 0 2.34 2.34 0 0 0-3.32-1.915 2.34 2.34 0 0 1-2.33-4.033 2.34 2.34 0 0 0 0-3.831A2.34 2.34 0 0 1 6.35 6.051a2.34 2.34 0 0 0 3.319-1.915');svg.append(path);+ if (icon === 'collapse') svg.setAttribute('data-collapse-chevron', '');if (icon === 'settings') {const circle = document.createElementNS(svg.namespaceURI, 'circle');for (const [name, value] of Object.entries({ cx: '12', cy: '12', r: '3' })) circle.setAttribute(name, value);@@ -551,7 +600,7 @@}function configure() {- if (settingsView?.dialog.open) { settingsView.base.focus(); return; }+ if (settingsView?.dialog.open) { settingsView.reopen(); return; }const previousFocus = current?.root.shadowRoot?.activeElement || document.activeElement;const saved = configuration();const { root, shadow } = surface('peach-jav-settings', 'Peach 设置');@@ -634,15 +683,51 @@form.append(bar, body, footer);dialog.append(form);shadow.append(dialog);- settingsView = { root, dialog, base: address.input };+ let closing = false;+ let closeGeneration = 0;+ settingsView = { root, dialog, base: address.input, reopen() {+ closeGeneration++;+ closing = false;+ dialog.removeAttribute('data-closing');+ address.input.focus();+ } };+ if (current) {+ current.root.setAttribute('data-settings-open', '');+ current.root.inert = true;+ }const cleanup = () => {+ if (!root.isConnected) return;+ closeGeneration++;+ closing = false;secret.input.value = '';if (settingsView?.root === root) settingsView = null;root.remove();+ if (current) {+ current.root.removeAttribute('data-settings-open');+ current.root.inert = false;+ }if (previousFocus?.isConnected) previousFocus.focus();else current?.settings.focus();};- const dismiss = () => { dialog.close(); cleanup(); };+ const dismiss = async () => {+ if (closing || !dialog.open) return;+ closing = true;+ const run = ++closeGeneration;+ dialog.setAttribute('data-closing', '');+ if (!matchMedia('(prefers-reduced-motion: reduce)').matches) {+ dialog.getBoundingClientRect();+ const animations = dialog.getAnimations();+ if (animations.length) {+ let timer;+ await Promise.race([Promise.allSettled(animations.map(animation => animation.finished)),+ new Promise(resolve => { timer = setTimeout(resolve, 220); })]);+ clearTimeout(timer);+ }+ }+ if (run !== closeGeneration || !closing) return;+ dialog.close();+ cleanup();+ };close.addEventListener('click', dismiss);cancel.addEventListener('click', dismiss);dialog.addEventListener('cancel', event => {@@ -662,7 +747,7 @@});form.addEventListener('submit', event => {event.preventDefault();- if (composing) return;+ if (composing || closing) return;for (const input of [address.input, secret.input]) input.removeAttribute('aria-invalid');let config;let invalid = address.input;@@ -702,8 +787,59 @@GM_registerMenuCommand('配置 Peach 地址与令牌', configure);GM_registerMenuCommand('选中番号加入 Peach', selectCode);+ let reporting = false;+ let reportAfter = 0;+ function pendingErrors() {+ try {+ const rows = JSON.parse(GM_getValue(STORAGE_ERRORS, '[]'));+ return Array.isArray(rows) ? rows.filter(row => row && typeof row.base === 'string' && row.event+ && typeof row.event.id === 'string' && Date.now() - Date.parse(row.event.at) < 7 * 86400_000).slice(-20) : [];+ } catch { return []; }+ }++ function flushErrors(config) {+ if (reporting || Date.now() < reportAfter) return;+ const rows = pendingErrors().filter(row => row.base === config.base).slice(0, 10);+ if (!rows.length) return;+ reporting = true;+ reportAfter = Date.now() + 60_000;+ const done = () => { reporting = false; };+ try {+ GM_xmlhttpRequest({ method: 'POST', url: `${config.base}/api/jav-browser/errors`, anonymous: true,+ headers: { Authorization: `Bearer ${config.token}`, 'Content-Type': 'application/json' }, timeout: 5000,+ data: JSON.stringify({ events: rows.map(row => row.event) }),+ onload(response) {+ try {+ if (response.status >= 200 && response.status < 300 && Number.isInteger(JSON.parse(response.responseText).recorded)) {+ const ids = new Set(rows.map(row => row.event.id));+ GM_setValue(STORAGE_ERRORS, JSON.stringify(pendingErrors().filter(row => !ids.has(row.event.id))));+ }+ } catch { /* 错误取证不影响添加和状态查询。 */ }+ done();+ }, onerror: done, ontimeout: done, onabort: done,+ });+ } catch { done(); }+ }++ function rememberError(config, code, source, operation, kind, elapsed, status) {+ try {+ const site = siteFor(new URL(source));+ if (!site) return;+ const event = { id: crypto.randomUUID(), at: new Date().toISOString(), kind, operation, site: site.id,+ code, elapsed_ms: Math.min(3_600_000, Math.max(0, Math.round(elapsed))), status, script_version: SCRIPT_VERSION };+ GM_setValue(STORAGE_ERRORS, JSON.stringify([...pendingErrors(), { base: config.base, event }].slice(-20)));+ flushErrors(config);+ } catch { /* GM 存储不可用时保留原操作的错误反馈。 */ }+ }+function request(config, code, source, method, resolveIdentity = false) {return new Promise((resolve, reject) => {+ const started = performance.now();+ const fail = (kind, message, status = 0) => {+ rememberError(config, resolveIdentity ? '' : code, source, resolveIdentity ? 'IDENTIFY' : method,+ kind, performance.now() - started, status);+ reject(new Error(message));+ };const headers = { Authorization: `Bearer ${config.token}`, Accept: 'application/json' };if (method === 'POST') headers['Content-Type'] = 'application/json';try {@@ -714,17 +850,17 @@headers,...(method === 'POST' ? { data: JSON.stringify({ code, source_url: source }) } : {}),anonymous: true,- timeout: 15_000,+ timeout: 60_000,onload(response) {if (response.status < 200 || response.status >= 300) {let detail = '';try { const value = JSON.parse(response.responseText).detail; if (typeof value === 'string' && value.length <= 200) detail = value; } catch { /* 非 JSON 错误使用 HTTP 状态提示。 */ }- reject(new Error(response.status === 401 || response.status === 403 ? '令牌无效或无权限,请重新配置。'+ fail('http', response.status === 401 || response.status === 403 ? '令牌无效或无权限,请重新配置。': response.status >= 500 ? 'Peach 服务暂时不可用,请稍后查询状态。': response.status === 429 ? 'Peach 请求过于频繁,请稍后查询。': resolveIdentity && [404, 405].includes(response.status) ? 'Peach 尚不支持商品号识别,请更新 Peach。': response.status === 400 && detail ? detail- : resolveIdentity ? '未识别到作品番号,请选中页面的完整番号后加入 Peach。' : 'Peach 请求失败,请查询状态。'));+ : resolveIdentity ? '未识别到作品番号,请选中页面的完整番号后加入 Peach。' : 'Peach 请求失败,请查询状态。', response.status);return;}try {@@ -733,21 +869,48 @@|| candidates(body.code).size !== 1|| ((!resolveIdentity || code) && ![...candidates(body.code)].some(candidate => comparisonKey(candidate) === comparisonKey(code)))) throw new Error();resolve(body);- } catch { reject(new Error('Peach 返回的状态无效,请查询状态。')); }+ flushErrors(config);+ } catch { fail('invalid_response', 'Peach 返回的状态无效,请查询状态。', response.status); }},- onerror: () => reject(new Error('无法连接 Peach,请查询状态。')),- ontimeout: () => reject(new Error('Peach 请求超时,请查询状态。')),- onabort: () => reject(new Error('Peach 请求已中止,请查询状态。')),+ onerror: () => fail('network', '无法连接 Peach,请查询状态。'),+ ontimeout: () => fail('timeout', 'Peach 请求超时,请查询状态。'),+ onabort: () => fail('abort', 'Peach 请求已中止,请查询状态。'),});- } catch { reject(new Error('无法连接 Peach,请查询状态。')); }+ } catch { fail('client_exception', '无法连接 Peach,请查询状态。'); }});}function alive(view) { return current === view && generation === view.generation && view.url === location.href; }+ function present(view, mode, focus = false) {+ if (!alive(view)) return;+ panelMode = mode;+ view.presentation?.cancel();+ const minimized = mode === 'minimized';+ const expanded = mode === 'expanded';+ view.root.dataset.panelMode = mode;+ view.panel.hidden = minimized;+ view.launcher.hidden = !minimized;+ view.body.hidden = !expanded;+ view.body.inert = !expanded;+ view.summary.hidden = expanded;+ view.summary.textContent = mode === 'collapsed' ? view.note.textContent : '';+ view.collapse.setAttribute('aria-expanded', String(expanded));+ view.collapse.setAttribute('aria-label', expanded ? '折叠 Peach 详情' : '展开 Peach 详情');+ if (focus) {+ (minimized ? view.launcher : view.collapse).focus();+ if (!matchMedia('(prefers-reduced-motion: reduce)').matches) {+ const target = minimized ? view.launcher : view.panel;+ view.presentation = target.animate([{opacity:0, transform:'translateY(4px) scale(.97)'}, {opacity:1, transform:'translateY(0) scale(1)'}],+ {duration:200, easing:'ease-in-out'});+ }+ }+ }+function render(view) {if (!alive(view)) return;- const terminalSuccess = ['ingested', 'owned'].includes(view.state);+ view.summary.textContent = panelMode === 'collapsed' ? view.note.textContent : '';+ const terminalSuccess = ['ingested', 'owned'].includes(view.state) && !view.tracking;view.button.disabled = view.identity.conflict || terminalSuccess;view.button.setAttribute('aria-busy', String(view.busy));view.button.setAttribute('aria-disabled', String(view.busy || view.button.disabled));@@ -770,6 +933,46 @@}}+ function tracking(body) {+ return ACTIVE.has(body.state) || (body.state === 'ingested'+ && ['pending', 'queued', 'running'].includes(body.download?.postprocess_state));+ }++ function renderFlow(view, body) {+ const download = body?.download;+ let current = -1;+ let completed = 0;+ let fraction = 0;+ const failed = ['failed', 'no_match'].includes(body?.state) || download?.postprocess_state === 'failed';+ if (body?.state === 'queued') current = 0;+ else if (body?.state === 'searching') current = body.stage === 'submitting' ? 2 : 1;+ else if (body?.state === 'submitted' || body?.state === 'ingested' || failed) {+ if (download?.state === 'ingested' || body.state === 'ingested') {+ if (['complete', 'not_requested'].includes(download?.postprocess_state)) completed = 5;+ else if (download?.postprocess_state) current = 4;+ else completed = 4;+ } else if (download?.phase === 'ingest' || ['remote_done', 'landed'].includes(download?.state)) current = 3;+ else if (download || body.state === 'submitted') current = 2;+ else current = 1;+ }+ if (current >= 0) completed = current;+ if (current === 2 && !failed && download?.state === 'remote_running'+ && typeof download.progress === 'number' && Number.isFinite(download.progress)) fraction = Math.min(1, Math.max(0, download.progress));+ view.flow.toggleAttribute('hidden', !body || ['idle', 'owned'].includes(body.state));+ view.progress.setAttribute('aria-valuenow', String(Math.round((completed + fraction) * 1000) / 1000));+ view.progress.setAttribute('aria-valuetext', download?.state === 'ingested' && download.postprocess_state === 'not_requested'+ ? '流程完成,整理未请求' : `${completed} 个阶段已完成${current >= 0 ? `,${failed ? '未完成' : '当前'}:${['排队', '搜索', '下载', '入库', '整理'][current]}` : ''}`);+ view.progressFill.setAttribute('width', String((completed + fraction) * 20));+ view.steps.forEach((step, index) => {+ const skipped = download?.state === 'ingested' && download.postprocess_state === 'not_requested' && index === 4;+ const state = skipped ? 'skipped' : index < completed ? 'complete' : index === current ? failed ? 'error' : 'current' : 'pending';+ step.dataset.state = state;+ if (index === current) step.setAttribute('aria-current', 'step'); else step.removeAttribute('aria-current');+ step.querySelector('.flow-mark path').setAttribute('d', STEP_ICON_PATHS[state === 'complete' ? 'check' : state === 'error' ? 'error' : state === 'skipped' ? 'skipped' : 'circle']);+ step.setAttribute('aria-label', `${['排队', '搜索', '下载', '入库', '整理'][index]},${{complete:'已完成',current:'当前阶段',error:'未完成',skipped:'未请求',pending:'待处理'}[state]}`);+ });+ }+function applyState(view, body) {if (view.identity.resolve) {view.identity.code = body.code;@@ -777,10 +980,25 @@view.heading.textContent = body.code;}view.state = body.state;- view.queryOnly = ACTIVE.has(body.state);+ view.tracking = tracking(body);+ view.queryOnly = view.tracking;if (!view.queryOnly) attempts.delete(comparisonKey(view.identity.code));- view.note.textContent = LABELS[body.state];- view.note.dataset.variant = body.state === 'failed' ? 'error' : 'secondary';+ const download = body.download;+ const known = download && ['submitted', 'remote_running', 'remote_done', 'landed', 'ingested', 'failed', 'cancelled', 'stalled'].includes(download.state);+ let label = body.stage === 'submitting' ? '正在提交网盘' : LABELS[body.state];+ renderFlow(view, body);+ if (known && typeof download.label === 'string') {+ label = download.label.slice(0, 80);+ if (download.state === 'ingested' && download.postprocess_state !== 'not_requested'+ && typeof download.postprocess_label === 'string') label += ` · ${download.postprocess_label.slice(0, 80)}`;+ if (download.state === 'remote_running' && typeof download.progress === 'number' && Number.isFinite(download.progress)) {+ const percent = Math.round(Math.min(1, Math.max(0, download.progress)) * 100);+ label += ` · ${percent}%`;+ }+ }+ view.statusText = label;+ view.note.textContent = label;+ view.note.dataset.variant = body.state === 'failed' || download?.postprocess_state === 'failed' ? 'error' : 'secondary';render(view);}@@ -794,6 +1012,9 @@attempts.add(comparisonKey(view.identity.code));view.queryOnly = true;view.note.textContent = '正在交给 Peach';+ renderFlow(view, { state: 'pending' });+ view.progress.removeAttribute('aria-valuenow');+ view.progress.setAttribute('aria-valuetext', '等待 Peach 确认任务状态');}render(view);const deadline = Date.now() + 120_000;@@ -801,17 +1022,23 @@let body = await request(config, view.identity.code, view.identity.source, method, Boolean(view.identity.resolve));if (!alive(view)) return;applyState(view, body);- for (let count = 0; ACTIVE.has(body.state) && count < 30 && Date.now() < deadline; count++) {+ for (let count = 0; tracking(body) && count < 30 && Date.now() < deadline; count++) {await new Promise(resolve => setTimeout(resolve, 2000));if (!alive(view)) return;body = await request(config, view.identity.code, view.identity.source, 'GET');if (!alive(view)) return;applyState(view, body);}- if (ACTIVE.has(body.state)) view.note.textContent = '任务仍在继续,可查询状态。';+ if (tracking(body)) view.note.textContent = `${view.statusText},可查询状态。`;} catch (error) {if (alive(view)) {view.queryOnly = true;+ if (view.flow.hasAttribute('hidden')) {+ renderFlow(view, { state: 'pending' });+ view.progress.removeAttribute('aria-valuenow');+ view.progress.setAttribute('aria-valuetext', '连接异常,任务状态待确认');+ } else view.progress.setAttribute('aria-valuetext', view.progress.hasAttribute('aria-valuenow')+ ? '连接异常,显示最近一次确认的阶段' : '连接异常,任务状态待确认');view.note.textContent = error.message;view.note.dataset.variant = 'error';}@@ -833,22 +1060,80 @@document.getElementById(ROOT_ID)?.remove();const { root, shadow } = surface(ROOT_ID, 'Peach 入库');const panel = element('section', 'panel');+ panel.id = `${ROOT_ID}-panel`;const bar = element('header', 'bar');const label = element('strong', '', item.conflict ? '番号待核对' : item.code || '作品番号');+ const summary = element('span', 'bar-summary');+ summary.hidden = true;+ const heading = element('div', 'bar-heading');+ heading.append(label, summary);+ const actions = element('div', 'bar-actions');const settingsButton = control('Peach 设置', { icon: 'settings' });settingsButton.addEventListener('click', configure);- bar.append(label, settingsButton);+ const collapse = control('折叠 Peach 详情', { icon: 'collapse' });+ collapse.setAttribute('aria-expanded', 'true');+ collapse.setAttribute('aria-controls', `${ROOT_ID}-body`);+ const hide = control('隐藏 Peach 面板', { icon: 'close' });+ actions.append(settingsButton, collapse, hide);+ bar.append(heading, actions);const body = element('div', 'body');+ body.id = `${ROOT_ID}-body`;const button = control('加入 Peach 馆藏', { primary: true });button.dataset.action = 'add';const note = element('p', 'geist-note');note.setAttribute('role', 'status');note.setAttribute('aria-live', 'polite');- body.append(note, button);+ // 结构与尺寸复用 Peach 生产 Progress 的 SVG 快照。+ const progress = document.createElementNS('http://www.w3.org/2000/svg', 'svg');+ for (const [name, value] of Object.entries({ role: 'progressbar', 'aria-label': '整体任务进度',+ 'aria-valuemin': '0', 'aria-valuemax': '5', viewBox: '0 0 100 1', preserveAspectRatio: 'none', class: 'task-progress' })) progress.setAttribute(name, value);+ const progressFill = document.createElementNS(progress.namespaceURI, 'rect');+ const progressTrack = document.createElementNS(progress.namespaceURI, 'rect');+ for (const [rect, width, style] of [[progressTrack, '100', 'track'], [progressFill, '0', 'fill']]) {+ rect.setAttribute('width', width); rect.setAttribute('height', '1'); rect.setAttribute('class', style);+ }+ progress.append(progressTrack, progressFill);+ for (const point of [20, 40, 60, 80]) {+ const stop = document.createElementNS(progress.namespaceURI, 'rect');+ stop.setAttribute('x', String(point - .4)); stop.setAttribute('width', '.4'); stop.setAttribute('height', '1'); stop.setAttribute('class', 'stop');+ progress.append(stop);+ }+ const flow = element('div', 'flow');+ flow.hidden = true;+ const stepList = element('ol', 'flow-steps');+ stepList.setAttribute('aria-label', '整体任务阶段');+ const steps = ['排队', '搜索', '下载', '入库', '整理'].map(label => {+ const step = element('li', 'flow-step');+ const mark = element('span', 'flow-mark'); mark.setAttribute('aria-hidden', 'true'); mark.append(stepMark());+ step.append(mark, element('span', 'flow-label', label)); stepList.append(step); return step;+ });+ flow.append(progress, stepList);+ body.append(note, flow, button);panel.append(bar, body);- shadow.append(panel);- const view = { root, button, note, heading: label, settings: settingsButton, identity: item, url: location.href, generation, state: 'idle', busy: false, queryOnly: attempts.has(comparisonKey(item.code)) };+ const launcher = control('展开 Peach 面板');+ launcher.classList.add('launcher');+ launcher.setAttribute('aria-label', '展开 Peach 面板');+ launcher.setAttribute('aria-controls', panel.id);+ launcher.setAttribute('aria-expanded', 'false');+ const logo = document.createElement('img');+ logo.src = PEACH_LOGO;+ logo.alt = '';+ logo.setAttribute('aria-hidden', 'true');+ launcher.replaceChildren(logo);+ launcher.hidden = true;+ shadow.append(panel, launcher);+ const view = { root, panel, body, launcher, collapse, summary, button, note, flow, steps, progress, progressFill, heading: label, settings: settingsButton, identity: item, url: location.href, generation, state: 'idle', busy: false, tracking: false, queryOnly: attempts.has(comparisonKey(item.code)) };current = view;+ if (settingsView?.dialog.open) {+ root.setAttribute('data-settings-open', '');+ root.inert = true;+ }+ collapse.addEventListener('click', () => present(view, panelMode === 'collapsed' ? 'expanded' : 'collapsed', true));+ hide.addEventListener('click', () => present(view, 'minimized', true));+ launcher.addEventListener('click', () => {+ present(view, 'expanded', true);+ if (!view.identity.conflict && configuration() && !view.busy) void query(view);+ });note.textContent = item.conflict ? '页面身份不一致,请核对番号。' : configuration() ? '正在查询 Peach 馆藏' : '配置地址与令牌后,即可加入 Peach 馆藏。';button.addEventListener('click', () => {if (!alive(view) || view.busy || view.button.disabled) return;@@ -856,6 +1141,7 @@void query(view, view.queryOnly || ACTIVE.has(view.state) ? 'GET' : 'POST');});render(view);+ present(view, panelMode);if (!item.conflict && configuration()) void query(view);}