cdp-tunnel 3.2.4 → 3.2.6

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

@@ -65,8 +65,30 @@ var SpecialHandler = (function() {
       }
 
       var isAlreadyAttached = state.isTabAttached(tabId);
-
-      if (isAlreadyAttached) {
+      var isAttaching = state.attachingTabs && state.attachingTabs.has(tabId);
+
+      if (isAlreadyAttached || isAttaching) {
+        // 已 attach 或正在 attach——等待正在进行的 attach 完成后返回新 session
+        if (isAttaching && state.attachingTabs) {
+          // 等待 attach 完成
+          var waitAttach = function(cb, retries) {
+            if (state.isTabAttached(tabId)) {
+              var sid = CDPUtils.generateSessionId();
+              state.mapSession(sid, tabId, targetId);
+              muteTabIfNeeded(tabId);
+              cb({ sessionId: sid });
+            } else if (retries > 0) {
+              setTimeout(function() { waitAttach(cb, retries - 1); }, 100);
+            } else {
+              // 超时——直接生成 session（attach 可能成功了但标记慢了）
+              var sid2 = CDPUtils.generateSessionId();
+              state.mapSession(sid2, tabId, targetId);
+              muteTabIfNeeded(tabId);
+              cb({ sessionId: sid2 });
+            }
+          };
+          return new Promise(function(resolve) { waitAttach(resolve, 30); });
+        }
         var newSessionId = CDPUtils.generateSessionId();
         state.mapSession(newSessionId, tabId, targetId);
         muteTabIfNeeded(tabId);
@@ -74,7 +96,14 @@ var SpecialHandler = (function() {
         return { sessionId: newSessionId };
       }
 
+      // 标记为正在 attach（防止并发 attach 同一个 tab）
+      if (!state.attachingTabs) state.attachingTabs = new Set();
+      state.attachingTabs.add(tabId);
+
       return DebuggerManager.attach(tabId, state).then(function(attached) {
+        // 清除"正在 attach"标记
+        if (state.attachingTabs) state.attachingTabs.delete(tabId);
+
         if (!attached) {
           throw new Error('Failed to attach');
         }

package/extension-new/manifest.json

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

package/package.json

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

@@ -209,15 +209,17 @@ class PortPoolManager {
       try { msg = JSON.parse(data.toString()); } catch { return; }
 
       if (msg.id !== undefined) {
+        // 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);
         }
 
-        if (msg.method === 'Network.enable' || msg.method === 'Page.startScreencast') {
-          // 已转发，继续
-        }
-
         // 命令：分配新 id，记录映射（含 method 名供响应后处理），转发给 plugin
         const newId = `pool${session.portIndex}_${msg.id}`;
         session.pendingRequests.set(newId, {
@@ -271,12 +273,18 @@ class PortPoolManager {
       const pending = session.pendingRequests.get(msg.id);
       session.pendingRequests.delete(msg.id);
 
-      // 如果是 createTarget 响应，记录 targetId → portIndex 归属 + 初始 url
+      // 如果是 createTarget 响应，记录 targetId → portIndex 归属 + 初始 url + 释放锁
       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 (session._releaseCreateTarget) {
+          session._releaseCreateTarget();
+          session._releaseCreateTarget = null;
+          session.createTargetLock = null;
+        }
       }
 
       // 如果是 Page.navigate 响应，更新 targetId 的 url