cdp-tunnel 1.0.15 → 1.2.0

package/cli/chrome-manager.js

@@ -0,0 +1,111 @@
+#!/usr/bin/env node
+'use strict';
+
+const { execSync, spawn } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+function findChromePath() {
+  if (process.env.CHROME_PATH && fs.existsSync(process.env.CHROME_PATH)) {
+    return process.env.CHROME_PATH;
+  }
+
+  const platform = os.platform();
+  const candidates = {
+    darwin: [
+      '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+      '/Applications/Chromium.app/Contents/MacOS/Chromium',
+      '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
+    ],
+    win32: [
+      'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
+      'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
+      path.join(os.homedir(), 'AppData\\Local\\Google\\Chrome\\Application\\chrome.exe'),
+    ],
+    linux: [
+      '/usr/bin/google-chrome-stable',
+      '/usr/bin/google-chrome',
+      '/usr/bin/chromium-browser',
+      '/usr/bin/chromium',
+      '/snap/bin/chromium',
+    ],
+  };
+
+  const paths = candidates[platform] || [];
+  for (const p of paths) {
+    if (fs.existsSync(p)) return p;
+  }
+  return null;
+}
+
+function isChromeRunning() {
+  const platform = os.platform();
+  try {
+    if (platform === 'darwin') {
+      const result = execSync('pgrep -x "Google Chrome" || pgrep -x "Chromium" || pgrep -x "Google Chrome Helper" || true', { encoding: 'utf8' });
+      return result.trim().length > 0;
+    }
+    if (platform === 'win32') {
+      const result = execSync('tasklist /FI "IMAGENAME eq chrome.exe" /NH', { encoding: 'utf8' });
+      return result.includes('chrome.exe');
+    }
+    const result = execSync('pgrep -f "chrome|chromium" || true', { encoding: 'utf8' });
+    return result.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+
+function getExtensionPath() {
+  return path.resolve(__dirname, '..', 'extension-new');
+}
+
+function launchChromeWithExtension() {
+  const chromePath = findChromePath();
+  if (!chromePath) {
+    console.error('[AUTO-RESTART] Chrome not found. Set CHROME_PATH env var.');
+    return false;
+  }
+
+  const extensionPath = getExtensionPath();
+  if (!fs.existsSync(extensionPath)) {
+    console.error('[AUTO-RESTART] Extension directory not found:', extensionPath);
+    return false;
+  }
+
+  const platform = os.platform();
+
+  try {
+    if (platform === 'darwin') {
+      const appName = chromePath.replace(/\/Contents\/MacOS\/.*$/, '');
+      execSync(`open -a "${appName}" --args --load-extension="${extensionPath}"`, {
+        timeout: 10000,
+        stdio: 'ignore',
+      });
+    } else if (platform === 'win32') {
+      spawn(chromePath, [`--load-extension=${extensionPath}`], {
+        detached: true,
+        stdio: 'ignore',
+      }).unref();
+    } else {
+      spawn(chromePath, [`--load-extension=${extensionPath}`], {
+        detached: true,
+        stdio: 'ignore',
+      }).unref();
+    }
+
+    console.log(`[AUTO-RESTART] Chrome launched with extension: ${chromePath}`);
+    return true;
+  } catch (err) {
+    console.error('[AUTO-RESTART] Failed to launch Chrome:', err.message);
+    return false;
+  }
+}
+
+module.exports = {
+  findChromePath,
+  isChromeRunning,
+  getExtensionPath,
+  launchChromeWithExtension,
+};

package/cli/index.js

@@ -143,14 +143,14 @@ function openChromeExtensions() {
   }
 }
 
-function startServer(port, watchdog) {
+function startServer(port, watchdog, autoRestart) {
   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() }
+    env: { ...process.env, PORT: port.toString(), AUTO_RESTART: autoRestart ? 'true' : 'false' }
   });
 
   fs.writeFileSync(PID_FILE, child.pid.toString());
