@memef1f1y/dsh-plugin-tts 0.6.3 → 0.6.5

package/TODO.md

@@ -1,5 +1,16 @@
 # TODO（待办）
 
+## 2026-09-27 Mac 交接前进度（已 push，工作区干净）
+
+- [x] 五提供者指南：Edge / Index-TTS2 / CosyVoice / Cloud TTS / RVC per-provider guides + agent handoff header（`docs/`，2026-09-22）。
+- [x] 分块播放：indexed chunk serve order、prewarm skip、starved chunk clamp、orphan sweep + overlap detector、fluency trio（cosy trim / chunk retry-skip / stall watchdog，2026-09-22）。
+- [x] 诊断：diag log JSON 导出 + triage（calibration / cache / model / jobs）+ per-provider triage + chunk forensics（host build tag / job summaries / early-done，2026-09-25）。
+- [x] 发布：npm `@memef1f1y/dsh-plugin-tts`，v0.6.1 chunk-order、v0.6.2 loader-name、v0.6.3 scroll-follow v2（2026-09-25~26）。
+- [x] scroll-follow v2：stepwise signal + latch-off + highlight + spans；`ttsFollow` 提至 apply scope + ratio fallback 修复（HEAD `149fb9d`，v0.6.4，2026-09-26，已 push，`origin/main` 同步，工作区干净）。
+- [ ] 待 Mac 端：`docs/scroll-follow-v2.md` 在 UTF-8 下读出乱码（疑似 GBK 存档），需确认源编码并转 UTF-8；`TODO.md` 此前停留在 08-17，本次已补齐。
+
+> 交接注意：`dsh-plugin-TTS/` 外层（`edge-tts-worker.cjs` 旧独立 worker、`README.md` 旧版、6 个 `rvc-*.log`、`.npm-cache/`）不在 git 内，Mac 端只需 clone `plugin/` 本体（`https://github.com/1624318455/dsh-plugin-tts.git`，`main@149fb9d`）；外层文件无需带走，log 已被 `plugin/.gitignore` 的 `*.log` 排除。
+
 ## 发布与引流
 
 - [x] **B站介绍视频已发布**，简介已放便携运行时网盘链接（`E:\rvc-portable-torch2.7-cu128.zip`，4.35GB）。

package/lib/client.js

