cdp-tunnel 3.0.1 → 3.0.3

package/extension-new/manifest.json

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

package/package.json

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

@@ -181,24 +181,28 @@ class PortPoolManager {
       return;
     }
 
+    // 合成输入命令需要 ensureVisible（和 forward.js 的逻辑一致）
+    const SYNTHETIC_INPUT = ['Input.dispatchKeyEvent', 'Input.dispatchMouseEvent'];
+
     // 消息处理：client → plugin（带 portIndex 标记）
-    ws.on('message', (data) => {
+    ws.on('message', async (data) => {
       let msg;
       try { msg = JSON.parse(data.toString()); } catch { return; }
 
       if (msg.id !== undefined) {
-        // 命令：分配新 id，记录映射，转发给 plugin
+        // 合成输入命令：先 bringToFront + 等待，再发原命令
+        if (SYNTHETIC_INPUT.indexOf(msg.method) >= 0 && msg.sessionId) {
+          await this._ensureVisible(session, pluginWs, msg.sessionId);
+        }
+
+        // 命令：分配新 id，记录映射（含 method 名供响应后处理），转发给 plugin
         const newId = `pool${session.portIndex}_${msg.id}`;
         session.pendingRequests.set(newId, {
           originalId: msg.id,
+          method: msg.method,
           clientWs: ws
         });
 
-        // 特殊处理 createTarget：记录 targetId 归属
-        if (msg.method === 'Target.createTarget') {
-          msg.params = msg.params || {};
-        }
-
         const forwarded = { ...msg, id: newId, __portIndex: session.portIndex };
         pluginWs.send(JSON.stringify(forwarded));
       } else {
@@ -227,6 +231,10 @@ class PortPoolManager {
 
     // 1. 响应消息：id 以 pool 开头
     if (msg.id && typeof msg.id === 'string' && msg.id.startsWith('pool')) {
+      // 内部命令（ensureVisible 用的）响应直接丢弃
+      if (msg.id.includes('_internal')) {
+        return true;
+      }
       const match = msg.id.match(/^pool(\d+)_(.+)$/);
       if (!match) return false;
 
@@ -251,6 +259,12 @@ class PortPoolManager {
         console.log(`[PORT POOL] sessionId=${msg.result.sessionId.slice(0,12)} → port ${session.port}`);
       }
 
+      // 如果是 getTargets 响应，按 portIndex 过滤 targetInfos
+      if (pending && pending.method === 'Target.getTargets' && msg.result && msg.result.targetInfos) {
+        msg.result.targetInfos = msg.result.targetInfos.filter(t => session.targetIds.has(t.targetId));
+        console.log(`[PORT POOL] getTargets filtered: ${msg.result.targetInfos.length} targets for port ${session.port}`);
+      }
+
       // 恢复原始 id，发给发起请求的 client
       const response = { ...msg, id: this._parseOriginalId(originalId) };
       if (pending && pending.clientWs && pending.clientWs.readyState === WebSocket.OPEN) {
@@ -298,6 +312,54 @@ class PortPoolManager {
     return isNaN(n) ? idStr : n;
   }
 
+  /**
+   * 让 tab 变 visible：Page.bringToFront + 等待 + 恢复焦点。
+   * 内部命令用 _internal_ 前缀，handlePluginMessage 会丢弃它们的响应。
+   */
+  async _ensureVisible(session, pluginWs, sessionId) {
+    const pfx = `pool${session.portIndex}_internal`;
+
+    // 1. 保存焦点
+    pluginWs.send(JSON.stringify({
+      id: `${pfx}_save_${Date.now()}`,
+      method: 'Runtime.evaluate',
+      params: { expression: '(function(){var el=document.activeElement;if(el&&el!==document.body&&el.focus){el.setAttribute("data-cdp-saved-focus","1");return 1}return 0})()', returnByValue: true },
+      sessionId, __portIndex: session.portIndex
+    }));
+
+    // 2. bringToFront
+    pluginWs.send(JSON.stringify({
+      id: `${pfx}_front_${Date.now()}`,
+      method: 'Page.bringToFront',
+      params: {},
+      sessionId, __portIndex: session.portIndex
+    }));
+
+    // 3. 等 visibilitychange + 双 rAF（renderer 完成切换）
+    pluginWs.send(JSON.stringify({
+      id: `${pfx}_vis_${Date.now()}`,
+      method: 'Runtime.evaluate',
+      params: {
+        expression: 'new Promise(function(r){function ok(){requestAnimationFrame(function(){requestAnimationFrame(function(){r(1)})})}if(document.visibilityState==="visible"){ok()}else{var d=function(){if(document.visibilityState==="visible"){document.removeEventListener("visibilitychange",d);ok()}};document.addEventListener("visibilitychange",d);setTimeout(function(){document.removeEventListener("visibilitychange",d);ok()},3000)}})',
+        awaitPromise: true
+      },
+      sessionId, __portIndex: session.portIndex
+    }));
+
+    // 给 bringToFront + visibility 等待时间（不等具体响应，内部命令响应被丢弃）
+    await new Promise(r => setTimeout(r, 300));
+
+    // 4. 恢复焦点
+    pluginWs.send(JSON.stringify({
+      id: `${pfx}_restore_${Date.now()}`,
+      method: 'Runtime.evaluate',
+      params: { expression: '(function(){var el=document.querySelector("[data-cdp-saved-focus]");if(el){el.removeAttribute("data-cdp-saved-focus");el.focus();return 1}return 0})()', returnByValue: true },
+      sessionId, __portIndex: session.portIndex
+    }));
+
+    await new Promise(r => setTimeout(r, 50));
+  }
+
   _broadcastToPort(portIndex, msg) {
     const session = this.portSessions[portIndex];
     if (!session) return;