claude-opencode-viewer 2.6.20 → 2.6.22

package/index-pc.html

@@ -848,10 +848,18 @@
       }
 
       // PC端尺寸计算
+      var resizeRetryCount = 0;
       function resize() {
         var container = document.getElementById('terminal');
         var cellDims = getCellDims();
-        if (!cellDims) return;
+        if (!cellDims) {
+          if (resizeRetryCount < 10) {
+            resizeRetryCount++;
+            setTimeout(resize, 200);
+          }
+          return;
+        }
+        resizeRetryCount = 0;
         var charW = cellDims.width;
         var charH = cellDims.height;
         var availW = container.clientWidth;

package/package.json

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

package/server.js

@@ -16,7 +16,7 @@ process.title = 'claude-opencode-viewer';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const IS_PC = process.argv.includes('--pc');
-let PORT = parseInt(process.argv[2]) || (IS_PC ? 19200 : 7008);
+const PORT = parseInt(process.argv[2]) || 7008;
 const USE_HTTPS = process.argv.includes('--https');
 const JSON_OUTPUT = process.argv.includes('--json');
 
@@ -162,6 +162,26 @@ function findCommand(cmd) {
   return cmd;
 }
 
+function killProcessTree(proc) {
+  if (!proc || !proc.pid) return;
+  const pid = proc.pid;
+  // 1. 尝试杀整个进程组（负 PID）
+  try { process.kill(-pid, 'SIGTERM'); } catch {}
+  // 2. 杀 pty 进程本身
+  try { proc.kill(); } catch {}
+  // 3. 1秒后检查，如果还活着就 SIGKILL 强杀
+  setTimeout(() => {
+    try {
+      process.kill(-pid, 0); // 检查进程组是否还在
+      process.kill(-pid, 'SIGKILL');
+    } catch {}
+    try {
+      process.kill(pid, 0);
+      process.kill(pid, 'SIGKILL');
+    } catch {}
+  }, 1000);
+}
+
 async function spawnProcess(mode, sessionId = null) {
   const pty = await getPty();
   fixSpawnHelperPermissions();
@@ -245,7 +265,7 @@ async function spawnProcess(mode, sessionId = null) {
     if (claudeProcess && claudeProcess !== proc && claudeProcess.pid) {
       try {
         console.log(`[spawnProcess] 清理旧 claude 进程 PID: ${claudeProcess.pid}`);
-        claudeProcess.kill();
+        killProcessTree(claudeProcess);
       } catch {}
     }
     claudeProcess = proc;
@@ -253,7 +273,7 @@ async function spawnProcess(mode, sessionId = null) {
     if (opencodeProcess && opencodeProcess !== proc && opencodeProcess.pid) {
       try {
         console.log(`[spawnProcess] 清理旧 opencode 进程 PID: ${opencodeProcess.pid}`);
-        opencodeProcess.kill();
+        killProcessTree(opencodeProcess);
       } catch {}
     }
     opencodeProcess = proc;
@@ -287,7 +307,7 @@ async function switchMode(newMode) {
   if (currentMode === 'claude' && claudeProcess) {
     try {
       console.log(`[switchMode] 杀死 claude 进程 PID: ${claudeProcess.pid}`);
-      claudeProcess.kill();
+      killProcessTree(claudeProcess);
     } catch (e) {
       console.log('[switchMode] 杀死 claude 进程失败:', e.message);
     }
@@ -295,7 +315,7 @@ async function switchMode(newMode) {
   } else if (currentMode === 'opencode' && opencodeProcess) {
     try {
       console.log(`[switchMode] 杀死 opencode 进程 PID: ${opencodeProcess.pid}`);
-      opencodeProcess.kill();
+      killProcessTree(opencodeProcess);
     } catch (e) {
       console.log('[switchMode] 杀死 opencode 进程失败:', e.message);
     }
@@ -701,7 +721,7 @@ wssInst.on('connection', (ws, req) => {
     const sid = currentSessionId;
     try {
       if (opencodeProcess) {
-        opencodeProcess.kill();
+        killProcessTree(opencodeProcess);
         opencodeProcess = null;
         currentProcess = null;
       }
@@ -797,7 +817,7 @@ wssInst.on('connection', (ws, req) => {
           if (opencodeProcess) {
             try {
               console.log(`[restore] 杀死当前进程 PID: ${opencodeProcess.pid}`);
-              opencodeProcess.kill();
+              killProcessTree(opencodeProcess);
             } catch (e) {
               console.log('[restore] 杀死进程失败:', e.message);
             }
@@ -843,11 +863,11 @@ wssInst.on('connection', (ws, req) => {
         currentSessionId = null; // 立即清除旧会话 ID
 
         if (mode === 'opencode' && opencodeProcess) {
-          try { opencodeProcess.kill(); } catch {}
+          try { killProcessTree(opencodeProcess); } catch {}
           opencodeProcess = null;
           currentProcess = null;
         } else if (mode === 'claude' && claudeProcess) {
-          try { claudeProcess.kill(); } catch {}
+          try { killProcessTree(claudeProcess); } catch {}
           claudeProcess = null;
           currentProcess = null;
         }
@@ -920,15 +940,15 @@ wssInst.on('connection', (ws, req) => {
 
 createServerAndWss();
 
-process.on('SIGINT', () => process.exit(0));
-process.on('SIGTERM', () => process.exit(0));
-
-// 端口范围，用于端口冲突重试
-const PORT_MIN = IS_PC ? 19200 : 7008;
-const PORT_MAX = IS_PC ? 19220 : 7028;
-const MAX_PORT_RETRIES = 20;
+function cleanupAndExit() {
+  if (claudeProcess) killProcessTree(claudeProcess);
+  if (opencodeProcess) killProcessTree(opencodeProcess);
+  setTimeout(() => process.exit(0), 500);
+}
+process.on('SIGINT', cleanupAndExit);
+process.on('SIGTERM', cleanupAndExit);
 
-function startServer(retries = 0) {
+function startServer() {
   server.listen(PORT, '0.0.0.0', async () => {
     const ip = getLocalIp();
     const proto = USE_HTTPS ? 'https' : 'http';
@@ -966,15 +986,8 @@ function startServer(retries = 0) {
   });
 
   server.on('error', (err) => {
-    if (err.code === 'EADDRINUSE' && retries < MAX_PORT_RETRIES) {
-      const oldPort = PORT;
-      PORT = PORT >= PORT_MAX ? PORT_MIN : PORT + 1;
-      console.error(`[port] ${oldPort} 已占用，尝试 ${PORT} (${retries + 1}/${MAX_PORT_RETRIES})`);
-      createServerAndWss();
-      startServer(retries + 1);
-    } else {
-      console.error(`启动失败: ${err.message}`);
-      process.exit(1);
+    console.error(`启动失败: ${err.message}`);
+    process.exit(1);
     }
   });
 }