cdp-tunnel 2.7.5 → 2.7.7

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;
@@ -65,8 +67,7 @@ var SpecialHandler = (function() {
 
         if (State.isCDPCreatedTab(tabId)) {
           addTabToAutomationGroup(tabId, clientId);
-        } else {
-          State.addPreExistingTab(tabId);
+        } else {          State.addPreExistingTab(tabId);
           Logger.info('[CDP] Target.attachToTarget: user tab not CDP-created, treating as pre-existing. tabId:', tabId);
         }
 
@@ -141,12 +142,9 @@ var SpecialHandler = (function() {
 
   function groupTabSilently(tabId, clientId) {
     return new Promise(function(resolve) {
-      try {
-        addTabToAutomationGroup(tabId, clientId);
-      } catch (e) {
-        Logger.error('[TabGroup] addTabToAutomationGroup threw:', e.message || e);
-      }
-      setTimeout(resolve, 100);
+      addTabToAutomationGroup(tabId, clientId, function(success) {
+        setTimeout(resolve, 50);
+      });
     });
   }
 
@@ -162,7 +160,34 @@ var SpecialHandler = (function() {
     });
   }
 
-  function addTabToAutomationGroup(tabId, clientId) {
+  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' });
@@ -183,21 +208,23 @@ var SpecialHandler = (function() {
         Logger.warn('[TabGroup] No clientId for tab:', tabId, 'fallback to first client:', groupClientId);
       } else {
         Logger.warn('[TabGroup] No clientId for tab:', tabId, '— skipping group operation');
+        if (callback) callback(false);
         return;
       }
     }
     var baseName = CDPUtils.getGroupBaseName(groupClientId);
 
     Logger.info('[TabGroup] Grouping tab immediately for:', baseName);
-    doGroup(tabId, groupClientId, baseName);
+    doGroup(tabId, groupClientId, baseName, 0, callback);
   }
 
-  function doGroup(tabId, clientId, baseName, retries) {
+  function doGroup(tabId, clientId, baseName, retries, callback) {
     retries = retries || 0;
     Logger.info('[TabGroup] doGroup: tabId=' + tabId + ' clientId=' + (clientId || 'none') + ' baseName=' + baseName + ' retry=' + retries);
     if (!chrome.tabGroups) {
       Logger.warn('[TabGroup] chrome.tabGroups API not available (headless mode?), skipping grouping for tab:', tabId);
       EventBuilder.send('CDPTunnel.debug', { source: 'doGroup', phase: 'skip', reason: 'tabGroups-unavailable', tabId: tabId });
+      if (callback) callback(false);
       return;
     }
     chrome.tabGroups.query({}, function(allGroups) {
@@ -214,12 +241,15 @@ var SpecialHandler = (function() {
             Logger.error('[TabGroup] Failed to add tab to group:', chrome.runtime.lastError.message, 'retries:', retries);
             EventBuilder.send('CDPTunnel.debug', { source: 'doGroup', phase: 'addToExisting', error: chrome.runtime.lastError.message, tabId: tabId, groupId: existing.id });
             if (retries < 3) {
-              setTimeout(function() { doGroup(tabId, clientId, baseName, retries + 1); }, 500);
+              setTimeout(function() { doGroup(tabId, clientId, baseName, retries + 1, callback); }, 500);
+            } else {
+              if (callback) callback(false);
             }
           } else {
             State.setGroupIdForClient(clientId, existing.id);
             updateTabGroupName(clientId);
             Logger.info('[TabGroup] Tab', tabId, 'added to existing group:', existing.id);
+            if (callback) callback(true);
           }
         });
       } else {
@@ -229,7 +259,9 @@ var SpecialHandler = (function() {
             Logger.error('[TabGroup] Failed to create group:', chrome.runtime.lastError.message, 'retries:', retries);
             EventBuilder.send('CDPTunnel.debug', { source: 'doGroup', phase: 'createGroup', error: chrome.runtime.lastError.message, tabId: tabId });
             if (retries < 3) {
-              setTimeout(function() { doGroup(tabId, clientId, baseName, retries + 1); }, 500);
+              setTimeout(function() { doGroup(tabId, clientId, baseName, retries + 1, callback); }, 500);
+            } else {
+              if (callback) callback(false);
             }
             return;
           }
@@ -250,13 +282,16 @@ var SpecialHandler = (function() {
                   updateTabGroupName(clientId);
                   Logger.info('[TabGroup] Group updated:', groupId, baseName);
                 }
+                if (callback) callback(true);
               });
             } else {
               State.setGroupIdForClient(clientId, groupId);
               Logger.info('[TabGroup] Group created but tabGroups.update unavailable (headless):', groupId);
+              if (callback) callback(true);
             }
           } else {
             Logger.error('[TabGroup] chrome.tabs.group returned null groupId');
+            if (callback) callback(false);
           }
         });
       }

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

@@ -281,22 +281,50 @@ var WebSocketManager = (function() {
     Logger.info('[WS] Closing tab group for client:', clientId);
     
     return new Promise(function(resolve) {
-        var groupId = State.getGroupIdForClient(clientId);
+      var timeoutId = setTimeout(function() {
+        Logger.warn('[WS] closeTabGroupByClientId timeout for client:', clientId, '— forcing cleanup');
+        cleanupStaleState(clientId);
+        resolve();
+      }, 5000);
         
-        if (groupId) {
-            closeGroupById(groupId, clientId, resolve);
-        } else {
-            var baseName = CDPUtils.getGroupBaseName(clientId);
-            chrome.tabGroups.query({}, function(allGroups) {
-                var match = CDPUtils.findGroupByName(allGroups, baseName);
-                if (match) {
-                    closeGroupById(match.id, clientId, resolve);
-                } else {
-                    Logger.info('[WS] No tab group found, closing tabs by clientId:', clientId);
-                    closeTabsByClientId(clientId, resolve);
-                }
+      var groupId = State.getGroupIdForClient(clientId);
+      
+      if (groupId) {
+        closeGroupById(groupId, clientId, function() {
+          clearTimeout(timeoutId);
+          cleanupStaleState(clientId);
+          resolve();
+        });
+      } else {
+        var baseName = CDPUtils.getGroupBaseName(clientId);
+        chrome.tabGroups.query({}, function(allGroups) {
+          var match = CDPUtils.findGroupByName(allGroups, baseName);
+          if (match) {
+            closeGroupById(match.id, clientId, function() {
+              clearTimeout(timeoutId);
+              cleanupStaleState(clientId);
+              resolve();
             });
-        }
+          } else {
+            Logger.info('[WS] No tab group found, closing tabs by clientId:', clientId);
+            closeTabsByClientId(clientId, function() {
+              clearTimeout(timeoutId);
+              cleanupStaleState(clientId);
+              resolve();
+            });
+          }
+        });
+      }
+    });
+  }
+
+  function cleanupStaleState(clientId) {
+    if (!clientId) return;
+    var attachedTabs = State.getAttachedTabIds();
+    attachedTabs.forEach(function(tabId) {
+      if (State.getClientIdByTabId(tabId) === clientId) {
+        State.removeTabIdToClientId(tabId);
+      }
     });
   }
 
@@ -306,6 +334,7 @@ var WebSocketManager = (function() {
         if (!tabs || tabs.length === 0) {
             Logger.info('[WS] No tabs in group:', groupId);
             State.removeGroupForClient(clientId);
+            removeEmptyGroup(groupId);
             resolve();
             return;
         }
@@ -338,11 +367,33 @@ var WebSocketManager = (function() {
             });
             
             State.removeGroupForClient(clientId);
+            removeEmptyGroup(groupId);
             resolve();
         });
     });
   }
 
+  function removeEmptyGroup(groupId) {
+    if (!groupId || !chrome.tabGroups) return;
+    setTimeout(function() {
+      chrome.tabGroups.query({ groupId: groupId }, function(groups) {
+        if (chrome.runtime.lastError) return;
+        if (groups && groups.length > 0) {
+          chrome.tabs.query({ groupId: groupId }, function(tabs) {
+            if (chrome.runtime.lastError) return;
+            if (!tabs || tabs.length === 0) {
+              chrome.tabGroups.remove(groupId, function() {
+                if (!chrome.runtime.lastError) {
+                  Logger.info('[WS] Removed empty group:', groupId);
+                }
+              });
+            }
+          });
+        }
+      });
+    }, 500);
+  }
+
   function closeTabsByClientId(clientId, resolve) {
     var attachedTabs = State.getAttachedTabIds();
     var cdpCreatedTabs = State.getCDPCreatedTabIds();

package/extension-new/manifest.json

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

package/extension-new/utils/helpers.js

@@ -44,7 +44,13 @@ var CDPUtils = (function() {
 
   function buildGroupName(clientId) {
     if (!clientId) return 'CDP';
-    var suffix = clientId.length > 8 ? clientId.substring(clientId.length - 8) : clientId;
+    var hash = 0;
+    for (var i = 0; i < clientId.length; i++) {
+      var chr = clientId.charCodeAt(i);
+      hash = ((hash << 5) - hash) + chr;
+      hash = hash | 0;
+    }
+    var suffix = Math.abs(hash).toString(16).substring(0, 8).padStart(8, '0');
     return 'CDP-' + suffix;
   }
 
@@ -55,7 +61,7 @@ var CDPUtils = (function() {
   function findGroupByName(allGroups, baseName) {
     for (var i = 0; i < allGroups.length; i++) {
       var g = allGroups[i];
-      if (g.title && g.title.indexOf(baseName) === 0) return g;
+      if (g.title === baseName || (g.title && g.title.indexOf(baseName + ' (') === 0)) return g;
     }
     return null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "2.7.5",
+  "version": "2.7.7",
   "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",
@@ -16,6 +16,10 @@
     "benchmark:proxy": "node benchmark/run-all.js --proxy",
     "demo": "node demo/server.js",
     "test:compare": "node tests/cdp-compare/cdp-compare-runner.js",
+    "test": "node tests/e2e/run-all.js",
+    "test:e2e": "node tests/e2e/run-all.js",
+    "test:core": "SKIP_EXTENDED=1 node tests/e2e/run-all.js",
+    "test:smoke": "ONLY=test-default-page,test-strict-isolation,test-no-user-tab-grab node tests/e2e/run-all.js",
     "prepare": "husky"
   },
   "keywords": [

package/server/proxy-server.js

@@ -487,11 +487,33 @@ function cleanupClient(ws, id, reason) {
     }
 
     if (ws.pairedPlugin) {
-        safeSend(ws.pairedPlugin, JSON.stringify({
+        const sendOk = safeSend(ws.pairedPlugin, JSON.stringify({
             type: 'client-disconnected',
             clientId: id,
             sessions: []
         }), 'plugin');
+        if (!sendOk) {
+            console.log(`[WARN] cleanupClient: failed to send client-disconnected for ${id} to plugin`);
+        }
+
+        const pluginNs = getNamespace(ws.pairedPlugin);
+        if (pluginNs) {
+            const targetsToClose = [];
+            for (const [tId, cId] of pluginNs.targetIdToClientId.entries()) {
+                if (cId === id) {
+                    targetsToClose.push(tId);
+                }
+            }
+            targetsToClose.forEach(function(tId) {
+                const closeReq = JSON.stringify({
+                    id: -1,
+                    method: 'Target.closeTarget',
+                    params: { targetId: tId },
+                    __clientId: id
+                });
+                safeSend(ws.pairedPlugin, closeReq, 'plugin');
+            });
+        }
     }
 
     broadcastClientList();
@@ -1307,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) {