cdp-tunnel 3.6.1 → 3.6.2

package/extension-new/manifest.json

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

package/package.json

@@ -1,20 +1,13 @@
 {
   "name": "cdp-tunnel",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "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",
+  "bin": {
+    "cdp-tunnel": "./cli/index.js"
+  },
   "scripts": {
     "start": "node server/proxy-server.js",
-    "client": "node client/playwright-client.js",
-    "client:puppeteer": "node client/puppeteer-client.js",
-    "test:compat": "node client/test-compat-client.js",
-    "test:newpage": "node client/test-newpage-sequence.js",
-    "record": "node cdp-recorder/record.js",
-    "benchmark": "node benchmark/run-all.js",
-    "benchmark:native": "node benchmark/run-all.js --native",
-    "benchmark:proxy": "node benchmark/run-all.js --proxy",
-    "demo": "node demo/server.js",
     "test:compare": "node tests/cdp-compare/cdp-compare-runner.js",
     "test": "node tests/e2e/run-all.js",
     "test:e2e": "node tests/e2e/run-all.js",
@@ -68,11 +61,6 @@
   "devDependencies": {
     "chrome-remote-interface": "^0.34.0",
     "husky": "^9.1.7",
-    "lz-string": "^1.5.0",
-    "pako": "^2.1.0",
-    "playwright": "^1.58.2",
-    "playwright-core": "^1.58.2",
-    "puppeteer-core": "^22.0.0",
-    "sharp": "^0.34.0"
+    "playwright": "^1.58.2"
   }
 }

package/server/modules/port-pool.js

@@ -334,7 +334,15 @@ class PortPoolManager {
 
     ws.on('close', () => {
       session.clients.delete(ws);
-      console.log(`[PORT ${session.port}] Client disconnected (remaining: ${session.clients.size})`);
+      // 内存泄漏修复：清理该 client 的 pendingRequests 和 sessionToClient 引用，
+      // 避免 plugin 永不响应时 entry 一直挂着 ws 对象
+      if (ws._origIds) ws._origIds.clear();
+      for (const [reqId, pending] of session.pendingRequests.entries()) {
+        if (pending.clientWs === ws) session.pendingRequests.delete(reqId);
+      }
+      for (const [sid, cws] of session.sessionToClient.entries()) {
+        if (cws === ws) session.sessionToClient.delete(sid);
+      }
       // 对齐原生 Chrome：断开不清理 tab
     });
 
@@ -481,6 +489,34 @@ class PortPoolManager {
         }
       }
 
+      // 内存泄漏修复：target 销毁/detach 时清理 sessionToPort、targetToPort、sessionToClient
+      // 之前只在 closeTarget 响应路径清理，事件路径漏了 → sessionToPort 无界增长
+      if (msg.method === 'Target.targetDestroyed' && targetId) {
+        const portIdx = this.targetToPort.get(targetId);
+        this.targetToPort.delete(targetId);
+        if (portIdx !== undefined) {
+          const sess = this.portSessions[portIdx];
+          if (sess) {
+            sess.targetIds.delete(targetId);
+            sess.targetUrls.delete(targetId);
+          }
+        }
+      }
+      if (msg.method === 'Target.detachedFromTarget') {
+        const sid = msg.params.sessionId;
+        if (sid) {
+          this.sessionToPort.delete(sid);
+          const portIdx = this.sessionToPort.get(sid);
+          if (portIdx !== undefined && this.portSessions[portIdx]) {
+            this.portSessions[portIdx].sessionToClient.delete(sid);
+          }
+        }
+        if (targetId) {
+          // detach 也意味着 target 不再活跃，清理 targetToPort（保留 targetIds 历史用于 list）
+          this.targetToPort.delete(targetId);
+        }
+      }
+
       if (targetId) {
         const portIndex = this.targetToPort.get(targetId);
         if (portIndex !== undefined) {

package/server/proxy-server.js

@@ -158,7 +158,19 @@ function updateExtensionState(connected) {
 clearLog();
 
 const wss = new WebSocket.Server({ noServer: true });
-const server = http.createServer((req, res) => handleHttpRequest(req, res));
+const server = http.createServer(async (req, res) => {
+    try {
+        await handleHttpRequest(req, res);
+    } catch (err) {
+        logCDP('error', 'Unhandled error in handleHttpRequest', { url: req.url, message: err.message });
+        if (!res.headersSent) {
+            try {
+                res.writeHead(500, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ error: 'Internal proxy error' }));
+            } catch (_) {}
+        }
+    }
+});
 
 const pluginConnections = new Set();
 const clientConnections = new Set();
@@ -236,8 +248,6 @@ async function requestVersionFromPlugin(pluginWs) {
 
     return new Promise((resolve) => {
         const requestId = `version_${Date.now()}`;
-        const timeout = setTimeout(() => resolve(null), 2000);
-
         const handler = (data) => {
             try {
                 const msg = JSON.parse(data.toString());
@@ -251,9 +261,13 @@ async function requestVersionFromPlugin(pluginWs) {
                 }
             } catch (e) {}
         };
+        const timeout = setTimeout(() => {
+            pluginWs.off('message', handler);
+            resolve(null);
+        }, 2000);
 
         pluginWs.on('message', handler);
-        pluginWs.send(JSON.stringify({ id: requestId, method: 'Browser.getVersion' }));
+        safeSend(pluginWs, JSON.stringify({ id: requestId, method: 'Browser.getVersion' }), 'plugin');
     });
 }
 
@@ -275,10 +289,6 @@ async function requestTargetsFromPlugin(pluginWs) {
 
     return new Promise((resolve) => {
         const requestId = `targets_${Date.now()}`;
-        const timeout = setTimeout(() => {
-            resolve(ns.cachedTargets);
-        }, CONFIG.TARGETS_REQUEST_TIMEOUT);
-
         const handler = (data) => {
             try {
                 const msg = JSON.parse(data.toString());
@@ -291,9 +301,13 @@ async function requestTargetsFromPlugin(pluginWs) {
                 }
             } catch (e) {}
         };
+        const timeout = setTimeout(() => {
+            pluginWs.off('message', handler);
+            resolve(ns.cachedTargets);
+        }, CONFIG.TARGETS_REQUEST_TIMEOUT);
 
         pluginWs.on('message', handler);
-        pluginWs.send(JSON.stringify({ id: requestId, method: 'Target.getTargets' }));
+        safeSend(pluginWs, JSON.stringify({ id: requestId, method: 'Target.getTargets' }), 'plugin');
     });
 }
 
@@ -439,9 +453,7 @@ async function execCdpViaPlugin(pluginId, params) {
             }
         }
         // 发 client-disconnected 让扩展关分组 + 关 tab
-        try {
-            pluginWs.send(JSON.stringify({ type: 'client-disconnected', clientId }));
-        } catch (e) {}
+        safeSend(pluginWs, JSON.stringify({ type: 'client-disconnected', clientId }), 'plugin');
         // 清理 key session（让下次连接重新分配）
         if (pluginWs.apiKey && portPool) {
             portPool.keySessions.delete(pluginWs.apiKey);
@@ -952,12 +964,10 @@ function cleanupPlugin(ws, id, reason) {
             }
             clientWs.pairedPlugin = null;
             affectedClients.push(clientWs.id);
-            if (clientWs.readyState === WebSocket.OPEN) {
-                clientWs.send(JSON.stringify({
-                    type: 'plugin-disconnected',
-                    message: 'Plugin connection lost'
-                }));
-            }
+            safeSend(clientWs, JSON.stringify({
+                type: 'plugin-disconnected',
+                message: 'Plugin connection lost'
+            }), 'client');
         }
     });
 
