cdp-tunnel 3.2.5 → 3.2.7

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.5",
+  "version": "3.2.7",
   "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:9221/plugin',
+  WS_URL: 'ws://localhost:29931/plugin',
   RECONNECT_DELAY: 3000,
   DEBUGGER_VERSION: '1.3',
   HEARTBEAT_INTERVAL: 25000,

package/package.json

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

@@ -204,38 +204,57 @@ class PortPoolManager {
     const SYNTHETIC_INPUT = ['Input.dispatchKeyEvent', 'Input.dispatchMouseEvent'];
 
     // 消息处理：client → plugin（带 portIndex 标记）
-    ws.on('message', async (data) => {
+    // session 级别的命令队列：保证跨 client 的命令串行处理
+    const handleMessage = async (data) => {
       let msg;
       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; });
+        // 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);
         }
 
-        // 合成输入命令：先 bringToFront + 等待，再发原命令
         if (SYNTHETIC_INPUT.indexOf(msg.method) >= 0 && msg.sessionId) {
           await this._ensureVisible(session, pluginWs, msg.sessionId);
         }
 
-        // 命令：分配新 id，记录映射（含 method 名供响应后处理），转发给 plugin
+        // 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}`;
         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', () => {
@@ -256,8 +275,8 @@ class PortPoolManager {
   handlePluginMessage(msg, pluginWs) {
     if (!msg) return false;
 
-    // 1. 响应消息：id 以 pool 开头
-    if (msg.id && typeof msg.id === 'string' && msg.id.startsWith('pool')) {
+    // 1. 响应消息：id 以 pool 开头（排除事件——事件有 method 字段）
+    if (msg.id && typeof msg.id === 'string' && msg.id.startsWith('pool') && !msg.method) {
       // 内部命令（ensureVisible 用的）响应直接丢弃
       if (msg.id.includes('_internal')) {
         return true;
@@ -273,18 +292,18 @@ class PortPoolManager {
       const pending = session.pendingRequests.get(msg.id);
       session.pendingRequests.delete(msg.id);
 
-      // 如果是 createTarget 响应，记录 targetId → portIndex 归属 + 初始 url + 释放锁
+      // 如果是 createTarget 响应，记录 targetId + 释放串行链
       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;
-        }
+      }
+      // 释放 createTarget 串行链
+      if (pending && pending.method === 'Target.createTarget' && session._releaseCT) {
+        session._releaseCT();
+        session._releaseCT = null;
+        session.createTargetChain = null;
       }
 
       // 如果是 Page.navigate 响应，更新 targetId 的 url