cdp-tunnel 2.7.7 → 2.7.9

package/extension-new/background.js

@@ -142,10 +142,57 @@ importScripts('features/automation-badge.js');
     State.removeTabIdToClientId(tabId);
   });
 
+  if (chrome.tabGroups) {
+    chrome.tabGroups.onRemoved.addListener(function(group) {
+      if (!group) return;
+      var removedGroupId = group.id;
+      Logger.info('[TabGroups] Group removed:', removedGroupId);
+
+      var clients = State.getCDPClients() || [];
+      for (var i = 0; i < clients.length; i++) {
+        var clientId = clients[i].id;
+        if (State.getGroupIdForClient(clientId) === removedGroupId) {
+          Logger.info('[TabGroups] Clearing cached groupId for client:', clientId);
+          State.setGroupIdForClient(clientId, null);
+
+          var attached = State.getAttachedTabIds();
+          attached.forEach(function(tid) {
+            if (State.getClientIdByTabId(tid) === clientId && !State.isPreExistingTab(tid)) {
+              Logger.info('[TabGroups] Re-grouping tab', tid, 'for client:', clientId);
+              SpecialHandler.addTabToAutomationGroup(tid, clientId);
+            }
+          });
+          break;
+        }
+      }
+    });
+  }
+
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
     if (changeInfo.status === 'complete' && State.isTabAttached(tabId)) {
       // 不再注入自动化标识，改为通过标签分组区分
     }
