Peach: Local-first video metadata scraper and media manager.
fix(jav): 按来源核对商品号并保留完整作品身份
longmeidaoc5eab5afcbe3
diff --git a/docs/JAV_BROWSER.md b/docs/JAV_BROWSER.mdindex 7611e56ec..3ca698849 100644--- a/docs/JAV_BROWSER.md+++ b/docs/JAV_BROWSER.md@@ -12,7 +12,7 @@ CloudDrive2 分别返回提交云下载和管理离线任务的能力。支持脚本由 [peach-mitao/peach-userscript](https://github.com/peach-mitao/peach-userscript) 独立维护,覆盖在线播放、数据库与资料、发行销售平台、片商官网、无码发行站和资源索引。各站的域名与识别方式见[完整站点清单](JAV_BROWSER_SITES.md)。镜像域名单独登记,不根据相似名称自动认作同一站。面向使用者的安装、配对和站点说明集中在 [Sleazy 发布页文案](JAV_USERSCRIPT_SLEAZY.md),Peach 配置页只保留安装与配对操作。-自动识别使用作品详情页的主标题与明确番号字段;DMM、MGS 的详情地址则交给 Peach 现有商品号解析器识别。字段缺失或身份冲突时,使用选中番号的方式。标记为「选中番号」的站点需要先选中一个完整番号,再从脚本菜单选择「选中番号加入 Peach」,最后点击浮出的添加按钮。+自动识别使用作品详情页的主标题与明确番号字段;DMM、MGS 的详情地址与页面「メーカー品番」「品番」由 Peach 按来源联合校验。DMM 商品目录前缀与 MGS 发行前缀分别解释,商品番号的尾字母保留。字段缺失时可选中完整番号;字段冲突时停止自动添加并提示核对。标记为「选中番号」的站点需要先选中一个完整番号,再从脚本菜单选择「选中番号加入 Peach」,最后点击浮出的添加按钮。## 安装与配对@@ -51,7 +51,7 @@ Peach 配置页通过同源桥接页检测脚本版本和是否已为当前地云下载能力查询只读,结果缓存 30 秒;媒体路径、名称、下载设置或凭据变化时失效。渠道被移除不清除已有账号、配对信息或下载任务。请求超时、轮询上限、协议版本与字段长度属于通信和校验约束。-DMM / FANZA 的 `/av/content/?id=…` 与旧版数字、DVD 详情路径,以及 MGS 的 `/product/product_detail/…/` 自动把商品号交给 Peach 识别。例如 `ssis00519` 由现有编目规则识别为 `SSIS-519`,MGS 的数字前缀按同一套番号规则保留。不能确定身份时,在页面选中完整番号后从脚本菜单加入。识别和状态查询均不创建下载任务。+DMM / FANZA 的 `/av/content/?id=…` 与旧版数字、DVD 详情路径,以及 MGS 的 `/product/product_detail/…/` 自动把商品号交给 Peach 识别。例如 DMM 的 `1dandy00899` 对应 `DANDY-899`,`h_086iqqq00026` 对应 `IQQQ-026`;MGS 的 `104DANDY-851C` 保留发行前缀和尾字母。明确商品番号与文件名的字幕标记使用各自的上下文,日期式番号的分隔符也属于身份。脚本支持 KIRARI 的 `MKBD-S`/`MKD-S` 和二至四位序号的日期式番号。识别和状态查询均不创建下载任务。## 常见问题@@ -69,7 +69,7 @@ DMM / FANZA 的 `/av/content/?id=…` 与旧版数字、DVD 详情路径,以## 核验范围-临时账本与模拟网盘完成服务端回归;模拟 GM API 的真实 Chromium 页面覆盖桌面、390×844、SPA 切页、身份冲突、番号规范化与请求重试。真实 Tampermonkey 扩展安装、MissAV/Jable 当前页面和真实网盘下载的联合验收未取得。+临时账本与模拟网盘完成服务端回归;完整安装脚本通过模拟 GM 桥连接真实临时后端,覆盖 DMM 与 MGS 商品号、厂家番号和尾字母的桌面及 390×844 联合验收。模拟 GM API 的 Chromium 页面另覆盖特殊番号、SPA 切页、身份冲突、HTTP 错误和请求重试。真实 Tampermonkey 扩展安装、MissAV/Jable 当前页面和真实网盘下载的联合验收未取得。## 制品同步diff --git a/docs/REUSE.md b/docs/REUSE.mdindex c964d7dcc..b53f278d2 100644--- a/docs/REUSE.md+++ b/docs/REUSE.md@@ -155,7 +155,7 @@ Windows 复用 FFmpeg 的 D3D11VA 解码与 `h264_amf`、`h264_qsv` 编码,沿Peach 保留页面粗提取与身份冲突提示,服务端复用 `catalog_rules` 的唯一番号规则、`feeds.scan_code`、`web_resource_search.q_resource_search` 的来源顺序与质量排序、`submit_offline_download` 的 infohash 幂等、现有云下载落地与后处理。浏览器添加在共享提交锁内按番号接管已有任务,覆盖其他入口同时提交不同磁力的情况。专用令牌经 `CredentialStore` 仅保存 SHA-256 摘要,不声明跨机同步字段。队列用已有 `atomic_write_text` 保存本机运行状态,关闭功能会撤销令牌并停止尚未提交的添加。-DMM / MGS 的只读商品号识别复用 `code_key`、`release_code_from_text`、`normalise_code_key` 和 `release_identity`,脚本只提交已净化的详情地址,不维护独立的前缀映射。DMM 官方 GraphQL 对 `ssis00519` 返回 `makerContentId: SSIS-519`;详情 DOM 的配信品番为 `ssis00519`,厂商番号为 `SSIS-519`。MGS 详情 DOM 的品番为 `300MIUM-1239`,三位数字前缀沿用同一套编目规则,不将不同发行物的前缀直接剥掉。+DMM / MGS 的只读商品号识别复用 `sources.dmm` 的 CID 结构与 `catalog_rules.release_code_from_product`。浏览器提交净化后的详情地址及可选厂家番号;DMM 的目录数字头按来源解释,MGS 保留三位发行前缀,尾字母和日期分隔符保留为身份。`release_code_from_text` 继续处理普通文件名的字幕与画质标记,不用文件名噪声规则改写明确商品身份。资源名称的完整商品号匹配复用同一编目模式,元数据身份校验与 DMM 搜索核对尾字母。运行时不新增 HTTP 请求或依赖;已有 DMM/OpenAver 取证与来源协议足以覆盖转换,不引入第二套外部番号库。完整脚本连接临时账本的真实识别接口,联合验证 DMM/MGS 桌面与手机场景;保留基于模拟响应的跨站交互回归。配置页继续使用 BoardUI Button / Input / Select 与共享 Note。配对信息复用当前页面 origin、签发响应和浏览器 Clipboard API,脚本在用户粘贴时填表,保存后写入 GM 存储。同源子框架桥接只回报脚本版本和当前地址的配置状态,父窗口、origin、协议版本与一次性 nonce 均须匹配,不回传令牌。未收到回报显示「未检测到」,不推断安装列表。桥接路径窄匹配与来源站顶层注入分别处理;实际脚本管理器权限和扩展联合验收未取得。无新增运行依赖、迁移或 ledger 写入。diff --git a/frontend/e2e/jav-userscript-contract.mjs b/frontend/e2e/jav-userscript-contract.mjsnew file mode 100644index 000000000..83309aa72--- /dev/null+++ b/frontend/e2e/jav-userscript-contract.mjs@@ -0,0 +1,56 @@+import assert from 'node:assert/strict';+import { readFileSync } from 'node:fs';+import { chromium } from 'playwright-core';++const [origin, scriptPath, executablePath] = process.argv.slice(2);+const script = readFileSync(scriptPath, 'utf8');+const browser = await chromium.launch({ headless: true, executablePath });+try {+ for (const viewport of [{ width: 1280, height: 800 }, { width: 390, height: 844 }]) {+ for (const [url, code, label] of [+ ['https://video.dmm.co.jp/av/content/?id=1dandy00899', 'DANDY-899', 'メーカー品番:'],+ ['https://video.dmm.co.jp/av/content/?id=1dandy00851c', 'DANDY-851C', 'メーカー品番:'],+ ['https://video.dmm.co.jp/av/content/?id=118abw00220', 'ABW-220', 'メーカー品番:'],+ ['https://www.mgstage.com/product/product_detail/104DANDY-851C/', '104DANDY-851C', '品番:'],+ ]) {+ const context = await browser.newContext({ viewport });+ try {+ const page = await context.newPage();+ const requests = [];+ const problems = [];+ page.on('pageerror', error => problems.push(error.message));+ await context.route('**/*', route => route.fulfill({ contentType: 'text/html', body:+ `<!doctype html><meta charset="utf-8"><title>作品详情</title><table><tr><th>${label}</th><td>${code}</td></tr></table>` }));+ await page.exposeFunction('peachContract', async request => {+ assert.equal(request.method, 'GET');+ const parsed = new URL(request.url);+ assert.equal(parsed.pathname, '/api/jav-browser/identify');+ assert.equal(parsed.searchParams.get('source_url'), url);+ assert.equal(parsed.searchParams.get('code'), code);+ requests.push(request.url);+ const response = await fetch(origin + parsed.pathname + parsed.search);+ return { status: response.status, responseText: await response.text() };+ });+ await page.addInitScript(() => {+ Object.assign(window, {+ GM_getValue: key => key === 'peach.jav.base' ? 'https://peach-contract.example.invalid' : 'isolated-test-token',+ GM_setValue: () => {}, GM_registerMenuCommand: () => {},+ GM_xmlhttpRequest: request => window.peachContract({ method: request.method, url: request.url })+ .then(response => request.onload(response), () => request.onerror()),+ });+ });+ await page.goto(url);+ await page.addScriptTag({ content: script });+ await page.waitForFunction(expected => {+ const root = document.getElementById('peach-jav-action')?.shadowRoot;+ return root?.querySelector('.bar strong')?.textContent === expected+ && root.querySelector('[data-action="add"]')?.getAttribute('aria-busy') === 'false'+ && root.querySelector('p')?.textContent === '可以加入 Peach 馆藏';+ }, code, { timeout: 15000 });+ assert.equal(requests.length, 1);+ assert.deepEqual(problems, []);+ } finally { await context.close(); }+ }+ }+ console.log('真实识别接口与完整用户脚本:8 个桌面和手机场景通过');+} finally { await browser.close(); }diff --git a/src/peach/catalog_rules.py b/src/peach/catalog_rules.pyindex 252d42c84..635b055ed 100644--- a/src/peach/catalog_rules.py+++ b/src/peach/catalog_rules.py@@ -194,8 +194,8 @@ def canonical_tag_name(name: str) -> str:key = value.casefold()return _TAG_ALIASES.get(key, _TAG_SPELLINGS.get(key, value))-_CODE_STUDIO = re.compile(r"^[A-Z]{2,8}-\d{2,5}$")-_CODE_AMATEUR = re.compile(r"^\d{3}[A-Z]{2,8}-\d{2,5}$")+_CODE_STUDIO = re.compile(r"^[A-Z]{2,8}-\d{2,5}(?:[A-Z]{1,2})?$")+_CODE_AMATEUR = re.compile(r"^\d{3}[A-Z]{2,8}-\d{2,5}(?:[A-Z]{1,2})?$")#: 素人系无码番号 `MMDDYY-NNN` / `MMDDYY_NNN`。**分隔符是片商标识,属于身份的一部分**:#: 一本道、パコパコママ、カリビアンコムPR 用 `_`,カリビアンコム 用 `-`,同一天同一序号#: 是两部不同影片。JavDB 自己也分开保存——搜 `092415-001` 首位返回的是一本道的@@ -245,7 +245,7 @@ MAKER_NUMBER_PREFIX = {_DATED_COMPACT = re.compile(rf"^{_MMDDYY}\d{{2,4}}$")_CODE_MAKER_PREFIXED = re.compile(r"^(\d{3})([A-Z]{2,8})-(\d{2,5})$")#: 数字前缀单独保留;`h_` 是 DMM content_id 的 label 标记。-_RELEASE_ID = re.compile(r"^(\d{1,4})?([A-Z]{2,8})0*(\d{1,5})([A-Z]?)$")+_RELEASE_ID = re.compile(r"^(\d{1,4})?([A-Z]{2,8})0*(\d{1,5})([A-Z]{0,2})$")# 仅登记已核验的写法关系;查询扩展表不是身份等价表。## MGStage 前缀那 9 行 2026-09-25 逐组核过:MGStage 商品页与 r18dev 快照的标题、时长、@@ -555,10 +555,10 @@ def normalise_code_key(code: str | None) -> str:short_fc2 = _FC2_ID.match(value)if short_fc2:return f"FC2-PPV-{short_fc2.group(1)}"- shape = re.match(r"^(\d{3})?([A-Z]+)-?(\d+)$", value)+ shape = re.fullmatch(r"(\d{3})?([A-Z]+)-?(\d+)([A-Z]{0,2})", value)if not shape:return value- return f"{shape.group(1) or ''}{shape.group(2)}-{int(shape.group(3)):03d}"+ return f"{shape.group(1) or ''}{shape.group(2)}-{int(shape.group(3)):03d}{shape.group(4)}"def is_jav_code(code: str | None) -> bool:@@ -571,6 +571,8 @@ def is_jav_code(code: str | None) -> bool:value = (code or "").upper().strip()if not value or is_repost_site_label(value) or is_code_body_stopword(value):return False+ if value.startswith(("MKBD-", "MKD-")):+ return bool(_KIRARI_CODE.fullmatch(value))if value.startswith("FC2"):return bool(re.search(r"\d{5,}", value))return bool(@@ -660,9 +662,12 @@ def release_identity(code: str | None) -> str:if shape:prefix, letters, number, suffix = shape.groups()prefix = prefix or ""+ # HA 的这一组重制写法已有来源等价证据,其余尾字母均保留。+ if (prefix, letters, suffix) == ("49", "HA", "R"):+ suffix = ""if (prefix, letters) in _RELEASE_PREFIX_ALIASES or str(code or "").upper().strip().startswith("H_"):prefix = ""- return f"{prefix}{letters}-{int(number)}"+ return f"{prefix}{letters}-{int(number)}{suffix}"return value@@ -777,6 +782,15 @@ def scrapes_as_jav(code: str | None, studio: str | None = None,return bool(_RELEASE_SYSTEM_SHAPE.match(normalise_code_key(code).upper()))+def release_code_from_product(value: str | None) -> str | None:+ """明确的商品番号保留尾字母;文件名中的字幕、画质标记仍由文本解析器处理。"""+ raw = _ASSET_EXTENSION.sub("", str(value or "").strip())+ if re.fullmatch(r"(?:\d{3})?[A-Za-z]{2,8}[-_]?\d{2,5}[A-Za-z]{1,2}", raw):+ code = normalise_code_key(raw)+ return code if is_jav_code(code) else None+ return release_code_from_text(raw)++def release_code_from_text(value: str | None) -> str | None:"""从一段文字(目录名或文件名主干)里解析出规范番号;解析不出返回 None。@@ -948,12 +962,12 @@ def _jav_code_pattern(code: str | None) -> str:fc2 = re.fullmatch(r"FC2-PPV-(\d+)", canonical)if fc2:return rf"FC2(?:[-_ ]?PPV)?[-_ ]*0*{re.escape(fc2.group(1))}"- amateur = re.fullmatch(r"(\d{3})?([A-Z]+)-(\d+)", canonical)+ amateur = re.fullmatch(r"(\d{3})?([A-Z]+)-(\d+)([A-Z]{0,2})", canonical)if amateur:- prefix, letters, digits = amateur.groups()+ prefix, letters, digits, suffix = amateur.groups()return (rf"{re.escape(prefix or '')}{re.escape(letters)}"- rf"[-_ ]*0*{re.escape(str(int(digits)))}"+ rf"[-_ ]*0*{re.escape(str(int(digits)))}{re.escape(suffix)}")tokyo = _TOKYO_HOT_BODY.fullmatch(canonical)if tokyo:diff --git a/src/peach/feeds.py b/src/peach/feeds.pyindex fb074cc09..019b7fd35 100644--- a/src/peach/feeds.py+++ b/src/peach/feeds.py@@ -116,20 +116,21 @@ def stamp(moment: datetime | None = None) -> str:timezone.utc).isoformat(timespec="milliseconds").replace("+00:00", "Z")-def scan_code(text: str | None) -> str | None:+def scan_code(text: str | None, *, product: bool = False) -> str | None:"""从一段文本里找出番号:整段先试一次,不成再逐词元试。- 番号的判据一个字都不新写,全部转给 `catalog_rules.release_code_from_text`——- 两份实现漂移会产生两个封面缓存键,那是 `catalog_rules` 自己注释里记着的旧伤。- 这里加的只是「标题里夹着简介时也要能找到」这一层。+ 番号判据复用 `catalog_rules`;明确商品身份使用保留尾字母的解析器,普通文件名+ 使用文本解析器。两条路径都按第一个可识别番号确定身份,不在标题后段另挑作品。"""if not text:return None- whole = release_code_from_text(text)+ from .catalog_rules import release_code_from_product+ parser = release_code_from_product if product else release_code_from_text+ whole = parser(text)if whole:return wholefor token in _TOKEN.findall(str(text)):- found = release_code_from_text(token)+ found = parser(token)if found:return foundreturn Nonediff --git a/src/peach/jav_browser.py b/src/peach/jav_browser.pyindex 00c941332..ce6798581 100644--- a/src/peach/jav_browser.py+++ b/src/peach/jav_browser.py@@ -12,12 +12,13 @@ from functools import lru_cachefrom pathlib import Pathfrom urllib.parse import parse_qsl, urlencode, urlsplit-from .catalog_rules import is_jav_code, normalise_code_key, release_code_from_text, release_identity, same_release_code+from .catalog_rules import is_jav_code, normalise_code_key, release_code_from_product, same_release_codefrom .config import PROJECT_ROOTfrom .downloads import INGESTED, RESUBMITTABLE_STATES, submit_offline_download, parse_magnetfrom .follow_secrets import CredentialErrorfrom .feeds import scan_codefrom .fsutil import atomic_write_text+from .sources.dmm import code_from_cidLOGGER = logging.getLogger(__name__)CREDENTIAL = "jav-browser"@@ -61,7 +62,7 @@ def source_site(host: str) -> dict | None:def code_key(value: object) -> str:raw = str(value or "").strip()- code = release_code_from_text(raw) if len(raw) <= 80 else None+ code = release_code_from_product(raw) if len(raw) <= 80 else Noneif not code or not is_jav_code(code) or normalise_code_key(raw) != normalise_code_key(code):raise ValueError("请提供一个明确的 JAV 番号")return normalise_code_key(code)@@ -86,7 +87,7 @@ def source_page(value: object) -> str:return parsed._replace(query=urlencode(parameters), fragment="").geturl()-def identify_source(value: object) -> str:+def identify_source(value: object, hint: str = "") -> str:"""从已登记发行平台的详情地址提取商品号,复用编目规则确认番号。"""source = source_page(value)url = urlsplit(source)@@ -99,10 +100,10 @@ def identify_source(value: object) -> str:(dict(parse_qsl(url.query)).get(key, "") for key in site.get("query_keys", ())), "")if not product:raise ValueError("未识别到作品番号,请选中页面的完整番号后加入 Peach")- try:- return code_key(product)- except ValueError:- return code_key(normalise_code_key(release_identity(product)))+ code = code_key(code_from_cid(product) if site["id"] == "dmm" else product)+ if hint and not same_release_code(code, code_key(hint)):+ raise ValueError("页面番号与商品号不一致,请核对作品详情")+ return codeclass JavBrowser:@@ -266,7 +267,9 @@ class JavBrowser:candidate = Nonefor item in result.get("items", ()):name = str(item.get("name") or "")- if (not same_release_code(scan_code(name), code)+ matches = (same_release_code(scan_code(name), code)+ or same_release_code(scan_code(name, product=True), code))+ if (not matchesor re.search(r"(?i)\b(?:sample|trailer|preview)\b|予告|预告|預告", name)):continuetry:diff --git a/src/peach/metadata.py b/src/peach/metadata.pyindex 8b8ed9eee..c826524da 100644--- a/src/peach/metadata.py+++ b/src/peach/metadata.py@@ -206,10 +206,11 @@ def identifies_code(code: str, payload: dict) -> bool:if not blob.strip("|"):return Falsevalue = str(code or "").upper()- matched = re.fullmatch(r"(?:\d{3,6})?([A-Z]{2,8})-?(\d{2,5})", value)+ matched = re.fullmatch(r"(?:\d{3,6})?([A-Z]{2,8})-?(\d{2,5})([A-Z]{0,2})", value)if matched:letters, digits = matched.group(1).lower(), matched.group(2).lstrip("0") or "0"- return any(re.search(rf"(?<![a-z]){letters}[-_]?0*{digits}(?!\d)",+ suffix = matched.group(3).lower()+ return any(re.search(rf"(?<![a-z]){letters}[-_]?0*{digits}{suffix}(?![a-z0-9])",str(payload.get(field) or "").lower()) is not Nonefor field in IDENTITY_FIELDS)return _compact(value) in blobdiff --git a/src/peach/routes_jav_browser.py b/src/peach/routes_jav_browser.pyindex 9e52da56f..0672658dd 100644--- a/src/peach/routes_jav_browser.py+++ b/src/peach/routes_jav_browser.py@@ -38,9 +38,9 @@ def status(code: str, service=Depends(browser_client)):raise HTTPException(400, str(error)) from None-def identify(source_url: str, service=Depends(browser_client)):+def identify(source_url: str, code: str = "", service=Depends(browser_client)):try:- return JSONResponse(service.status(identify_source(source_url)), headers={"Cache-Control": "no-store"})+ return JSONResponse(service.status(identify_source(source_url, code)), headers={"Cache-Control": "no-store"})except ValueError as error:raise HTTPException(400, str(error)) from Nonediff --git a/src/peach/sources/dmm.py b/src/peach/sources/dmm.pyindex 1673eadbd..1cc9b11d7 100644--- a/src/peach/sources/dmm.py+++ b/src/peach/sources/dmm.py@@ -29,6 +29,7 @@ from datetime import datetime, timedelta, timezonefrom urllib.parse import quotefrom ..metadata import identifies_code+from ..catalog_rules import normalise_code_keyfrom .base import FailureReason, Page, Session, SiteConfig, SiteRecord, SiteSource, SourceFailure#: 不带 Cookie,主机间隔用默认的 2 秒。一次响应实测几 KB,1 MiB 是余量。@@ -59,14 +60,23 @@ MISSING = "DMM 没有这个番号"NOT_JSON = "DMM 返回的不是作品 JSON"REFUSED = "DMM 拒绝了这条查询"-_CODE = re.compile(r"^(\d{3})?([A-Z]{2,8})-?(\d{1,5})$")+_CODE = re.compile(r"^(\d{3})?([A-Z]{2,8})-?(\d{1,5})([A-Z]{0,2})$")_CID = re.compile(r"^(?:h_\d+|\d+)?([a-z]+)(\d+)([a-z]*)$")+def code_from_cid(value: str) -> str:+ """DMM 商品号的数字头属于发行目录,尾字母保留为作品身份。"""+ matched = _CID.fullmatch(str(value or "").lower())+ if not matched:+ return ""+ letters, digits, suffix = matched.groups()+ return normalise_code_key(f"{letters}-{digits}{suffix}")++def code_parts(code: str) -> tuple[str, str, str] | None:- """番号拆成(数字前缀,字母段,数字):`SSIS-057` → `('', 'SSIS', '057')`,`300MIUM-1239` → `('300', 'MIUM', '1239')`。"""+ """番号拆成(数字前缀,字母段,序号及尾字母),例如 `DANDY-851C` → `('', 'DANDY', '851C')`。"""matched = _CODE.match(str(code or "").strip().upper())- return (matched.group(1) or "", matched.group(2), matched.group(3)) if matched else None+ return (matched.group(1) or "", matched.group(2), matched.group(3) + matched.group(4)) if matched else Nonedef guessed_cid(code: str) -> str:@@ -75,7 +85,8 @@ def guessed_cid(code: str) -> str:if not parts:return ""digits, letters, number = parts- return f"{digits}{letters.lower()}{int(number):05d}"+ serial = re.fullmatch(r"(\d+)([A-Z]*)", number)+ return f"{digits}{letters.lower()}{int(serial.group(1)):05d}{serial.group(2).lower()}"def matching_cids(code: str, cids) -> list[str]:@@ -84,11 +95,14 @@ def matching_cids(code: str, cids) -> list[str]:if not parts:return []digits, letters, number = parts+ serial = re.fullmatch(r"(\d+)([A-Z]*)", number)found = []for cid in cids:text = str(cid or "").lower()matched = _CID.match(text)- if not matched or matched.group(1) != letters.lower() or int(matched.group(2)) != int(number):+ if not matched or matched.group(1) != letters.lower() or int(matched.group(2)) != int(serial.group(1)):+ continue+ if serial.group(2) and matched.group(3) != serial.group(2).lower():continueif digits and not text.startswith(digits):continuediff --git a/tests/test_downloads_jav_browser.py b/tests/test_downloads_jav_browser.pyindex 97d71d3b3..8ea62e3ec 100644--- a/tests/test_downloads_jav_browser.py+++ b/tests/test_downloads_jav_browser.py@@ -3,9 +3,12 @@ from __future__ import annotationsimport hashlibimport json+import shutil+import subprocessimport tempfileimport threadingimport unittest+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServerfrom pathlib import Pathfrom unittest.mock import Mock, patch@@ -16,6 +19,7 @@ from peach.api import create_appfrom peach.config import PROJECT_ROOT, PeachSettingsfrom peach.jav_browser import CREDENTIAL, JavBrowser, code_key, identify_source, source_page, source_sitesfrom support.ledger import fresh_ledger+from support.conditions import missing_prerequisiteHASH = "c9e15763f722f23e98a29decdfae341b98d53056"MAGNET = f"magnet:?xt=urn:btih:{HASH}&dn=ABC-123"@@ -316,10 +320,17 @@ class BrowserTests(unittest.TestCase):def test_official_product_identification_is_read_only_and_uses_catalog_rules(self):cases = {"https://video.dmm.co.jp/av/content/?id=ssis00519": "SSIS-519",+ "https://video.dmm.co.jp/av/content/?id=1dandy00899": "DANDY-899",+ "https://video.dmm.co.jp/av/content/?id=1fns00061": "FNS-061",+ "https://video.dmm.co.jp/av/content/?id=1ssis00519": "SSIS-519",+ "https://video.dmm.co.jp/av/content/?id=118abw00220": "ABW-220",+ "https://video.dmm.co.jp/av/content/?id=1dandy00851c": "DANDY-851C",+ "https://video.dmm.co.jp/av/content/?id=48midv00012ai": "MIDV-012AI","https://www.dmm.co.jp/digital/videoa/-/detail/=/cid=ssis00057/": "SSIS-057","https://www.dmm.co.jp/mono/dvd/-/detail/=/cid=h_086iqqq00026/": "IQQQ-026","https://www.mgstage.com/product/product_detail/300MIUM-1239/": "300MIUM-1239","https://www.mgstage.com/product/product_detail/259LUXU-1475/": "259LUXU-1475",+ "https://www.mgstage.com/product/product_detail/104DANDY-851C/": "104DANDY-851C",}for source, expected in cases.items():with self.subTest(source=source):@@ -331,13 +342,100 @@ class BrowserTests(unittest.TestCase):self.service.search.assert_not_called()self.remote.submit.assert_not_called()self.assertEqual(self.service.rows, {})- for source in ("https://video.dmm.co.jp/av/content/?id=1ssis00519", "https://video.dmm.co.jp/av/content/?id=ssis00519&id=abw00123",+ for source in ("https://video.dmm.co.jp/av/content/?id=opaque_cid", "https://video.dmm.co.jp/av/content/?id=ssis00519&id=abw00123","https://unrelated.invalid/av/content/?id=ssis00519", "https://www.mgstage.com/search/?q=300MIUM-1239"):with self.subTest(source=source):result = self.client.get("/api/jav-browser/identify", params={"source_url": source}, headers=self.script_headers)self.assertEqual(result.status_code, 400, result.text)self.assertEqual(self.client.get("/api/jav-browser/identify", params={"source_url": next(iter(cases))}).status_code, 401)+ def test_product_page_number_must_agree_with_the_registered_product(self):+ source = "https://video.dmm.co.jp/av/content/?id=1dandy00899"+ for hint, status in (("DANDY-899", 200), ("DANDY-899C", 400), ("ABW-899", 400)):+ result = self.client.get("/api/jav-browser/identify", headers=self.script_headers,+ params={"source_url": source, "code": hint})+ self.assertEqual(result.status_code, status, result.text)+ self.assertFalse(self.service.rows)+ self.service.search.assert_not_called()+ self.remote.submit.assert_not_called()++ def test_explicit_product_suffix_is_preserved_through_the_download_submission(self):+ code = "104DANDY-851C"+ self.service.search.return_value = {"items": [+ {"name": "104DANDY-851 1080p", "uri": MAGNET},+ {"name": "104DANDY-851CH 1080p", "uri": MAGNET},+ {"name": "104DANDY-851C 1080p", "uri": MAGNET}]}+ self.assertEqual(self.add(code).status_code, 200)+ self.service.process_one()+ self.assertEqual(self.service.rows[code]["state"], "submitted")+ self.service.search.assert_called_once_with(self.app.state.web_contract, {"code": code, "goal": "quality"})+ self.assertEqual(self.downloads.store.get(self.service.rows[code]["task_id"]).code, code)++ def test_explicit_product_suffix_does_not_adopt_the_plain_release(self):+ self.service.search.return_value = {"items": [{"name": "DANDY-851 1080p", "uri": MAGNET}]}+ self.add("DANDY-851C")+ self.service.process_one()+ self.assertEqual(self.service.rows["DANDY-851C"]["state"], "no_match")+ self.remote.submit.assert_not_called()++ def test_resource_identity_keeps_the_date_separator(self):+ self.service.search.return_value = {"items": [{"name": "092415-001 1080p", "uri": MAGNET}]}+ self.add("092415_001")+ self.service.process_one()+ self.assertEqual(self.service.rows["092415_001"]["state"], "no_match")+ self.remote.submit.assert_not_called()++ def test_resource_title_does_not_override_a_conflicting_primary_number(self):+ self.service.search.return_value = {"items": [{"name": "XYZ-999 DANDY-851C 1080p", "uri": MAGNET}]}+ self.add("DANDY-851C")+ self.service.process_one()+ self.assertEqual(self.service.rows["DANDY-851C"]["state"], "no_match")+ self.remote.submit.assert_not_called()++ def test_supported_explicit_numbers_use_the_same_status_contract(self):+ for code in ("MKBD-S123", "MKD-S123", "092415_01", "092415_0001", "DANDY-851C", "MIDV-012AI"):+ response = self.client.get("/api/jav-browser", params={"code": code}, headers=self.script_headers)+ self.assertEqual(response.status_code, 200, response.text)+ self.assertEqual(response.json()["code"], code)++ def test_complete_userscript_uses_the_real_identification_endpoint(self):+ from test_web_e2e import chrome_executable+ node, chrome = shutil.which("node"), chrome_executable()+ if not node or not chrome or not (PROJECT_ROOT / "frontend/node_modules/playwright-core").is_dir():+ missing_prerequisite("用户脚本联合验收需要 Node、Chrome 和前端锁定依赖")+ client, headers = self.client, self.script_headers++ class Handler(BaseHTTPRequestHandler):+ def do_GET(self):+ if not self.path.startswith("/api/jav-browser/identify?"):+ self.send_error(404)+ return+ response = client.get(self.path, headers=headers)+ self.send_response(response.status_code)+ self.send_header("Content-Type", "application/json")+ self.end_headers()+ self.wfile.write(response.content)++ def log_message(self, *_args):+ pass++ server = ThreadingHTTPServer(("127.0.0.1", 0), Handler)+ worker = threading.Thread(target=server.serve_forever, daemon=True)+ worker.start()+ try:+ result = subprocess.run([node, str(PROJECT_ROOT / "frontend/e2e/jav-userscript-contract.mjs"),+ f"http://127.0.0.1:{server.server_port}",+ str(PROJECT_ROOT / "web/integrations/peach-jav.user.js"), chrome],+ capture_output=True, text=True, encoding="utf-8", timeout=120)+ self.assertEqual(result.returncode, 0, result.stdout + result.stderr)+ finally:+ server.shutdown()+ server.server_close()+ worker.join(timeout=5)+ self.assertFalse(self.service.rows)+ self.service.search.assert_not_called()+ self.remote.submit.assert_not_called()+def test_userscript_bridge_requires_the_peach_session_and_contains_no_credential(self):path = "/integrations/peach-userscript-bridge"self.assertEqual(self.client.get(path).status_code, 401)diff --git a/tests/test_metadata.py b/tests/test_metadata.pyindex 2eaf61116..0723933be 100644--- a/tests/test_metadata.py+++ b/tests/test_metadata.py@@ -189,6 +189,12 @@ class MetadataProviderTests(unittest.TestCase):}})class SourceIdentityTests(unittest.TestCase):+ def test_explicit_release_suffix_is_not_satisfied_by_a_plain_or_different_product(self):+ self.assertTrue(identifies_code("DANDY-851C", {"content_id": "1dandy00851c"}))+ self.assertFalse(identifies_code("DANDY-851C", {"content_id": "1dandy00851"}))+ self.assertFalse(identifies_code("DANDY-851C", {"content_id": "1dandy00851ch"}))+ self.assertFalse(identifies_code("DANDY-851", {"content_id": "1dandy00851c"}))+def test_prefixed_release_requires_matching_product_evidence(self):dvd = {"id": "JAC-040", "content_id": "118jac040","source_url": "https://www.dmm.co.jp/mono/dvd/-/detail/=/cid=118jac040/"}diff --git a/tests/test_metadata_dmm.py b/tests/test_metadata_dmm.pyindex afc78ca61..a074e1949 100644--- a/tests/test_metadata_dmm.py+++ b/tests/test_metadata_dmm.py@@ -9,7 +9,7 @@ from peach.library_processing import LibraryMetadataProviderfrom peach.scraping_access import SourcePausedfrom peach.sources import DMM, DmmSource, FailureReason, Page, Session, SourceFailurefrom peach.sources.dmm import (DETAIL_ATTEMPTS, DETAIL_QUERY, SEARCH_LIMIT, SEARCH_QUERY, code_parts,- guessed_cid, matching_cids, release_date)+ code_from_cid, guessed_cid, matching_cids, release_date)ENDPOINT = "https://api.video.dmm.co.jp/graphql"PAGE_URL = "https://video.dmm.co.jp/av/content/?id=ssis00057"@@ -64,11 +64,19 @@ def asked(transport):class CodeMappingTests(unittest.TestCase):+ def test_dmm_product_identity_keeps_the_release_suffix_and_uses_the_dmm_namespace(self):+ for product, expected in {"1dandy00899": "DANDY-899", "118abw00220": "ABW-220",+ "h_086iqqq00026": "IQQQ-026", "1dandy00851c": "DANDY-851C",+ "48midv00012ai": "MIDV-012AI"}.items():+ self.assertEqual(code_from_cid(product), expected)+ self.assertEqual(code_from_cid("opaque_cid"), "")+def test_code_parts_keep_the_numeric_prefix_and_the_digits_as_written(self):self.assertEqual(code_parts("SSIS-057"), ("", "SSIS", "057"))self.assertEqual(code_parts("ssis057"), ("", "SSIS", "057"))self.assertEqual(code_parts("300MIUM-1239"), ("300", "MIUM", "1239"))- for code in ("", None, "FC2-PPV-1812235", "092415_001", "n0780", "MIDV-012ai"):+ self.assertEqual(code_parts("MIDV-012ai"), ("", "MIDV", "012AI"))+ for code in ("", None, "FC2-PPV-1812235", "092415_001", "n0780"):with self.subTest(code=code):self.assertIsNone(code_parts(code))@@ -76,6 +84,7 @@ class CodeMappingTests(unittest.TestCase):self.assertEqual(guessed_cid("SSIS-057"), "ssis00057")self.assertEqual(guessed_cid("START-640"), "start00640")self.assertEqual(guessed_cid("300MIUM-1239"), "300mium01239")+ self.assertEqual(guessed_cid("DANDY-851C"), "dandy00851c")self.assertEqual(guessed_cid("092415_001"), "")def test_matching_cids_compare_the_letters_and_the_number_not_the_substring(self):@@ -90,6 +99,7 @@ class CodeMappingTests(unittest.TestCase):"""`MIDV 012` 同时命中原版与 AI 重制版,原版先核。"""self.assertEqual(matching_cids("MIDV-012", ["48midv00012ai", "midv00127", "midv00012", "48midv00012"]),["midv00012", "48midv00012", "48midv00012ai"])+ self.assertEqual(matching_cids("DANDY-851C", ["1dandy00851", "1dandy00851c", "1dandy00851ai"]), ["1dandy00851c"])def test_a_numeric_prefix_in_the_code_must_lead_the_cid(self):self.assertEqual(matching_cids("300MIUM-1239", ["300mium01239", "mium01239", "259mium01239"]), ["300mium01239"])diff --git a/web/integrations/jav-sites.json b/web/integrations/jav-sites.jsonindex 0c52a4b71..81375606d 100644--- a/web/integrations/jav-sites.json+++ b/web/integrations/jav-sites.json@@ -353,6 +353,11 @@"query_keys": ["id"],+ "selectors": [+ "th",+ "dt",+ "[data-video-code]"+ ],"detail_pattern": "^/(?:av/content/?|(?:digital/(?:videoa|videoc)|mono/dvd)/-/detail/=/cid=([A-Za-z0-9_]+)/?)$"},{@@ -364,6 +369,11 @@],"mode": "automatic","identity": "peach",+ "selectors": [+ "th",+ "dt",+ "[data-video-code]"+ ],"detail_pattern": "^/product/product_detail/([A-Za-z0-9_-]+)/?$"},{diff --git a/web/integrations/jav-userscript-release.json b/web/integrations/jav-userscript-release.jsonindex ad80e6dc8..6c41c15a1 100644--- a/web/integrations/jav-userscript-release.json+++ b/web/integrations/jav-userscript-release.json@@ -1,12 +1,12 @@{- "version": "0.4.0",+ "version": "0.5.0","repository": "https://github.com/peach-mitao/peach-userscript",- "commit": "3d7141fbd0f97459e1af9e405314e5ab25097b88",+ "commit": "561f7f59012bab15a7720ba92329cd7caca14351","install_url": "/integrations/peach-jav.user.js",- "bridge_min_version": "0.4.0",+ "bridge_min_version": "0.5.0","site_schema_version": 1,"files": {- "peach-jav.user.js": "9215b91d208bea8b81fcd713bc8676bb3eda649d6e638823ed40cdfe7e22f368",- "jav-sites.json": "5cb77aaebf79ebae49e7e13306e284f7e5890610f613e6862b238b7332d48876"+ "peach-jav.user.js": "40b00ba7d5ed987ff93ddb9dc1a6a0b5087aef0b011d9a53143f407749b171ec",+ "jav-sites.json": "74983ac48fb8dda583bd066f7dce7fbc01834137a8be07f5cbe779dcfb7b83db"}}diff --git a/web/integrations/peach-jav.user.js b/web/integrations/peach-jav.user.jsindex 4e24103b5..686092456 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.4.0+// @version 0.5.0// @description 在 JAV 作品详情页识别或选中番号,交给 Peach 下载入库。// @match https://missav.ws/*// @match https://*.missav.ws/*@@ -249,11 +249,11 @@* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.*/- 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"],"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","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 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 ROOT_ID = 'peach-jav-action';- const SCRIPT_VERSION = "0.4.0";+ const SCRIPT_VERSION = "0.5.0";if (location.pathname === '/integrations/peach-userscript-bridge') {let origin;try { origin = settings(location.origin, 'bridge-only').base; } catch { return; }@@ -396,16 +396,20 @@found.add(prefix.toLowerCase() + digits);return ' ';});- for (const match of rest.matchAll(/\b((?:\d{1,5})?[A-Z]{2,12})[-_]?(\d{1,8})(?=$|[^A-Z0-9])/g)) {- found.add(`${match[1]}-${match[2]}`);+ rest = rest.replace(/\b(MKB?D)-S(\d{2,4})(?=$|[^A-Z0-9])/g, (_, prefix, digits) => {+ found.add(`${prefix}-S${digits}`);+ return ' ';+ });+ for (const match of rest.matchAll(/\b((?:\d{1,5})?[A-Z]{2,12})[-_]?(\d{1,8})([A-Z]{0,2})(?=$|[^A-Z0-9])/g)) {+ found.add(`${match[1]}-${match[2]}${match[3]}`);}- for (const match of rest.matchAll(/\b\d{6}[-_]\d{3}\b/g)) found.add(match[0]);+ for (const match of rest.matchAll(/\b\d{6}[-_]\d{2,4}\b/g)) found.add(match[0]);return found;}function comparisonKey(code) {if (code.startsWith('FC2-PPV-')) return code;- return code.replace(/^((?:\d+)?[A-Z]+)-0*(\d+)$/, '$1-$2');+ return code.toUpperCase().replace(/^((?:\d+)?[A-Z]+)-0*(\d+)([A-Z]{0,2})$/, '$1-$2$3');}function siteFor(url) {@@ -437,11 +441,12 @@} catch { return ''; }}const text = (field.textContent || '').slice(0, 800);- if (field.matches('dt, strong, b, .header, p')) {+ if (field.matches('th, dt, strong, b, .header, p')) {const label = text.trim().split(/[::]/, 1)[0].trim().toLowerCase();- const labelled = ['番号', '番號', '品番', '識別碼', '识别码', 'id', 'code'].includes(label)- || /^(番号|番號|品番|識別碼|识别码|ID|Code)\s*[::]/i.test(text.trim());+ const labelled = ['番号', '番號', '品番', 'メーカー品番', '識別碼', '识别码', 'id', 'code'].includes(label)+ || /^(メーカー品番|番号|番號|品番|識別碼|识别码|ID|Code)\s*[::]/i.test(text.trim());if (!labelled) return '';+ if (field.tagName === 'TH') return field.nextElementSibling?.tagName === 'TD' ? field.nextElementSibling.textContent : '';if (field.tagName === 'DT') return field.nextElementSibling?.tagName === 'DD' ? field.nextElementSibling.textContent : '';if (field.tagName === 'P') return text;let value = text;@@ -463,7 +468,14 @@if (site.identity === 'peach') {if (!match[1] && site.query_keys?.some(key => url.searchParams.getAll(key).length !== 1|| !/^[A-Za-z0-9_-]{1,100}$/.test(url.searchParams.get(key)))) return null;- return { code: '', conflict: false, source: sourcePage(url, site), resolve: true };+ const codes = new Map();+ for (const selector of site.selectors || []) {+ for (const field of [...document.querySelectorAll(selector)].slice(0, 40)) {+ for (const code of candidates(fieldText(field))) codes.set(comparisonKey(code), code);+ }+ }+ return { code: codes.size === 1 ? [...codes.values()][0] : '', conflict: codes.size > 1,+ source: sourcePage(url, site), resolve: true };}if (site.query_keys?.length && !site.query_keys.every(key => url.searchParams.getAll(key).length === 1&& /^[A-Za-z0-9_-]{1,100}$/.test(url.searchParams.get(key)))) return null;@@ -511,7 +523,7 @@const site = siteFor(url);if (!site) return;const raw = String(getSelection() || '').trim();- const shortCode = /^(?:FC2(?:[-_ ]?PPV)?[-_ ]?\d{4,9}|[NK]\d{4}|(?:\d{1,5})?[A-Z]{2,12}[-_]?\d{1,8}|\d{6}[-_]\d{3})$/i;+ const shortCode = /^(?:FC2(?:[-_ ]?PPV)?[-_ ]?\d{4,9}|[NK]\d{4}|MKB?D-S\d{2,4}|(?:\d{1,5})?[A-Z]{2,12}[-_]?\d{1,8}[A-Z]{0,2}|\d{6}[-_]\d{2,4})$/i;const extracted = candidates(raw);if (raw.length > 80 || !shortCode.test(raw) || extracted.size !== 1) {showNotice('请只选中一个完整的短番号,再从脚本菜单加入 Peach。');@@ -697,7 +709,7 @@try {GM_xmlhttpRequest({method,- url: resolveIdentity ? `${config.base}/api/jav-browser/identify?source_url=${encodeURIComponent(source)}`+ url: resolveIdentity ? `${config.base}/api/jav-browser/identify?source_url=${encodeURIComponent(source)}${code ? `&code=${encodeURIComponent(code)}` : ''}`: `${config.base}/api/jav-browser${method === 'GET' ? `?code=${encodeURIComponent(code)}` : ''}`,headers,...(method === 'POST' ? { data: JSON.stringify({ code, source_url: source }) } : {}),@@ -705,7 +717,13 @@timeout: 15_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 ? '令牌无效或无权限,请重新配置。'+ : response.status >= 500 ? 'Peach 服务暂时不可用,请稍后查询状态。'+ : response.status === 429 ? 'Peach 请求过于频繁,请稍后查询。'+ : resolveIdentity && [404, 405].includes(response.status) ? 'Peach 尚不支持商品号识别,请更新 Peach。'+ : response.status === 400 && detail ? detail: resolveIdentity ? '未识别到作品番号,请选中页面的完整番号后加入 Peach。' : 'Peach 请求失败,请查询状态。'));return;}@@ -713,7 +731,7 @@const body = JSON.parse(response.responseText);if (body.ok !== true || !STATES.has(body.state) || typeof body.code !== 'string'|| candidates(body.code).size !== 1- || (!resolveIdentity && ![...candidates(body.code)].some(candidate => comparisonKey(candidate) === comparisonKey(code)))) throw new Error();+ || ((!resolveIdentity || code) && ![...candidates(body.code)].some(candidate => comparisonKey(candidate) === comparisonKey(code)))) throw new Error();resolve(body);} catch { reject(new Error('Peach 返回的状态无效,请查询状态。')); }},