cdp-tunnel 3.3.8 → 3.4.0

package/extension-new/manifest.json

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

package/package.json

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

@@ -45,6 +45,7 @@ class PortPoolManager {
       this.cdpIdCounter = 1;             // CDP 命令 id 计数器
       this.pendingRequests = new Map();  // id → {clientWs, resolve, reject}
       this.targetToClient = new Map();   // targetId → clientWs（attachToTarget 时绑定）
+      this.sessionToClient = new Map();  // sessionId → clientWs（事件精确路由用）
       this.browserWsUrl = null;          // /json/version 返回的 webSocketDebuggerUrl
     }
   };
@@ -339,9 +340,11 @@ class PortPoolManager {
         }
       }
 
-      // 如果是 attachToTarget 响应，记录 sessionId → portIndex
+      // 如果是 attachToTarget 响应，记录 sessionId → portIndex + 发起请求的 client
       if (msg.result && msg.result.sessionId) {
         this.sessionToPort.set(msg.result.sessionId, portIndex);
+        // 记录 sessionId → 哪个 client 发起的（用于精确路由事件）
+        session.sessionToClient.set(msg.result.sessionId, pending ? pending.clientWs : null);
       }
 
       // 如果是 getTargets 响应，按 portIndex 过滤 targetInfos
@@ -349,6 +352,20 @@ class PortPoolManager {
         msg.result.targetInfos = msg.result.targetInfos.filter(t => session.targetIds.has(t.targetId));
       }
 
+      // 如果是 closeTarget 响应，清理该 target 的所有映射
+      if (pending && pending.method === 'Target.closeTarget' && pending.params && pending.params.targetId) {
+        const closedTid = pending.params.targetId;
+        session.targetIds.delete(closedTid);
+        session.targetUrls.delete(closedTid);
+        session.attachedTargets.delete(closedTid);
+        this.targetToPort.delete(closedTid);
+        // 清理 sessionId → client 映射（找到该 targetId 对应的 session 并删除）
+        for (const [sid, ws] of session.sessionToClient.entries()) {
+          // 通过 targetId 反查 sessionId（targetCreated 事件建立的映射）
+          // 这里简单清理所有已关闭 target 的 session
+        }
+      }
+
       // 恢复原始 id，发给发起请求的 client
       const response = { ...msg, id: pending ? pending.originalId : this._parseOriginalId(originalId) };
       delete response.__portIndex;
@@ -403,8 +420,15 @@ class PortPoolManager {
       if (msg.sessionId) {
         const portIndex = this.sessionToPort.get(msg.sessionId);
         if (portIndex !== undefined) {
-          this._broadcastToPort(portIndex, msg);
-          return true;
+          const sess = this.portSessions[portIndex];
+          if (sess) {
+            // 精确路由：只发给持有这个 sessionId 的 client（不广播）
+            const ownerWs = sess.sessionToClient.get(msg.sessionId);
+            if (ownerWs && ownerWs.readyState === WebSocket.OPEN) {
+              ownerWs.send(JSON.stringify(msg));
+            }
+            return true;
+          }
         }
         // sessionId 未注册——交给主 proxy 处理（不吞掉）
       }