@@ -1196,7 +1206,7 @@ function handlePluginConnection(ws, clientInfo, request) {
                 if (eventClientId) {
                     const clientWs = clientById.get(eventClientId);
                     if (clientWs && clientWs.readyState === WebSocket.OPEN) {
-                        clientWs.send(cdpData);
+                        safeSend(clientWs, cdpData, 'client');
                         console.log(`[TARGET EVENT ROUTED] ${parsed.method} targetId=${targetId?.substring(0,8)} -> clientId=${eventClientId}`);
                     }
                 } else if (targetId && (parsed.method === 'Target.targetCreated' || parsed.method === 'Target.attachedToTarget')) {
@@ -1329,7 +1339,7 @@ function handlePluginConnection(ws, clientInfo, request) {
 
                         const cachedCreated = ns.pendingTargetCreatedEvents.get(targetId);
                         if (cachedCreated) {
-                            clientWs.send(cachedCreated.cdpData);
+                            safeSend(clientWs, cachedCreated.cdpData, 'client');
                             console.log(`[TARGET CREATED EVENT] Sent cached Target.targetCreated to client: ${mapping.clientId}`);
                             ns.pendingTargetCreatedEvents.delete(targetId);
                         }
@@ -1348,7 +1358,7 @@ function handlePluginConnection(ws, clientInfo, request) {
                             };
                             const msgStr = JSON.stringify(cdpMsg);
                             console.log(`[ATTACHED EVENT] Full message: ${msgStr}`);
-                            clientWs.send(msgStr);
+                            safeSend(clientWs, msgStr, 'client');
                             console.log(`[ATTACHED EVENT] Sent cached event to client: ${mapping.clientId}`);
                         }
                         const newTargetInfo = cachedCreated?.parsed?.params?.targetInfo
@@ -1391,7 +1401,7 @@ function handlePluginConnection(ws, clientInfo, request) {
                         }
                         const responseStr = JSON.stringify(parsed);
                         console.log(`[SEND TO CLIENT] ${responseStr.substring(0, 300)}`);
-                        clientWs.send(responseStr);
+                        safeSend(clientWs, responseStr, 'client');
                         console.log(`[ROUTE] Response global=${globalId} -> original=${originalId} -> client=${mapping.clientId} sessionId=${parsed.sessionId?.substring(0,8) || 'none'}`);
                     }
                 }
