cdp-tunnel 2.10.11 → 2.10.14

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

@@ -1,4 +1,13 @@
 var ForwardHandler = (function() {
+  // 合成输入事件（keyboard/mouse）需要页面 visibility=visible 才能投递到 DOM。
+  // cdp-tunnel 的隔离 tab（active:false + 折叠分组）默认 visibility=hidden，
+  // 导致 Input.dispatchKeyEvent/dispatchMouseEvent 被 Chromium 丢弃。
+  // 这些命令发送前需要 Page.bringToFront 让页面变 visible + 恢复焦点。
+  var SYNTHETIC_INPUT_METHODS = [
+    'Input.dispatchKeyEvent',
+    'Input.dispatchMouseEvent'
+  ];
+
   function execute(context) {
     var id = context.id;
     var method = context.method;
@@ -19,11 +28,52 @@ var ForwardHandler = (function() {
     }
 
     Logger.debug('[Forward]', method, '-> tabId:', tabId);
+
+    // 合成输入事件需要页面 visible：先 ensureVisible 再发命令
+    if (SYNTHETIC_INPUT_METHODS.indexOf(method) >= 0) {
+      return ensureVisible(tabId).then(function() {
+        return chrome.debugger.sendCommand({ tabId: tabId }, method, params);
+      }).then(function(result) {
+        return result || {};
+      });
+    }
+
     return chrome.debugger.sendCommand({ tabId: tabId }, method, params).then(function(result) {
       return result || {};
     });
   }
 
+  /**
+   * 让 tab 变 visible：Page.bringToFront + 等 visibilitychange + 恢复焦点。
+   * bringToFront 会重置页面元素焦点，需要保存/恢复。
+   */
+  function ensureVisible(tabId) {
+    // 1. 保存焦点：给 activeElement 打标记
+    return chrome.debugger.sendCommand({ tabId: tabId }, 'Runtime.evaluate', {
+      expression: '(function(){var el=document.activeElement;if(el&&el!==document.body&&el.focus){el.setAttribute("data-cdp-saved-focus","1");return 1}return 0})()',
+      returnByValue: true
+    }).catch(function() { return { result: { value: 0 } }; }).then(function(res) {
+      var hadFocus = res && res.result && res.result.value;
+
+      // 2. bringToFront 让 visibility 从 hidden→visible
+      return chrome.debugger.sendCommand({ tabId: tabId }, 'Page.bringToFront', {}).then(function() {
+        // 3. 等 visibilitychange 事件 + 双 rAF（确保 renderer 完成切换）
+        return chrome.debugger.sendCommand({ tabId: tabId }, 'Runtime.evaluate', {
+          expression: 'new Promise(function(r){function ok(){requestAnimationFrame(function(){requestAnimationFrame(function(){r(1)})})}if(document.visibilityState==="visible"){ok()}else{var d=function(){if(document.visibilityState==="visible"){document.removeEventListener("visibilitychange",d);ok()}};document.addEventListener("visibilitychange",d);setTimeout(function(){document.removeEventListener("visibilitychange",d);ok()},3000)}})',
+          awaitPromise: true
+        });
+      }).then(function() {
+        // 4. 恢复焦点
+        if (hadFocus) {
+          return chrome.debugger.sendCommand({ tabId: tabId }, 'Runtime.evaluate', {
+            expression: '(function(){var el=document.querySelector("[data-cdp-saved-focus]");if(el){el.removeAttribute("data-cdp-saved-focus");el.focus();return 1}return 0})()',
+            returnByValue: true
+          }).catch(function() {});
+        }
+      });
+    });
+  }
+
   function resolveTabId(sessionId, state) {
     if (!state) return null;
     if (sessionId) {

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

@@ -501,7 +501,8 @@ var LocalHandler = (function() {
       targetId: target.id || String(target.tabId),
       type: target.type || 'page',
       title: target.title || '',
-      url: target.url || '',
+      // 原生 Chrome CDP 中 page 类型 target 的 url 一定存在（至少 "about:blank"）
+      url: target.url || 'about:blank',
       attached: !!target.attached,
       canAccessOpener: false,
       browserContextId: 'default'

package/extension-new/core/debugger.js

@@ -72,6 +72,10 @@ var DebuggerManager = (function() {
 })();
 `;
 
+  // 跟踪每个 tab 最后一次非 about:blank 的导航 url
+  // 用于过滤 attach 时 Chrome 重放的 about:blank frameNavigated 事件
+  var tabLastRealUrl = {};
+
   function attach(tabId, connState) {
     var state = connState || _getAnyStateForTab(tabId);
     if (tabId == null) {
@@ -289,6 +293,23 @@ var DebuggerManager = (function() {
       }
     }
 
+    // 过滤 attach 时 Chrome 重放的 about:blank frameNavigated 事件
+    // 原生 Chrome CDP 中，navigate 成功后不会回退到 about:blank
+    if (method === 'Page.frameNavigated' && params && params.frame) {
+      var navUrl = params.frame.url || '';
+      var tabIdKey = String(source.tabId);
+
+      if (navUrl && navUrl !== 'about:blank') {
+        // 记录真实导航 url
+        tabLastRealUrl[tabIdKey] = navUrl;
+      } else if (navUrl === 'about:blank' && tabLastRealUrl[tabIdKey]) {
+        // tab 已经导航到真实 url，但收到 about:blank 的 frameNavigated
+        // 这是 attach 时 Chrome 重放的旧事件，过滤掉
+        Logger.info('[Event] Filtering stale about:blank frameNavigated for tab', source.tabId, '(real url:', tabLastRealUrl[tabIdKey] + ')');
+        return;
+      }
+    }
+
     for (var i = 0; i < sessionIds.length; i++) {
       EventBuilder.send(method, params, sessionIds[i], wsManager);
     }
@@ -297,6 +318,8 @@ var DebuggerManager = (function() {
   function handleDetach(source, reason) {
     Logger.info('[Debugger] Detached from tab', source.tabId, ', reason:', reason);
 
+    delete tabLastRealUrl[String(source.tabId)];
+
     var entry = ConnectionManager.getConnectionByTabId(source.tabId);
     var state = entry ? entry.state : null;
     var wsManager = entry ? entry.wsManager : null;

package/extension-new/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "CDP Bridge",
-  "version": "2.10.11",
+  "version": "2.10.14",
   "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:17606/plugin',
+  WS_URL: 'ws://localhost:9221/plugin',
   RECONNECT_DELAY: 3000,
   DEBUGGER_VERSION: '1.3',
   HEARTBEAT_INTERVAL: 25000,

package/package.json

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

@@ -361,17 +361,9 @@ async function handleHttpRequest(req, res) {
     if (url.pathname === '/json' || url.pathname === '/json/' ||
         url.pathname === '/json/list' || url.pathname === '/json/list/' ||
         url.pathname.match(/^\/json\/list\/[^/]+$/)) {
-        // create 模式（9221）：HTTP /json/list 无 clientId 上下文，无法做归属过滤
-        // 标准客户端（Playwright/Puppeteer）走 WS Target.setAutoAttach，不依赖此接口
-        // takeover 模式（9222）：操作的是用户自己的 tab，返回全部是预期行为
-        if (!req._takeoverMode) {
-            if (shouldLog('info')) {
-                console.log(`[JSON LIST] create mode — returning empty list for isolation`);
-            }
-            res.writeHead(200, { 'Content-Type': 'application/json' });
-            res.end(JSON.stringify([]));
-            return;
-        }
+        // 注意：Playwright connectOverCDP 和 Puppeteer connect 都依赖 /json/list 发现 targets
+        // HTTP 端无 clientId 上下文，无法做归属过滤，但 attach 路径（handlePageConnection）有归属校验
+        // 所以即使列表可见，无归属 target 也无法被 attach（close 1008）
         const pluginWs = resolvePluginFromUrl(url);
         const targets = await requestTargetsFromPlugin(pluginWs);
         const browserId = pluginWs ? pluginWs.pluginId : BROWSER_ID;
@@ -402,7 +394,31 @@ async function handleHttpRequest(req, res) {
         res.end(JSON.stringify(targetList));
         return;
     }
-    
+
+    if (url.pathname === '/debug/maps') {
+        const stats = {};
+        for (const [pluginWs, ns] of pluginNamespaces) {
+            stats.targetIdToClientId = ns.targetIdToClientId.size;
+            stats.sessionToClientId = ns.sessionToClientId.size;
+            stats.browserContextToClientId = ns.browserContextToClientId.size;
+            stats.clientIdToBrowserContext = ns.clientIdToBrowserContext.size;
+            stats.pendingAttachedEvents = ns.pendingAttachedEvents.size;
+            stats.pendingTargetCreatedEvents = ns.pendingTargetCreatedEvents.size;
+            stats.pendingSessionToClientId = (ns.pendingSessionToClientId || new Map()).size;
+            stats.discoveringClientIds = ns.discoveringClientIds.size;
+            stats.cachedTargets = ns.cachedTargets.length;
+        }
+        stats.globalRequestIdMap = globalRequestIdMap.size;
+        stats.connectionPairs = connectionPairs.size;
+        stats.clientById = clientById.size;
+        stats.clientIdToPlugin = clientIdToPlugin.size;
+        stats.clientConnections = clientConnections.size;
+        stats.pluginConnections = pluginConnections.size;
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify(stats, null, 2));
+        return;
+    }
+
     res.writeHead(404, { 'Content-Type': 'text/plain' });
     res.end('Not Found');
 }
@@ -551,6 +567,33 @@ function cleanupClient(ws, id, reason) {
         for (const [tId, cId] of ns.targetIdToClientId.entries()) {
             if (cId === id) ns.targetIdToClientId.delete(tId);
         }
+        // session 清理：value 可能是 clientId（正常）或 targetId（旧 bug 残留，兼容清理）
+        const clientTargetIds = new Set();
+        for (const [tId, cId] of ns.targetIdToClientId.entries()) {
+            if (cId === id) clientTargetIds.add(tId);
+        }
+        for (const [sId, val] of ns.sessionToClientId.entries()) {
+            if (val === id || clientTargetIds.has(val)) {
+                ns.sessionToClientId.delete(sId);
+            }
+        }
+        // 清理 pending session（归属未定的暂存）
+        if (ns.pendingSessionToClientId) {
+            for (const [pSid, pTid] of ns.pendingSessionToClientId.entries()) {
+                if (clientTargetIds.has(pTid)) ns.pendingSessionToClientId.delete(pSid);
+            }
+        }
+        // 清理 pending 事件（targetCreated/attachedToTarget 缓存，防止泄漏）
+        if (ns.pendingAttachedEvents) {
+            for (const [pTid] of ns.pendingAttachedEvents.entries()) {
+                if (clientTargetIds.has(pTid)) ns.pendingAttachedEvents.delete(pTid);
+            }
+        }
+        if (ns.pendingTargetCreatedEvents) {
+            for (const [pTid] of ns.pendingTargetCreatedEvents.entries()) {
+                if (clientTargetIds.has(pTid)) ns.pendingTargetCreatedEvents.delete(pTid);
+            }
+        }
         for (const [bcId, cId] of ns.browserContextToClientId.entries()) {
             if (cId === id) ns.browserContextToClientId.delete(bcId);
         }
@@ -882,8 +925,11 @@ function handlePluginConnection(ws, clientInfo, request) {
                         ns.sessionToClientId.set(sessionId, clientId);
                         console.log(`[SESSION MAPPED] sessionId=${sessionId?.substring(0,8) || 'none'} -> clientId=${clientId?.substring(0,8) || 'none'}`);
                     } else {
-                        ns.sessionToClientId.set(sessionId, targetId);
-                        console.log(`[SESSION MAPPED] sessionId=${sessionId?.substring(0,8) || 'none'} -> targetId=${targetId?.substring(0,8) || 'none'} (no pairedClientId)`);
+                        // 以前这里存 targetId 作为 value，导致 cleanupClient 按 clientId 匹配时清不掉（泄漏）
+                        // 改为：暂存到 pendingSessionToClientId，等 targetId 归属绑定时再补绑
+                        if (!ns.pendingSessionToClientId) ns.pendingSessionToClientId = new Map();
+                        ns.pendingSessionToClientId.set(sessionId, targetId);
+                        console.log(`[SESSION MAPPED] sessionId=${sessionId?.substring(0,8) || 'none'} -> targetId=${targetId?.substring(0,8) || 'none'} (pending, no clientId yet)`);
                     }
                 }
             }
@@ -948,7 +994,19 @@ function handlePluginConnection(ws, clientInfo, request) {
                         const targetId = parsed.result.targetId;
                         ns.targetIdToClientId.set(targetId, mapping.clientId);
                         console.log(`[TARGET MAPPED] targetId=${targetId} -> clientId=${mapping.clientId} mapSize=${ns.targetIdToClientId.size}`);
-                        
+
+                        // 补绑 pending 的 session（之前 targetId 归属未定时暂存的）
+                        if (ns.pendingSessionToClientId && ns.pendingSessionToClientId.size > 0) {
+                            const pendingSessionId = null;
+                            for (const [pSid, pTid] of ns.pendingSessionToClientId.entries()) {
+                                if (pTid === targetId) {
+                                    ns.sessionToClientId.set(pSid, mapping.clientId);
+                                    ns.pendingSessionToClientId.delete(pSid);
+                                    console.log(`[SESSION MAPPED from pending] sessionId=${pSid?.substring(0,8)} -> clientId=${mapping.clientId?.substring(0,8)} (targetId=${targetId?.substring(0,8)})`);
+                                }
+                            }
+                        }
+
                         const cachedCreated = ns.pendingTargetCreatedEvents.get(targetId);
                         if (cachedCreated) {
                             clientWs.send(cachedCreated.cdpData);