npm - cc-viewer - Versions diffs - 1.6.32 → 1.6.34 - Mend

cc-viewer 1.6.32 → 1.6.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/assets/{index-BlNBvL5K.css → index-BdC0zG2U.css} +2 -2
package/dist/assets/{index-AD0x3eII.js → index-DE4AHbP5.js} +159 -159
package/dist/index.html +2 -2
package/i18n.js +0 -40
package/interceptor.js +2 -2
package/lib/delta-reconstructor.js +75 -3
package/lib/log-management.js +20 -24
package/lib/log-stream.js +192 -0
package/lib/log-watcher.js +25 -8
package/package.json +1 -1
package/server.js +110 -140
package/lib/translator.js +0 -84

package/dist/index.html CHANGED Viewed

@@ -6,8 +6,8 @@
   <title>Claude Code Viewer</title>
   <link rel="icon" href="/favicon.ico?v=1">
   <link rel="shortcut icon" href="/favicon.ico?v=1">
-  <script type="module" crossorigin src="/assets/index-AD0x3eII.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-BlNBvL5K.css">
+  <script type="module" crossorigin src="/assets/index-DE4AHbP5.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-BdC0zG2U.css">
 </head>
 <body>
   <div id="root"></div>

package/i18n.js CHANGED Viewed

@@ -1599,46 +1599,6 @@ const i18nData = {
     "tr": "Düşünce süreci",
     "uk": "Процес мислення"
   },
