cdp-tunnel 2.5.12 → 2.5.13

package/extension-new/background.js

@@ -230,56 +230,7 @@ importScripts('features/automation-badge.js');
           }
         });
         
-        // 将标签页添加到CDP组（添加延迟等待）
-        setTimeout(function() {
-          var openerClientId = openerTabId ? State.getClientIdByTabId(openerTabId) : null;
-          var groupClientId = openerClientId;
-          if (!groupClientId) {
-            var cdpClients = State.getCDPClients() || [];
-            if (cdpClients.length > 0 && cdpClients[0] && cdpClients[0].id) {
-              groupClientId = cdpClients[0].id;
-            }
-          }
-
-          if (!groupClientId) return;
-          var baseName = CDPUtils.getGroupBaseName(groupClientId);
-          Logger.info('[TabGroup] background onCreated, baseName:', baseName);
-
-          chrome.tabGroups.query({}, function(allGroups) {
-            var existing = CDPUtils.findGroupByName(allGroups, baseName);
-            if (existing) {
-              chrome.tabs.group({ tabIds: tabId, groupId: existing.id }, function(groupId) {
-                if (chrome.runtime.lastError) {
-                  Logger.error('[TabGroup] Failed to add tab to group:', chrome.runtime.lastError.message);
-                } else {
-                  State.setGroupIdForClient(groupClientId, existing.id);
-                  Logger.info('[TabGroup] Tab added to group:', groupId);
-                }
-              });
-            } else {
-              chrome.tabs.group({ tabIds: tabId }, function(groupId) {
-                if (chrome.runtime.lastError) {
-                  Logger.error('[TabGroup] Failed to create group:', chrome.runtime.lastError.message);
-                  return;
-                }
-                if (groupId) {
-                  chrome.tabGroups.update(groupId, {
-                    title: baseName,
-                    color: CDPUtils.getGroupColorForClient(groupClientId),
-                    collapsed: true
-                  }, function(group) {
-                    if (chrome.runtime.lastError) {
-                      Logger.error('[TabGroup] Failed to update group:', chrome.runtime.lastError.message);
-                    } else {
-                      State.setGroupIdForClient(groupClientId, groupId);
-                      Logger.info('[TabGroup] Group created:', group);
-                    }
-                  });
-                }
-              });
-            }
-          });
-        }, 2000);
+        SpecialHandler.addTabToAutomationGroup(tabId, openerClientId);
         
         Logger.info('[Tabs] Sending Target.attachedToTarget event');
         

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

