cdp-tunnel 3.0.6 → 3.0.8

package/extension-new/manifest.json

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

package/package.json

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

@@ -65,26 +65,18 @@ class PortPoolManager {
     this.portSessions[portIndex] = session;
 
     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);
-    });
+    this.createServers[portIndex] = server;
 
-    // WebSocket upgrade
+    // 端口池端口复用主 proxy 的 wss——通过 localPort 区分
     server.on('upgrade', (req, socket, head) => {
-      const url = new URL(req.url, `http://localhost:${port}`);
-      const path = url.pathname;
-      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);
+      req._poolPortIndex = portIndex;
+      req._poolPort = port;
+      // 转发给主 proxy 的 wss 处理
+      this.mainProxy.handlePoolUpgrade(req, socket, head, portIndex, port);
     });
+
+    server.on('request', (req, res) => {
+      this._handleHttp(req, res, session);
     });
 
     server.on('error', (err) => {
@@ -100,7 +92,6 @@ class PortPoolManager {
     });
 
     this.createServers[portIndex] = server;
-    this.createWss[portIndex] = wss;
   }
 
   _startTakeoverPort() {
@@ -181,6 +172,13 @@ class PortPoolManager {
       return;
     }
 
+    // 通知扩展有 client 连接（扩展需要 hasConnectedClient=true 才转发 debugger 事件）
+    const poolClientId = `pool_${session.portIndex}_${Date.now()}`;
+    pluginWs.send(JSON.stringify({
+      type: 'client-connected',
+      clientId: poolClientId
+    }));
+
     // 合成输入命令需要 ensureVisible（和 forward.js 的逻辑一致）
     const SYNTHETIC_INPUT = ['Input.dispatchKeyEvent', 'Input.dispatchMouseEvent'];
 
@@ -195,6 +193,10 @@ class PortPoolManager {
           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, {

package/server/proxy-server.js

@@ -456,6 +456,15 @@ wss.on('connection', (ws, req) => {
     const path = url.pathname;
     const pathParts = path.split('/').filter(Boolean);
 
+    // v3.0 端口池连接：走 PortPoolManager 的隔离逻辑
+    if (req._poolPortIndex !== undefined && portPool) {
+        const session = portPool.portSessions[req._poolPortIndex];
+        if (session) {
+            portPool._handleClientConnect(ws, req, session);
+            return;
+        }
+    }
+
     const clientInfo = {
         ip: req.socket.remoteAddress,
         port: req.socket.remotePort
@@ -2130,6 +2139,12 @@ portPool = new PortPoolManager({
         for (const ws of pluginConnections) return ws;
         return null;
     },
+    handlePoolUpgrade: (req, socket, head, portIndex, port) => {
+        req._poolPortIndex = portIndex;
+        wss.handleUpgrade(req, socket, head, (ws) => {
+            wss.emit('connection', ws, req);
+        });
+    },
     getAllTargets: async (portIndex) => {
         const session = portPool.portSessions[portIndex];
         if (!session) return [];