cc-viewer 1.0.2 → 1.0.4

package/{lib/server.js → server.js}

@@ -1,10 +1,10 @@
-import { createServer, request as httpRequest } from 'node:http';
-import { readFileSync, existsSync, watchFile, unwatchFile, statSync, writeFileSync, unlinkSync, readdirSync, openSync, closeSync } from 'node:fs';
+import { createServer } from 'node:http';
+import { readFileSync, existsSync, watchFile, unwatchFile, statSync, readdirSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname, join, extname, basename } from 'node:path';
 import { homedir } from 'node:os';
-import { LOG_FILE } from '../interceptor.js';
-import { t } from '../i18n.js';
+import { LOG_FILE } from './interceptor.js';
+import { t } from './i18n.js';
 
 const LOG_DIR = join(homedir(), '.claude', 'cc-viewer');
 const SHOW_ALL_FILE = '/tmp/cc-viewer-show-all';
@@ -14,51 +14,12 @@ const __dirname = dirname(__filename);
 const START_PORT = 7008;
 const MAX_PORT = 7099;
 const HOST = '127.0.0.1';
-const PORT_FILE = '/tmp/cc-viewer-port';
-const LOCK_FILE = '/tmp/cc-viewer-lock';
-
-function acquireLock() {
-  try {
-    // wx flag: exclusive create, fails if file already exists
-    const fd = openSync(LOCK_FILE, 'wx');
-    writeFileSync(fd, String(process.pid));
-    closeSync(fd);
-    return true;
-  } catch {
-    // 检查锁文件是否过期（超过 10 秒视为过期）
-    try {
-      const stat = statSync(LOCK_FILE);
-      if (Date.now() - stat.mtimeMs > 10000) {
-        unlinkSync(LOCK_FILE);
-        const fd = openSync(LOCK_FILE, 'wx');
-        writeFileSync(fd, String(process.pid));
-        closeSync(fd);
-        return true;
-      }
-    } catch {}
-    return false;
-  }
-}
-
-function releaseLock() {
-  try { unlinkSync(LOCK_FILE); } catch {}
-}
-
-function checkPortAlive(port) {
-  return new Promise((resolve) => {
-    const req = httpRequest({ host: HOST, port, path: '/api/requests', method: 'GET', timeout: 1000 }, (res) => {
-      res.resume();
-      resolve(true);
-    });
-    req.on('error', () => resolve(false));
-    req.on('timeout', () => { req.destroy(); resolve(false); });
-    req.end();
-  });
-}
 
 let clients = [];
 let server;
 let actualPort = START_PORT;
+// 跟踪所有被 watch 的日志文件
+const watchedFiles = new Map();
 
 const MIME_TYPES = {
   '.html': 'text/html; charset=utf-8',
@@ -103,11 +64,13 @@ function sendToClients(entry) {
   });
 }
 
