claude-opencode-viewer 2.6.23 → 2.6.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-opencode-viewer",
-  "version": "2.6.23",
+  "version": "2.6.25",
   "description": "A unified terminal viewer for Claude Code and OpenCode with seamless switching",
   "type": "module",
   "main": "server.js",

package/server.js

@@ -19,6 +19,7 @@ const IS_PC = process.argv.includes('--pc');
 const PORT = parseInt(process.argv[2]) || 7008;
 const USE_HTTPS = process.argv.includes('--https');
 const JSON_OUTPUT = process.argv.includes('--json');
+const LOG = JSON_OUTPUT ? console.log.bind(console) : () => {};
 
 // 自签名证书生成（使用 selfsigned 库，不依赖 openssl）
 async function getOrCreateCert() {
@@ -30,7 +31,7 @@ async function getOrCreateCert() {
     return { key: readFileSync(keyPath), cert: readFileSync(certPath) };
   }
 
-  if (!JSON_OUTPUT) console.log('🔐 首次使用 HTTPS，生成自签名证书...');
+  if (!JSON_OUTPUT) LOG('🔐 首次使用 HTTPS，生成自签名证书...');
   mkdirSync(certDir, { recursive: true });
 
   const { default: selfsigned } = await import('selfsigned');
@@ -48,7 +49,7 @@ async function getOrCreateCert() {
 
   writeFileSync(keyPath, pems.private);
   writeFileSync(certPath, pems.cert);
-  if (!JSON_OUTPUT) console.log(`📁 证书已保存到 ${certDir}`);
+  if (!JSON_OUTPUT) LOG(`📁 证书已保存到 ${certDir}`);
   return { key: pems.private, cert: pems.cert };
 }
 
@@ -200,7 +201,7 @@ async function spawnProcess(mode, sessionId = null) {
     // 如果提供了 sessionId，添加 --session 参数
     if (sessionId) {
       args = ['--session', sessionId];
-      console.log(`[opencode] 恢复会话: ${sessionId}`);
+      LOG(`[opencode] 恢复会话: ${sessionId}`);
     }
   }
 
@@ -219,10 +220,10 @@ async function spawnProcess(mode, sessionId = null) {
       db.close();
       if (session && session.directory && existsSync(session.directory)) {
         spawnCwd = session.directory;
-        console.log(`[opencode] 使用会话目录: ${spawnCwd}`);
+        LOG(`[opencode] 使用会话目录: ${spawnCwd}`);
       }
     } catch (e) {
-      console.log('[opencode] 查询会话目录失败:', e.message);
+      LOG('[opencode] 查询会话目录失败:', e.message);
     }
   }
 
