cdp-tunnel 1.0.11 → 1.0.13

package/cli/index.js

@@ -143,10 +143,72 @@ function openChromeExtensions() {
   }
 }
 
+function startServer(port, watchdog) {
+  const serverPath = path.join(__dirname, '..', 'server', 'proxy-server.js');
+  const logFd = fs.openSync(LOG_FILE, 'a');
+
+  const child = spawn('node', [serverPath], {
+    detached: !watchdog,
+    stdio: ['ignore', logFd, logFd],
+    env: { ...process.env, PORT: port.toString() }
+  });
+
+  fs.writeFileSync(PID_FILE, child.pid.toString());
+
+  if (watchdog) {
+    let restartCount = 0;
+    const MAX_RESTARTS = 10;
+    const RESTART_WINDOW = 60000;
+    let restartTimestamps = [];
+
+    child.on('exit', (code, signal) => {
+      const now = Date.now();
+      restartTimestamps = restartTimestamps.filter(t => now - t < RESTART_WINDOW);
+      restartTimestamps.push(now);
+
+      if (restartTimestamps.length > MAX_RESTARTS) {
+        console.log('');
+        log('red', '✗ 服务器在 60 秒内崩溃超过 ' + MAX_RESTARTS + ' 次，停止重启');
+        log('gray', '  请检查日志: ' + LOG_FILE);
+        console.log('');
+        try { fs.unlinkSync(PID_FILE); } catch {}
+        process.exit(1);
+      }
+
+      const reason = signal ? `信号 ${signal}` : `退出码 ${code}`;
+      console.log('');
+      log('yellow', '⚠ 服务器异常退出 (' + reason + ')，3 秒后自动重启...');
+      console.log('  重启次数: ' + restartTimestamps.length + '/' + MAX_RESTARTS + ' (60秒内)');
+      console.log('');
+
+      setTimeout(() => startServer(port, true), 3000);
+    });
+
+    process.on('SIGINT', () => {
+      console.log('');
+      log('cyan', '正在停止服务器（含 watchdog）...');
+      try { child.kill('SIGTERM'); } catch {}
+      try { fs.unlinkSync(PID_FILE); } catch {}
+      process.exit(0);
+    });
+
+    process.on('SIGTERM', () => {
+      try { child.kill('SIGTERM'); } catch {}
+      try { fs.unlinkSync(PID_FILE); } catch {}
+      process.exit(0);
+    });
+  } else {
+    child.unref();
+  }
+
+  return child;
+}
+
 program
   .command('start')
   .description('启动 CDP Tunnel 服务器')
   .option('-p, --port <port>', '指定端口', parseInt)
+  .option('-w, --watchdog', '启用看门狗，服务器崩溃时自动重启')
   .action((options) => {
     const config = getConfig();
     const port = options.port || config.port;
@@ -168,17 +230,7 @@ program
     ensureConfigDir();
     cleanupLogFile();
 
-    const serverPath = path.join(__dirname, '..', 'server', 'proxy-server.js');
-    
-    const child = spawn('node', [serverPath], {
-      detached: true,
-      stdio: ['ignore', fs.openSync(LOG_FILE, 'a'), fs.openSync(LOG_FILE, 'a')],
-      env: { ...process.env, PORT: port.toString() }
-    });
-    
-    child.unref();
-    
-    fs.writeFileSync(PID_FILE, child.pid.toString());
+    startServer(port, options.watchdog);
     
     if (port !== config.port) {
       config.port = port;
@@ -191,6 +243,9 @@ program
     console.log('  端口: ' + port);
     console.log('  插件: ws://localhost:' + port + '/plugin');
     console.log('  CDP:  http://localhost:' + port);
+    if (options.watchdog) {
+      console.log('  看门狗: 已启用（崩溃自动重启）');
+    }
     console.log('');
     log('gray', '  日志: ' + LOG_FILE);
     console.log('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Chrome Extension CDP Proxy - 通过 Chrome 扩展将 chrome.debugger API 暴露为 WebSocket 端点",
   "main": "server/proxy-server.js",
   "bin": "./cli/index.js",

package/server/modules/logger.js

@@ -11,6 +11,7 @@ const statusLogFile = path.join(logDir, 'server-status.log');
 
 const MAX_LOG_SIZE = 10 * 1024 * 1024;
 const MAX_LOG_FILES = 5;
+const MAX_TOTAL_LOG_SIZE = 30 * 1024 * 1024;
 
 let logWriteQueue = [];
 let isWritingLog = false;
@@ -84,6 +85,25 @@ function flushStatusQueue() {
 function checkLogRotation() {
   checkAndRotateLog(logFile);
   checkAndRotateLog(statusLogFile);
+  cleanupOldLogs();
+}
+
+function cleanupOldLogs() {
+  try {
+    const files = fs.readdirSync(logDir).filter(f => f.endsWith('.log')).map(f => {
+      const fp = path.join(logDir, f);
+      try {
+        return { path: fp, stat: fs.statSync(fp) };
+      } catch { return null; }
+    }).filter(Boolean).sort((a, b) => a.stat.mtimeMs - b.stat.mtimeMs);
+
+    let totalSize = files.reduce((sum, f) => sum + f.stat.size, 0);
+    while (totalSize > MAX_TOTAL_LOG_SIZE && files.length > 1) {
+      const oldest = files.shift();
+      fs.unlinkSync(oldest.path);
+      totalSize -= oldest.stat.size;
+    }
+  } catch {}
 }
 
 setInterval(checkLogRotation, 60000);
@@ -105,7 +125,43 @@ const NOISY_METHODS = [
   'Network.responseReceivedExtraInfo',
   'Network.dataReceived',
   'Network.loadingFinished',
+  'Network.resourceChangedPriority',
+  'Network.requestServedFromCache',
+  'Network.webSocketFrameSent',
+  'Network.webSocketFrameReceived',
+  'Network.eventSourceMessageReceived',
   'Input.dispatchMouseEvent',
+  'Input.mouseMoved',
+  'Input.keyDown',
+  'Input.keyUp',
+  'Input.char',
+  'Input.dispatchKeyEvent',
+  'Page.lifecycleEvent',
+  'Page.frameStartedLoading',
+  'Page.frameStoppedLoading',
+  'Page.frameNavigated',
+  'Page.frameRequestedNavigation',
+  'Page.frameScheduledNavigation',
+  'Page.frameStartedNavigating',
+  'Page.frameAttached',
+  'Page.frameClearedScheduledNavigation',
+  'Page.navigatedWithinDocument',
+  'Page.domContentEventFired',
+  'Page.loadEventFired',
+  'Page.screencastFrame',
+  'Page.screencastFrameAck',
+  'Runtime.executionContextCreated',
+  'Runtime.executionContextDestroyed',
+  'Runtime.executionContextsCleared',
+  'Runtime.bindingCalled',
+  'CSS.styleChanged',
+  'CSS.fontsUpdated',
+  'DOM.childNodeInserted',
+  'DOM.childNodeRemoved',
+  'DOM.attributeModified',
+  'DOM.attributeRemoved',
+  'DOM.childNodeCountUpdated',
+  'Log.entryAdded',
 ];
 
 function truncateMessage(message) {