cdp-tunnel 2.5.19 → 2.5.21

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

@@ -162,6 +162,8 @@ var SpecialHandler = (function() {
   function addTabToAutomationGroup(tabId, clientId) {
     Logger.info('[TabGroup] Starting addTabToAutomationGroup for tabId:', tabId, 'clientId:', clientId);
 
+    WebSocketManager.send({ type: 'tabgroup-debug', tabId: tabId, clientId: clientId, phase: 'start' });
+
     setTimeout(function() {
       muteTabIfNeeded(tabId);
     }, 200);
@@ -185,12 +187,20 @@ var SpecialHandler = (function() {
 
   function doGroup(tabId, clientId, baseName, retries) {
     retries = retries || 0;
+    Logger.info('[TabGroup] doGroup: tabId=' + tabId + ' clientId=' + (clientId || 'none') + ' baseName=' + baseName + ' retry=' + retries);
     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');
       var existing = CDPUtils.findGroupByName(allGroups, baseName);
       if (existing) {
+        Logger.info('[TabGroup] Found existing group:', existing.id, 'title:', existing.title);
         chrome.tabs.group({ tabIds: tabId, groupId: existing.id }, function(result) {
           if (chrome.runtime.lastError) {
             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);
             }
@@ -201,14 +211,18 @@ var SpecialHandler = (function() {
           }
         });
       } else {
+        Logger.info('[TabGroup] No existing group, creating new one for tab:', tabId);
         chrome.tabs.group({ tabIds: tabId }, function(groupId) {
           if (chrome.runtime.lastError) {
             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);
             }
             return;
           }
+          Logger.info('[TabGroup] chrome.tabs.group returned groupId:', groupId);
+          EventBuilder.send('CDPTunnel.debug', { source: 'doGroup', phase: 'groupCreated', tabId: tabId, groupId: groupId });
           if (groupId) {
             chrome.tabGroups.update(groupId, {
               title: baseName,
@@ -217,12 +231,15 @@ var SpecialHandler = (function() {
             }, function() {
               if (chrome.runtime.lastError) {
                 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 });
               } else {
                 State.setGroupIdForClient(clientId, groupId);
                 updateTabGroupName(clientId);
                 Logger.info('[TabGroup] Created new group:', groupId, 'with tab:', tabId);
               }
             });
+          } else {
+            Logger.error('[TabGroup] chrome.tabs.group returned null groupId');
           }
         });
       }

package/extension-new/core/state.js

@@ -263,6 +263,10 @@ var State = (function() {
     return _state.cdpCreatedTabIds.has(tabId);
   }
 
+  function getCDPCreatedTabIds() {
+    return Array.from(_state.cdpCreatedTabIds);
+  }
+
   function clearAllState() {
     clearSessionState();
     _state.attachedTabIds.clear();
@@ -506,6 +510,7 @@ var State = (function() {
     removePreExistingTab: removePreExistingTab,
     clearPreExistingTabsForClient: clearPreExistingTabsForClient,
     addCDPCreatedTab: addCDPCreatedTab,
-    isCDPCreatedTab: isCDPCreatedTab
+    isCDPCreatedTab: isCDPCreatedTab,
+    getCDPCreatedTabIds: getCDPCreatedTabIds
   };
 })();

package/extension-new/core/websocket.js

@@ -339,23 +339,40 @@ var WebSocketManager = (function() {
 
   function closeTabsByClientId(clientId, resolve) {
     var attachedTabs = State.getAttachedTabIds();
+    var cdpCreatedTabs = State.getCDPCreatedTabIds();
     var tabsToClose = [];
+    var tabsToCloseSet = new Set();
+    
+    Logger.info('[WS] closeTabsByClientId: clientId=' + clientId + ' attachedTabs=' + JSON.stringify(attachedTabs) + ' cdpCreatedTabs=' + JSON.stringify(cdpCreatedTabs));
     
-    Logger.info('[WS] closeTabsByClientId: clientId=' + clientId + ' attachedTabs=' + JSON.stringify(attachedTabs));
     attachedTabs.forEach(function(tabId) {
       var tabClientId = State.getClientIdByTabId(tabId);
       var isPre = State.isPreExistingTab(tabId);
       var isCDP = State.isCDPCreatedTab(tabId);
-      Logger.info('[WS]   tabId=' + tabId + ' clientId=' + tabClientId + ' isPre=' + isPre + ' isCDP=' + isCDP);
+      Logger.info('[WS]   [attached] tabId=' + tabId + ' clientId=' + tabClientId + ' isPre=' + isPre + ' isCDP=' + isCDP);
       if (tabClientId === clientId && !isPre) {
-        tabsToClose.push(tabId);
+        tabsToCloseSet.add(tabId);
       }
     });
     
+    cdpCreatedTabs.forEach(function(tabId) {
+      if (tabsToCloseSet.has(tabId)) return;
+      
+      var tabClientId = State.getClientIdByTabId(tabId);
+      var isPre = State.isPreExistingTab(tabId);
+      Logger.info('[WS]   [cdpCreated] tabId=' + tabId + ' clientId=' + tabClientId + ' isPre=' + isPre + ' isAttached=' + attachedTabs.includes(tabId));
+      if (tabClientId === clientId && !isPre && !attachedTabs.includes(tabId)) {
+        tabsToCloseSet.add(tabId);
+        Logger.info('[WS]     -> Added to close list (not yet attached)');
+      }
+    });
+    
+    tabsToClose = Array.from(tabsToCloseSet);
+    
     Logger.info('[WS] closeTabsByClientId: will close ' + tabsToClose.length + ' tabs');
     
     if (tabsToClose.length === 0) {
-      Logger.info('[WS] No attached tabs found for clientId:', clientId);
+      Logger.info('[WS] No tabs found for clientId:', clientId);
       resolve();
       return;
     }

package/extension-new/manifest.json

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

package/package.json

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

package/server/proxy-server.js

@@ -633,11 +633,18 @@ function handlePluginConnection(ws, clientInfo) {
         
         console.log(`[PLUGIN MSG] id=${parsed?.id} method=${parsed?.method || 'none'} type=${parsed?.type || 'none'} sessionId=${parsed?.sessionId?.substring(0,8) || 'none'}`);
 
+        if (parsed?.type === 'tabgroup-debug') {
+            console.log(`[TABGROUP DEBUG] ${JSON.stringify(parsed)}`);
+        }
+
         // 记录所有 PLUGIN -> CLIENT 消息到日志文件
         logCDP('PLUGIN -> CLIENT', data.toString().substring(0, CONFIG.LOG_MESSAGE_PREVIEW_LENGTH), parsed?.sessionId, ws.pluginType);
 
         // 处理 type: 'event' 消息（来自 background.js 的 screencast 等事件）
         if (parsed && parsed.type === 'event' && parsed.method) {
+            if (parsed.method.startsWith('CDPTunnel.')) {
+                console.log(`[EXT DEBUG] ${parsed.method}: ${JSON.stringify(parsed.params)}`);
+            }
             // 对于 Target 事件，始终广播给所有客户端
             const targetEvents = ['Target.targetCreated', 'Target.attachedToTarget', 'Target.targetDestroyed', 'Target.targetInfoChanged'];
             if (targetEvents.includes(parsed.method)) {