cdp-tunnel 2.9.2 → 2.9.4

package/extension-new/cdp/handler/special.js

@@ -84,8 +84,7 @@ var SpecialHandler = (function() {
           addTabToAutomationGroup(tabId, clientId, null, context);
         } else if (context.mode === 'takeover') {
           state.addPreExistingTab(tabId);
-          addTabToAutomationGroup(tabId, clientId, null, context);
-          Logger.info('[CDP TAKEOVER] Target.attachToTarget: added to TAKE group. tabId:', tabId);
+          Logger.info('[CDP TAKEOVER] Target.attachToTarget: attached without grouping. tabId:', tabId);
         } else {
           state.addPreExistingTab(tabId);
           Logger.info('[CDP] Target.attachToTarget: user tab not CDP-created, treating as pre-existing. tabId:', tabId);

package/extension-new/core/connection-manager.js

@@ -41,8 +41,11 @@ var ConnectionManager = (function() {
     var entry = _connections.get(connectionId);
     if (!entry) return;
 
+    entry.wsManager._removed = true;
     entry.state.clearReconnectTimer();
     if (entry.state.ws) {
+      entry.state.ws.onclose = null;
+      entry.state.ws.onerror = null;
       try { entry.state.ws.close(); } catch(e) {}
     }
     entry.state.clearAllState();
@@ -97,10 +100,12 @@ var ConnectionManager = (function() {
 
   function disconnectAll() {
     _connections.forEach(function(entry) {
+      entry.state.clearReconnectTimer();
       if (entry.state.ws) {
+        entry.state.ws.onclose = null;
+        entry.state.ws.onerror = null;
         try { entry.state.ws.close(); } catch(e) {}
       }
-      entry.state.clearReconnectTimer();
     });
   }
 

package/extension-new/core/websocket.js

@@ -32,10 +32,15 @@ var WebSocketConnection = (function() {
     this._maxQueueSize = 100;
     this._bufferThreshold = 512 * 1024;
     this._groupCreationPending = new Set();
+    this._removed = false;
   }
 
   WebSocketConnection.prototype.connect = function() {
     var self = this;
+    if (self._removed) {
+      Logger.info('[WS:' + self.connectionId + '] Skipping connect, connection removed');
+      return;
+    }
     var ws = self.state.getWs();
     if (ws && (ws.readyState === WebSocket.CONNECTING || ws.readyState === WebSocket.OPEN)) {
       return;
@@ -43,6 +48,10 @@ var WebSocketConnection = (function() {
 
     var wsUrl = self.config.url;
     Config.getPluginId(function(pluginId) {
+      if (self._removed) {
+        Logger.info('[WS:' + self.connectionId + '] Aborting connect (async), connection removed');
+        return;
+      }
       if (pluginId) {
         var sep = wsUrl.indexOf('?') >= 0 ? '&' : '?';
         wsUrl += sep + 'pluginId=' + encodeURIComponent(pluginId);
@@ -150,9 +159,14 @@ var WebSocketConnection = (function() {
   };
 
   WebSocketConnection.prototype._scheduleReconnect = function() {
+    if (this._removed) {
+      Logger.info('[WS:' + this.connectionId + '] Skipping reconnect, connection removed');
+      return;
+    }
     this.state.clearReconnectTimer();
     var self = this;
     var timer = setTimeout(function() {
+      if (self._removed) return;
       Logger.info('[WS:' + self.connectionId + '] Attempting to reconnect...');
       self.connect();
     }, Config.RECONNECT_DELAY);
@@ -269,7 +283,6 @@ var WebSocketConnection = (function() {
           var sessions = self.state.findSessionsByTabId(tid);
           sessions.forEach(function(sid) { self.state.unmapSession(sid); });
         });
-        self.state.removeGroupForClient(takeClientId);
         self.state.removeCDPClient(takeClientId);
         if (self.state.getCDPClients().length === 0) {
           self.state.setHasConnectedClient(false);
@@ -541,6 +554,10 @@ var WebSocketConnection = (function() {
   WebSocketConnection.prototype._createGroupForClient = function(clientId, mode) {
     var self = this;
     if (!clientId || !chrome.tabGroups) return;
+    if (mode === 'takeover') {
+      Logger.info('[WS:' + self.connectionId + '] Skipping group creation for takeover mode, clientId:', clientId);
+      return;
+    }
 
     if (self._groupCreationPending.has(clientId)) {
       Logger.info('[WS:' + self.connectionId + '] Group creation already pending for client:', clientId);

package/extension-new/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "CDP Bridge",
-  "version": "2.9.2",
+  "version": "2.9.4",
   "description": "Chrome DevTools Protocol Bridge for Playwright/Puppeteer automation",
   "permissions": [
     "debugger",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "2.9.2",
+  "version": "2.9.4",
   "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",
@@ -67,6 +67,7 @@
     "ws": "^8.16.0"
   },
   "devDependencies": {
+    "chrome-remote-interface": "^0.34.0",
     "husky": "^9.1.7",
     "lz-string": "^1.5.0",
     "pako": "^2.1.0",

package/server/proxy-server.js

@@ -350,7 +350,8 @@ async function handleHttpRequest(req, res) {
             'User-Agent': userAgent,
             'V8-Version': ver?.jsVersion || '',
             'WebKit-Version': '537.36',
-            webSocketDebuggerUrl: `ws://${getHost(req)}/devtools/browser/${browserId}`
+            webSocketDebuggerUrl: `ws://${getHost(req)}/devtools/browser/${browserId}`,
+            totalPlugins: pluginConnections.size
         };
         res.writeHead(200, { 'Content-Type': 'application/json' });
         res.end(JSON.stringify(payload));