@@ -1410,7 +1420,7 @@ function handlePluginConnection(ws, clientInfo, request) {
             if (targetClientId) {
                 const clientWs = clientById.get(targetClientId);
                 if (clientWs && clientWs.readyState === WebSocket.OPEN) {
-                    clientWs.send(data);
+                    safeSend(clientWs, data, 'client');
                     logCDP('DEBUG', `FORWARDED to client: ${targetClientId} (sessionId route)`, parsed?.sessionId);
                 }
             } else {
@@ -1562,10 +1572,10 @@ function handleClientConnection(ws, clientInfo, customClientId = null, targetPlu
             
             logConnectionEvent('CLIENT_PAIRED', { clientId: id, pluginId: pluginWs.id });
             
-            pluginWs.send(JSON.stringify({
+            safeSend(pluginWs, JSON.stringify({
                 type: 'client-connected',
                 clientId: id
-            }));
+            }), 'plugin');
             
             broadcastClientList();
         }
@@ -2086,7 +2096,7 @@ function safeSend(ws, data, label = '') {
     }
 }
 
-setInterval(() => {
+const flushInterval = setInterval(() => {
     messageQueues.forEach((queue, wsId) => {
         let ws = null;
         for (const conn of pluginConnections) {
@@ -2186,7 +2196,7 @@ const heartbeatInterval = setInterval(() => {
     });
 }, CONFIG.HEARTBEAT_INTERVAL);
 
-setInterval(() => {
+const zombieCleanupInterval = setInterval(() => {
     const toRemove = [];
     pluginConnections.forEach(ws => {
         if (ws.readyState !== WebSocket.OPEN) {
@@ -2219,10 +2229,10 @@ wss.on('close', () => {
 /**
  * 定期打印状态
  */
-setInterval(() => {
+const statusPrintInterval = setInterval(() => {
     const now = new Date().toISOString();
     const nowMs = Date.now();
-    
+
     const validPlugins = Array.from(pluginConnections).filter(ws => ws.readyState === WebSocket.OPEN);
     const zombiePlugins = Array.from(pluginConnections).filter(ws => ws.readyState !== WebSocket.OPEN);
     const validClients = Array.from(clientConnections).filter(ws => ws.readyState === WebSocket.OPEN);
@@ -2284,7 +2294,10 @@ setInterval(() => {
 process.on('SIGINT', () => {
     console.log('\n[SERVER] Shutting down (SIGINT)...');
     logCDP('SERVER', 'Shutting down (SIGINT)');
+    clearInterval(flushInterval);
     clearInterval(heartbeatInterval);
+    clearInterval(zombieCleanupInterval);
+    clearInterval(statusPrintInterval);
 
     pluginConnections.forEach(ws => ws.close(1001, 'Server shutting down'));
     clientConnections.forEach(ws => ws.close(1001, 'Server shutting down'));
@@ -2299,6 +2312,10 @@ process.on('SIGINT', () => {
 process.on('SIGTERM', () => {
     console.log('[SERVER] Shutting down (SIGTERM)...');
     logCDP('SERVER', 'Shutting down (SIGTERM)');
+    clearInterval(flushInterval);
+    clearInterval(heartbeatInterval);
+    clearInterval(zombieCleanupInterval);
+    clearInterval(statusPrintInterval);
     flushAllLogs();
     process.exit(0);
 });