-function startWatching() {
+function watchLogFile(logFile) {
+  if (watchedFiles.has(logFile)) return;
   let lastSize = 0;
-  watchFile(LOG_FILE, { interval: 500 }, () => {
+  watchedFiles.set(logFile, true);
+  watchFile(logFile, { interval: 500 }, () => {
     try {
-      const content = readFileSync(LOG_FILE, 'utf-8');
+      const content = readFileSync(logFile, 'utf-8');
       const newContent = content.slice(lastSize);
       lastSize = content.length;
 
@@ -128,6 +91,10 @@ function startWatching() {
   });
 }
 
+function startWatching() {
+  watchLogFile(LOG_FILE);
+}
+
 function handleRequest(req, res) {
   const { url, method } = req;
 
@@ -142,6 +109,29 @@ function handleRequest(req, res) {
     return;
   }
 
+  // 注册新的日志文件进行 watch（供新进程复用旧服务时调用）
+  if (url === '/api/register-log' && method === 'POST') {
+    let body = '';
+    req.on('data', chunk => { body += chunk; });
+    req.on('end', () => {
+      try {
+        const { logFile } = JSON.parse(body);
+        if (logFile && typeof logFile === 'string' && logFile.startsWith(LOG_DIR) && existsSync(logFile)) {
+          watchLogFile(logFile);
+          res.writeHead(200, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ ok: true }));
+        } else {
+          res.writeHead(400, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error: 'Invalid log file path' }));
+        }
+      } catch {
+        res.writeHead(400, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Invalid request body' }));
+      }
+    });
+    return;
+  }
+
   // SSE endpoint
   if (url === '/events' && method === 'GET') {
     res.writeHead(200, {
@@ -297,88 +287,42 @@ function handleRequest(req, res) {
 }
 
 export async function startViewer() {
-  // 尝试获取文件锁，防止多个进程同时启动服务器
-  if (!acquireLock()) {
-    // 另一个进程正在启动，等待它完成后复用
-    await new Promise(resolve => setTimeout(resolve, 2000));
-    if (existsSync(PORT_FILE)) {
-      try {
-        const existingPort = parseInt(readFileSync(PORT_FILE, 'utf-8').trim(), 10);
-        if (existingPort >= START_PORT && existingPort <= MAX_PORT) {
-          const alive = await checkPortAlive(existingPort);
-          if (alive) {
-            actualPort = existingPort;
-            return null;
-          }
-        }
-      } catch {}
-    }
-    // 等待后仍无法复用，静默退出
-    return null;
-  }
-
-  try {
-    // 检查是否已有 cc-viewer 实例在运行
-    if (existsSync(PORT_FILE)) {
-      try {
-        const existingPort = parseInt(readFileSync(PORT_FILE, 'utf-8').trim(), 10);
-        if (existingPort >= START_PORT && existingPort <= MAX_PORT) {
-          const alive = await checkPortAlive(existingPort);
-          if (alive) {
-            actualPort = existingPort;
-            releaseLock();
-            console.log(t('server.reuse', { host: HOST, port: existingPort }));
-            return null;
-          }
-        }
-      } catch {
-        // PORT_FILE 读取失败，继续正常启动
+  return new Promise((resolve, reject) => {
+    function tryListen(port) {
+      if (port > MAX_PORT) {
+        console.log(t('server.portsBusy', { start: START_PORT, end: MAX_PORT }));
+        resolve(null);
+        return;
       }
-      // 旧实例已不存在，清理 PORT_FILE
-      try { unlinkSync(PORT_FILE); } catch {}
-    }
-
-    return new Promise((resolve, reject) => {
-      function tryListen(port) {
-        if (port > MAX_PORT) {
-          console.log(t('server.portsBusy', { start: START_PORT, end: MAX_PORT }));
-          releaseLock();
-          resolve(null);
-          return;
-        }
 
-        const currentServer = createServer(handleRequest);
+      const currentServer = createServer(handleRequest);
 
-        currentServer.listen(port, HOST, () => {
-          server = currentServer;
-          actualPort = port;
-          try { writeFileSync(PORT_FILE, String(port)); } catch {}
-          releaseLock();
-          console.log(t('server.started', { host: HOST, port }));
-          startWatching();
-          resolve(server);
-        });
+      currentServer.listen(port, HOST, () => {
+        server = currentServer;
+        actualPort = port;
+        console.log(t('server.started', { host: HOST, port }));
+        startWatching();
+        resolve(server);
+      });
 
-        currentServer.on('error', (err) => {
-          if (err.code === 'EADDRINUSE') {
-            tryListen(port + 1);
-          } else {
-            releaseLock();
-            reject(err);
-          }
-        });
-      }
+      currentServer.on('error', (err) => {
+        if (err.code === 'EADDRINUSE') {
+          tryListen(port + 1);
+        } else {
+          reject(err);
+        }
+      });
+    }
 
-      tryListen(START_PORT);
-    });
-  } catch (err) {
-    releaseLock();
-    throw err;
-  }
+    tryListen(START_PORT);
+  });
 }
 
 export function stopViewer() {
-  unwatchFile(LOG_FILE);
+  for (const logFile of watchedFiles.keys()) {
+    unwatchFile(logFile);
+  }
+  watchedFiles.clear();
   clients.forEach(client => client.end());
   clients = [];
   if (server) {