dsh-bili-watch 0.2.25 → 0.2.27

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "dsh-bili-watch",
-    "version":  "0.2.25",
+    "version":  "0.2.27",
     "private":  false,
     "description":  "把 B 站视频读成文本给 DSH agent 用：元数据、评论、弹幕、字幕、本地转写、抽帧 OCR；支持 b23.tv 短链与 av 号，抽帧缓存目录可换。只读命令零依赖。",
     "type":  "module",

package/tools/look.mjs

@@ -93,7 +93,17 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms))
 const jitter = (base, spread) => base + Math.floor(Math.random() * spread)
 
 async function jget(url, headers = H, timeoutMs = 30000) {
-  const r = await fetch(url, { headers, signal: AbortSignal.timeout(timeoutMs) })
+  // T36-P1-2：只对网络层抖动重试一次（B 站偶发 ECONNRESET）；业务 code（-352/-404）不重试
+  let r
+  for (let attempt = 0; ; attempt++) {
+    try {
+      r = await fetch(url, { headers, signal: AbortSignal.timeout(timeoutMs) })
+      if (!(r.status >= 500) || attempt >= 1) break
+    } catch (e) {
+      if (attempt >= 1) throw e
+    }
+    await sleep(300 + Math.floor(Math.random() * 400))
+  }
   const t = await r.text()
   if (!r.ok) return { code: -r.status, message: `HTTP ${r.status}` }
   try {
@@ -433,7 +443,7 @@ function findFfmpeg(arg) {
   for (const c of cands) {
     if (c !== 'ffmpeg' && !existsSync(c)) continue
     try {
-      execFileSync(c, ['-version'], { stdio: 'ignore' })
+      execFileSync(c, ['-version'], { stdio: 'ignore', timeout: 300000 })
       return c
     } catch {}
   }
@@ -623,12 +633,12 @@ async function grabFrames(bv, { step = 0, outDir, ffmpeg, fresh = false, p: page
       // 场景吸附：逐点 -ss 抽帧
       frameTimes.forEach((t, i) => {
         const out = join(dir, `${bv}-${String(i + 1).padStart(2, '0')}.jpg`)
-        execFileSync(bin, ['-y', '-threads', '2', '-ss', String(t), '-i', mp4, '-frames:v', '1', '-q:v', '2', out], { stdio: 'ignore' })
+        execFileSync(bin, ['-y', '-threads', '2', '-ss', String(t), '-i', mp4, '-frames:v', '1', '-q:v', '2', out], { stdio: 'ignore', timeout: 300000 })
       })
     } else {
       // 默认等间隔
       const pattern = join(dir, `${bv}-%02d.jpg`)
-      execFileSync(bin, ['-y', '-threads', '2', '-i', mp4, '-vf', `fps=1/${useStep}`, '-q:v', '2', pattern], { stdio: 'ignore' })
+      execFileSync(bin, ['-y', '-threads', '2', '-i', mp4, '-vf', `fps=1/${useStep}`, '-q:v', '2', pattern], { stdio: 'ignore', timeout: 300000 })
     }
 
     const n = jpgs().length
@@ -1364,7 +1374,7 @@ async function cmdSheet(bv, opts = {}) {
   if (!bin) { process.exitCode = 1; console.log('✗ 找不到 ffmpeg：' + FFMPEG_HINT); return }
   const out = join(CACHE, 'sheets', `${bv}-p${opts.p ?? 1}-${grid}.jpg`)
   mkdirSync(dirname(out), { recursive: true })
-  execFileSync(bin, ['-y', '-threads', '2', '-i', join(tmp, '%02d.jpg'), '-vf', `scale=640:-1,tile=${cols}x${rows}`, '-frames:v', '1', out], { stdio: 'ignore' })
+  execFileSync(bin, ['-y', '-threads', '2', '-i', join(tmp, '%02d.jpg'), '-vf', `scale=640:-1,tile=${cols}x${rows}`, '-frames:v', '1', out], { stdio: 'ignore', timeout: 300000 })
   console.log(`拼图: ${out}（${(statSync(out).size / 1024).toFixed(0)} KiB，共 ${picked.length} 帧）`)
   console.log('读这张图就能过一遍画面；要精确读字用 ocr <BV>。')
 }
@@ -1385,7 +1395,7 @@ async function cmdSubstrip(bv, opts = {}) {
   if (!bin) { process.exitCode = 1; console.log('✗ 找不到 ffmpeg：' + FFMPEG_HINT); return }
   const out = join(CACHE, 'sheets', `${bv}-p${opts.p ?? 1}-substrip.jpg`)
   mkdirSync(dirname(out), { recursive: true })
-  execFileSync(bin, ['-y', '-threads', '2', '-i', join(tmp, '%02d.jpg'), '-vf', `crop=iw:ih*0.20:0:ih*0.80,scale=1280:-1,tile=1x${take}`, '-frames:v', '1', out], { stdio: 'ignore' })
+  execFileSync(bin, ['-y', '-threads', '2', '-i', join(tmp, '%02d.jpg'), '-vf', `crop=iw:ih*0.20:0:ih*0.80,scale=1280:-1,tile=1x${take}`, '-frames:v', '1', out], { stdio: 'ignore', timeout: 300000 })
   console.log(`字幕带: ${out}（${(statSync(out).size / 1024).toFixed(0)} KiB，共 ${take} 条）`)
   console.log('一张图里是整片底部字幕；硬字幕视频用它比逐帧 OCR 省很多。')
 }
@@ -1781,7 +1791,12 @@ async function cmdText(bv, credPath, opts = {}) {
       // 口播类正常 4–6 字/秒；低于 2 字/秒多半是背景音乐、外语歌或纯画面，
       // 这时候转写出来的「字」只是把杂音听成了字，继续往下走 OCR 更靠谱。
       const rate = v.dur > 0 ? a.chars / v.dur : 0
-      if (rate >= 2) {
+      if (rate >= 2 && !(a.verify && a.verify.suspect)) {
+        // T40：ASR 也会把杂音/背景音听成字，主入口同样要过诱饵信号（原先只有字幕分支有）
+        const asrBait = baitSignals(a.text, v, credibility(v, a.text))
+        if (asrBait.suspect) {
+          say(`[track] ⚠ 转写可疑：${asrBait.reasons.join('；')}（机器转写本来就可能听错，要看画面加 --verify 再跑一次）`)
+        }
         if (emitText(opts, {
           video: { bv, title: v.title, up: v.owner, dur: v.dur, p: v.p, pages: v.pages },
           source: 'asr',
@@ -1795,6 +1810,8 @@ async function cmdText(bv, credPath, opts = {}) {
         printText(a.text, opts, bv)
         done()
         return
+      } else if (a.verify && a.verify.suspect) {
+        say(`[track] 转写: ⚠ 疑似幻觉（${(a.verify.reasons || []).join('；')}），降级到抽帧/OCR`)
       }
       say(`[track] 转写: 质量低（${a.chars} 字，${rate.toFixed(1)} 字/秒），继续往下试`)
     } else {
@@ -2011,7 +2028,7 @@ function findYtDlp() {
   for (const c of cands) {
     if (c !== 'yt-dlp' && !existsSync(c)) continue
     try {
-      execFileSync(c, ['--version'], { stdio: 'ignore' })
+      execFileSync(c, ['--version'], { stdio: 'ignore', timeout: 300000 })
       return c
     } catch {}
   }
@@ -2151,7 +2168,7 @@ async function grabFramesLocal(mp4, tag, dur, { step = 0 } = {}) {
     const bin = findFfmpeg()
     if (!bin) throw new Error('找不到 ffmpeg：' + FFMPEG_HINT)
     const pattern = join(dir, `${tag}-%02d.jpg`)
-    execFileSync(bin, ['-y', '-threads', '2', '-i', mp4, '-vf', `fps=1/${useStep}`, '-q:v', '2', pattern], { stdio: 'ignore' })
+    execFileSync(bin, ['-y', '-threads', '2', '-i', mp4, '-vf', `fps=1/${useStep}`, '-q:v', '2', pattern], { stdio: 'ignore', timeout: 300000 })
     const n = jpgs().length
     if (!n) throw new Error('抽帧没产出图片（可能源流异常）')
     writeManifest(dir, { ok: true, tag, step: useStep, scene: false, frames: n })