cdp-tunnel 2.7.3 → 2.7.5

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

@@ -141,8 +141,11 @@ var SpecialHandler = (function() {
 
   function groupTabSilently(tabId, clientId) {
     return new Promise(function(resolve) {
-      addTabToAutomationGroup(tabId, clientId);
-      // 分组操作是异步的，给一点时间让 tab 被收进折叠的 group
+      try {
+        addTabToAutomationGroup(tabId, clientId);
+      } catch (e) {
+        Logger.error('[TabGroup] addTabToAutomationGroup threw:', e.message || e);
+      }
       setTimeout(resolve, 100);
     });
   }
@@ -165,7 +168,11 @@ var SpecialHandler = (function() {
     WebSocketManager.send({ type: 'tabgroup-debug', tabId: tabId, clientId: clientId, phase: 'start' });
 
     setTimeout(function() {
-      muteTabIfNeeded(tabId);
+      try {
+        muteTabIfNeeded(tabId);
+      } catch (e) {
+        Logger.error('[TabGroup] muteTabIfNeeded threw:', e.message || e);
+      }
     }, 200);
 
     var groupClientId = clientId;
@@ -188,6 +195,11 @@ 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);
+    if (!chrome.tabGroups) {
+      Logger.warn('[TabGroup] chrome.tabGroups API not available (headless mode?), skipping grouping for tab:', tabId);
+      EventBuilder.send('CDPTunnel.debug', { source: 'doGroup', phase: 'skip', reason: 'tabGroups-unavailable', tabId: tabId });
+      return;
+    }
     chrome.tabGroups.query({}, function(allGroups) {
       if (chrome.runtime.lastError) {
         Logger.error('[TabGroup] tabGroups.query failed:', chrome.runtime.lastError.message);
@@ -223,21 +235,26 @@ 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) {
-            chrome.tabGroups.update(groupId, {
-              title: baseName,
-              color: CDPUtils.getGroupColorForClient(clientId),
-              collapsed: true
-            }, 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);
-              }
-            });
+        if (groupId) {
+            if (chrome.tabGroups) {
+              chrome.tabGroups.update(groupId, {
+                title: baseName,
+                color: CDPUtils.getGroupColorForClient(clientId),
+                collapsed: true
+              }, 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] Group updated:', groupId, baseName);
+                }
+              });
+            } else {
+              State.setGroupIdForClient(clientId, groupId);
+              Logger.info('[TabGroup] Group created but tabGroups.update unavailable (headless):', groupId);
+            }
           } else {
             Logger.error('[TabGroup] chrome.tabs.group returned null groupId');
           }

package/extension-new/manifest.json

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

package/extension-new/utils/config.js

