cdp-tunnel 3.2.3 → 3.2.5

package/extension-new/manifest.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "3.2.3",
+  "version": "3.2.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/modules/port-pool.js

@@ -38,6 +38,7 @@ class PortPoolManager {
       this.portIndex = portIndex;
       this.port = port;
       this.targetIds = new Set();        // 这个端口创建的所有 targetId
+      this.targetUrls = new Map();       // targetId → url（navigate 时更新）
       this.tabIds = new Set();           // Chrome tabId（扩展端返回的）
       this.clients = new Set();          // 连接到这个端口的 client WebSocket
       this.cdpIdCounter = 1;             // CDP 命令 id 计数器
@@ -157,7 +158,7 @@ class PortPoolManager {
         targets.push({
           id: targetId,
           type: 'page',
-          url: 'about:blank',
+          url: session.targetUrls.get(targetId) || 'about:blank',
           title: '',
           webSocketDebuggerUrl: `ws://localhost:${session.port}/devtools/page/${targetId}`
         });
@@ -208,21 +209,25 @@ class PortPoolManager {
       try { msg = JSON.parse(data.toString()); } catch { return; }
 
       if (msg.id !== undefined) {
+        // createTarget 串行化（避免并发 chrome.tabs.create 回调串）
+        if (msg.method === 'Target.createTarget') {
+          while (session.createTargetLock) { await session.createTargetLock; }
+          session.createTargetLock = new Promise(r => { session._releaseCreateTarget = r; });
+        }
+
         // 合成输入命令：先 bringToFront + 等待，再发原命令
         if (SYNTHETIC_INPUT.indexOf(msg.method) >= 0 && msg.sessionId) {
           await this._ensureVisible(session, pluginWs, msg.sessionId);
         }
 
-        if (msg.method === 'Network.enable' || msg.method === 'Page.startScreencast') {
-          // 已转发，继续
-        }
-
         // 命令：分配新 id，记录映射（含 method 名供响应后处理），转发给 plugin
         const newId = `pool${session.portIndex}_${msg.id}`;
         session.pendingRequests.set(newId, {
           originalId: msg.id,
           method: msg.method,
-          clientWs: ws
+          clientWs: ws,
+          params: msg.params,
+          sessionId: msg.sessionId
         });
 
         const forwarded = { ...msg, id: newId, __portIndex: session.portIndex, __clientId: `pool_${session.port}` };
@@ -268,11 +273,31 @@ class PortPoolManager {
       const pending = session.pendingRequests.get(msg.id);
       session.pendingRequests.delete(msg.id);
 
-      // 如果是 createTarget 响应，记录 targetId → portIndex 归属
+      // 如果是 createTarget 响应，记录 targetId → portIndex 归属 + 初始 url + 释放锁
       if (msg.result && msg.result.targetId) {
-        session.targetIds.add(msg.result.targetId);
-        this.targetToPort.set(msg.result.targetId, portIndex);
-        console.log(`[PORT POOL] targetId=${msg.result.targetId.slice(0,12)} → port ${session.port}`);
+        const tid = msg.result.targetId;
+        session.targetIds.add(tid);
+        session.targetUrls.set(tid, pending?.params?.url || 'about:blank');
+        this.targetToPort.set(tid, portIndex);
+        // 释放 createTarget 锁
+        if (session._releaseCreateTarget) {
+          session._releaseCreateTarget();
+          session._releaseCreateTarget = null;
+          session.createTargetLock = null;
+        }
+      }
+
+      // 如果是 Page.navigate 响应，更新 targetId 的 url
+      if (pending && pending.method === 'Page.navigate' && pending.sessionId && msg.result) {
+        // 找 sessionId 对应的 targetId
+        for (const [tid, pidx] of this.targetToPort.entries()) {
+          if (pidx === portIndex) {
+            // 用 pending.params.url 更新
+            if (pending.params?.url) {
+              session.targetUrls.set(tid, pending.params.url);
+            }
+          }
+        }
       }
 
       // 如果是 attachToTarget 响应，记录 sessionId → portIndex