cdp-tunnel 3.0.9 → 3.1.0

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

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

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

@@ -1,6 +1,7 @@
 function ConnectionState(connectionId, mode) {
   this.connectionId = connectionId;
   this.mode = mode || 'create';
+  this.connectionTag = null;
   this.ws = null;
   this.reconnectTimer = null;
   this._hasConnectedClient = false;

package/extension-new/core/websocket.js

@@ -241,6 +241,9 @@ var WebSocketConnection = (function() {
         Logger.info('[WS:' + self.connectionId + '] Client connected, resuming event forwarding');
         self.state.setHasConnectedClient(true);
         self.state.addCDPClient(message.clientId, message.clientId);
+        if (message.__connectionTag) {
+          self.state.connectionTag = message.__connectionTag;
+        }
         self._createGroupForClient(message.clientId, message.__mode);
         self._broadcastStateUpdate();
         break;
@@ -577,7 +580,8 @@ var WebSocketConnection = (function() {
     var readyPromise = new Promise(function(resolve) { resolveGroupReady = resolve; });
     self.state.setGroupCreationPromise(clientId, readyPromise);
 
-    var baseName = CDPUtils.getGroupBaseName(clientId, self.config ? self.config.tag : null, mode);
+    var tag = self.state.connectionTag || (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) {
         Logger.warn('[WS:' + self.connectionId + '] No tabs found for group creation');

package/extension-new/manifest.json

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

package/package.json

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

@@ -165,18 +165,20 @@ class PortPoolManager {
   _handleClientConnect(ws, req, session) {
     session.clients.add(ws);
 
-    // 找到 plugin 连接（从主 proxy 获取）
     const pluginWs = this.mainProxy.getPluginConnection();
     if (!pluginWs) {
       ws.close(1011, 'No extension connected');
       return;
     }
 
-    // 通知扩展有 client 连接（扩展需要 hasConnectedClient=true 才转发 debugger 事件）
-    const poolClientId = `pool_${session.portIndex}_${Date.now()}`;
+    // 通知扩展有 client 连接（带端口号作为分组标识）
+    // clientId 固定为 pool_{port}，让扩展为每个端口建一个独立分组
+    const poolClientId = `pool_${session.port}`;
     pluginWs.send(JSON.stringify({
       type: 'client-connected',
-      clientId: poolClientId
+      clientId: poolClientId,
+      __mode: 'create',
+      __connectionTag: String(session.port)
     }));
 
     // 合成输入命令需要 ensureVisible（和 forward.js 的逻辑一致）
@@ -205,7 +207,7 @@ class PortPoolManager {
           clientWs: ws
         });
 
-        const forwarded = { ...msg, id: newId, __portIndex: session.portIndex };
+        const forwarded = { ...msg, id: newId, __portIndex: session.portIndex, __clientId: `pool_${session.port}` };
         pluginWs.send(JSON.stringify(forwarded));
       } else {
         // 无 id 的消息（事件），直接转发

package/server/proxy-server.js

@@ -2139,6 +2139,7 @@ portPool = new PortPoolManager({
         for (const ws of pluginConnections) return ws;
         return null;
     },
+    handleHttpRequest: (req, res) => handleHttpRequest(req, res),
     handlePoolUpgrade: (req, socket, head, portIndex, port) => {
         req._poolPortIndex = portIndex;
         wss.handleUpgrade(req, socket, head, (ws) => {