@@ -135,17 +135,96 @@ var LocalHandler = (function() {
     return {};
   }
 
-  function tabGetGroupInfo(context) {
+  function tabUngroup(context) {
     var clientId = context.clientId;
     var groupId = null;
-    var baseName = null;
     try {
       groupId = State.getGroupIdForClient(clientId);
+    } catch (e) {
+      Logger.error('[TabUngroup] Error getting groupId: ' + (e.message || e));
+      return Promise.resolve({ success: false, ungroupedCount: 0, error: e.message || String(e) });
+    }
+    if (groupId == null) {
+      return Promise.resolve({ success: true, ungroupedCount: 0 });
+    }
+    return new Promise(function(resolve) {
+      chrome.tabs.query({ groupId: groupId }, function(tabs) {
+        if (chrome.runtime.lastError) {
+          Logger.error('[TabUngroup] chrome.runtime.lastError: ' + chrome.runtime.lastError.message);
+          resolve({ success: false, ungroupedCount: 0, error: chrome.runtime.lastError.message });
+          return;
+        }
+        if (!tabs || tabs.length === 0) {
+          resolve({ success: true, ungroupedCount: 0 });
+          return;
+        }
+        var tabIds = tabs.map(function(tab) { return tab.id; });
+        chrome.tabs.ungroup(tabIds, function() {
+          if (chrome.runtime.lastError) {
+            Logger.error('[TabUngroup] ungroup lastError: ' + chrome.runtime.lastError.message);
+            resolve({ success: false, ungroupedCount: 0, error: chrome.runtime.lastError.message });
+            return;
+          }
+          State.removeGroupForClient(clientId);
+          resolve({ success: true, ungroupedCount: tabIds.length });
+        });
+      });
+    });
+  }
+
+  function tabGetGroupInfo(context) {
+    var clientId = context.clientId;
+    var cachedGroupId = null;
+    var baseName = null;
+    try {
+      cachedGroupId = State.getGroupIdForClient(clientId);
       baseName = CDPUtils.getGroupBaseName(clientId);
     } catch (e) {
       Logger.error('[TabGetGroupInfo] Error: ' + (e.message || e));
     }
-    return Promise.resolve({ groupId: groupId, baseName: baseName, clientId: clientId });
+
+    var attachedTabIds = State.getAttachedTabIds();
+    var matchedTabId = null;
+    for (var i = 0; i < attachedTabIds.length; i++) {
+      if (State.getClientIdByTabId(attachedTabIds[i]) === clientId) {
+        matchedTabId = attachedTabIds[i];
+        break;
+      }
+    }
+
+    if (matchedTabId == null) {
+      return Promise.resolve({
+        groupId: -1,
+        cachedGroupId: cachedGroupId,
+        baseName: baseName,
+        clientId: clientId,
+        tabId: null
+      });
+    }
+
+    var tabId = matchedTabId;
+    return new Promise(function(resolve) {
+      chrome.tabs.get(tabId, function(tab) {
+        if (chrome.runtime.lastError) {
+          Logger.error('[TabGetGroupInfo] chrome.tabs.get error: ' + chrome.runtime.lastError.message);
+          resolve({
+            groupId: -1,
+            cachedGroupId: cachedGroupId,
+            baseName: baseName,
+            clientId: clientId,
+            tabId: tabId
+          });
+          return;
+        }
+        resolve({
+          groupId: tab.groupId != null ? tab.groupId : -1,
+          cachedGroupId: cachedGroupId,
+          baseName: baseName,
+          clientId: clientId,
+          tabId: tabId
+        });
+      });
+    });
   }
 
   function tabGetMuteStatus(params) {
@@ -322,6 +401,7 @@ var LocalHandler = (function() {
     getTargetInfoById: getTargetInfoById,
     mapToTargetInfo: mapToTargetInfo,
     tabGetMuteStatus: tabGetMuteStatus,
-    tabGetGroupInfo: tabGetGroupInfo
+    tabGetGroupInfo: tabGetGroupInfo,
+    tabUngroup: tabUngroup
   };
 })();

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

@@ -149,28 +149,8 @@ var SpecialHandler = (function() {
     }
     var baseName = CDPUtils.getGroupBaseName(groupClientId);
 
-    var retries = 0;
-    var maxRetries = 20;
-    function tryGroup() {
-      chrome.tabs.get(tabId, function(tab) {
-        if (chrome.runtime.lastError || !tab) {
-          Logger.error('[TabGroup] Tab not found:', tabId, 'retries:', retries);
-          return;
-        }
-        if (tab.status === 'complete') {
-          Logger.info('[TabGroup] Tab ready, executing group operation for:', baseName);
-          doGroup(tabId, groupClientId, baseName);
-        } else if (retries < maxRetries) {
-          retries++;
-          Logger.info('[TabGroup] Tab not ready (', tab.status, '), retry', retries, '/', maxRetries);
-          setTimeout(tryGroup, 200);
-        } else {
-          Logger.warn('[TabGroup] Tab never reached complete status, grouping anyway. tabId:', tabId);
-          doGroup(tabId, groupClientId, baseName);
-        }
-      });
-    }
-    tryGroup();
+    Logger.info('[TabGroup] Grouping tab immediately for:', baseName);
+    doGroup(tabId, groupClientId, baseName);
   }
 
   function doGroup(tabId, clientId, baseName, retries) {
@@ -608,6 +588,7 @@ function checkTabVisibility(tabId) {
     pageAddScriptToEvaluateOnNewDocument: pageAddScriptToEvaluateOnNewDocument,
     runtimeRunIfWaitingForDebugger: runtimeRunIfWaitingForDebugger,
     domSetFileInputFiles: domSetFileInputFiles,
-    updateTabGroupName: updateTabGroupName
+    updateTabGroupName: updateTabGroupName,
+    addTabToAutomationGroup: addTabToAutomationGroup
   };
 })();

package/extension-new/cdp/index.js

@@ -24,6 +24,7 @@ var CDP_HANDLERS = {
 
   'Tab.getMuteStatus': { type: 'LOCAL', handler: LocalHandler.tabGetMuteStatus },
   'Tab.getGroupInfo': { type: 'LOCAL', handler: LocalHandler.tabGetGroupInfo },
+  'Tab.ungroup': { type: 'LOCAL', handler: LocalHandler.tabUngroup },
 
   'SystemInfo.getInfo': { type: 'LOCAL', handler: LocalHandler.systemInfoGetInfo },
   'SystemInfo.getProcessInfo': { type: 'LOCAL', handler: LocalHandler.systemInfoGetProcessInfo },

package/extension-new/core/websocket.js

@@ -409,8 +409,8 @@ var WebSocketManager = (function() {
             return;
           }
           var groupId = State.getGroupIdForClient(clientId);
-          Logger.info('[Monitor] Tab', tabId, 'groupId=' + (tab.groupId || 'none'), 'expectedGroup=' + (groupId || 'none'), 'clientId=' + (clientId || 'none'));
-          if (tab.groupId) return;
+          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() {

package/package.json

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