cdp-tunnel 3.1.0 → 3.2.0

package/extension-new/cdp/handler/special.js

@@ -12,8 +12,11 @@ var SpecialHandler = (function() {
   function _getConnectionTag(ctx) {
     var wm = ctx._wsManager;
     var state = ctx._state;
-    // 优先从 state.connectionTag 读（端口池设置的端口号）
-    if (state && state.connectionTag) return state.connectionTag;
+    var clientId = ctx.clientId;
+    if (state && clientId && state.getTagForClient) {
+      var tag = state.getTagForClient(clientId);
+      if (tag) return tag;
+    }
     return (wm && wm.config && wm.config.tag) || null;
   }
 

package/extension-new/core/connection-state.js

@@ -2,6 +2,7 @@ function ConnectionState(connectionId, mode) {
   this.connectionId = connectionId;
   this.mode = mode || 'create';
   this.connectionTag = null;
+  this.clientIdToTag = new Map();
   this.ws = null;
   this.reconnectTimer = null;
   this._hasConnectedClient = false;
@@ -299,6 +300,14 @@ ConnectionState.prototype.clearPreExistingTabsForClient = function(clientId) {
   });
 };
 
+ConnectionState.prototype.setTagForClient = function(clientId, tag) {
+  if (clientId && tag) this.clientIdToTag.set(clientId, tag);
+};
+
+ConnectionState.prototype.getTagForClient = function(clientId) {
+  return this.clientIdToTag.get(clientId) || null;
+};
+
 ConnectionState.prototype.addCDPClient = function(clientId, info) {
   var exists = false;
   for (var i = 0; i < this.cdpClients.length; i++) {

package/extension-new/core/websocket.js

@@ -242,7 +242,7 @@ var WebSocketConnection = (function() {
         self.state.setHasConnectedClient(true);
         self.state.addCDPClient(message.clientId, message.clientId);
         if (message.__connectionTag) {
-          self.state.connectionTag = message.__connectionTag;
+          self.state.setTagForClient(message.clientId, message.__connectionTag);
         }
         self._createGroupForClient(message.clientId, message.__mode);
         self._broadcastStateUpdate();
@@ -580,7 +580,7 @@ var WebSocketConnection = (function() {
     var readyPromise = new Promise(function(resolve) { resolveGroupReady = resolve; });
     self.state.setGroupCreationPromise(clientId, readyPromise);
 
-    var tag = self.state.connectionTag || (self.config ? self.config.tag : null);
+    var tag = (self.state.getTagForClient ? self.state.getTagForClient(clientId) : null) || (self.config ? self.config.tag : null);
     var baseName = CDPUtils.getGroupBaseName(clientId, tag, mode);
     chrome.tabs.query({ currentWindow: true }, function(tabs) {
       if (!tabs || tabs.length === 0) {

package/extension-new/manifest.json

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

package/package.json

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

@@ -1,5 +1,9 @@
 const CONFIG = {
   PORT: process.env.PORT ? parseInt(process.env.PORT) : 9221,
+  TAKEOVER_PORT: process.env.TAKEOVER_PORT ? parseInt(process.env.TAKEOVER_PORT) : 9220,
+  POOL_START: process.env.POOL_START ? parseInt(process.env.POOL_START) : 9231,
+  POOL_SIZE: process.env.POOL_SIZE ? parseInt(process.env.POOL_SIZE) : 9,
+  POOL_TAKEOVER_PORT: process.env.POOL_TAKEOVER_PORT ? parseInt(process.env.POOL_TAKEOVER_PORT) : 9220,
   HEARTBEAT_INTERVAL: 30000,
   STATUS_PRINT_INTERVAL: 60000,
   TARGETS_CACHE_TTL: 2000,
@@ -10,11 +14,7 @@ const CONFIG = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',
   AUTO_RESTART: process.env.AUTO_RESTART === 'true',
   CHROME_RESTART_COOLDOWN: 30000,
-  PLUGIN_MAX_MISSED_PINGS: 3,
-  TAKEOVER_PORT: process.env.TAKEOVER_PORT ? parseInt(process.env.TAKEOVER_PORT) : (parseInt(process.env.PORT || '9221') + 1),
-  POOL_TAKEOVER_PORT: process.env.POOL_TAKEOVER_PORT ? parseInt(process.env.POOL_TAKEOVER_PORT) : 9220,
-  POOL_START: process.env.POOL_START ? parseInt(process.env.POOL_START) : 9231,
-  POOL_SIZE: process.env.POOL_SIZE ? parseInt(process.env.POOL_SIZE) : 9
+  PLUGIN_MAX_MISSED_PINGS: 3
 };
 
 const LOG_LEVELS = {

package/server/modules/port-pool.js

@@ -67,16 +67,24 @@ class PortPoolManager {
     const server = http.createServer();
     this.createServers[portIndex] = server;
 
-    // 端口池端口复用主 proxy 的 wss——通过 localPort 区分
+    server.on('request', (req, res) => {
+      this._handleHttp(req, res, session);
+    });
+
     server.on('upgrade', (req, socket, head) => {
       req._poolPortIndex = portIndex;
       req._poolPort = port;
-      // 转发给主 proxy 的 wss 处理
-      this.mainProxy.handlePoolUpgrade(req, socket, head, portIndex, port);
-    });
+      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;
+      }
 
-    server.on('request', (req, res) => {
-      this._handleHttp(req, res, session);
+      this.mainProxy.handlePoolUpgrade(req, socket, head, portIndex, port);
     });
 
     server.on('error', (err) => {

package/server/proxy-server.js

@@ -2096,49 +2096,33 @@ server.on('error', (err) => {
     process.exit(1);
 });
 
+// v3.2: 9221 = 主 server（plugin + client），9222 废弃
 server.listen(PORT, '0.0.0.0');
 
-const takeoverServer = http.createServer((req, res) => {
-    req._takeoverMode = true;
-    handleHttpRequest(req, res);
-});
-takeoverServer.on('upgrade', (req, socket, head) => {
-    req._takeoverMode = true;
-    const url = new URL(req.url, `http://localhost:${TAKEOVER_PORT}`);
-    const path = url.pathname;
-    const isPlugin = path === '/plugin';
-    const isClient = path === '/client' ||
-                     path.startsWith('/client/') ||
-                     path.startsWith('/client-') ||
-                     path.startsWith('/devtools/browser/') ||
-                     path.startsWith('/devtools/page/');
-
-    if (!isPlugin && !isClient) {
-        socket.destroy();
-        return;
-    }
-
-    wss.handleUpgrade(req, socket, head, (ws) => {
-        wss.emit('connection', ws, req);
-    });
-});
-takeoverServer.on('error', (err) => {
-    if (err.code === 'EADDRINUSE') {
-        console.error(`[WARN] Takeover port ${TAKEOVER_PORT} is already in use. Takeover mode disabled.`);
-    } else {
-        console.error('[WARN] Takeover server error:', err.message);
-    }
-});
-takeoverServer.listen(TAKEOVER_PORT, '0.0.0.0', () => {
-    console.log(`[TAKEOVER] Listening on port ${TAKEOVER_PORT}`);
-});
-
-// v3.0 端口池启动
+// v3.0 端口池启动（唯一模式）
 portPool = new PortPoolManager({
     getPluginConnection: () => {
         for (const ws of pluginConnections) return ws;
         return null;
     },
+    handlePluginUpgrade: (req, socket, head) => {
+        wss.handleUpgrade(req, socket, head, (ws) => {
+            wss.emit('connection', ws, req);
+        });
+    },
+    handleTakeoverUpgrade: (req, socket, head) => {
+        req._takeoverMode = true;
+        const url = new URL(req.url, `http://localhost:${CONFIG.TAKEOVER_PORT}`);
+        const path = url.pathname;
+        if (path !== '/plugin' && path !== '/client' && !path.startsWith('/client/') &&
+            !path.startsWith('/devtools/browser/') && !path.startsWith('/devtools/page/')) {
+            socket.destroy();
+            return;
+        }
+        wss.handleUpgrade(req, socket, head, (ws) => {
+            wss.emit('connection', ws, req);
+        });
+    },
     handleHttpRequest: (req, res) => handleHttpRequest(req, res),
     handlePoolUpgrade: (req, socket, head, portIndex, port) => {
         req._poolPortIndex = portIndex;