@pyrokine/mcp-chrome 1.7.0 → 2.0.1

package/dist/extension/bridge.js

@@ -4,6 +4,7 @@
  * 封装与 Chrome Extension 的通信，提供与 CDP 类似的接口
  * 使用 HTTP + WebSocket 实现
  */
+import { DriverCapabilityError, } from '../core/browser-driver.js';
 import { ExtensionHttpServer } from './http-server.js';
 /** RPC 传输余量（毫秒）：给网络往返和 Extension 处理留出的额外时间 */
 const RPC_MARGIN = 5000;
@@ -26,8 +27,8 @@ export class ExtensionBridge {
         this.httpServer.on('connected', () => {
             if (this.currentTabId !== null) {
                 const tabId = this.currentTabId;
-                this.httpServer.sendCommand('debugger_attach', { tabId }).catch(() => {
-                    // tab 可能已关闭，忽略恢复失败
+                this.httpServer.sendCommand('debugger_attach', { tabId }).catch((err) => {
+                    console.error('[Bridge] 重连后 debugger re-attach 失败:', err.message);
                 });
             }
         });
@@ -53,6 +54,25 @@ export class ExtensionBridge {
         const result = await this.httpServer.sendCommand('tabs_list', {});
         return result;
     }
+    /** IBrowserDriver 接口：列出所有 tab，统一为 ListedTarget 形式（id 字符串化以保持跨 driver 兼容） */
+    async listTargets() {
+        const tabs = await this.listTabs();
+        return tabs.map((tab) => ({
+            id: tab.id,
+            targetId: String(tab.id),
+            url: tab.url,
+            title: tab.title,
+            type: 'page',
+            active: tab.active,
+            windowId: tab.windowId,
+            index: tab.index,
+            groupId: tab.groupId,
+            pinned: tab.pinned,
+            incognito: tab.incognito,
+            managed: tab.managed,
+            status: tab.status,
+        }));
+    }
     async createTab(url, timeout) {
         const rpcTimeout = timeout !== undefined ? timeout + RPC_MARGIN : undefined;
         const result = await this.httpServer.sendCommand('tabs_create', {
@@ -67,6 +87,16 @@ export class ExtensionBridge {
         this.updateState(tab.url, tab.title);
         return tab;
     }
+    /** IBrowserDriver 接口：新建页面（targetId 为字符串化的 chrome tab id） */
+    async newPage(url, timeout) {
+        const tab = await this.createTab(url, timeout);
+        return {
+            targetId: String(tab.id),
+            url: tab.url,
+            title: tab.title,
+            type: 'page',
+        };
+    }
     async closeTab(tabId) {
         await this.httpServer.sendCommand('tabs_close', { tabId });
         if (this.currentTabId === tabId) {
@@ -74,131 +104,164 @@ export class ExtensionBridge {
             this.state = null;
         }
     }
+    /** IBrowserDriver 接口：关闭页面（targetId 是 chrome tab id 的字符串形式，省略时关闭当前 tab） */
+    async closePage(targetId) {
+        const tabId = targetId !== undefined ? this.parseTargetId(targetId) : this.currentTabId;
+        if (tabId === null) {
+            throw new DriverCapabilityError('没有可关闭的页面，请指定 targetId');
+        }
+        await this.closeTab(tabId);
+    }
     async activateTab(tabId) {
         const result = await this.httpServer.sendCommand('tabs_activate', { tabId });
         const tab = result;
         this.currentTabId = tab.id;
         this.updateState(tab.url, tab.title);
     }
-    // ==================== 导航操作 ====================
+    /** IBrowserDriver 接口：激活页面（切到前台） */
+    async activatePage(targetId) {
+        const tabId = this.parseTargetId(targetId);
+        await this.activateTab(tabId);
+    }
+    /** IBrowserDriver 接口：选择操作目标 tab（不切换前台，只设置当前 currentTabId） */
+    async selectPage(targetId) {
+        this.currentTabId = this.parseTargetId(targetId);
+    }
+    /** IBrowserDriver 接口：获取当前操作目标 ID（chrome tab id 的字符串形式） */
+    getCurrentTargetId() {
+        return this.currentTabId !== null ? String(this.currentTabId) : null;
+    }
+    /** IBrowserDriver 接口：设置当前操作目标 ID */
+    setCurrentTargetId(targetId) {
+        this.currentTabId = targetId !== null ? this.parseTargetId(targetId) : null;
+    }
     async navigate(url, options) {
         const rpcTimeout = options?.timeout !== undefined ? options.timeout + RPC_MARGIN : undefined;
-        const result = await this.httpServer.sendCommand('navigate', {
-            tabId: this.currentTabId,
+        const params = {
             url,
-            waitUntil: options?.waitUntil ?? 'load',
+            waitUntil: options?.wait ?? 'load',
             timeout: options?.timeout,
-        }, rpcTimeout);
+        };
+        if (this.currentTabId !== null) {
+            params.tabId = this.currentTabId;
+        }
+        const result = await this.httpServer.sendCommand('navigate', params, rpcTimeout);
         const tab = result;
+        this.currentTabId = tab.id;
         this.updateState(tab.url, tab.title);
     }
+    // ==================== 导航操作 ====================
     async goBack(timeout) {
         // 默认：NAV_SIGNAL_WINDOW + 导航等待（默认 30s）+ RPC_MARGIN = 40s
         // 调用方传 timeout 时：timeout 即导航超时 + 信号窗口 + 传输余量
-        const rpcTimeout = timeout !== undefined ?
-            timeout + NAV_SIGNAL_WINDOW + RPC_MARGIN :
-            30000 + NAV_SIGNAL_WINDOW + RPC_MARGIN;
-        const result = await this.httpServer.sendCommand('go_back', {
-            tabId: this.currentTabId,
+        const rpcTimeout = timeout !== undefined ? timeout + NAV_SIGNAL_WINDOW + RPC_MARGIN : 30000 + NAV_SIGNAL_WINDOW + RPC_MARGIN;
+        const params = {
             waitUntil: 'load',
             timeout,
-        }, rpcTimeout);
+        };
+        if (this.currentTabId !== null) {
+            params.tabId = this.currentTabId;
+        }
+        const result = (await this.httpServer.sendCommand('go_back', params, rpcTimeout));
         this.updateState(result.url, result.title);
         return result;
     }
     async goForward(timeout) {
         // 默认：NAV_SIGNAL_WINDOW + 导航等待（默认 30s）+ RPC_MARGIN = 40s
         // 调用方传 timeout 时：timeout 即导航超时 + 信号窗口 + 传输余量
-        const rpcTimeout = timeout !== undefined ?
-            timeout + NAV_SIGNAL_WINDOW + RPC_MARGIN :
-            30000 + NAV_SIGNAL_WINDOW + RPC_MARGIN;
-        const result = await this.httpServer.sendCommand('go_forward', {
-            tabId: this.currentTabId,
+        const rpcTimeout = timeout !== undefined ? timeout + NAV_SIGNAL_WINDOW + RPC_MARGIN : 30000 + NAV_SIGNAL_WINDOW + RPC_MARGIN;
+        const params = {
             waitUntil: 'load',
             timeout,
-        }, rpcTimeout);
+        };
+        if (this.currentTabId !== null) {
+            params.tabId = this.currentTabId;
+        }
+        const result = (await this.httpServer.sendCommand('go_forward', params, rpcTimeout));
         this.updateState(result.url, result.title);
         return result;
     }
     async reload(ignoreCache = false, waitUntil, timeout) {
         const rpcTimeout = timeout !== undefined ? timeout + RPC_MARGIN : undefined;
-        const result = await this.httpServer.sendCommand('reload', {
-            tabId: this.currentTabId,
+        const params = {
             ignoreCache,
             waitUntil: waitUntil ?? 'load',
             timeout,
-        }, rpcTimeout);
+        };
+        if (this.currentTabId !== null) {
+            params.tabId = this.currentTabId;
+        }
+        const result = await this.httpServer.sendCommand('reload', params, rpcTimeout);
         const tab = result;
         this.updateState(tab.url, tab.title);
     }
-    // ==================== 页面内容 ====================
     async readPage(options) {
-        return await this.httpServer.sendCommand('read_page', {
+        return (await this.httpServer.sendCommand('read_page', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             ...options,
-        });
-    }
-    async screenshot(options) {
-        return await this.httpServer.sendCommand('screenshot', {
-            tabId: this.currentTabId,
-            ...options,
-        });
+        }));
     }
-    // ==================== DOM 操作 ====================
+    // ==================== 页面内容 ====================
     async click(refId) {
-        const result = await this.httpServer.sendCommand('click', {
+        const result = (await this.httpServer.sendCommand('click', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             refId,
-        });
+        }));
         if (!result.success) {
             throw new Error(result.error || 'Click failed');
         }
     }
+    // ==================== DOM 操作 ====================
     async actionableClick(refId, force) {
-        return await this.httpServer.sendCommand('actionable_click', {
+        return (await this.httpServer.sendCommand('actionable_click', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             refId,
             force: force ?? false,
-        });
+        }));
     }
-    async checkActionability(refId) {
-        return await this.httpServer.sendCommand('check_actionability', {
+    async dispatchInput(refId, text) {
+        return (await this.httpServer.sendCommand('dispatch_input', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             refId,
-        });
+            text,
+        }));
     }
-    async dispatchInput(refId, text) {
-        return await this.httpServer.sendCommand('dispatch_input', {
+    async dragAndDrop(srcRefId, dstRefId) {
+        return (await this.httpServer.sendCommand('drag_and_drop', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
-            refId,
-            text,
-        });
+            srcRefId,
+            dstRefId,
+        }));
     }
     async getComputedStyle(refId, prop) {
-        return await this.httpServer.sendCommand('get_computed_style', {
+        return (await this.httpServer.sendCommand('get_computed_style', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             refId,
             prop,
-        });
+        }));
     }
     async type(refId, text, clear = false) {
-        const result = await this.httpServer.sendCommand('type', {
+        const result = (await this.httpServer.sendCommand('type', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             refId,
             text,
             clear,
-        });
+        }));
         if (!result.success) {
             throw new Error(result.error || 'Type failed');
         }
     }
+    /** IBrowserDriver 接口别名（避开与字段名冲突的命名歧义） */
+    typeRef(refId, text, clear = false) {
+        return this.type(refId, text, clear);
+    }
     async scroll(x, y, refId) {
         await this.httpServer.sendCommand('scroll', {
             tabId: this.currentTabId,
@@ -208,84 +271,122 @@ export class ExtensionBridge {
             refId,
         });
     }
-    async evaluate(code, timeout, budget) {
-        // budget 覆盖 rpcTimeout：轮询调用方传入端到端预算；一次性调用不传，保留 RPC_MARGIN
-        const rpcTimeout = budget ?? (timeout !== undefined ? timeout + RPC_MARGIN : undefined);
-        const result = await this.httpServer.sendCommand('evaluate', {
+    /** IBrowserDriver 接口别名 */
+    scrollAt(x, y, refId) {
+        return this.scroll(x, y, refId);
+    }
+    async evaluate(code, _args, timeout) {
+        // _args 参数仅满足 IBrowserDriver 接口签名；ExtensionBridge 不消费 args（stealth 路径上层已字符串拼接）
+        const rpcTimeout = timeout !== undefined ? timeout + RPC_MARGIN : undefined;
+        const result = (await this.httpServer.sendCommand('evaluate', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             code,
             timeout,
-        }, rpcTimeout);
+        }, rpcTimeout));
         if (!result.success) {
             throw new Error(result.error || 'Evaluate failed');
         }
-        return result.result ? JSON.parse(result.result) : undefined;
+        if (!result.result) {
+            return undefined;
+        }
+        try {
+            return JSON.parse(result.result);
+        }
+        catch (err) {
+            throw new Error(`evaluate 结果 JSON 解析失败: ${err}`);
+        }
     }
     async find(selector, text, xpath, timeout) {
-        return await this.httpServer.sendCommand('find', {
+        return (await this.httpServer.sendCommand('find', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             selector,
             text,
             xpath,
-        }, timeout);
+        }, timeout));
     }
     async getText(selector) {
-        const result = await this.httpServer.sendCommand('get_text', {
+        const result = (await this.httpServer.sendCommand('get_text', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             selector,
-        });
+        }));
         return result.text;
     }
     async getHtml(selector, outer = true) {
-        const result = await this.httpServer.sendCommand('get_html', {
+        const result = (await this.httpServer.sendCommand('get_html', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             selector,
             outer,
-        });
+        }));
         return result.html;
     }