+
+    if (changeInfo.groupId !== undefined && changeInfo.groupId === -1) {
+      if (State.isTabAttached(tabId) && !State.isPreExistingTab(tabId)) {
+        var clientId = State.getClientIdByTabId(tabId);
+        if (clientId) {
+          var cachedGroupId = State.getGroupIdForClient(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);
+                SpecialHandler.addTabToAutomationGroup(tabId, clientId);
+              }
+            });
+          } else {
+            Logger.info('[Tabs] Tab', tabId, 'left group, no cached groupId — delegating to addTabToAutomationGroup');
+            SpecialHandler.addTabToAutomationGroup(tabId, clientId);
+          }
+        }
+      }
+    }
   });
 
   chrome.tabs.onCreated.addListener(function(tab) {

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

@@ -165,8 +165,13 @@ var SpecialHandler = (function() {
     var prev = _groupQueue.get(key) || Promise.resolve();
 
     var next = prev.then(function() {
-      return new Promise(function(resolve) {
+      return new Promise(function(resolve, reject) {
+        var timeoutId = setTimeout(function() {
+          reject(new Error('addTabToAutomationGroup timeout after 10s'));
+        }, 10000);
+
         _addTabToAutomationGroupInner(tabId, clientId, function(success) {
+          clearTimeout(timeoutId);
           resolve(success);
         });
       });
@@ -227,12 +232,40 @@ 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);
         EventBuilder.send('CDPTunnel.debug', { source: 'doGroup', phase: 'query', error: chrome.runtime.lastError.message });
       }
-      Logger.info('[TabGroup] query result: ' + (allGroups ? allGroups.length : 'null') + ' groups');
+      if (!allGroups) {
+        Logger.error('[TabGroup] tabGroups.query returned null');
+        if (retries < 3) {
+          setTimeout(function() { doGroup(tabId, clientId, baseName, retries + 1, callback); }, 500);
+        } else {
+          if (callback) callback(false);
+        }
+        return;
+      }
+      Logger.info('[TabGroup] query result: ' + allGroups.length + ' groups');
       var existing = CDPUtils.findGroupByName(allGroups, baseName);
       if (existing) {
         Logger.info('[TabGroup] Found existing group:', existing.id, 'title:', existing.title);
@@ -267,7 +300,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/websocket.js

@@ -197,7 +197,7 @@ var WebSocketManager = (function() {
         Logger.info('[WS] Client connected, resuming event forwarding');
         State.setHasConnectedClient(true);
         State.addCDPClient(message.clientId, message.clientId);
-        startGroupMonitor();
+        createGroupForClient(message.clientId);
         broadcastStateUpdate();
         break;
 
@@ -221,7 +221,6 @@ var WebSocketManager = (function() {
           State.removeCDPClient(discClientId);
           if (State.getCDPClients().length === 0) {
             State.setHasConnectedClient(false);
-            stopGroupMonitor();
           }
           broadcastStateUpdate();
         });
@@ -231,11 +230,6 @@ var WebSocketManager = (function() {
         Logger.info('[WS] Received client list:', message.clients);
         State.setCDPClients(message.clients || []);
         State.setHasConnectedClient((message.clients || []).length > 0);
-        if ((message.clients || []).length > 0) {
-          startGroupMonitor();
-        } else {
-          stopGroupMonitor();
-        }
         broadcastStateUpdate();
         break;
 
@@ -459,64 +453,40 @@ var WebSocketManager = (function() {
     });
   }
 
-  var _groupMonitorTimer = null;
-
-  function startGroupMonitor() {
-    Logger.info('[Monitor] Starting group monitor...');
-    if (_groupMonitorTimer) clearInterval(_groupMonitorTimer);
-    _groupMonitorTimer = setInterval(function() {
-      var attached = State.getAttachedTabIds();
-      Logger.info('[Monitor] Checking ' + attached.length + ' attached tabs for grouping...');
-      attached.forEach(function(tabId) {
-        var clientId = State.getClientIdByTabId(tabId);
-        if (!clientId) {
-          Logger.warn('[Monitor] Tab', tabId, 'has no clientId mapping, cannot group');
-          return;
-        }
-        if (State.isPreExistingTab(tabId)) {
-          Logger.info('[Monitor] Tab', tabId, 'is pre-existing, skipping');
+  function createGroupForClient(clientId) {
+    if (!clientId || !chrome.tabGroups) return;
+
+    var existingGroupId = State.getGroupIdForClient(clientId);
+    if (existingGroupId) {
+      Logger.info('[WS] Group already cached for client:', clientId, 'groupId:', existingGroupId);
+      return;
+    }
+
+    var baseName = CDPUtils.getGroupBaseName(clientId);
+    chrome.tabs.query({ currentWindow: true }, function(tabs) {
+      if (!tabs || tabs.length === 0) {
+        Logger.warn('[WS] No tabs found for group creation');
+        return;
+      }
+      var windowId = tabs[0].windowId;
+      chrome.tabs.group({ createProperties: { windowId: windowId } }, function(groupId) {
+        if (chrome.runtime.lastError) {
+          Logger.warn('[WS] Failed to create group on connect:', chrome.runtime.lastError.message);
           return;
         }
-        chrome.tabs.get(tabId, function(tab) {
-          if (chrome.runtime.lastError || !tab) {
-            Logger.error('[Monitor] Tab', tabId, 'not found:', chrome.runtime.lastError?.message);
-            return;
-          }
-          var groupId = State.getGroupIdForClient(clientId);
-          Logger.info('[Monitor] Tab', tabId, 'groupId=' + (tab.groupId > -1 ? tab.groupId : 'none'), 'expectedGroup=' + (groupId > -1 ? groupId : 'none'), 'clientId=' + (clientId || 'none'));
-          if (tab.groupId > -1) return;
-          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;
-              }
-              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);
-              });
-            });
+        chrome.tabGroups.update(groupId, {
+          title: baseName,
+          color: CDPUtils.getGroupColorForClient(clientId),
+          collapsed: true
+        }, function() {
+          if (chrome.runtime.lastError) {
+            Logger.warn('[WS] Failed to set group title:', chrome.runtime.lastError.message);
           }
         });
+        State.setGroupIdForClient(clientId, groupId);
+        Logger.info('[WS] Created group for client:', clientId, 'groupId:', groupId, 'title:', baseName);
       });
-    }, 5000);
-  }
-
-  function stopGroupMonitor() {
-    if (_groupMonitorTimer) {
-      clearInterval(_groupMonitorTimer);
-      _groupMonitorTimer = null;
-    }
+    });
   }
 
   function handleServerRestart() {

package/extension-new/manifest.json

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

package/package.json

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