cdp-tunnel 2.10.11 → 2.10.12

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.12",
   "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:19286/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.12",
   "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;