+    getPageHtml(selector, outer = true) {
+        return this.getHtml(selector, outer);
+    }
+    getPageText(selector) {
+        return this.getText(selector);
+    }
+    async getConsoleLogs(options = {}) {
+        const messages = await this.consoleGet(options);
+        return messages;
+    }
+    async getNetworkRequests(options = {}) {
+        const requests = await this.networkGet(options);
+        return requests;
+    }
+    async screenshot(options) {
+        return (await this.httpServer.sendCommand('screenshot', {
+            tabId: this.currentTabId,
+            ...options,
+        }));
+    }
     async getHtmlWithImages(selector, outer = true) {
-        return await this.httpServer.sendCommand('get_html_with_images', {
+        return (await this.httpServer.sendCommand('get_html_with_images', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             selector,
             outer,
-        });
+        }));
     }
     async getAttribute(selector, refId, attribute) {
-        const result = await this.httpServer.sendCommand('get_attribute', {
+        const result = (await this.httpServer.sendCommand('get_attribute', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
             selector,
             refId,
             attribute,
-        });
+        }));
         return result.value;
     }
     async getMetadata() {
-        return await this.httpServer.sendCommand('get_metadata', {
+        return (await this.httpServer.sendCommand('get_metadata', {
             tabId: this.currentTabId,
             frameId: this.currentFrameId || undefined,
-        });
+        }));
     }
