cdp-tunnel 2.10.5 → 2.10.7

package/extension-new/background.js

@@ -178,6 +178,7 @@ importScripts('features/automation-badge.js');
           if (state.getGroupIdForClient(clientId) === removedGroupId) {
             Logger.info('[TabGroups] Clearing cached groupId for client:', clientId);
             state.setGroupIdForClient(clientId, null);
+            state.setGroupCreationPromise(clientId, null);
 
             var attached = state.getAttachedTabIds();
             attached.forEach(function(tid) {
@@ -209,19 +210,20 @@ importScripts('features/automation-badge.js');
         var clientId = state.getClientIdByTabId(tabId);
         if (clientId) {
           var cachedGroupId = state.getGroupIdForClient(clientId);
+          var groupPromise = state.getGroupCreationPromise(clientId);
           if (cachedGroupId) {
-                Logger.info('[Tabs] Tab', tabId, 'left group, re-adding to cached group:', cachedGroupId);
-                chrome.tabs.group({ tabIds: tabId, groupId: cachedGroupId }, function() {
-                  if (chrome.runtime.lastError) {
-                    Logger.warn('[Tabs] Failed to re-add tab to group:', chrome.runtime.lastError.message);
-                    var ctx = { _state: state, _wsManager: wsManager, clientId: clientId, mode: state.mode };
-                    SpecialHandler.addTabToAutomationGroup(tabId, clientId, null, ctx);
+            Logger.info('[Tabs] Tab', tabId, 'left group, re-adding to cached group:', cachedGroupId);
+            chrome.tabs.group({ tabIds: tabId, groupId: cachedGroupId }, function() {
+              if (chrome.runtime.lastError) {
+                Logger.warn('[Tabs] Failed to re-add tab to group:', chrome.runtime.lastError.message);
+                var ctx = { _state: state, _wsManager: wsManager, clientId: clientId, mode: state.mode };
+                SpecialHandler.addTabToAutomationGroup(tabId, clientId, null, ctx);
               }
             });
+          } else if (!groupPromise) {
+            Logger.info('[Tabs] Tab', tabId, 'left group, no cache and no pending creation — skipping (onRemoved handles re-group)');
           } else {
-            Logger.info('[Tabs] Tab', tabId, 'left group, no cached groupId — delegating to addTabToAutomationGroup');
-            var ctx = { _state: state, _wsManager: wsManager, clientId: clientId, mode: state.mode };
-            SpecialHandler.addTabToAutomationGroup(tabId, clientId, null, ctx);
+            Logger.info('[Tabs] Tab', tabId, 'left group, group creation pending — skipping');
           }
         }
       }

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

@@ -278,6 +278,45 @@ var SpecialHandler = (function() {
       });
       return;
     }
+    var groupPromise = state ? state.getGroupCreationPromise(clientId) : null;
+    if (groupPromise) {
+      Logger.info('[TabGroup] No cached groupId, waiting for _createGroupForClient promise for client:', clientId);
+      var waited = false;
+      var waitTimer = setTimeout(function() {
+        if (waited) return;
+        waited = true;
+        Logger.warn('[TabGroup] _createGroupForClient wait timed out (3s) for client:', clientId);
+        doGroupQuery(tabId, clientId, baseName, retries, callback, context);
+      }, 3000);
+      groupPromise.then(function(resolvedId) {
+        if (waited) return;
+        clearTimeout(waitTimer);
+        waited = true;
+        if (resolvedId) {
+          Logger.info('[TabGroup] _createGroupForClient resolved with groupId:', resolvedId);
+          chrome.tabs.group({ tabIds: tabId, groupId: resolvedId }, function() {
+            if (chrome.runtime.lastError) {
+              Logger.warn('[TabGroup] Failed to add tab to resolved group:', chrome.runtime.lastError.message);
+              doGroupQuery(tabId, clientId, baseName, retries, callback, context);
+            } else {
+              updateTabGroupName(clientId, state, wsManager, context ? context.mode : null);
+              Logger.info('[TabGroup] Tab', tabId, 'added to pre-created group:', resolvedId);
+              if (callback) callback(true);
+            }
+          });
+        } else {
+          Logger.warn('[TabGroup] _createGroupForClient resolved with null');
+          doGroupQuery(tabId, clientId, baseName, retries, callback, context);
+        }
+      }).catch(function(err) {
+        if (waited) return;
+        clearTimeout(waitTimer);
+        waited = true;
+        Logger.error('[TabGroup] _createGroupForClient promise rejected:', err);
+        doGroupQuery(tabId, clientId, baseName, retries, callback, context);
+      });
+      return;
+    }
     doGroupQuery(tabId, clientId, baseName, retries, callback, context);
   }
 

package/extension-new/core/websocket.js

@@ -241,6 +241,7 @@ var WebSocketConnection = (function() {
         Logger.info('[WS:' + self.connectionId + '] Client connected, resuming event forwarding');
         self.state.setHasConnectedClient(true);
         self.state.addCDPClient(message.clientId, message.clientId);
+        self._createGroupForClient(message.clientId, message.__mode);
         self._broadcastStateUpdate();
         break;
 
@@ -294,6 +295,7 @@ var WebSocketConnection = (function() {
         Logger.info('[WS:' + self.connectionId + '] Client disconnected:', message.clientId);
         var discClientId = message.clientId;
         self._groupCreationPending.delete(discClientId);
+        self.state.setGroupCreationPromise(discClientId, null);
         self._closeTabGroupByClientId(discClientId).then(function() {
           return new Promise(function(resolve) {
             self._closeTabsByClientId(discClientId, resolve);
@@ -312,6 +314,7 @@ var WebSocketConnection = (function() {
           if (self.state.getCDPClients().length === 0) {
             self.state.setHasConnectedClient(false);
           }
+          self._cleanupStaleState(discClientId);
           self._broadcastStateUpdate();
         });
         break;
@@ -372,7 +375,6 @@ var WebSocketConnection = (function() {
     return new Promise(function(resolve) {
       var timeoutId = setTimeout(function() {
         Logger.warn('[WS:' + self.connectionId + '] closeTabGroupByClientId timeout for client:', clientId, '— forcing cleanup');
-        self._cleanupStaleState(clientId);
         resolve();
       }, 5000);
 
@@ -571,11 +573,17 @@ var WebSocketConnection = (function() {
 
     self._groupCreationPending.add(clientId);
 
+    var resolveGroupReady;
+    var readyPromise = new Promise(function(resolve) { resolveGroupReady = resolve; });
+    self.state.setGroupCreationPromise(clientId, readyPromise);
+
     var baseName = CDPUtils.getGroupBaseName(clientId, self.config ? self.config.tag : null, mode);
     chrome.tabs.query({ currentWindow: true }, function(tabs) {
       if (!tabs || tabs.length === 0) {
         Logger.warn('[WS:' + self.connectionId + '] No tabs found for group creation');
         self._groupCreationPending.delete(clientId);
+        self.state.setGroupCreationPromise(clientId, null);
+        resolveGroupReady(null);
         return;
       }
       var windowId = tabs[0].windowId;
@@ -583,9 +591,14 @@ var WebSocketConnection = (function() {
         if (chrome.runtime.lastError) {
           Logger.warn('[WS:' + self.connectionId + '] Failed to create group on connect:', chrome.runtime.lastError.message);
           self._groupCreationPending.delete(clientId);
+          self.state.setGroupCreationPromise(clientId, null);
+          resolveGroupReady(null);
           return;
         }
         self._groupCreationPending.delete(clientId);
+        if (!self.state.getGroupIdForClient(clientId)) {
+          self.state.setGroupIdForClient(clientId, groupId);
+        }
         chrome.tabGroups.update(groupId, {
           title: baseName,
           color: CDPUtils.getGroupColorForClient(clientId),
@@ -594,9 +607,10 @@ var WebSocketConnection = (function() {
           if (chrome.runtime.lastError) {
             Logger.warn('[WS:' + self.connectionId + '] Failed to set group title:', chrome.runtime.lastError.message);
           }
+          self.state.setGroupCreationPromise(clientId, null);
+          resolveGroupReady(groupId);
+          Logger.info('[WS:' + self.connectionId + '] Created group for client:', clientId, 'groupId:', groupId, 'title:', baseName);
         });
-        self.state.setGroupIdForClient(clientId, groupId);
-        Logger.info('[WS:' + self.connectionId + '] Created group for client:', clientId, 'groupId:', groupId, 'title:', baseName);
       });
     });
   };

package/extension-new/manifest.json

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

package/package.json

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