cdp-tunnel 2.5.18 → 2.5.20

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

@@ -228,6 +228,56 @@ var LocalHandler = (function() {
     });
   }
 
+  function tabSimulateUserOpen(context) {
+    var attachedTabIds = State.getAttachedTabIds();
+    var openerTabId = null;
+    for (var i = 0; i < attachedTabIds.length; i++) {
+      if (State.isCDPCreatedTab(attachedTabIds[i])) {
+        openerTabId = attachedTabIds[i];
+        break;
+      }
+    }
+    if (openerTabId == null) {
+      return Promise.resolve({ success: false, error: 'No CDP-created tab found to use as opener' });
+    }
+    return new Promise(function(resolve) {
+      chrome.tabs.create({ url: 'https://example.com', openerTabId: openerTabId }, function(tab) {
+        if (chrome.runtime.lastError) {
+          Logger.error('[TabSimulateUserOpen] Error: ' + chrome.runtime.lastError.message);
+          resolve({ success: false, error: chrome.runtime.lastError.message });
+          return;
+        }
+        setTimeout(function() {
+          chrome.tabs.get(tab.id, function(t) {
+            resolve({ success: true, newTabId: tab.id, openerTabId: openerTabId, actualOpenerTabId: t.openerTabId, actualGroupId: t.groupId });
+          });
+        }, 1000);
+      });
+    });
+  }
+
+  function tabGetTabGroup(context) {
+    var tabId = context.params && context.params.tabId;
+    if (tabId == null) {
+      return Promise.resolve({ error: 'tabId is required' });
+    }
+    return new Promise(function(resolve) {
+      chrome.tabs.get(tabId, function(tab) {
+        if (chrome.runtime.lastError) {
+          Logger.error('[TabGetTabGroup] Error: ' + chrome.runtime.lastError.message);
+          resolve({ tabId: tabId, groupId: -1, error: chrome.runtime.lastError.message });
+          return;
+        }
+        resolve({
+          tabId: tab.id,
+          groupId: tab.groupId != null ? tab.groupId : -1,
+          url: tab.url || '',
+          openerTabId: tab.openerTabId || null
+        });
+      });
+    });
+  }
+
   function tabGetMuteStatus(params) {
     var cdpOnly = params && params.cdpOnly;
     var attachedTabIds = State.getAttachedTabIds();
@@ -403,6 +453,8 @@ var LocalHandler = (function() {
     mapToTargetInfo: mapToTargetInfo,
     tabGetMuteStatus: tabGetMuteStatus,
     tabGetGroupInfo: tabGetGroupInfo,
-    tabUngroup: tabUngroup
+    tabUngroup: tabUngroup,
+    tabSimulateUserOpen: tabSimulateUserOpen,
+    tabGetTabGroup: tabGetTabGroup
   };
 })();

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