-    // ==================== Cookies ====================
     async getCookies(filter) {
-        return await this.httpServer.sendCommand('cookies_get', filter ?? {});
+        return (await this.httpServer.sendCommand('cookies_get', filter ?? {}));
     }
+    // ==================== Cookies ====================
     async setCookie(params) {
-        await this.httpServer.sendCommand('cookies_set', params);
+        const sameSiteMap = { None: 'no_restriction', Lax: 'lax', Strict: 'strict' };
+        const chromeSameSite = params.sameSite ? (sameSiteMap[params.sameSite] ?? params.sameSite) : undefined;
+        const url = params.url ?? this.state?.url ?? 'http://localhost';
+        await this.httpServer.sendCommand('cookies_set', {
+            ...params,
+            url,
+            ...(chromeSameSite !== undefined && { sameSite: chromeSameSite }),
+        });
     }
     async deleteCookie(url, name) {
         await this.httpServer.sendCommand('cookies_delete', { url, name });
     }
     async clearCookies(filter) {
-        return await this.httpServer.sendCommand('cookies_clear', filter ?? {});
+        return (await this.httpServer.sendCommand('cookies_clear', filter ?? {}));
     }
-    // ==================== Debugger (CDP via Extension) ====================
     async debuggerSend(method, params, tabId, timeout) {
         return await this.httpServer.sendCommand('debugger_send', {
             tabId: tabId ?? this.currentTabId,
@@ -293,7 +394,7 @@ export class ExtensionBridge {
             params,
         }, timeout);
     }
-    // ==================== 输入事件（通过 CDP）====================
+    // ==================== Debugger (CDP via Extension) ====================
     async inputKey(type, options = {}) {
         await this.httpServer.sendCommand('input_key', {
             tabId: this.currentTabId,
@@ -301,6 +402,7 @@ export class ExtensionBridge {
             ...options,
         });
     }
+    // ==================== 输入事件（通过 CDP）====================
     async inputMouse(type, x, y, options = {}) {
         await this.httpServer.sendCommand('input_mouse', {
             tabId: this.currentTabId,
@@ -324,85 +426,107 @@ export class ExtensionBridge {
             delay,
         });
     }
-    // ==================== 控制台日志 ====================
     async consoleEnable() {
         await this.httpServer.sendCommand('console_enable', {
             tabId: this.currentTabId,
         });
     }
+    // ==================== 控制台日志 ====================
     async consoleGet(options = {}) {
-        const result = await this.httpServer.sendCommand('console_get', {
+        const result = (await this.httpServer.sendCommand('console_get', {
             tabId: this.currentTabId,
             ...options,
-        });
+        }));
         return result.messages;
     }
-    // ==================== 网络日志 ====================
     async networkEnable() {
         await this.httpServer.sendCommand('network_enable', {
             tabId: this.currentTabId,
         });
     }
+    // ==================== 网络日志 ====================
     async networkGet(options = {}) {
-        const result = await this.httpServer.sendCommand('network_get', {
+        const result = (await this.httpServer.sendCommand('network_get', {
             tabId: this.currentTabId,
             ...options,
-        });
+        }));
         return result.requests;
     }
-    // ==================== Stealth 模式（JS 事件模拟，无 debugger）====================
     async stealthType(text, delay = 0) {
-        await this.httpServer.sendCommand('stealth_type', {
-            tabId: this.currentTabId,
-            frameId: this.currentFrameId || undefined,
+        const params = {
             text,
             delay,
-        });
+        };
+        if (this.currentTabId !== null) {
+            params.tabId = this.currentTabId;
+        }
+        if (this.currentFrameId !== null) {
+            params.frameId = this.currentFrameId;
+        }
+        await this.httpServer.sendCommand('stealth_type', params);
     }
+    // ==================== Stealth 模式（JS 事件模拟，无 debugger）====================
     async stealthKey(key, type = 'press', modifiers = []) {
-        await this.httpServer.sendCommand('stealth_key', {
-            tabId: this.currentTabId,
-            frameId: this.currentFrameId || undefined,
+        const params = {
             key,
             type,
             modifiers,
-        });
+        };
+        if (this.currentTabId !== null) {
+            params.tabId = this.currentTabId;
+        }
+        if (this.currentFrameId !== null) {
+            params.frameId = this.currentFrameId;
+        }
+        await this.httpServer.sendCommand('stealth_key', params);
     }
-    async stealthClick(x, y, button = 'left') {
-        await this.httpServer.sendCommand('stealth_click', {
-            tabId: this.currentTabId,
-            frameId: this.currentFrameId || undefined,
+    async stealthClick(x, y, button = 'left', clickCount = 1, refId) {
+        const params = {
             x,
             y,
             button,
-        });
+            clickCount,
+        };
+        if (this.currentTabId !== null) {
+            params.tabId = this.currentTabId;
+        }
+        if (this.currentFrameId !== null) {
+            params.frameId = this.currentFrameId;
+        }
+        if (typeof refId === 'string') {
+            params.refId = refId;
+        }
+        await this.httpServer.sendCommand('stealth_click', params);
     }
     async stealthMouse(type, x, y, button = 'left') {
-        await this.httpServer.sendCommand('stealth_mouse', {
-            tabId: this.currentTabId,
-            frameId: this.currentFrameId || undefined,
+        const params = {
             type,
             x,
             y,
             button,
-        });
+        };
+        if (this.currentTabId !== null) {
+            params.tabId = this.currentTabId;
+        }
+        if (this.currentFrameId !== null) {
+            params.frameId = this.currentFrameId;
+        }
+        await this.httpServer.sendCommand('stealth_mouse', params);
     }
     async stealthInject() {
-        await this.httpServer.sendCommand('stealth_inject', {
-            tabId: this.currentTabId,
-            frameId: this.currentFrameId || undefined,
-        });
+        const params = {};
+        if (this.currentTabId !== null) {
+            params.tabId = this.currentTabId;
+        }
+        if (this.currentFrameId !== null) {
+            params.frameId = this.currentFrameId;
+        }
+        await this.httpServer.sendCommand('stealth_inject', params);
     }
-    // ==================== 状态管理 ====================
     getState() {
         return this.state;
     }
-    getCurrentTabId() {
-        return this.currentTabId;
-    }
-    setCurrentTabId(tabId) {
-        this.currentTabId = tabId;
-    }
+    // ==================== 状态管理 ====================
     getCurrentFrameId() {
         return this.currentFrameId;
     }
@@ -413,23 +537,30 @@ export class ExtensionBridge {
      * 在指定 iframe 中以 precise 模式执行 JS（通过 contextId 绕过 CSP）
      */
     async evaluateInFrame(frameId, expression, timeout) {
-        return await this.httpServer.sendCommand('evaluate_in_frame', {
+        return (await this.httpServer.sendCommand('evaluate_in_frame', {
             tabId: this.currentTabId,
             frameId,
             expression,
             returnByValue: true,
             awaitPromise: true,
             timeout,
-        }, timeout);
+        }, timeout));
     }
     /**
      * 解析 iframe 选择器/索引 → frameId
      */
     async resolveFrame(frame) {
-        return await this.httpServer.sendCommand('resolve_frame', {
+        return (await this.httpServer.sendCommand('resolve_frame', {
             tabId: this.currentTabId,
             frame,
-        });
+        }));
+    }
+    parseTargetId(targetId) {
+        const parsed = parseInt(targetId, 10);
+        if (isNaN(parsed)) {
+            throw new DriverCapabilityError(`无效的 Tab ID: ${targetId}`);
+        }
+        return parsed;
     }
     updateState(url, title) {
         this.state = { url, title };