cdp-tunnel 2.7.6 → 2.7.8

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

@@ -13,9 +13,7 @@ var LocalHandler = (function() {
   }
 
   function browserClose() {
-    return State.cleanupAllTabs().then(function() {
-      return {};
-    });
+    return Promise.resolve({});
   }
 
   function getWindowForTarget() {

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

@@ -1,4 +1,6 @@
 var SpecialHandler = (function() {
+  var _groupQueue = new Map();
+
   function muteTabIfNeeded(tabId) {
     Config.getAutoMute(function(enabled) {
       if (!enabled) return;
@@ -159,6 +161,33 @@ var SpecialHandler = (function() {
   }
 
   function addTabToAutomationGroup(tabId, clientId, callback) {
+    var key = clientId || '__no_client__';
+    var prev = _groupQueue.get(key) || Promise.resolve();
+
+    var next = prev.then(function() {
+      return new Promise(function(resolve) {
+        _addTabToAutomationGroupInner(tabId, clientId, function(success) {
+          resolve(success);
+        });
+      });
+    }).catch(function(err) {
+      Logger.error('[addTabToAutomationGroup] queue error:', err.message || err);
+    });
+
+    _groupQueue.set(key, next);
+
+    next.finally(function() {
+      if (_groupQueue.get(key) === next) {
+        _groupQueue.delete(key);
+      }
+    });
+
+    if (callback) {
+      next.then(function(success) { callback(success); });
+    }
+  }
+
+  function _addTabToAutomationGroupInner(tabId, clientId, callback) {
     Logger.info('[TabGroup] Starting addTabToAutomationGroup for tabId:', tabId, 'clientId:', clientId);
 
     WebSocketManager.send({ type: 'tabgroup-debug', tabId: tabId, clientId: clientId, phase: 'start' });
@@ -198,6 +227,25 @@ var SpecialHandler = (function() {
       if (callback) callback(false);
       return;
     }
+    var cachedGroupId = State.getGroupIdForClient(clientId);
+    if (cachedGroupId) {
+      Logger.info('[TabGroup] Using cached groupId:', cachedGroupId, 'for client:', clientId);
+      chrome.tabs.group({ tabIds: tabId, groupId: cachedGroupId }, function(result) {
+        if (!chrome.runtime.lastError) {
+          updateTabGroupName(clientId);
+          Logger.info('[TabGroup] Tab', tabId, 'added to cached group:', cachedGroupId);
+          if (callback) callback(true);
+          return;
+        }
+        Logger.warn('[TabGroup] Cached groupId', cachedGroupId, 'failed:', chrome.runtime.lastError.message, '— falling back to query');
+        doGroupQuery(tabId, clientId, baseName, retries, callback);
+      });
+      return;
+    }
+    doGroupQuery(tabId, clientId, baseName, retries, callback);
+  }
+
+  function doGroupQuery(tabId, clientId, baseName, retries, callback) {
     chrome.tabGroups.query({}, function(allGroups) {
       if (chrome.runtime.lastError) {
         Logger.error('[TabGroup] tabGroups.query failed:', chrome.runtime.lastError.message);
@@ -238,7 +286,7 @@ var SpecialHandler = (function() {
           }
           Logger.info('[TabGroup] chrome.tabs.group returned groupId:', groupId);
           EventBuilder.send('CDPTunnel.debug', { source: 'doGroup', phase: 'groupCreated', tabId: tabId, groupId: groupId });
-        if (groupId) {
+          if (groupId) {
             if (chrome.tabGroups) {
               chrome.tabGroups.update(groupId, {
                 title: baseName,

package/extension-new/core/debugger.js

@@ -203,8 +203,8 @@ var DebuggerManager = (function() {
       return;
     }
 
-    var sessionId = State.findSessionByTabId(source.tabId);
-    Logger.info('[Event] method=' + method + ' tabId=' + source.tabId + ' sessionId=' + (sessionId || 'null'));
+    var sessionIds = State.findSessionsByTabId(source.tabId);
+    Logger.info('[Event] method=' + method + ' tabId=' + source.tabId + ' sessions=' + sessionIds.length);
     
     if (method === 'Runtime.executionContextCreated' && params && params.context) {
       var context = params.context;
@@ -285,7 +285,9 @@ var DebuggerManager = (function() {
       }
     }
     
-    EventBuilder.send(method, params, sessionId);
+    for (var i = 0; i < sessionIds.length; i++) {
+      EventBuilder.send(method, params, sessionIds[i]);
+    }
   }
 
   function handleDetach(source, reason) {

package/extension-new/core/state.js

@@ -54,15 +54,23 @@ var State = (function() {
   }
 
   function findSessionByTabId(tabId) {
-    var entries = _state.sessionIdToTabId.entries();
-    var entry = entries.next();
-    while (!entry.done) {
-      if (entry.value[1] === tabId) {
-        return entry.value[0];
+    var lastMatch = null;
+    _state.sessionIdToTabId.forEach(function(mappedTabId, sessionId) {
+      if (mappedTabId === tabId) {
+        lastMatch = sessionId;
       }
-      entry = entries.next();
-    }
-    return null;
+    });
+    return lastMatch;
+  }
+
+  function findSessionsByTabId(tabId) {
+    var sessions = [];
+    _state.sessionIdToTabId.forEach(function(mappedTabId, sessionId) {
+      if (mappedTabId === tabId) {
+        sessions.push(sessionId);
+      }
+    });
+    return sessions;
   }
 
   function findSessionByTargetId(targetId) {
@@ -453,6 +461,7 @@ var State = (function() {
     getTabIdBySession: getTabIdBySession,
     getTargetIdBySession: getTargetIdBySession,
     findSessionByTabId: findSessionByTabId,
+    findSessionsByTabId: findSessionsByTabId,
     findSessionByTargetId: findSessionByTargetId,
     getTabIdByTargetId: getTabIdByTargetId,
     hasOtherSessionForTab: hasOtherSessionForTab,

package/extension-new/core/websocket.js

@@ -488,24 +488,17 @@ var WebSocketManager = (function() {
           Logger.info('[Monitor] Tab', tabId, 'escaped! Forcing regroup for client:', clientId);
           if (groupId) {
             chrome.tabs.group({ tabIds: tabId, groupId: groupId }, function() {
-              Logger.info('[Monitor] Re-added tab', tabId, 'to existing group:', groupId);
-            });
-          } else {
-            var baseName = CDPUtils.getGroupBaseName(clientId);
-            chrome.tabs.group({ tabIds: tabId }, function(newGroupId) {
-              if (chrome.runtime.lastError || !newGroupId) {
-                Logger.error('[Monitor] Failed to create group for tab', tabId, ':', chrome.runtime.lastError?.message);
-                return;
+              if (chrome.runtime.lastError) {
+                Logger.error('[Monitor] Failed to re-add tab', tabId, 'to group', groupId, ':', chrome.runtime.lastError?.message);
+                State.removeGroupForClient(clientId);
+                SpecialHandler.addTabToAutomationGroup(tabId, clientId);
+              } else {
+                Logger.info('[Monitor] Re-added tab', tabId, 'to existing group:', groupId);
               }
-              chrome.tabGroups.update(newGroupId, {
-                title: baseName,
-                color: CDPUtils.getGroupColorForClient(clientId),
-                collapsed: true
-              }, function() {
-                State.setGroupIdForClient(clientId, newGroupId);
-                Logger.info('[Monitor] Created new group', newGroupId, 'for escaped tab', tabId);
-              });
             });
+          } else {
+            Logger.info('[Monitor] No cached groupId for client', clientId, '— delegating to addTabToAutomationGroup for tab', tabId);
+            SpecialHandler.addTabToAutomationGroup(tabId, clientId);
           }
         });
       });

package/extension-new/manifest.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "2.7.6",
+  "version": "2.7.8",
   "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

@@ -1329,9 +1329,15 @@ function handleClientConnection(ws, clientInfo, customClientId = null, targetPlu
         }
 
         if (parsed && parsed.method === 'Browser.close') {
-            if (shouldLog('info')) {
-                console.log(`\n[BROWSER CLOSE] Client ${id} requested Browser.close, forwarding to plugin`);
+            console.log(`[BROWSER CLOSE] Client ${id} requested Browser.close — closing client group only`);
+            if (ws.pairedPlugin) {
+                safeSend(ws.pairedPlugin, JSON.stringify({
+                    type: 'browser-close',
+                    clientId: id
+                }), 'plugin');
             }
+            safeSend(ws, JSON.stringify({ id: originalId, result: {} }), 'client');
+            return;
         }
 
         if (parsed && parsed.method) {