-  "ui.translate": {
-    "zh": "翻译",
-    "en": "Translate",
-    "zh-TW": "翻譯",
-    "ko": "번역",
-    "ja": "翻訳",
-    "de": "Übersetzen",
-    "es": "Traducir",
-    "fr": "Traduire",
-    "it": "Traduci",
-    "da": "Oversæt",
-    "pl": "Tłumacz",
-    "ru": "Перевести",
-    "ar": "ترجمة",
-    "no": "Oversett",
-    "pt-BR": "Traduzir",
-    "th": "แปล",
-    "tr": "Çevir",
-    "uk": "Перекласти"
-  },
-  "ui.translating": {
-    "zh": "翻译中…",
-    "en": "Translating…",
-    "zh-TW": "翻譯中…",
-    "ko": "번역 중…",
-    "ja": "翻訳中…",
-    "de": "Übersetze…",
-    "es": "Traduciendo…",
-    "fr": "Traduction…",
-    "it": "Traduzione…",
-    "da": "Oversætter…",
-    "pl": "Tłumaczenie…",
-    "ru": "Перевод…",
-    "ar": "جارٍ الترجمة…",
-    "no": "Oversetter…",
-    "pt-BR": "Traduzindo…",
-    "th": "กำลังแปล…",
-    "tr": "Çevriliyor…",
-    "uk": "Переклад…"
-  },
   "ui.skillLoaded": {
     "zh": "Skill 已加载",
     "en": "Skill Loaded",

package/interceptor.js CHANGED Viewed

@@ -198,7 +198,7 @@ export function resetWorkspace() {
   LOG_FILE = '';
 }
-const MAX_LOG_SIZE = 150 * 1024 * 1024; // 150MB
+const MAX_LOG_SIZE = 250 * 1024 * 1024; // 250MB
 function checkAndRotateLogFile() {
   // Teammate 不做日志轮转，由 leader 负责
@@ -373,7 +373,7 @@ export function setupInterceptor() {
       }
     } catch { }
-    // 用户新指令边界：检查日志文件大小，超过 150MB 则切换新文件
+    // 用户新指令边界：检查日志文件大小，超过 250MB 则切换新文件
     if (requestEntry?.mainAgent) {
       checkAndRotateLogFile();
       // 仅 mainAgent 请求时缓存模型名，避免 SubAgent 覆盖

package/lib/delta-reconstructor.js CHANGED Viewed

@@ -4,8 +4,9 @@
  * 将 delta 格式的日志条目重建为完整的 messages 数组。
  * 仅处理 mainAgent 条目，teammate/旧格式条目直接跳过。
  *
- * 提供两种 API：
+ * 提供三种 API：
  * - reconstructEntries(entries): 批量重建，用于 readLogFile() 和 readLocalLog()
+ * - reconstructSegment(segment, nextCheckpoint): 段级重建，用于流式分段处理
  * - createIncrementalReconstructor(): 有状态的增量重建器，用于 watcher 逐条重建
  */
@@ -16,7 +17,7 @@
  * 2. _isCheckpoint === true → 显式 checkpoint
  * 3. _totalMessageCount === body.messages.length → 隐式 checkpoint（delta 长度 === 总长度）
  */
-function isCheckpointEntry(entry) {
+export function isCheckpointEntry(entry) {
   // 无 _deltaFormat：旧格式全量条目
   if (!entry._deltaFormat) return true;
   // 显式 checkpoint
@@ -30,7 +31,7 @@ function isCheckpointEntry(entry) {
 /**
  * 判断一个条目是否为需要重建的 delta 条目（mainAgent + _deltaFormat）。
  */
-function isDeltaEntry(entry) {
+export function isDeltaEntry(entry) {
   return entry._deltaFormat && entry.mainAgent;
 }
@@ -112,6 +113,77 @@ function _compensateBrokenEntries(entries, brokenIndices) {
   }
 }
+/**
+ * 段级重建 — 用于流式分段处理。
+ * 对一个 checkpoint 边界内的段进行正向重建，如有 broken 条目则用 nextCheckpoint 反向修复。
+ * 段内条目数通常 ≤ CHECKPOINT_INTERVAL(10)，内存开销可控。
+ *
+ * @param {Array} segment - 段内条目数组（段首应为 checkpoint/旧格式条目）
+ * @param {object|null} nextCheckpoint - 下一个 checkpoint 条目（用于反向修复），最后一段可为 null
+ * @returns {Array} 重建后的段条目数组（原地修改）
+ */
+export function reconstructSegment(segment, nextCheckpoint) {
+  let accumulated = [];
+  const broken = [];
+  for (let i = 0; i < segment.length; i++) {
+    const entry = segment[i];
+    if (!isDeltaEntry(entry)) {
+      if (entry.mainAgent && Array.isArray(entry.body?.messages)) {
+        accumulated = [...entry.body.messages];
+      }
+      continue;
+    }
+    const msgs = entry.body?.messages;
+    if (!Array.isArray(msgs)) continue;
+    if (isCheckpointEntry(entry)) {
+      accumulated = [...msgs];
+    } else {
+      accumulated = [...accumulated, ...msgs];
+      entry.body.messages = accumulated;
+      if (entry._totalMessageCount && accumulated.length !== entry._totalMessageCount) {
+        broken.push(i);
+      }
+    }
+  }
+  // 补偿修复：先在段内向后查找，再用 nextCheckpoint
+  if (broken.length > 0) {
+    for (const brokenIdx of broken) {
+      const brokenEntry = segment[brokenIdx];
+      const expectedCount = brokenEntry._totalMessageCount;
+      if (!expectedCount) continue;
+      let repaired = false;
+      // 段内向后查找
+      for (let j = brokenIdx + 1; j < segment.length; j++) {
+        const candidate = segment[j];
+        if (!candidate.mainAgent || !Array.isArray(candidate.body?.messages)) continue;
+        const candidateMsgs = candidate.body.messages;
+        const candidateTotal = candidate._totalMessageCount || candidateMsgs.length;
+        const isFullEntry = !candidate._deltaFormat || isCheckpointEntry(candidate);
+        if (isFullEntry && candidateTotal >= expectedCount) {
+          brokenEntry.body.messages = candidateMsgs.slice(0, expectedCount);
+          repaired = true;
+          break;
+        }
+      }
+      // 段内未找到，用 nextCheckpoint 修复
+      if (!repaired && nextCheckpoint) {
+        const cpMsgs = nextCheckpoint.body?.messages;
+        const cpTotal = nextCheckpoint._totalMessageCount || cpMsgs?.length || 0;
+        if (Array.isArray(cpMsgs) && cpTotal >= expectedCount) {
+          brokenEntry.body.messages = cpMsgs.slice(0, expectedCount);
+        }
+      }
+    }
+  }
+  return segment;
+}
 /**
  * 创建有状态的增量重建器 — 用于 watcher 逐条重建。
  * 每次调用 reconstruct(entry) 处理一条新条目。

package/lib/log-management.js CHANGED Viewed

@@ -1,6 +1,7 @@
-import { readFileSync, writeFileSync, existsSync, statSync, readdirSync, unlinkSync, realpathSync } from 'node:fs';
+import { readFileSync, writeFileSync, existsSync, statSync, readdirSync, unlinkSync, realpathSync, renameSync, appendFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { reconstructEntries } from './delta-reconstructor.js';
+import { streamReconstructedEntries } from './log-stream.js';
 /**
  * Validate that a resolved file path is contained within logDir.
@@ -167,33 +168,28 @@ export function mergeLogFiles(logDir, files) {
     err.code = 'INVALID_INPUT';
     throw err;
   }
-  // Delta storage: 合并时先重建为全量格式再拼接（输出全部为旧格式全量条目，无 _deltaFormat）
+  // Delta storage: 流式合并 — 逐文件分段重建并直接写入目标文件，避免全量加载 OOM
   const targetFile = files[0];
   const targetPath = join(logDir, targetFile);
-  const allEntries = [];
+  // 先写到临时文件，成功后再覆盖目标
+  const tmpPath = targetPath + '.merge-tmp';
+  writeFileSync(tmpPath, ''); // 创建空临时文件
   for (const f of files) {
-    const content = readFileSync(join(logDir, f), 'utf-8');
-    const parsed = content.split('\n---\n').filter(line => line.trim()).map(entry => {
-      try { return JSON.parse(entry); } catch { return null; }
-    }).filter(Boolean);
-    // 去重
-    const map = new Map();
-    for (const entry of parsed) {
-      const key = `${entry.timestamp}|${entry.url}`;
-      map.set(key, entry);
-    }
-    // 重建 delta 为全量
-    const reconstructed = reconstructEntries(Array.from(map.values()));
-    // 清除 delta 元字段，输出为旧格式全量条目
-    for (const entry of reconstructed) {
-      delete entry._deltaFormat;
-      delete entry._totalMessageCount;
-      delete entry._conversationId;
-      delete entry._isCheckpoint;
-    }
-    allEntries.push(...reconstructed);
+    const filePath = join(logDir, f);
+    streamReconstructedEntries(filePath, (segment) => {
+      let chunk = '';
+      for (const entry of segment) {
+        delete entry._deltaFormat;
+        delete entry._totalMessageCount;
+        delete entry._conversationId;
+        delete entry._isCheckpoint;
+        chunk += JSON.stringify(entry) + '\n---\n';
+      }
+      appendFileSync(tmpPath, chunk);
+    });
   }
-  writeFileSync(targetPath, allEntries.map(e => JSON.stringify(e)).join('\n---\n') + '\n---\n');
+  // 临时文件写入成功后原子覆盖目标（POSIX renameSync 自动替换）
+  renameSync(tmpPath, targetPath);
   // 删除其余文件
   for (let i = 1; i < files.length; i++) {
     unlinkSync(join(logDir, files[i]));

package/lib/log-stream.js ADDED Viewed

@@ -0,0 +1,192 @@
+/**
+ * Log Stream — 流式分段读取模块
+ *
+ * 关键设计：server 不做 delta 重建，只做去重和流式发送。
+ * 重建交给客户端（浏览器内存更充裕）。
+ *
+ * 内存控制：
+ * - 文件读取：openSync + readSync 1MB 分块，generator 逐条 yield
+ * - 去重：用 regex 提取 key，不做 JSON.parse（存原始字符串）
+ * - 异步发送：逐条 write + 定期 setImmediate yield（GC + buffer drain）
+ */
+import { existsSync, statSync, openSync, readSync, closeSync } from 'node:fs';
+import { isCheckpointEntry, isDeltaEntry, reconstructSegment } from './delta-reconstructor.js';
+const READ_CHUNK_SIZE = 1024 * 1024; // 1MB
+const SEPARATOR = '\n---\n';
+/**
+ * Generator：分块读取 JSONL 文件，逐条 yield 原始 JSON 字符串。
+ * 内存 = 1MB buffer + pending。
+ */
+function* iterateRawEntries(filePath) {
+  const fileSize = statSync(filePath).size;
+  if (fileSize === 0) return;
+  const fd = openSync(filePath, 'r');
+  const buf = Buffer.alloc(Math.min(READ_CHUNK_SIZE, fileSize));
+  let offset = 0;
+  let pending = '';
+  try {
+    while (offset < fileSize) {
+      const toRead = Math.min(buf.length, fileSize - offset);
+      const bytesRead = readSync(fd, buf, 0, toRead, offset);
+      if (bytesRead === 0) break;
+      offset += bytesRead;
+      const raw = pending + buf.toString('utf-8', 0, bytesRead);
+      const parts = raw.split(SEPARATOR);
+      pending = parts.pop() || '';
+      for (const part of parts) {
+        const trimmed = part.trim();
+        if (trimmed) yield trimmed;
+      }
+    }
+    if (pending.trim()) {
+      yield pending.trim();
+    }
+  } finally {
+    closeSync(fd);
+  }
+}
+/**
+ * 轻量预扫描：统计条目总数（原始条目数，不去重）。
+ * 用于 SSE load_start 的 total 字段（进度显示）。
+ */
+export function countLogEntries(filePath) {
+  if (!existsSync(filePath)) return 0;
+  let count = 0;
+  for (const _ of iterateRawEntries(filePath)) { count++; }
+  return count;
+}
+/** 用 regex 从原始 JSON 字符串中提取 timestamp|url 去重 key（不做 JSON.parse） */
+function extractDedupKey(raw) {
+  const tsMatch = raw.match(/"timestamp"\s*:\s*"([^"]+)"/);
+  const urlMatch = raw.match(/"url"\s*:\s*"([^"]+)"/);
+  if (tsMatch && urlMatch) return `${tsMatch[1]}|${urlMatch[1]}`;
+  // fallback: 无法提取 key 则用内容哈希
+  return null;
+}
+function isSegmentBoundary(entry) {
+  if (!entry.mainAgent) return false;
+  if (!entry._deltaFormat) return true;
+  return isCheckpointEntry(entry);
+}
+// ============================================================================
+// 同步 API — 用于 mergeLogFiles（合并需要重建为全量格式写入磁盘）
+// ============================================================================
+export function streamReconstructedEntries(filePath, onSegment, opts = {}) {
+  if (!existsSync(filePath)) return 0;
+  const stat = statSync(filePath);
+  if (stat.size === 0) return 0;
+  const sinceMs = opts.since ? new Date(opts.since).getTime() : 0;
+  let currentSegment = [];
+  let dedup = new Map();
+  let sentCount = 0;
+  function flushSegment(nextCp) {
+    if (currentSegment.length === 0) return;
+    const dedupedSegment = Array.from(dedup.values());
+    reconstructSegment(dedupedSegment, nextCp);
+    let toSend = dedupedSegment;
+    if (sinceMs) {
+      toSend = dedupedSegment.filter(e => {
+        const ts = e.timestamp ? new Date(e.timestamp).getTime() : 0;
+        return ts > sinceMs;
+      });
+    }
+    if (toSend.length > 0) {
+      onSegment(toSend);
+      sentCount += toSend.length;
+    }
+    currentSegment = [];
+    dedup = new Map();
+  }
+  for (const rawEntry of iterateRawEntries(filePath)) {
+    let entry;
+    try { entry = JSON.parse(rawEntry); } catch { continue; }
+    if (isSegmentBoundary(entry) && currentSegment.length > 0) {
+      const key = `${entry.timestamp}|${entry.url}`;
+      const last = currentSegment[currentSegment.length - 1];
+      const lastKey = `${last.timestamp}|${last.url}`;
+      if (key !== lastKey) {
+        flushSegment(entry);
+      }
+    }
+    const key = `${entry.timestamp}|${entry.url}`;
+    dedup.set(key, entry);
+    currentSegment.push(entry);
+  }
+  flushSegment(null);
+  return sentCount;
+}
+// ============================================================================
+// 异步 API — 用于 SSE/HTTP：不做重建，直接发原始 JSON 字符串
+// ============================================================================
+/**
+ * 异步流式发送原始条目（不重建 delta）。
+ *
+ * - 用 generator 逐条读取原始 JSON 字符串
+ * - regex 提取 key 去重（后出现的覆盖先出现的）
+ * - 逐条调用 onRawEntry(rawJsonString)
+ * - 每 N 条 setImmediate yield 让 GC + write buffer drain
+ *
+ * server 不做 JSON.parse / JSON.stringify / reconstruct = 内存峰值极低。
+ * 客户端收到后自行 reconstructEntries()。
+ *
+ * @param {string} filePath
+ * @param {(rawJson: string) => void} onRawEntry - 原始 JSON 字符串回调
+ * @returns {Promise<number>} 发送条目数
+ */
+export async function streamRawEntriesAsync(filePath, onRawEntry) {
+  if (!existsSync(filePath)) return 0;
+  const stat = statSync(filePath);
+  if (stat.size === 0) return 0;
+  // 第一遍：generator 逐条读取 → dedup Map 存原始字符串（不 parse）
+  // 内存 = 去重后的原始字符串总量 ≈ 文件大小的一半（inProgress 被 completed 覆盖）
+  const dedup = new Map();
+  for (const raw of iterateRawEntries(filePath)) {
+    const key = extractDedupKey(raw);
+    if (key) {
+      dedup.set(key, raw);
+    } else {
+      // 无法提取 key 的条目直接保留（用自增 id 避免被覆盖）
+      dedup.set(`__nokey_${dedup.size}`, raw);
+    }
+  }
+  // 第二遍：逐条发送 + 定期 yield
+  let sentCount = 0;
+  const YIELD_INTERVAL = 20; // 每 20 条 yield 一次
+  for (const raw of dedup.values()) {
+    onRawEntry(raw);
+    sentCount++;
+    if (sentCount % YIELD_INTERVAL === 0) {
+      await new Promise(resolve => setImmediate(resolve));
+    }
+  }
+  // 最终 yield 确保最后一批 buffer drain
+  await new Promise(resolve => setImmediate(resolve));
+  return sentCount;
+}

package/lib/log-watcher.js CHANGED Viewed

@@ -2,6 +2,7 @@ import { readFileSync, existsSync, watchFile, unwatchFile, openSync, readSync, c
 import { isMainAgentEntry, extractCachedContent } from './kv-cache-analyzer.js';
 import { buildContextWindowEvent, getContextSizeForModel } from './context-watcher.js';
 import { reconstructEntries, createIncrementalReconstructor } from './delta-reconstructor.js';
+import { countLogEntries, streamReconstructedEntries } from './log-stream.js';
 // 跟踪所有被 watch 的日志文件
 const watchedFiles = new Map();
@@ -110,11 +111,19 @@ export function watchLogFile(opts) {
           unwatchFile(logFile);
           watchedFiles.delete(logFile);
-          const newEntries = readLogFile(currentLogFile);
+          // 流式分段广播，避免全量加载 OOM
+          const rotTotal = countLogEntries(currentLogFile);
           clients.forEach(client => {
-            try {
-              client.write(`event: full_reload\ndata: ${JSON.stringify(newEntries)}\n\n`);
-            } catch { }
+            try { client.write(`event: load_start\ndata: ${JSON.stringify({ total: rotTotal, incremental: false })}\n\n`); } catch { }
+          });
+          streamReconstructedEntries(currentLogFile, (segment) => {
+            const data = JSON.stringify(segment);
+            clients.forEach(client => {
+              try { client.write(`event: load_chunk\ndata: ${data}\n\n`); } catch { }
+            });
+          });
+          clients.forEach(client => {
+            try { client.write(`event: load_end\ndata: {}\n\n`); } catch { }
           });
           watchLogFile({ ...opts, logFile: currentLogFile });
           return;
@@ -193,11 +202,19 @@ export function watchLogFile(opts) {
         unwatchFile(logFile);
         watchedFiles.delete(logFile);
-        const newEntries = readLogFile(currentLogFile);
+        // 流式分段广播，避免全量加载 OOM
+        const endRotTotal = countLogEntries(currentLogFile);
         clients.forEach(client => {
-          try {
-            client.write(`event: full_reload\ndata: ${JSON.stringify(newEntries)}\n\n`);
-          } catch { }
+          try { client.write(`event: load_start\ndata: ${JSON.stringify({ total: endRotTotal, incremental: false })}\n\n`); } catch { }
+        });
+        streamReconstructedEntries(currentLogFile, (segment) => {
+          const data = JSON.stringify(segment);
+          clients.forEach(client => {
+            try { client.write(`event: load_chunk\ndata: ${data}\n\n`); } catch { }
+          });
+        });
+        clients.forEach(client => {
+          try { client.write(`event: load_end\ndata: {}\n\n`); } catch { }
         });
         watchLogFile({ ...opts, logFile: currentLogFile });
       }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "cc-viewer",
-  "version": "1.6.32",
+  "version": "1.6.34",
   "description": "Claude Code Logger visualization management tool",
   "license": "MIT",
   "main": "server.js",