cdp-tunnel 2.1.0 → 2.1.2

package/cli/index.js

@@ -104,6 +104,9 @@ function checkChromeExtension() {
 }
 
 function getExtensionPath() {
+  if (process.env.CDP_TUNNEL_DEV_EXT) {
+    return process.env.CDP_TUNNEL_DEV_EXT;
+  }
   const cliDir = __dirname;
   return path.join(cliDir, '..', 'extension-new');
 }
@@ -181,6 +184,18 @@ function startServer(port, watchdog, autoRestart) {
       console.log('  重启次数: ' + restartTimestamps.length + '/' + MAX_RESTARTS + ' (60秒内)');
       console.log('');
 
+      // Kill any leftover process occupying the port before restarting
+      try {
+        const result = execSync(`lsof -ti:${port} 2>/dev/null || true`).toString().trim();
+        if (result) {
+          const pids = result.split('\n').filter(p => p && parseInt(p) !== process.pid);
+          pids.forEach(p => { try { process.kill(parseInt(p), 'SIGKILL'); } catch {} });
+          if (pids.length > 0) {
+            log('gray', '  已清理占用端口 ' + port + ' 的残留进程: ' + pids.join(', '));
+          }
+        }
+      } catch {}
+
       setTimeout(() => startServer(port, true, autoRestart), 3000);
     });
 

package/extension-new/core/state.js

@@ -285,7 +285,7 @@ var State = (function() {
           }
           
           var cdpGroups = groups.filter(function(g) {
-            return g.title && g.title.indexOf('CDP-') === 0;
+            return g.title && (g.title.indexOf('CDP-') === 0 || g.title.indexOf('CDP #') === 0);
           });
           
           if (cdpGroups.length === 0) {

package/extension-new/core/websocket.js

@@ -316,6 +316,7 @@ var WebSocketManager = (function() {
 
   function closeTabsByClientId(clientId, resolve) {
     var attachedTabs = State.getAttachedTabIds();
+    var groupId = State.getGroupIdForClient(clientId);
     var tabsToClose = [];
     
     attachedTabs.forEach(function(tabId) {
@@ -329,10 +330,35 @@ var WebSocketManager = (function() {
       resolve();
       return;
     }
-    
-    Logger.info('[WS] Closing ' + tabsToClose.length + ' attached tabs for clientId:', clientId);
-    
-    tabsToClose.forEach(function(tabId) {
+
+    if (groupId) {
+      chrome.tabs.query({ groupId: groupId }, function(groupTabs) {
+        if (chrome.runtime.lastError || !groupTabs) {
+          resolve();
+          return;
+        }
+        var groupTabIds = new Set(groupTabs.map(function(t) { return t.id; }));
+        var safeToClose = tabsToClose.filter(function(tabId) {
+          return groupTabIds.has(tabId);
+        });
+        var unsafeCount = tabsToClose.length - safeToClose.length;
+        if (unsafeCount > 0) {
+          Logger.info('[WS] Protecting ' + unsafeCount + ' tabs outside group from deletion');
+        }
+        doCloseTabs(safeToClose, clientId, resolve);
+      });
+    } else {
+      doCloseTabs(tabsToClose, clientId, resolve);
+    }
+  }
+
+  function doCloseTabs(tabIds, clientId, resolve) {
+    if (tabIds.length === 0) {
+      resolve();
+      return;
+    }
+    Logger.info('[WS] Closing ' + tabIds.length + ' attached tabs for clientId:', clientId);
+    tabIds.forEach(function(tabId) {
       chrome.tabs.remove(tabId, function() {
         if (chrome.runtime.lastError) {
           Logger.info('[WS] Tab already closed:', tabId);
@@ -341,7 +367,6 @@ var WebSocketManager = (function() {
       chrome.debugger.detach({ tabId: tabId }).catch(function() {});
       State.removeAttachedTab(tabId);
     });
-    
     resolve();
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Bridge Chrome's debugger API to WebSocket — control your existing browser with Playwright/Puppeteer via CDP",
   "main": "server/proxy-server.js",
   "bin": "./cli/index.js",

package/server/proxy-server.js

@@ -22,6 +22,7 @@ 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');
+const SERVER_START_TIME = Date.now();
 
 let lastChromeRestartAttempt = 0;
 const CHROME_RESTART_COOLDOWN = CONFIG.CHROME_RESTART_COOLDOWN;
@@ -739,7 +740,7 @@ function handlePluginConnection(ws, clientInfo) {
         type: 'connected',
         role: 'plugin',
         id: id,
-        fresh: true,
+        fresh: (Date.now() - SERVER_START_TIME) < 5000,
         timestamp: Date.now()
     }));
 }
@@ -1513,4 +1514,14 @@ process.on('SIGTERM', () => {
     process.exit(0);
 });
 
+server.on('error', (err) => {
+    if (err.code === 'EADDRINUSE') {
+        console.error(`[FATAL] Port ${PORT} is already in use. Is another cdp-tunnel running?`);
+        console.error(`  Run "cdp-tunnel stop" first, or kill the process on port ${PORT}.`);
+        process.exit(2);
+    }
+    console.error('[FATAL] Server error:', err.message);
+    process.exit(1);
+});
+
 server.listen(PORT, '0.0.0.0');