cdp-tunnel 3.0.4 → 3.0.6

package/extension-new/manifest.json

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

package/package.json

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

@@ -64,26 +64,27 @@ class PortPoolManager {
     const session = new PortPoolManager.PortSession(portIndex, port);
     this.portSessions[portIndex] = session;
 
-    const server = http.createServer((req, res) => {
+    const server = http.createServer();
+    const wss = new WebSocket.Server({ noServer: true });
+    this.createWss[portIndex] = wss;
+
+    // HTTP 请求（非 upgrade）
+    server.on('request', (req, res) => {
       this._handleHttp(req, res, session);
     });
 
-    const wss = new WebSocket.Server({ noServer: true });
-
+    // WebSocket upgrade
     server.on('upgrade', (req, socket, head) => {
       const url = new URL(req.url, `http://localhost:${port}`);
       const path = url.pathname;
-
-      // 只允许 client 连接（plugin 连的是 9221）
       if (path !== '/client' && !path.startsWith('/client/') &&
           !path.startsWith('/devtools/browser/') && !path.startsWith('/devtools/page/')) {
         socket.destroy();
         return;
       }
-
-      wss.handleUpgrade(req, socket, head, (ws) => {
-        this._handleClientConnect(ws, req, session);
-      });
+    wss.handleUpgrade(req, socket, head, (ws) => {
+      this._handleClientConnect(ws, req, session);
+    });
     });
 
     server.on('error', (err) => {
@@ -172,7 +173,6 @@ class PortPoolManager {
    */
   _handleClientConnect(ws, req, session) {
     session.clients.add(ws);
-    console.log(`[PORT ${session.port}] Client connected (total: ${session.clients.size})`);
 
     // 找到 plugin 连接（从主 proxy 获取）
     const pluginWs = this.mainProxy.getPluginConnection();
@@ -256,7 +256,6 @@ class PortPoolManager {
       // 如果是 attachToTarget 响应，记录 sessionId → portIndex
       if (msg.result && msg.result.sessionId) {
         this.sessionToPort.set(msg.result.sessionId, portIndex);
-        console.log(`[PORT POOL] sessionId=${msg.result.sessionId.slice(0,12)} → port ${session.port}`);
       }
 
       // 如果是 getTargets 响应，按 portIndex 过滤 targetInfos
@@ -276,9 +275,9 @@ class PortPoolManager {
       return true;
     }
 
-    // 2. 事件消息（无 id）：按 targetId 路由
+    // 2. 事件消息（无 id）：按 targetId 或 sessionId 路由
     if (msg.method && msg.params) {
-      // 从事件参数里提取 targetId
+      // 诊断：打印所有未匹配到的事件
       let targetId = null;
       if (msg.params.targetId) targetId = msg.params.targetId;
       else if (msg.params.targetInfo && msg.params.targetInfo.targetId) targetId = msg.params.targetInfo.targetId;
@@ -294,7 +293,7 @@ class PortPoolManager {
         }
       }
 
-      // sessionId 路由（attachedToTarget 后的 session 事件）
+      // sessionId 路由（Network/Screencast/Input 等 session 事件）
       if (msg.sessionId) {
         const portIndex = this.sessionToPort.get(msg.sessionId);
         if (portIndex !== undefined) {

package/server/proxy-server.js

@@ -812,7 +812,7 @@ function handlePluginConnection(ws, clientInfo, request) {
 
         // v3.0 端口池 hook：先让 PortPoolManager 处理端口池的消息
         if (parsed && portPool && portPool.handlePluginMessage(parsed, ws)) {
-            return;  // 已被端口池处理
+            return;
         }
 
         // 处理 keepalive 消息