@@ -181,7 +181,7 @@ function startServer(port, watchdog) {
       console.log('  重启次数: ' + restartTimestamps.length + '/' + MAX_RESTARTS + ' (60秒内)');
       console.log('');
 
-      setTimeout(() => startServer(port, true), 3000);
+      setTimeout(() => startServer(port, true, autoRestart), 3000);
     });
 
     process.on('SIGINT', () => {
@@ -204,56 +204,136 @@ function startServer(port, watchdog) {
   return child;
 }
 
+function waitForPluginConnection(maxWaitMs) {
+  return new Promise((resolve) => {
+    const start = Date.now();
+    const interval = setInterval(() => {
+      const status = checkChromeExtension();
+      if (status.connected) {
+        clearInterval(interval);
+        resolve(true);
+      } else if (Date.now() - start > maxWaitMs) {
+        clearInterval(interval);
+        resolve(false);
+      }
+    }, 3000);
+  });
+}
+
+function generateAndSaveGuideHtml() {
+  return generateGuideHtml();
+}
+
+function openInBrowser(filePath) {
+  const platform = os.platform();
+  try {
+    if (platform === 'darwin') {
+      execSync(`open "${filePath}"`);
+    } else if (platform === 'win32') {
+      execSync(`start "" "${filePath}"`);
+    } else {
+      execSync(`xdg-open "${filePath}"`);
+    }
+  } catch {}
+}
+
 program
   .command('start')
   .description('启动 CDP Tunnel 服务器')
   .option('-p, --port <port>', '指定端口', parseInt)
   .option('-w, --watchdog', '启用看门狗，服务器崩溃时自动重启')
-  .action((options) => {
+  .option('-a, --auto-restart', '浏览器断连时自动重启 Chrome（带插件）')
+  .action(async (options) => {
     const config = getConfig();
-    const port = options.port || config.port;
-    
+    const port = options.port || config.port || 9221;
+
+    config.port = port;
+    config.autoRestart = !!options.autoRestart;
+    saveConfig(config);
+
     if (isServerRunning()) {
       console.log('');
-      log('yellow', '⚠️  服务器已在运行');
-      log('cyan', '   端口: ') + console.log(port);
-      log('cyan', '   PID:  ') + console.log(getServerPid());
-      return;
+      log('yellow', `⚠ 服务器已在运行 (PID: ${getServerPid()})`);
+      log('cyan', `  CDP: http://localhost:${port}`);
+    } else {
+      ensureConfigDir();
+      cleanupLogFile();
+      startServer(port, options.watchdog, options.autoRestart);
+      console.log('');
+      log('green', '✅ 服务器已启动');
+      log('cyan', `  CDP: http://localhost:${port}`);
     }
-    
+
+    await new Promise(r => setTimeout(r, 1000));
+
     const extStatus = checkChromeExtension();
-    if (!extStatus.installed) {
-      printExtensionGuide();
-      openChromeExtensions();
+    if (extStatus.connected) {
+      console.log('');
+      log('green', '✅ Ready! Chrome 扩展已连接');
+      log('cyan', `  连接: ws://localhost:${port}/devtools/browser/...`);
+      if (!options.watchdog) {
+        process.exit(0);
+      }
+      return;
     }
-    
-    ensureConfigDir();
-    cleanupLogFile();
 
-    startServer(port, options.watchdog);
-    
-    if (port !== config.port) {
-      config.port = port;
-      saveConfig(config);
-    }
-    
-    console.log('');
-    log('green', '✓ CDP Tunnel 服务器已启动');
-    console.log('');
-    console.log('  端口: ' + port);
-    console.log('  插件: ws://localhost:' + port + '/plugin');
-    console.log('  CDP:  http://localhost:' + port);
-    if (options.watchdog) {
-      console.log('  看门狗: 已启用（崩溃自动重启）');
+    const { isChromeRunning, launchChromeWithExtension } = require('./chrome-manager');
+    const chromeRunning = isChromeRunning();
+
+    if (!chromeRunning) {
+      log('cyan', '🔍 Chrome 未运行，正在启动...');
+      const launched = launchChromeWithExtension();
+      if (launched) {
+        log('cyan', '⏳ 等待插件连接...');
+        const connected = await waitForPluginConnection(15000);
+        if (connected) {
+          console.log('');
+          log('green', '✅ Ready! Chrome 已启动，插件已连接');
+          log('cyan', `  连接: ws://localhost:${port}/devtools/browser/...`);
+        } else {
+          console.log('');
+          log('yellow', '⚠ Chrome 已启动，但插件未自动连接。请点击浏览器工具栏上的 CDP Bridge 图标。');
+        }
+      } else {
+        console.log('');
+        log('yellow', '⚠ 无法自动启动 Chrome。请手动安装插件：');
+        printExtensionGuide();
+        openChromeExtensions();
+        const connected = await waitForPluginConnection(120000);
+        if (connected) {
+          console.log('');
+          log('green', '✅ Ready! 插件已连接');
+          log('cyan', `  连接: ws://localhost:${port}/devtools/browser/...`);
+        } else {
+          console.log('');
+          log('yellow', '⚠ 等待超时。插件安装完成后，运行 cdp-tunnel start 即可。');
+        }
+      }
+      if (!options.watchdog) process.exit(0);
+      return;
     }
+
     console.log('');
-    log('gray', '  日志: ' + LOG_FILE);
-    console.log('');
-    
-    if (!extStatus.installed) {
-      console.log('请先安装扩展，然后点击扩展图标连接服务器');
+    log('yellow', '⚠ Chrome 正在运行但插件未连接');
+    log('cyan', '📖 正在打开安装引导...');
+
+    const guidePath = generateAndSaveGuideHtml();
+    openInBrowser(guidePath);
+    openChromeExtensions();
+    printExtensionGuide();
+
+    log('cyan', '⏳ 等待插件安装并连接（最多 2 分钟）...');
+    const connected = await waitForPluginConnection(120000);
+    if (connected) {
       console.log('');
+      log('green', '✅ Ready! 插件已连接');
+      log('cyan', `  连接: ws://localhost:${port}/devtools/browser/...`);
+    } else {
+      console.log('');
+      log('yellow', '⚠ 等待超时。插件安装完成后，运行 cdp-tunnel start 即可。');
     }
+
+    if (!options.watchdog) process.exit(0);
   });
 
 program
@@ -278,64 +358,83 @@ program
 program
   .command('update')
   .description('自动更新 cdp-tunnel 并重启服务')
-  .option('-p, --port <port>', '重启时指定端口', parseInt)
-  .option('-w, --watchdog', '重启时启用看门狗')
+  .option('-p, --port <port>', '指定端口', parseInt)
+  .option('-w, --watchdog', '启用看门狗')
   .action(async (options) => {
     const config = getConfig();
     const wasRunning = isServerRunning();
     const savedPort = options.port || config.port;
     const savedWatchdog = options.watchdog;
-
-    console.log('');
-    log('cyan', '⬆  正在检查更新...');
-
+    
     try {
-      const beforeVersion = execSync('npm view cdp-tunnel version', { encoding: 'utf8' }).trim();
-      const localVersion = require(path.join(__dirname, '..', 'package.json')).version;
+      log('cyan', '🔍 检查更新...');
+      let latestVersion;
+      try {
+        latestVersion = execSync('npm view cdp-tunnel version', { 
+          encoding: 'utf8', 
+          timeout: 30000
+        }).trim();
+      } catch (err) {
+        log('red', '❌ 无法连接 npm registry: ' + err.message);
+        process.exit(1);
+      }
+      
+      const localVersion = JSON.parse(fs.readFileSync(
+        path.join(__dirname, '..', 'package.json'), 'utf8'
+      )).version;
+      
       log('gray', '  当前版本: ' + localVersion);
-      log('gray', '  最新版本: ' + beforeVersion);
-
+      log('gray', '  最新版本: ' + latestVersion);
+      
+      if (localVersion === latestVersion) {
+        log('green', '✅ 已是最新版本 (' + localVersion + ')');
+        if (wasRunning) {
+          log('cyan', '  服务器仍在运行中');
+        }
+        process.exit(0);
+      }
+      
       if (wasRunning) {
-        log('yellow', '  正在停止服务器...');
-        try {
-          const pid = getServerPid();
-          process.kill(pid, 'SIGTERM');
-          fs.unlinkSync(PID_FILE);
+        log('yellow', '⏸ 停止服务器...');
+        const pid = getServerPid();
+        if (pid) {
+          try { process.kill(pid, 'SIGTERM'); } catch {}
           await new Promise(r => setTimeout(r, 1500));
-          log('green', '  ✓ 服务器已停止');
-        } catch (e) {
-          log('yellow', '  ⚠ 停止服务器失败: ' + e.message);
         }
       }
-
-      log('cyan', '  正在更新...');
-      execSync('npm update -g cdp-tunnel', { stdio: 'inherit' });
-
-      const afterVersion = require(path.join(__dirname, '..', 'package.json')).version;
-      if (afterVersion !== localVersion) {
-        log('green', '  ✓ 已更新: ' + localVersion + ' → ' + afterVersion);
+      
+      log('cyan', '📦 更新中 (' + localVersion + ' → ' + latestVersion + ')...');
+      try {
+        execSync('npm update -g cdp-tunnel', { 
+          stdio: 'inherit',
+          timeout: 120000
+        });
+      } catch (err) {
+        log('red', '❌ 更新失败: ' + err.message);
+        process.exit(1);
+      }
+      
+      const newVersion = JSON.parse(fs.readFileSync(
+        path.join(__dirname, '..', 'package.json'), 'utf8'
+      )).version;
+      
+      if (newVersion !== localVersion) {
+        log('green', '✅ 已更新: ' + localVersion + ' → ' + newVersion);
       } else {
-        log('green', '  ✓ 已是最新版本');
+        log('yellow', '⚠ 版本未变化，可能需要手动更新');
       }
-
-      ensureConfigDir();
-      cleanupLogFile();
-      startServer(savedPort, savedWatchdog);
-      log('green', '  ✓ 服务器已重启 (端口: ' + savedPort + ')');
-      console.log('');
-    } catch (e) {
-      log('red', '✗ 更新失败: ' + e.message);
-      console.log('');
+      
       if (wasRunning) {
-        log('yellow', '正在尝试恢复服务器...');
-        try {
-          ensureConfigDir();
-          startServer(savedPort, savedWatchdog);
-          log('green', '✓ 服务器已恢复');
-        } catch (re) {
-          log('red', '✗ 恢复失败，请手动启动: cdp-tunnel start');
-        }
+        log('cyan', '🔄 重启服务器...');
+        startServer(savedPort, savedWatchdog, config.autoRestart);
+        log('green', '✅ 服务器已重启');
+      } else {
+        log('cyan', '  运行 cdp-tunnel start 启动服务器');
       }
+      
+      process.exit(0);
+    } catch (err) {
+      log('red', '❌ 更新出错: ' + err.message);
       process.exit(1);
     }
   });
@@ -359,6 +458,10 @@ program
       console.log('  PID:    ' + getServerPid());
       console.log('  CDP:    http://localhost:' + config.port);
     }
+
+    if (config.autoRestart) {
+      console.log('  自动重启: 已启用');
+    }
     
     console.log('');
     if (extStatus.installed && extStatus.connected) {
@@ -492,4 +595,19 @@ program
     }
   });
 
+program.addHelpText('after', `
+
+常用命令:
+  $ cdp-tunnel start              启动服务（自动启动 Chrome）
+  $ cdp-tunnel start --auto-restart   Chrome 断连时自动重启
+  $ cdp-tunnel start --watchdog       服务崩溃时自动重启
+  $ cdp-tunnel status             查看状态
+  $ cdp-tunnel update             检查并更新
+  $ cdp-tunnel extension          安装 Chrome 扩展
+
+快速开始:
+  $ npm install -g cdp-tunnel
+  $ cdp-tunnel start              # 一行命令搞定！
+`);
+
 program.parse();

package/package.json

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

package/server/modules/config.js

@@ -7,7 +7,9 @@ const CONFIG = {
   CDP_TRACE_MAX_LENGTH: 300,
   LOG_MESSAGE_PREVIEW_LENGTH: 1000,
   CLIENT_IDLE_TIMEOUT: 300000,
-  LOG_LEVEL: process.env.LOG_LEVEL || 'info'
+  LOG_LEVEL: process.env.LOG_LEVEL || 'info',
+  AUTO_RESTART: process.env.AUTO_RESTART === 'true',
+  CHROME_RESTART_COOLDOWN: 30000
 };
 
 const LOG_LEVELS = {

package/server/proxy-server.js

@@ -14,12 +14,112 @@ const WebSocket = require('ws');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { execSync, spawn: spawnProcess } = require('child_process');
 const { CONFIG, BROWSER_ID, shouldLog } = require('./modules/config');
 const { logCDP, logEvent, clearLog, logStatus, logConnectionEvent, flushAllLogs } = require('./modules/logger');
 
 const PORT = CONFIG.PORT;
 const CONFIG_DIR = path.join(os.homedir(), '.cdp-tunnel');
 const EXTENSION_STATE_FILE = path.join(CONFIG_DIR, 'extension-state.json');
+const PLUGIN_EVER_CONNECTED_FILE = path.join(CONFIG_DIR, 'plugin-ever-connected');
+
+let lastChromeRestartAttempt = 0;
+const CHROME_RESTART_COOLDOWN = CONFIG.CHROME_RESTART_COOLDOWN;
+const autoRestartEnabled = CONFIG.AUTO_RESTART;
+
+function findChromePath() {
+    if (process.env.CHROME_PATH && fs.existsSync(process.env.CHROME_PATH)) {
+        return process.env.CHROME_PATH;
+    }
+    const platform = os.platform();
+    const candidates = {
+        darwin: [
+            '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+            '/Applications/Chromium.app/Contents/MacOS/Chromium',
+        ],
+        win32: [
+            'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
+            'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
+        ],
+        linux: [
+            '/usr/bin/google-chrome-stable',
+            '/usr/bin/google-chrome',
+            '/usr/bin/chromium-browser',
+            '/usr/bin/chromium',
+        ],
+    };
+    const paths = candidates[platform] || [];
+    for (const p of paths) {
+        if (fs.existsSync(p)) return p;
+    }
+    return null;
+}
+
+function isChromeRunning() {
+    const platform = os.platform();
+    try {
+        if (platform === 'darwin') {
+            const result = execSync('pgrep -x "Google Chrome" || pgrep -x "Chromium" || true', { encoding: 'utf8' });
+            return result.trim().length > 0;
+        }
+        if (platform === 'win32') {
+            const result = execSync('tasklist /FI "IMAGENAME eq chrome.exe" /NH', { encoding: 'utf8' });
+            return result.includes('chrome.exe');
+        }
+        const result = execSync('pgrep -f "chrome|chromium" || true', { encoding: 'utf8' });
+        return result.trim().length > 0;
+    } catch { return false; }
+}
+
+function tryAutoRestartChrome() {
+    if (!autoRestartEnabled) return false;
+
+    const now = Date.now();
+    if (now - lastChromeRestartAttempt < CHROME_RESTART_COOLDOWN) {
+        console.log('[AUTO-RESTART] Cooldown active, skipping restart');
+        return false;
+    }
+    lastChromeRestartAttempt = now;
+
+    if (isChromeRunning()) {
+        console.log('[AUTO-RESTART] Chrome is already running. Cannot add extension to running Chrome.');
+        console.log('[AUTO-RESTART] Please click the CDP Bridge extension icon to connect.');
+        return false;
+    }
+
+    const chromePath = findChromePath();
+    if (!chromePath) {
+        console.log('[AUTO-RESTART] Chrome not found. Set CHROME_PATH env var.');
+        return false;
+    }
+
+    const extensionPath = path.join(__dirname, '..', 'extension-new');
+    if (!fs.existsSync(extensionPath)) {
+        console.log('[AUTO-RESTART] Extension directory not found:', extensionPath);
+        return false;
+    }
+
+    try {
+        const platform = os.platform();
+        if (platform === 'darwin') {
+            const appName = chromePath.replace(/\/Contents\/MacOS\/.*$/, '');
+            execSync(`open -a "${appName}" --args --load-extension="${extensionPath}"`, {
+                timeout: 10000,
+                stdio: 'ignore',
+            });
+        } else {
+            spawnProcess(chromePath, [`--load-extension=${extensionPath}`], {
+                detached: true,
+                stdio: 'ignore',
+            }).unref();
+        }
+        console.log('[AUTO-RESTART] Chrome launched with extension:', chromePath);
+        return true;
+    } catch (err) {
+        console.error('[AUTO-RESTART] Failed to launch Chrome:', err.message);
+        return false;
+    }
+}
 
 function updateExtensionState(connected) {
     try {
@@ -268,6 +368,15 @@ function handlePluginConnection(ws, clientInfo) {
     
     updateExtensionState(true);
 
+    try {
+        if (!fs.existsSync(CONFIG_DIR)) {
+            fs.mkdirSync(CONFIG_DIR, { recursive: true });
+        }
+        if (!fs.existsSync(PLUGIN_EVER_CONNECTED_FILE)) {
+            fs.writeFileSync(PLUGIN_EVER_CONNECTED_FILE, new Date().toISOString());
+        }
+    } catch {}
+
     // 如果有待配对的客户端，自动配对
     if (clientConnections.size > 0) {
         for (const clientWs of clientConnections) {
@@ -659,6 +768,16 @@ function handleClientConnection(ws, clientInfo, customClientId = null) {
             console.log(`  - Please ensure Chrome extension is connected.`);
         }
         logConnectionEvent('CLIENT_NO_PLUGIN', { clientId: id });
+        
+        if (autoRestartEnabled) {
+            const wasConnectedBefore = fs.existsSync(PLUGIN_EVER_CONNECTED_FILE);
+            if (wasConnectedBefore) {
+                console.log('[AUTO-RESTART] Plugin disconnected, client connecting. Attempting to restart Chrome...');
+                tryAutoRestartChrome();
+            } else {
+                console.log('[AUTO-RESTART] No previous plugin connection found. New user? Run "cdp-tunnel extension" to install.');
+            }
+        }
     } else {
         // 多客户端模式: 所有客户端共享同一个 plugin
         // 每个 clientId 对应不同的 tab