@@ -18,7 +18,7 @@ window.__ModuleLoader__.load({
 
     // Bundle build tag: bump on every client fix so a console line proves
     // WHICH code is actually running (rules out stale-bundle confusion).
-    const CLIENT_BUILD = "2026-09-26.04-follow-v2";
+    const CLIENT_BUILD = "2026-10-11.01-remove-dead-runtime-inject";
     const apply = ctx => {
       const slots = ctx.slots ?? (typeof ctx.get === "function" ? ctx.get("slots") : undefined);
       if (!slots) throw new Error("[dsh-plugin-tts] slots service unavailable");
@@ -1490,6 +1490,13 @@ window.__ModuleLoader__.load({
         return shared.rvc.baseVoice || shared.voice;
       }
 
+      // --- Scroll-follow v2 state: apply-scope singleton so BOTH speakText
+      // (new-read re-latch) and TtsReadingOverlay (tick / takeover / resume)
+      // share the SAME object. Must NOT live inside the component (each render
+      // would recreate it: speakText would throw ReferenceError AND latch-off
+      // would be lost on next render).
+      const ttsFollow = { latched: true, touchActive: false, selfUntil: 0 };
+
       // ---------- approval voice alerts (Agent-event broadcast) ----------
       // The Host ingests approval session events (approval/asked, approval/
       // decided) from the session/event firehose and serves them through
@@ -3546,7 +3553,8 @@ window.__ModuleLoader__.load({
         // with manual resume; reduced-motion respected. No polling loop:
         // evaluation runs per chunk-index change + on scroll/touch/viewport
         // events (the old 250ms full-DOM scan forced reflow at 4Hz).
-        const ttsFollow = { latched: true, touchActive: false, selfUntil: 0 };
+        // NOTE: ttsFollow lives in apply scope (shared singleton) — do NOT
+        // redeclare here, or speakText can't see it (0.6.3 ReferenceError).
         const ttsReducedMotion = () => {
           try { return !!(window.matchMedia && window.matchMedia("(prefers-reduced-motion: reduce)").matches); } catch (e) { return false; }
         };
@@ -3640,6 +3648,7 @@ window.__ModuleLoader__.load({
             // one forever (that froze follow at the initial spot).
             const fullNeedle = shared.currentText || "";
             if (!fullNeedle) { mark("no-needle"); return false; }
+            const ratio = total ? (idx - 1) / total : 0;
             const pos = Math.floor(fullNeedle.length * Math.min(0.99, Math.max(0, ratio)));
             const needle = fullNeedle.slice(Math.max(0, pos - 50), pos + 50);
             if (!needle) { mark("no-needle"); return false; }

package/lib/index.mjs

@@ -9,7 +9,9 @@
 //   GET  /dsh-tts-api/rvc-packs-installed                 -> { installed }
 //   POST /dsh-tts-api/rvc-pack-install {registry, packId} -> download+sha256-verify+install
 // Synthesis runs a zero-dependency Edge TTS worker via `node -e`
-// (Sec-MS-GEC query-param protocol, mirroring node-edge-tts@1.2.10).
+// (Sec-MS-GEC query-param protocol, mirroring node-edge-tts@1.2.10;
+// 2026-10 v1->v2 migration per rany2/edge-tts#490: WSS host is now
+// api.msedgeservices.com with Ocp-Apim-Subscription-Key, legacy token kept).
 import { spawn } from 'node:child_process';
 import { readFileSync, writeFileSync, existsSync, mkdirSync, rmSync } from 'node:fs';
 import { createHash } from 'node:crypto';
@@ -31,7 +33,7 @@ const path = require('node:path');
 const TRUSTED_CLIENT_TOKEN = '6A5AA1D4EAFF4E9FB37E23D68491D6F4';
 const CHROMIUM_FULL_VERSION = '143.0.3650.75';
 const WINDOWS_FILE_TIME_EPOCH = 11644473600n;
-const WSS_BASE = 'wss://speech.platform.bing.com/consumer/speech/synthesize/readaloud/edge/v1';
+const WSS_BASE = 'wss://api.msedgeservices.com/tts/cognitiveservices/websocket/v1';
 const CRLF = String.fromCharCode(13, 10);
 function generateSecMsGecToken() {
   const ticks = BigInt(Math.floor(Date.now() / 1000) + Number(WINDOWS_FILE_TIME_EPOCH)) * 10000000n;
@@ -62,7 +64,8 @@ function isHardWorkerError(msg) {
 function synthesizeOnce(voice, text, outPath, lang, rate, pitch, volume) {
   return new Promise(function (resolve, reject) {
     const secMsGec = generateSecMsGecToken();
-    const url = WSS_BASE + '?TrustedClientToken=' + TRUSTED_CLIENT_TOKEN + '&Sec-MS-GEC=' + secMsGec + '&Sec-MS-GEC-Version=1-' + CHROMIUM_FULL_VERSION;
+    const connectionId = crypto.randomBytes(16).toString('hex');
+    const url = WSS_BASE + '?Ocp-Apim-Subscription-Key=' + TRUSTED_CLIENT_TOKEN + '&Sec-MS-GEC=' + secMsGec + '&Sec-MS-GEC-Version=1-' + CHROMIUM_FULL_VERSION + '&ConnectionId=' + connectionId;
     const ws = new WebSocket(url, {
       headers: {
         'Pragma': 'no-cache',
@@ -92,7 +95,7 @@ function synthesizeOnce(voice, text, outPath, lang, rate, pitch, volume) {
             parts.push('detail=' + s.slice(0, 200));
           }
         }
-        parts.push('url=speech.platform.bing.com/edge/v1');
+        parts.push('url=api.msedgeservices.com/tts/v1');
         return 'websocket error (' + parts.join(' ') + ')';
       } catch (err) {
         return 'websocket error: ' + String(e);
@@ -1991,7 +1994,7 @@ const WORKER_META = {
 // Bump on every Host-side playback fix: package.json versions only move on
 // releases, so without this two different Host builds are indistinguishable
 // in an exported log (exactly what stalled the 1/3/2 swap triage).
-const HOST_BUILD = '2026-09-26.02-job-summary';
+const HOST_BUILD = '2026-10-11.01-remove-dead-runtime-inject';
 
 export function apply(ctx) {
   const webServer = ctx.get('webServer');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@memef1f1y/dsh-plugin-tts",
   "description": "Edge TTS 语音大集成插件：消息朗读按钮、自动朗读开关、语音设置面板（Edge TTS / RVC / Index-TTS2 / CosyVoice / Google Cloud TTS）",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "type": "module",
   "engines": {
     "node": ">=22"
@@ -22,7 +22,6 @@
     "client": {
       "platform": "web",
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-ui-slots"
       ]
     }
@@ -33,8 +32,8 @@
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-base": ">=0.1.0-rc.6"
+    "@deepseek-ai/cordis": "^4.0.4",
+    "@deepseek-ai/dsh-base": "0.2.0-rc.2"
   },
   "scripts": {
     "test": "node tests/smoke.mjs",