@@ -245,7 +246,7 @@ async function spawnProcess(mode, sessionId = null) {
   });
 
   proc.onExit(({ exitCode }) => {
-    console.log(`[onExit] 进程退出, PID: ${proc.pid}, exitCode: ${exitCode}`);
+    LOG(`[onExit] 进程退出, PID: ${proc.pid}, exitCode: ${exitCode}`);
     if (currentProcess === proc) {
       currentProcess = null;
     }
@@ -264,7 +265,7 @@ async function spawnProcess(mode, sessionId = null) {
   if (mode === 'claude') {
     if (claudeProcess && claudeProcess !== proc && claudeProcess.pid) {
       try {
-        console.log(`[spawnProcess] 清理旧 claude 进程 PID: ${claudeProcess.pid}`);
+        LOG(`[spawnProcess] 清理旧 claude 进程 PID: ${claudeProcess.pid}`);
         killProcessTree(claudeProcess);
       } catch {}
     }
@@ -272,7 +273,7 @@ async function spawnProcess(mode, sessionId = null) {
   } else {
     if (opencodeProcess && opencodeProcess !== proc && opencodeProcess.pid) {
       try {
-        console.log(`[spawnProcess] 清理旧 opencode 进程 PID: ${opencodeProcess.pid}`);
+        LOG(`[spawnProcess] 清理旧 opencode 进程 PID: ${opencodeProcess.pid}`);
         killProcessTree(opencodeProcess);
       } catch {}
     }
@@ -281,7 +282,7 @@ async function spawnProcess(mode, sessionId = null) {
     // 追踪当前会话 ID
     if (sessionId) {
       currentSessionId = sessionId;
-      console.log(`[session] 当前会话 ID: ${currentSessionId}`);
+      LOG(`[session] 当前会话 ID: ${currentSessionId}`);
     } else {
       // 新建会话：保持 null，前端点击复制时不显示内容
       currentSessionId = null;
@@ -289,14 +290,14 @@ async function spawnProcess(mode, sessionId = null) {
   }
 
   currentProcess = proc;
-  console.log(`[claude-opencode-viewer] ${mode === 'claude' ? 'Claude Code' : 'OpenCode'} 已启动 (PID: ${proc.pid})`);
+  LOG(`[claude-opencode-viewer] ${mode === 'claude' ? 'Claude Code' : 'OpenCode'} 已启动 (PID: ${proc.pid})`);
   return proc;
 }
 
 async function switchMode(newMode) {
   if (newMode === currentMode) return;
 
-  console.log(`[switchMode] 从 ${currentMode} 切换到 ${newMode}`);
+  LOG(`[switchMode] 从 ${currentMode} 切换到 ${newMode}`);
 
   isSwitching = true;
 
@@ -306,18 +307,18 @@ async function switchMode(newMode) {
   // 杀死旧进程
   if (currentMode === 'claude' && claudeProcess) {
     try {
-      console.log(`[switchMode] 杀死 claude 进程 PID: ${claudeProcess.pid}`);
+      LOG(`[switchMode] 杀死 claude 进程 PID: ${claudeProcess.pid}`);
       killProcessTree(claudeProcess);
     } catch (e) {
-      console.log('[switchMode] 杀死 claude 进程失败:', e.message);
+      LOG('[switchMode] 杀死 claude 进程失败:', e.message);
     }
     claudeProcess = null;
   } else if (currentMode === 'opencode' && opencodeProcess) {
     try {
-      console.log(`[switchMode] 杀死 opencode 进程 PID: ${opencodeProcess.pid}`);
+      LOG(`[switchMode] 杀死 opencode 进程 PID: ${opencodeProcess.pid}`);
       killProcessTree(opencodeProcess);
     } catch (e) {
-      console.log('[switchMode] 杀死 opencode 进程失败:', e.message);
+      LOG('[switchMode] 杀死 opencode 进程失败:', e.message);
     }
     opencodeProcess = null;
   }
@@ -334,9 +335,9 @@ async function switchMode(newMode) {
     if (currentProcess && lastPtyCols && lastPtyRows) {
       try { currentProcess.resize(lastPtyCols, lastPtyRows); } catch {}
     }
-    console.log(`[switchMode] 切换到 ${newMode} 成功`);
+    LOG(`[switchMode] 切换到 ${newMode} 成功`);
   } catch (e) {
-    console.error('[switchMode] 启动新进程失败:', e.message);
+    LOG('[switchMode] 启动新进程失败:', e.message);
   }
   isSwitching = false;
 }
@@ -361,7 +362,7 @@ function resizePty(cols, rows) {
 function getOpenCodeSessions() {
   try {
     if (!existsSync(OPENCODE_DB_PATH)) {
-      console.log('[DB] OpenCode 数据库不存在:', OPENCODE_DB_PATH);
+      LOG('[DB] OpenCode 数据库不存在:', OPENCODE_DB_PATH);
       return [];
     }
 
@@ -416,7 +417,7 @@ function getOpenCodeSessions() {
                 : partData.text;
             }
           } catch (e) {
-            console.error('[DB] 解析 part 失败:', e.message);
+            LOG('[DB] 解析 part 失败:', e.message);
           }
         }
       }
@@ -430,7 +431,7 @@ function getOpenCodeSessions() {
     db.close();
     return result;
   } catch (err) {
-    console.error('[DB] 读取会话失败:', err.message);
+    LOG('[DB] 读取会话失败:', err.message);
     return [];
   }
 }
@@ -501,7 +502,7 @@ function getSessionMessages(sessionId) {
     db.close();
     return result;
   } catch (err) {
-    console.error('[DB] 读取消息失败:', err.message);
+    LOG('[DB] 读取消息失败:', err.message);
     return [];
   }
 }
@@ -661,7 +662,7 @@ const requestHandler = async (req, res) => {
       db.close();
       res.end(JSON.stringify({ ok: true, changes: result.changes }));
     } catch (err) {
-      console.error('[DB] 软删除会话失败:', err.message);
+      LOG('[DB] 软删除会话失败:', err.message);
       res.end(JSON.stringify({ ok: false, error: err.message }));
     }
     return;
@@ -706,7 +707,9 @@ function createServerAndWss() {
 
 function setupWss(wssInst) {
 wssInst.on('connection', (ws, req) => {
-  console.log('[WS] 客户端连接 from', req.socket.remoteAddress);
+  LOG('[WS] 客户端连接 from', req.socket.remoteAddress);
+  ws.isAlive = true;
+  ws.on('pong', () => { ws.isAlive = true; });
 
   ws.send(JSON.stringify({
     type: 'state',
@@ -732,7 +735,7 @@ wssInst.on('connection', (ws, req) => {
         await spawnProcess('opencode', sid);
         ws.send(JSON.stringify({ type: 'started', sessionId: sid }));
       } catch (e) {
-        console.error('[reconnect] 重启失败:', e.message);
+        LOG('[reconnect] 重启失败:', e.message);
       }
       isSwitching = false;
     }, 200);
@@ -758,19 +761,19 @@ wssInst.on('connection', (ws, req) => {
   ws.on('message', async (raw) => {
     try {
       const msg = JSON.parse(raw);
-      console.log(`[WS msg] type=${msg.type}, currentProcess=${!!currentProcess}, currentMode=${currentMode}`);
+      LOG(`[WS msg] type=${msg.type}, currentProcess=${!!currentProcess}, currentMode=${currentMode}`);
 
       if (msg.type === 'input') {
         // 进程已退出时，自动重新启动（参考 cc-viewer 逻辑）
         // 模式切换/新建会话期间不触发 respawn
         if (!currentProcess && !isSwitching) {
           try {
-            console.log(`[respawn] 进程已退出，自动重新启动 ${currentMode}`);
+            LOG(`[respawn] 进程已退出，自动重新启动 ${currentMode}`);
             outputBuffer = '';
             await spawnProcess(currentMode);
-            console.log(`[respawn] 重新启动成功, currentProcess=${!!currentProcess}`);
+            LOG(`[respawn] 重新启动成功, currentProcess=${!!currentProcess}`);
           } catch (e) {
-            console.log(`[respawn] 重新启动失败: ${e.message}`);
+            LOG(`[respawn] 重新启动失败: ${e.message}`);
           }
         }
         if (activeWs !== ws) {
@@ -809,17 +812,17 @@ wssInst.on('connection', (ws, req) => {
       } else if (msg.type === 'restore') {
         // 恢复会话
         if (msg.sessionId && currentMode === 'opencode') {
-          console.log(`[restore] 恢复会话: ${msg.sessionId}`);
+          LOG(`[restore] 恢复会话: ${msg.sessionId}`);
 
           isSwitching = true;
 
           // 杀死当前 opencode 进程
           if (opencodeProcess) {
             try {
-              console.log(`[restore] 杀死当前进程 PID: ${opencodeProcess.pid}`);
+              LOG(`[restore] 杀死当前进程 PID: ${opencodeProcess.pid}`);
               killProcessTree(opencodeProcess);
             } catch (e) {
-              console.log('[restore] 杀死进程失败:', e.message);
+              LOG('[restore] 杀死进程失败:', e.message);
             }
             opencodeProcess = null;
             currentProcess = null;
@@ -836,7 +839,7 @@ wssInst.on('connection', (ws, req) => {
             await spawnProcess('opencode', msg.sessionId);
             ws.send(JSON.stringify({ type: 'restored', sessionId: msg.sessionId }));
           } catch (e) {
-            console.error('[restore] 启动进程失败:', e.message);
+            LOG('[restore] 启动进程失败:', e.message);
             ws.send(JSON.stringify({ type: 'restore-error', error: e.message }));
           }
           isSwitching = false;
@@ -844,19 +847,19 @@ wssInst.on('connection', (ws, req) => {
       } else if (msg.type === 'start') {
         // 前端启动指令：可选带 sessionId 恢复会话
         const mode = currentMode;
-        console.log(`[start] 启动 ${mode}, sessionId=${msg.sessionId || '(新会话)'}`);
+        LOG(`[start] 启动 ${mode}, sessionId=${msg.sessionId || '(新会话)'}`);
         outputBuffer = '';
         try {
           await spawnProcess(mode, msg.sessionId || null);
           ws.send(JSON.stringify({ type: 'started', sessionId: msg.sessionId || null }));
         } catch (e) {
-          console.error('[start] 启动失败:', e.message);
+          LOG('[start] 启动失败:', e.message);
           ws.send(JSON.stringify({ type: 'start-error', error: e.message }));
         }
       } else if (msg.type === 'new-session') {
         // 开启新会话：杀掉当前进程，重新启动不带 session 参数的 opencode
         const mode = currentMode;
-        console.log(`[new-session] 开启新会话, mode=${mode}`);
+        LOG(`[new-session] 开启新会话, mode=${mode}`);
 
         isSwitching = true;
         previousSessionId = currentSessionId; // 记住旧会话，用于判断新会话是否已写入 DB
@@ -880,7 +883,7 @@ wssInst.on('connection', (ws, req) => {
         try {
           await spawnProcess(mode);
         } catch (e) {
-          console.error('[new-session] 启动失败:', e.message);
+          LOG('[new-session] 启动失败:', e.message);
           ws.send(JSON.stringify({ type: 'new-session-error', error: e.message }));
         }
         isSwitching = false;
@@ -898,7 +901,7 @@ wssInst.on('connection', (ws, req) => {
               db.close();
               if (row && row.id !== prevSid) {
                 currentSessionId = row.id;
-                console.log(`[new-session] 检测到新会话 ID: ${currentSessionId}`);
+                LOG(`[new-session] 检测到新会话 ID: ${currentSessionId}`);
                 return;
               }
             }
@@ -908,7 +911,7 @@ wssInst.on('connection', (ws, req) => {
         setTimeout(() => checkNewSession(0), 3000);
       }
     } catch (err) {
-      console.error('[WS] Error:', err.message);
+      LOG('[WS] Error:', err.message);
     }
   });
 
@@ -936,6 +939,18 @@ wssInst.on('connection', (ws, req) => {
     }
   });
 });
+
+  // WebSocket 心跳保活，防止中间网络设备断开空闲连接
+  const HEARTBEAT_INTERVAL = 15000;
+  const heartbeat = setInterval(() => {
+    wssInst.clients.forEach((ws) => {
+      if (ws.isAlive === false) return ws.terminate();
+      ws.isAlive = false;
+      ws.ping();
+    });
+  }, HEARTBEAT_INTERVAL);
+
+  wssInst.on('close', () => clearInterval(heartbeat));
 } // end setupWss
 
 createServerAndWss();
@@ -954,16 +969,16 @@ function startServer() {
     const proto = USE_HTTPS ? 'https' : 'http';
 
     if (JSON_OUTPUT) {
-      console.log(JSON.stringify({ port: PORT, url: `${proto}://127.0.0.1:${PORT}`, ip, proto, pid: process.pid }));
+      LOG(JSON.stringify({ port: PORT, url: `${proto}://127.0.0.1:${PORT}`, ip, proto, pid: process.pid }));
     } else {
-      console.log('\n' + '='.repeat(50));
-      console.log('✅ Claude OpenCode Viewer 已启动');
-      console.log('='.repeat(50));
-      console.log(`🖥️  本地访问：${proto}://127.0.0.1:${PORT}`);
-      console.log(`📱  手机访问：${proto}://${ip}:${PORT}`);
-      if (USE_HTTPS) console.log('🔐 HTTPS 模式（首次访问需信任自签名证书）');
-      console.log('='.repeat(50));
-      console.log('\n按 Ctrl+C 停止服务\n');
+      LOG('\n' + '='.repeat(50));
+      LOG('✅ Claude OpenCode Viewer 已启动');
+      LOG('='.repeat(50));
+      LOG(`🖥️  本地访问：${proto}://127.0.0.1:${PORT}`);
+      LOG(`📱  手机访问：${proto}://${ip}:${PORT}`);
+      if (USE_HTTPS) LOG('🔐 HTTPS 模式（首次访问需信任自签名证书）');
+      LOG('='.repeat(50));
+      LOG('\n按 Ctrl+C 停止服务\n');
     }
 
     // 尝试恢复最近的会话，如果没有则新建
@@ -978,7 +993,7 @@ function startServer() {
     } catch (e) {}
 
     if (lastSessionId) {
-      console.log(`[startup] 恢复最近会话: ${lastSessionId}`);
+      LOG(`[startup] 恢复最近会话: ${lastSessionId}`);
       await spawnProcess('opencode', lastSessionId);
     } else {
       await spawnProcess('opencode');