@@ -1,5 +1,5 @@
 var Config = {
-  WS_URL: 'ws://localhost:23297/plugin',
+  WS_URL: 'ws://localhost:58288/plugin',
   RECONNECT_DELAY: 3000,
   DEBUGGER_VERSION: '1.3',
   HEARTBEAT_INTERVAL: 25000,

package/package.json

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

@@ -788,24 +788,16 @@ function handlePluginConnection(ws, clientInfo, request) {
                 } else if (targetId && (parsed.method === 'Target.targetCreated' || parsed.method === 'Target.attachedToTarget')) {
                     const pendingMap = parsed.method === 'Target.targetCreated' ? ns.pendingTargetCreatedEvents : ns.pendingAttachedEvents;
                     
-                    let routedToDiscoverer = false;
-                    if (ns.discoveringClientIds.size > 0) {
-                        for (const [discClientId, timestamp] of ns.discoveringClientIds) {
-                            if (Date.now() - timestamp < 30000) {
-                                const discWs = clientById.get(discClientId);
-                                if (discWs && discWs.readyState === WebSocket.OPEN) {
-                                    discWs.send(cdpData);
-                                    routedToDiscoverer = true;
-                                }
-                            } else {
-                                ns.discoveringClientIds.delete(discClientId);
-                            }
-                        }
-                    }
+                    // Check if there's a pending Target.createTarget from any client.
+                    // If so, cache this event — createTarget response will deliver it to the right client.
+                    // If not, broadcast to discovering clients (for emitAutoAttachForExistingTargets etc.)
+                    const hasPendingCreateTarget = Array.from(globalRequestIdMap.values()).some(m => m.isCreateTarget);
                     
-                    if (!routedToDiscoverer) {
+                    if (hasPendingCreateTarget) {
                         pendingMap.set(targetId, { parsed: JSON.parse(JSON.stringify(parsed)), cdpData });
-                        console.log(`[TARGET EVENT PENDING] ${parsed.method} targetId=${targetId?.substring(0,8)} (cached, waiting for createTarget response)`);
+                        console.log(`[TARGET EVENT PENDING] ${parsed.method} targetId=${targetId?.substring(0,8) || 'none'} (cached, waiting for createTarget response)`);
+                    } else {
+                        console.log(`[TARGET EVENT DROPPED] ${parsed.method} targetId=${targetId?.substring(0,8) || 'none'} (no owner, dropped for isolation)`);
                     }
                 } else {
                     console.log(`[TARGET EVENT DROPPED] ${parsed.method} targetId=${targetId?.substring(0,8) || 'none'} (no owner, dropped for isolation)`);
@@ -818,7 +810,7 @@ function handlePluginConnection(ws, clientInfo, request) {
                 const sessionId = parsed.params?.sessionId;
                 
                 if (targetId && sessionId) {
-                    const clientId = ws.pairedClientId;
+                    const clientId = ns.targetIdToClientId.get(targetId) || ws.pairedClientId;
                     if (clientId) {
                         ns.sessionToClientId.set(sessionId, clientId);
                         console.log(`[SESSION MAPPED] sessionId=${sessionId?.substring(0,8) || 'none'} -> clientId=${clientId?.substring(0,8) || 'none'}`);
@@ -938,15 +930,33 @@ function handlePluginConnection(ws, clientInfo, request) {
                         invalidateTargetsCache(ws);
                     }
                     
-                    const originalId = mapping.originalId;
-                    parsed.id = originalId;
-                    if (mapping.sessionId && !parsed.sessionId) {
-                        parsed.sessionId = mapping.sessionId;
+                    if (mapping.isAutoDefaultPage) {
+                        console.log(`[AUTO DEFAULT PAGE] createTarget response received for client=${mapping.clientId}, targetId=${parsed.result?.targetId?.substring(0,8) || 'none'} — skipping response send to client`);
+                        
+                        if (mapping.pendingSetAutoAttach) {
+                            const pending = mapping.pendingSetAutoAttach;
+                            const pendingParsed = pending.parsed;
+                            const pendingClientId = pending.clientId;
+                            
+                            console.log(`[AUTO DEFAULT PAGE] Now forwarding pending setAutoAttach for client=${pendingClientId}`);
+                            
+                            if (ws.readyState === WebSocket.OPEN) {
+                                const forwardMsg = { ...pendingParsed, __clientId: pendingClientId };
+                                ws.send(JSON.stringify(forwardMsg));
+                                console.log(`[SEND TO PLUGIN] Forwarding setAutoAttach for client=${pendingClientId}`);
+                            }
+                        }
+                    } else {
+                        const originalId = mapping.originalId;
+                        parsed.id = originalId;
+                        if (mapping.sessionId && !parsed.sessionId) {
+                            parsed.sessionId = mapping.sessionId;
+                        }
+                        const responseStr = JSON.stringify(parsed);
+                        console.log(`[SEND TO CLIENT] ${responseStr.substring(0, 300)}`);
+                        clientWs.send(responseStr);
+                        console.log(`[ROUTE] Response global=${globalId} -> original=${originalId} -> client=${mapping.clientId} sessionId=${parsed.sessionId?.substring(0,8) || 'none'}`);
                     }
-                    const responseStr = JSON.stringify(parsed);
-                    console.log(`[SEND TO CLIENT] ${responseStr.substring(0, 300)}`);
-                    clientWs.send(responseStr);
-                    console.log(`[ROUTE] Response global=${globalId} -> original=${originalId} -> client=${mapping.clientId} sessionId=${parsed.sessionId?.substring(0,8) || 'none'}`);
                 }
                 globalRequestIdMap.delete(globalId);
             } else {
@@ -1042,6 +1052,52 @@ function handlePluginConnection(ws, clientInfo, request) {
     }));
 }
 
+function autoCreateDefaultPageAndForward(clientWs, setAutoAttachParsed, originalData, clientId, originalRequestId) {
+    const pluginWs = clientWs.pairedPlugin;
+    if (!pluginWs || pluginWs.readyState !== WebSocket.OPEN) {
+        forwardToPlugin(clientWs, originalData, clientId);
+        return;
+    }
+
+    globalRequestIdCounter++;
+    const createGlobalId = globalRequestIdCounter;
+
+    globalRequestIdMap.set(createGlobalId, {
+        clientId: clientId,
+        originalId: -1,
+        sessionId: null,
+        method: 'Target.createTarget',
+        isCreateTarget: true,
+        isAutoDefaultPage: true,
+        pendingSetAutoAttach: {
+            parsed: setAutoAttachParsed,
+            data: originalData,
+            clientId: clientId,
+            originalRequestId: originalRequestId
+        }
+    });
+
+    const request = {
+        id: createGlobalId,
+        method: 'Target.createTarget',
+        params: { url: 'about:blank' },
+        __clientId: clientId
+    };
+
+    console.log(`[AUTO DEFAULT PAGE] Sending Target.createTarget for client=${clientId} globalId=${createGlobalId}, will forward setAutoAttach after`);
+    pluginWs.send(JSON.stringify(request));
+}
+
+function forwardToPlugin(clientWs, data, clientId) {
+    const pluginWs = clientWs.pairedPlugin;
+    if (pluginWs && pluginWs.readyState === WebSocket.OPEN) {
+        console.log(`[SEND TO PLUGIN] method=Target.setAutoAttach clientId=${clientId}`);
+        pluginWs.send(data);
+    } else {
+        broadcastToPlugins(data, clientWs);
+    }
+}
+
 /**
  * 处理 CDP 客户端连接 (Playwright/Puppeteer)
  */
@@ -1244,6 +1300,12 @@ function handleClientConnection(ws, clientInfo, customClientId = null, targetPlu
             }
         }
 
+        if (parsed && parsed.method === 'Target.setAutoAttach' && parsed.params?.autoAttach && !ws._autoDefaultPageSent) {
+            ws._autoDefaultPageSent = true;
+            autoCreateDefaultPageAndForward(ws, parsed, modifiedData, id, originalId);
+            return;
+        }
+
         if (parsed && parsed.method === 'Browser.close') {
             if (shouldLog('info')) {
                 console.log(`\n[BROWSER CLOSE] Client ${id} requested Browser.close, forwarding to plugin`);