@@ -100,35 +100,65 @@ var SpecialHandler = (function() {
     var url = (params && params.url) || 'about:blank';
     var browserContextId = (params && params.browserContextId) || 'default';
     var clientId = context.clientId;
+    var needsNavigate = url !== 'about:blank' && url !== '';
 
     return new Promise(function(resolve, reject) {
-      State.addPendingCreatedTabUrl(url);
-      // 默认设置active: false，避免自动切换标签页
-      chrome.tabs.create({ url: url, active: false }, function(tab) {
+      // Step 1: 先创建 about:blank (不加载任何资源，tab bar 闪烁最小)
+      chrome.tabs.create({ url: 'about:blank', active: false }, function(tab) {
         if (!tab || !tab.id) {
-          State.removePendingCreatedTabUrl(url);
           reject(new Error('Failed to create tab'));
           return;
         }
 
-        // 保存tabId到clientId的映射，用于后续分组
         if (clientId) {
           State.setTabIdToClientId(tab.id, clientId);
         }
 
         State.addCDPCreatedTab(tab.id);
 
-        addTabToAutomationGroup(tab.id, clientId);
-
-        getTargetIdByTabId(tab.id).then(function(targetId) {
-          return emitAutoAttachEvents(tab.id, targetId, browserContextId).then(function() {
-            resolve({ targetId: targetId });
+        // Step 2: 立刻分组折叠 (用户在 tab bar 上看不到)
+        groupTabSilently(tab.id, clientId).then(function() {
+          // Step 3: 获取 targetId 并 attach debugger
+          return getTargetIdByTabId(tab.id).then(function(targetId) {
+            return emitAutoAttachEvents(tab.id, targetId, browserContextId).then(function() {
+              // Step 4: 折叠+attach 完成后，再导航到真实 URL
+              if (needsNavigate) {
+                State.addPendingCreatedTabUrl(url);
+                return navigateTabQuietly(tab.id, url).then(function() {
+                  resolve({ targetId: targetId });
+                });
+              }
+              resolve({ targetId: targetId });
+            });
           });
+        }).catch(function(err) {
+          Logger.error('[CreateTarget] Error:', err.message || err);
+          reject(err);
         });
       });
     });
   }
 
+  function groupTabSilently(tabId, clientId) {
+    return new Promise(function(resolve) {
+      addTabToAutomationGroup(tabId, clientId);
+      // 分组操作是异步的，给一点时间让 tab 被收进折叠的 group
+      setTimeout(resolve, 100);
+    });
+  }
+
+  function navigateTabQuietly(tabId, url) {
+    return new Promise(function(resolve) {
+      chrome.tabs.update(tabId, { url: url }, function() {
+        if (chrome.runtime.lastError) {
+          Logger.warn('[NavigateQuietly] Failed:', chrome.runtime.lastError.message);
+        }
+        // 不管成功失败都 resolve，让调用者继续
+        resolve();
+      });
+    });
+  }
+
   function addTabToAutomationGroup(tabId, clientId) {
     Logger.info('[TabGroup] Starting addTabToAutomationGroup for tabId:', tabId, 'clientId:', clientId);
 

package/extension-new/cdp/index.js

@@ -25,6 +25,8 @@ var CDP_HANDLERS = {
   'Tab.getMuteStatus': { type: 'LOCAL', handler: LocalHandler.tabGetMuteStatus },
   'Tab.getGroupInfo': { type: 'LOCAL', handler: LocalHandler.tabGetGroupInfo },
   'Tab.ungroup': { type: 'LOCAL', handler: LocalHandler.tabUngroup },
+  'Tab.simulateUserOpen': { type: 'LOCAL', handler: LocalHandler.tabSimulateUserOpen },
+  'Tab.getTabGroup': { type: 'LOCAL', handler: LocalHandler.tabGetTabGroup },
 
   'SystemInfo.getInfo': { type: 'LOCAL', handler: LocalHandler.systemInfoGetInfo },
   'SystemInfo.getProcessInfo': { type: 'LOCAL', handler: LocalHandler.systemInfoGetProcessInfo },

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.18",
+  "version": "2.5.20",
   "description": "Chrome DevTools Protocol Bridge for Playwright/Puppeteer automation",
   "permissions": [
     "debugger",

package/package.json

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

@@ -1169,7 +1169,6 @@ function handlePageConnection(ws, clientInfo, targetId) {
     const plugin = pluginConnections.values().next().value;
     if (plugin && plugin.readyState === WebSocket.OPEN) {
         ws.pairedPlugin = plugin;
-        plugin.pairedClientId = id;
         if (shouldLog('info')) {
             console.log(`  - Paired with plugin: ${plugin.id}`);
         }
@@ -1268,7 +1267,9 @@ function handlePageConnection(ws, clientInfo, targetId) {
 
         if (ws.pairedPlugin && ws.pluginMessageHandler) {
             ws.pairedPlugin.off('message', ws.pluginMessageHandler);
-            ws.pairedPlugin.pairedClientId = null;
+            if (ws.pairedPlugin.pairedClientId === id) {
+                ws.pairedPlugin.pairedClientId = null;
+            }
             
             safeSend(ws.pairedPlugin, JSON.stringify({
                 type: 'client-disconnected',
@@ -1291,7 +1292,9 @@ function handlePageConnection(ws, clientInfo, targetId) {
         
         if (ws.pairedPlugin && ws.pluginMessageHandler) {
             ws.pairedPlugin.off('message', ws.pluginMessageHandler);
-            ws.pairedPlugin.pairedClientId = null;
+            if (ws.pairedPlugin.pairedClientId === id) {
+                ws.pairedPlugin.pairedClientId = null;
+            }
         }
         
         ws.pluginMessageHandler = null;
@@ -1336,8 +1339,8 @@ function broadcastToClients(data, excludeWs = null) {
     let sent = 0;
     logCDP('BROADCAST', `Starting broadcast to ${clientConnections.size} clients, data preview: ${data.substring(0, 200)}`);
     clientConnections.forEach((client) => {
-        logCDP('BROADCAST', `Checking client ${client.id}, state=${client.readyState}, excluded=${client === excludeWs}`);
-        if (client !== excludeWs && safeSend(client, data, 'client')) {
+        logCDP('BROADCAST', `Checking client ${client.id}, state=${client.readyState}, excluded=${client === excludeWs}, hasOwnHandler=${!!client.pluginMessageHandler}`);
+        if (client !== excludeWs && !client.pluginMessageHandler && safeSend(client, data, 'client')) {
             sent++;
             logCDP('BROADCAST', `Sent to client ${client.id}`);
         }