cdp-tunnel 3.3.0 → 3.3.2

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.3.0",
+  "version": "3.3.2",
   "description": "Chrome DevTools Protocol Bridge for Playwright/Puppeteer automation",
   "permissions": [
     "debugger",

package/package.json

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

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 端口一个
@@ -209,10 +210,11 @@ class PortPoolManager {
       try { msg = JSON.parse(data.toString()); } catch { return; }
 
       if (msg.id !== undefined) {
-        // createTarget 串行化（避免并发 chrome.tabs.create 回调串）
+        // createTarget 串行化 + 标记 pending
         if (msg.method === 'Target.createTarget') {
           while (session.createTargetLock) { await session.createTargetLock; }
           session.createTargetLock = new Promise(r => { session._releaseCreateTarget = r; });
+          session.pendingCreate = true; // 标记：下一个 targetCreated 事件归属这个端口
         }
 
         // 合成输入命令：先 bringToFront + 等待，再发原命令
@@ -220,8 +222,12 @@ class PortPoolManager {
           await this._ensureVisible(session, pluginWs, msg.sessionId);
         }
 
-        // 命令：分配新 id，记录映射（含 method 名供响应后处理），转发给 plugin
-        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,
@@ -273,7 +279,10 @@ class PortPoolManager {
       const pending = session.pendingRequests.get(msg.id);
       session.pendingRequests.delete(msg.id);
 
-      // 如果是 createTarget 响应，记录 targetId → portIndex 归属 + 初始 url + 释放锁
+      // 如果是 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);
@@ -311,7 +320,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;
@@ -340,6 +349,19 @@ class PortPoolManager {
             return true;
           }
         }
+        // 竞态处理：targetCreated 在 createTarget 响应之前到达
+        // 如果有 pendingCreate，把事件归属到对应端口
+        for (let pi = 0; pi < this.portSessions.length; pi++) {
+          const sess = this.portSessions[pi];
+          if (sess && sess.pendingCreate) {
+            sess.targetIds.add(targetId);
+            sess.targetUrls.set(targetId, 'about:blank');
+            this.targetToPort.set(targetId, pi);
+            sess.pendingCreate = false; // 消费掉
+            this._broadcastToPort(pi, msg);
+            return true;
+          }
+        }
       }
 
       // sessionId 路由（Network/Screencast/Input 等 session 事件）