cc-viewer 1.6.300 → 1.6.302

package/server/server.js

@@ -78,7 +78,10 @@ import { CONTEXT_WINDOW_FILE, readModelContextSize } from './lib/context-watcher
 import { watchLogFile, startWatching, unwatchAll, sendEventToClients, sendToClients } from './lib/log-watcher.js';
 import { cleanupExtractCache } from './lib/jsonl-archive.js';
 import { backupConfigs } from './lib/config-backup.js';
+import { normalizeBasePath, validateBasePath, stripBasePath } from './lib/base-path.js';
+import { createHardenedCleanup } from './lib/term-signals.js';
 import { createBackpressureGate } from './lib/ws-backpressure.js';
+import { createFloodCoalescer } from './lib/pty-flood-coalescer.js';
 
 
 // 动态获取 getPrefsFile()（LOG_DIR 可能在运行时被 setLogDir 修改）
@@ -567,12 +570,13 @@ async function handleRequest(req, res) {
   let url = parsedUrl.pathname;
 
   // CCV_BASE_PATH reverse proxy: strip prefix at TOP so API/WS/static/SPA
-  // all work with original unprefixed paths. basePath normalized.
-  const bpRaw = process.env.CCV_BASE_PATH || '';
-  const bp = bpRaw && bpRaw !== '/' ? bpRaw.replace(/\/?$/, '/') : '';
-  if (bp && url.startsWith(bp)) {
-    url = url.slice(bp.length) || '/';
-  }
+  // all work with original unprefixed paths. 剥离后必须写回 parsedUrl.pathname ——
+  // dispatch()（routes/_dispatch.js）与多个 handler（files-content/ask-perm/im）直读
+  // parsedUrl.pathname 做路由匹配和偏移 slice，不写回则前缀下全部 /api/* 与 SSE /events
+  // 命不中、落 SPA fallback（PR #108 遗留 P0）。searchParams 不受 pathname 赋值影响。
+  const bp = normalizeBasePath(process.env.CCV_BASE_PATH);
+  url = stripBasePath(url, bp);
+  parsedUrl.pathname = url;
   const method = req.method;
 
   // WebSocket 路径不处理，交给 upgrade 事件
@@ -677,14 +681,9 @@ async function handleRequest(req, res) {
 
   // 静态文件服务
   if (method === 'GET') {
-    const rawBase = process.env.CCV_BASE_PATH || '';
-    // Normalize to ensure trailing slash; prevents /proxy/ws from
-    // incorrectly matching /proxy/ws-other due to startsWith ambiguity.
-    const basePath = rawBase && rawBase !== '/' ? rawBase.replace(/\/?$/, '/') : '';
+    // basePath 已在 handleRequest 顶部统一剥离，这里不可再剥——否则 /proxy/proxy/x
+    // 这类路径会被双重剥离。
     let filePath = url;
-    if (basePath && url.startsWith(basePath)) {
-      filePath = url.slice(basePath.length) || '/';
-    }
     if (filePath === '/') filePath = '/index.html';
     // 去掉 query string
     filePath = filePath.split('?')[0];
@@ -728,12 +727,12 @@ async function handleRequest(req, res) {
         html = html.replace(/<html([^>]*?)data-theme="[^"]*"/, `<html$1data-theme="${themeColor}"`);
         // 运行时注入 <base> 标签：当 CCV_BASE_PATH 设置为非空非根路径时，
         // 使浏览器将所有相对 URL 解析到代理子路径下。配合 Vite base='' 输出相对路径。
-        const basePath = process.env.CCV_BASE_PATH || '';
-        if (basePath && basePath !== '/') {
-          const safeBase = basePath.replace(/\/?$/, '/');
-                  const escapedBase = safeBase.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-        const jsSafeBase = safeBase.replace(/"/g, '"').replace(/<\//g, '<\/');
-        html = html.replace(/<head[^>]*>/i, m => m + `<base href="${escapedBase}"><script>window.__CCV_BASE_PATH__="${jsSafeBase}"</script>`);
+        const injectBase = normalizeBasePath(process.env.CCV_BASE_PATH);
+        if (injectBase) {
+          const escapedBase = injectBase.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+          // JS 双引号字符串转义：\ → \\、" → \"、</ → <\/（防 </script> 提前闭合）
+          const jsSafeBase = injectBase.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/<\//g, '<\\/');
+          html = html.replace(/<head[^>]*>/i, m => m + `<base href="${escapedBase}"><script>window.__CCV_BASE_PATH__="${jsSafeBase}"</script>`);
         }
         res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8', 'Cache-Control': 'no-cache' });
         res.end(html);
@@ -877,17 +876,25 @@ export async function startViewer() {
               if (_prefs.lang) setLang(_prefs.lang);
             }
           } catch { /* 读 prefs 失败就保持默认语言 */ }
+          // CCV_BASE_PATH 配置校验：缺前导 '/' 时剥离静默失效（startsWith 永不命中），
+          // 启动期告警一次。放在 setLang 之后，告警语言才跟随用户配置。
+          {
+            const _bpCheck = validateBasePath(process.env.CCV_BASE_PATH);
+            if (_bpCheck.warning) console.warn(t(_bpCheck.warning, { value: process.env.CCV_BASE_PATH }));
+          }
           // interceptor.js runs in this same process (via proxy.js → setupInterceptor).
           // Inject live-port via module-level setter instead of process.env to avoid
           // polluting env of child_process.spawn descendants (Bash tools / MCP / Electron tabs).
           setLivePort(port, serverProtocol);
-          const url = `${serverProtocol}://127.0.0.1:${port}`;
+          // 自动打开/serverStarted hook 用的 URL 也要带反代前缀（与启动打印一致）
+          const url = `${serverProtocol}://127.0.0.1:${port}${normalizeBasePath(process.env.CCV_BASE_PATH)}`;
           if (!isCliMode) {
             console.error(t('server.started'));
-            console.error(t('server.startedLocal', { protocol: serverProtocol, port }));
+            const _bp = normalizeBasePath(process.env.CCV_BASE_PATH);
+            console.error(t('server.startedLocal', { protocol: serverProtocol, port, basePath: _bp }));
             const _ips = getAllLocalIps();
             for (const _ip of _ips) {
-              console.error(t('server.startedNetwork', { protocol: serverProtocol, ip: _ip, port, token: ACCESS_TOKEN }));
+              console.error(t('server.startedNetwork', { protocol: serverProtocol, ip: _ip, port, basePath: _bp, token: ACCESS_TOKEN }));
             }
             if (authConfig.enabled) {
               if (authConfig.password === '') console.error(t('server.passwordEmptyWarn'));
@@ -1021,7 +1028,7 @@ export async function startViewer() {
 async function setupTerminalWebSocket(httpServer) {
   try {
     const { WebSocketServer } = await import('ws');
-    const { writeToPty, writeToPtySequential, resizePty, onPtyData, onPtyExit, getPtyState, getOutputBuffer, getCurrentWorkspace, spawnShell } = await import('./pty-manager.js');
+    const { writeToPty, writeToPtySequential, resizePty, onPtyData, onPtyExit, getPtyState, getOutputBuffer, getCurrentWorkspace, spawnShell, findSafeSliceStart } = await import('./pty-manager.js');
     const {
       spawnScratch,
       writeScratch,
@@ -1064,12 +1071,8 @@ async function setupTerminalWebSocket(httpServer) {
 
     httpServer.on('upgrade', (req, socket, head) => {
       const wsUrl = new URL(req.url, `${serverProtocol}://${req.headers.host}`);
-      let pathname = wsUrl.pathname;
-      const bpRaw = process.env.CCV_BASE_PATH || '';
-      const wsBp = bpRaw && bpRaw !== '/' ? bpRaw.replace(/\/?$/, '/') : '';
-      if (wsBp && pathname.startsWith(wsBp)) {
-        pathname = '/' + pathname.slice(wsBp.length);
-      }
+      // upgrade 不经 handleRequest，basePath 需独立剥离（与 HTTP 段同走统一函数）
+      let pathname = stripBasePath(wsUrl.pathname, normalizeBasePath(process.env.CCV_BASE_PATH));
       // 与 HTTP 一致的鉴权（此前 WS upgrade 完全不校验 token，远程终端实为无门禁——本次堵洞）。
       // 在此显式计算 isLocal（与 handleRequest 同款三态判断），WS 视作非 HTML 请求。
       const wsRemoteIp = req.socket.remoteAddress;
@@ -1130,6 +1133,20 @@ async function setupTerminalWebSocket(httpServer) {
       };
     };
 
+    // 洪泛限流器状态日志（与 makeBpLogger 同款 5s 节流，独立实例不共享计数）。
+    // Windows 实机排"切主题/大流量卡死"时据此确认 ConPTY 洪泛是否触发、几次、量级。
+    const makeFloodLogger = (label, ws) => {
+      let floodCount = 0;
+      let lastLogAt = 0;
+      return (event, bytes) => {
+        if (event === 'start') floodCount++;
+        const now = Date.now();
+        if (now - lastLogAt < 5000) return;
+        lastLogAt = now;
+        console.warn(`[${label}] pty flood ${event}: client=${ws._socket?.remoteAddress || '?'} winBytes=${bytes} floodTotal=${floodCount}`);
+      };
+    };
+
     // scratch 终端 WS：极简版，仅承载 input/resize/data/exit + 显式 kill；不掺杂 hook/SDK/preset
     wssScratch.on('connection', async (ws, req) => {
       const id = req.ccvScratchId;
@@ -1155,11 +1172,18 @@ async function setupTerminalWebSocket(httpServer) {
       // 快照自身有界：scratch outputBuffer 50KB 滚动截断（scratch-pty-manager.js MAX_BUFFER），
       // behind 期间继续灌也不会撑爆 resync 响应。
       const _bpLog = makeBpLogger('scratch-ws', ws);
+      // floodGate 在 bpGate 之后构造（send 闭包依赖 bpGate），onBehind/onResume 经 let 前向引用 reset：
+      // resync 快照是唯一真相源，coalescer 残留 pending 不清会把早于快照的旧字节回灌导致画面回退。
+      let floodGate = null;
       const bpGate = createBackpressureGate({
         getBufferedAmount: () => ws.bufferedAmount,
-        onBehind: (buffered) => _bpLog('behind', buffered),
+        onBehind: (buffered) => {
+          _bpLog('behind', buffered);
+          floodGate?.reset();
+        },
         onResume: (buffered) => {
           _bpLog('resume', buffered);
+          floodGate?.reset();
           if (ws.readyState !== 1) return;
           try { ws.send(JSON.stringify({ type: 'data-resync', data: getScratchOutputBuffer(id) })); } catch {}
         },
@@ -1169,10 +1193,22 @@ async function setupTerminalWebSocket(httpServer) {
         },
       });
 
+      // 洪泛限流器：字节率超阈值时按窗口合并 + last-wins 截断（ConPTY 全屏重绘洪泛防卡死，
+      // 与 bpGate 互补——bpGate 管慢网络写缓冲，floodGate 管快 LAN 字节率，详见 lib/pty-flood-coalescer.js）
+      const _floodLog = makeFloodLogger('scratch-ws', ws);
+      floodGate = createFloodCoalescer({
+        send: (data) => {
+          if (ws.readyState === 1 && bpGate.offer()) {
+            try { ws.send(JSON.stringify({ type: 'data', data })); } catch {}
+          }
+        },
+        findSafeSliceStart,
+        onFloodStart: (bytes) => _floodLog('start', bytes),
+        onFloodEnd: () => _floodLog('end', 0),
+      });
+
       const removeDataListener = onScratchData(id, (data) => {
-        if (ws.readyState === 1 && bpGate.offer()) {
-          try { ws.send(JSON.stringify({ type: 'data', data })); } catch {}
-        }
+        floodGate.offer(data);
       });
 
       const removeExitListener = onScratchExit(id, (exitCode) => {
@@ -1201,6 +1237,7 @@ async function setupTerminalWebSocket(httpServer) {
 
       ws.on('close', () => {
         bpGate.dispose();
+        floodGate.dispose();
         removeDataListener();
         removeExitListener();
         // pty 本身**不杀**（保留以支持刷新重连），由 kill 消息或 /api/workspaces/stop 触发；
@@ -1253,11 +1290,18 @@ async function setupTerminalWebSocket(httpServer) {
       // 快照自身有界：outputBuffer 200KB 滚动截断（pty-manager.js MAX_BUFFER + findSafeSliceStart
       // ANSI 安全起点），behind 期间 PTY 继续灌也不会撑爆 resync 响应。
       const _bpLog = makeBpLogger('terminal-ws', ws);
+      // floodGate 前向引用（构造顺序同 scratch 路径）：onBehind/onResume 必清 coalescer
+      // pending——resync 快照是唯一真相源，旧 pending 回灌会导致画面回退。
+      let floodGate = null;
       const bpGate = createBackpressureGate({
         getBufferedAmount: () => ws.bufferedAmount,
-        onBehind: (buffered) => _bpLog('behind', buffered),
+        onBehind: (buffered) => {
+          _bpLog('behind', buffered);
+          floodGate?.reset();
+        },
         onResume: (buffered) => {
           _bpLog('resume', buffered);
+          floodGate?.reset();
           if (ws.readyState !== 1) return;
           try { ws.send(JSON.stringify({ type: 'data-resync', data: getOutputBuffer() })); } catch {}
           try {
@@ -1286,11 +1330,23 @@ async function setupTerminalWebSocket(httpServer) {
         },
       });
 
+      // 洪泛限流器：字节率超阈值时按窗口合并 + last-wins 截断（ConPTY 全屏重绘洪泛防卡死，
+      // 与 bpGate 互补——bpGate 管慢网络写缓冲，floodGate 管快 LAN 字节率，详见 lib/pty-flood-coalescer.js）
+      const _floodLog = makeFloodLogger('terminal-ws', ws);
+      floodGate = createFloodCoalescer({
+        send: (data) => {
+          if (ws.readyState === 1 && bpGate.offer()) {
+            try { ws.send(JSON.stringify({ type: 'data', data })); } catch {}
+          }
+        },
+        findSafeSliceStart,
+        onFloodStart: (bytes) => _floodLog('start', bytes),
+        onFloodEnd: () => _floodLog('end', 0),
+      });
+
       // PTY 输出 → WebSocket(合并 ws 后客户端自行按 msg.type 分发,server 端不再 role 过滤)
       const removeDataListener = onPtyData((data) => {
-        if (ws.readyState === 1 && bpGate.offer()) {
-          ws.send(JSON.stringify({ type: 'data', data }));
-        }
+        floodGate.offer(data);
       });
 
       // PTY 退出 → WebSocket
@@ -1668,6 +1724,7 @@ async function setupTerminalWebSocket(httpServer) {
 
       ws.on('close', () => {
         bpGate.dispose();
+        floodGate.dispose();
         removeDataListener();
         removeExitListener();
         clientSizes.delete(ws);
@@ -1929,8 +1986,20 @@ async function _doStop() {
   _lastCliActive = false;
   // Tear down all IM bridge connections so a stop/start cycle (Electron tab switch, tests) never
   // leaks a second WS to the same app. Idempotent + swallows errors.
-  try { await imCore.stopAll(); } catch { }
-  try { await Promise.race([runParallelHook('serverStopping'), new Promise(r => setTimeout(r, 3000))]); } catch { }
+  // IM teardown + serverStopping hook 共用一个 3s 总预算（保持串行语义）：
+  // Windows 上 IM bridge WS teardown 挂住会卡死整条退出链（原本裸 await 是
+  // "Ctrl+C 完全无反应"的 B 类成因）；两段若各自 3s race 串行最坏 6s，会越过
+  // cleanup watchdog(5s) 截断其后的 temp jsonl rename（用户数据）——合并为单预算
+  // 保证 teardown ≤3s，watchdog 前始终留出 rename 余量。超时后控制流顺序继续。
+  try {
+    await Promise.race([
+      (async () => {
+        try { await imCore.stopAll(); } catch { }
+        await runParallelHook('serverStopping');
+      })(),
+      new Promise(r => setTimeout(r, 3000)),
+    ]);
+  } catch { }
   // 如果用户未做选择，将临时文件转为正式文件
   if (_resumeState && _resumeState.tempFile) {
     try {
@@ -2100,6 +2169,9 @@ function handleExit() {
 if (!globalThis._ccvServerSignalsRegistered) {
   globalThis._ccvServerSignalsRegistered = true;
   process.on('exit', handleExit);
-  process.on('SIGINT', () => { stopViewer().finally(() => process.exit()); });
-  process.on('SIGTERM', () => { stopViewer().finally(() => process.exit()); });
+  // hardened：watchdog 5s 强退 + 重复触发立退（防 Windows 上 stopViewer 内部
+  // await 挂住导致 .finally(exit) 永不执行 = Ctrl+C 完全无反应）。
+  const _hardenedStop = createHardenedCleanup({ doCleanup: () => stopViewer() });
+  process.on('SIGINT', _hardenedStop);
+  process.on('SIGTERM', _hardenedStop);
 }