cdp-tunnel 3.2.7 → 3.3.1

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

@@ -161,11 +161,24 @@ var SpecialHandler = (function() {
     var needsNavigate = url !== 'about:blank' && url !== '';
 
     return new Promise(function(resolve, reject) {
-      chrome.tabs.create({ url: 'about:blank', active: false }, function(tab) {
-        if (!tab || !tab.id) {
-          reject(new Error('Failed to create tab'));
-          return;
-        }
+      var retryCount = 0;
+      var maxRetries = 3;
+
+      function doCreate() {
+        chrome.tabs.create({ url: 'about:blank', active: false }, function(tab) {
+          if (!tab || !tab.id) {
+            retryCount++;
+            if (retryCount <= maxRetries) {
+              Logger.warn('[CreateTarget] Empty tab (tab=' + (!!tab) + '), retry ' + retryCount);
+              setTimeout(doCreate, 100 * retryCount);
+              return;
+            }
+            Logger.error('[CreateTarget] Failed after ' + maxRetries + ' retries');
+            reject(new Error('Failed to create tab after ' + maxRetries + ' retries'));
+            return;
+          }
+
+          Logger.info('[CreateTarget] tab created: ' + tab.id);
 
         if (clientId) {
           state.setTabIdToClientId(tab.id, clientId);
@@ -189,7 +202,10 @@ var SpecialHandler = (function() {
           Logger.error('[CreateTarget] Error:', err.message || err);
           reject(err);
         });
-      });
+        }); // chrome.tabs.create callback end
+      } // doCreate end
+
+      doCreate();
     });
   }
 

package/extension-new/manifest.json

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

package/extension-new/utils/config.js

@@ -1,5 +1,5 @@
 var Config = {
-  WS_URL: 'ws://localhost:29931/plugin',
+  WS_URL: 'ws://localhost:9221/plugin',
   RECONNECT_DELAY: 3000,
   DEBUGGER_VERSION: '1.3',
   HEARTBEAT_INTERVAL: 25000,

package/package.json

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

@@ -20,7 +20,8 @@ const { CONFIG } = require('./config');
 
 class PortPoolManager {
   constructor(mainProxy) {
-    this.mainProxy = mainProxy;  // 现有 proxy 的引用（拿 plugin 连接）
+    this.mainProxy = mainProxy;
+    this.idCounter = 0; // 全局唯一 id 计数器  // 现有 proxy 的引用（拿 plugin 连接）
     this.createServers = [];      // [http.Server] 每个 create 端口一个
     this.createWss = [];          // [WebSocket.Server] 每个 create 端口一个
     this.portSessions = [];       // [PortSession] 每个 create 端口一个
@@ -204,57 +205,42 @@ class PortPoolManager {
     const SYNTHETIC_INPUT = ['Input.dispatchKeyEvent', 'Input.dispatchMouseEvent'];
 
     // 消息处理：client → plugin（带 portIndex 标记）
-    // session 级别的命令队列：保证跨 client 的命令串行处理
-    const handleMessage = async (data) => {
+    ws.on('message', async (data) => {
       let msg;
       try { msg = JSON.parse(data.toString()); } catch { return; }
 
       if (msg.id !== undefined) {
-        // createTarget：等前一个 createTarget 的响应回来
-        if (msg.method === 'Target.createTarget' && session.createTargetChain) {
-          await session.createTargetChain;
-        }
-
-        // attachToTarget：已 attach 的 target 返回虚拟 session
-        if (msg.method === 'Target.attachToTarget' && msg.params && msg.params.targetId) {
-          const targetId = msg.params.targetId;
-          if (session.attachedTargets && session.attachedTargets.has(targetId)) {
-            const vsid = `vs_${session.portIndex}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-            session.virtualSessions.set(vsid, targetId);
-            this.sessionToPort.set(vsid, session.portIndex);
-            ws.send(JSON.stringify({ id: msg.id, result: { sessionId: vsid } }));
-            return;
-          }
-          if (!session.attachedTargets) session.attachedTargets = new Set();
-          session.attachedTargets.add(targetId);
+        // createTarget 串行化（避免并发 chrome.tabs.create 回调串）
+        if (msg.method === 'Target.createTarget') {
+          while (session.createTargetLock) { await session.createTargetLock; }
+          session.createTargetLock = new Promise(r => { session._releaseCreateTarget = r; });
         }
 
+        // 合成输入命令：先 bringToFront + 等待，再发原命令
         if (SYNTHETIC_INPUT.indexOf(msg.method) >= 0 && msg.sessionId) {
           await this._ensureVisible(session, pluginWs, msg.sessionId);
         }
 
-        // createTarget：设置串行链
-        if (msg.method === 'Target.createTarget') {
-          let release;
-          session.createTargetChain = new Promise(r => { release = r; });
-          session._releaseCT = release;
-        }
-
-        const newId = `pool${session.portIndex}_${msg.id}`;
+        // 命令：分配全局唯一 id（避免不同 client 的 msg.id 冲突）
+        const uniqueId = ++this.idCounter;
+        const newId = `pool${session.portIndex}_${uniqueId}`;
+        // 记录 originalId（用于响应时恢复）
+        if (!ws._origIds) ws._origIds = new Map();
+        ws._origIds.set(uniqueId, msg.id);
         session.pendingRequests.set(newId, {
-          originalId: msg.id, method: msg.method, clientWs: ws,
-          params: msg.params, sessionId: msg.sessionId
+          originalId: msg.id,
+          method: msg.method,
+          clientWs: ws,
+          params: msg.params,
+          sessionId: msg.sessionId
         });
+
         const forwarded = { ...msg, id: newId, __portIndex: session.portIndex, __clientId: `pool_${session.port}` };
         pluginWs.send(JSON.stringify(forwarded));
       } else {
+        // 无 id 的消息（事件），直接转发
         pluginWs.send(JSON.stringify({ ...msg, __portIndex: session.portIndex }));
       }
-    };
-
-    ws.on('message', (data) => {
-      if (!session.cmdQueue) session.cmdQueue = Promise.resolve();
-      session.cmdQueue = session.cmdQueue.then(() => handleMessage(data)).catch(() => {});
     });
 
     ws.on('close', () => {
@@ -292,18 +278,21 @@ class PortPoolManager {
       const pending = session.pendingRequests.get(msg.id);
       session.pendingRequests.delete(msg.id);
 
-      // 如果是 createTarget 响应，记录 targetId + 释放串行链
+      // 如果是 createTarget 响应
+      if (pending && pending.method === 'Target.createTarget') {
+        console.log('[PORT POOL] createTarget resp: ' + JSON.stringify(msg.result).slice(0, 80) + ' pending=' + !!pending);
+      }
       if (msg.result && msg.result.targetId) {
         const tid = msg.result.targetId;
         session.targetIds.add(tid);
         session.targetUrls.set(tid, pending?.params?.url || 'about:blank');
         this.targetToPort.set(tid, portIndex);
-      }
-      // 释放 createTarget 串行链
-      if (pending && pending.method === 'Target.createTarget' && session._releaseCT) {
-        session._releaseCT();
-        session._releaseCT = null;
-        session.createTargetChain = null;
+        // 释放 createTarget 锁
+        if (session._releaseCreateTarget) {
+          session._releaseCreateTarget();
+          session._releaseCreateTarget = null;
+          session.createTargetLock = null;
+        }
       }
 
       // 如果是 Page.navigate 响应，更新 targetId 的 url
@@ -330,7 +319,7 @@ class PortPoolManager {
       }
 
       // 恢复原始 id，发给发起请求的 client
-      const response = { ...msg, id: this._parseOriginalId(originalId) };
+      const response = { ...msg, id: pending ? pending.originalId : this._parseOriginalId(originalId) };
       delete response.__portIndex;
       delete response.__clientId;
       delete response.type;