cdp-tunnel 2.10.4 → 2.10.6

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);
   }
 
@@ -334,6 +373,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 }, null, wsManager);
           if (groupId) {
+            if (state) state.setGroupIdForClient(clientId, groupId);
             if (chrome.tabGroups) {
               chrome.tabGroups.update(groupId, {
                 title: baseName,
@@ -344,14 +384,12 @@ var SpecialHandler = (function() {
                   Logger.error('[TabGroup] Failed to update group:', chrome.runtime.lastError.message);
                   EventBuilder.send('CDPTunnel.debug', { source: 'doGroup', phase: 'updateGroup', error: chrome.runtime.lastError.message, groupId: groupId }, null, wsManager);
                 } else {
-                  if (state) state.setGroupIdForClient(clientId, groupId);
                   updateTabGroupName(clientId, state, wsManager, context ? context.mode : null);
                   Logger.info('[TabGroup] Group updated:', groupId, baseName);
                 }
                 if (callback) callback(true);
               });
             } else {
-              if (state) state.setGroupIdForClient(clientId, groupId);
               Logger.info('[TabGroup] Group created but tabGroups.update unavailable (headless):', groupId);
               if (callback) callback(true);
             }

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);
@@ -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);
+        self.state.setGroupIdForClient(clientId, groupId);
+        self.state.setGroupCreationPromise(clientId, null);
+        resolveGroupReady(groupId);
         chrome.tabGroups.update(groupId, {
           title: baseName,
           color: CDPUtils.getGroupColorForClient(clientId),
@@ -595,7 +608,6 @@ var WebSocketConnection = (function() {
             Logger.warn('[WS:' + self.connectionId + '] Failed to set group title:', chrome.runtime.lastError.message);
           }
         });
-        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.4",
+  "version": "2.10.6",
   "description": "Chrome DevTools Protocol Bridge for Playwright/Puppeteer automation",
   "permissions": [
     "debugger",

package/package.json

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