@pyrokine/mcp-chrome 2.0.2 → 2.1.0

package/dist/extension/bridge.js

@@ -54,24 +54,25 @@ export class ExtensionBridge {
         const result = await this.httpServer.sendCommand('tabs_list', {});
         return result;
     }
+    async listWindows() {
+        const result = await this.httpServer.sendCommand('tabs_topology', {});
+        const topology = result;
+        return {
+            ...topology,
+            windows: topology.windows.map((window) => ({
+                ...window,
+                tabs: window.tabs.map((tab) => ({
+                    ...tab,
+                    targetId: String(tab.id),
+                    type: tab.type ?? 'page',
+                })),
+            })),
+        };
+    }
     /** 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,
-        }));
+        return tabs.map((tab) => this.tabToTarget(tab));
     }
     async createTab(url, timeout) {
         const rpcTimeout = timeout !== undefined ? timeout + RPC_MARGIN : undefined;
@@ -84,7 +85,7 @@ export class ExtensionBridge {
         const tab = result;
         // 自动切换到新创建的 tab，后续操作立即生效
         this.currentTabId = tab.id;
-        this.updateState(tab.url, tab.title);
+        this.updateState(tab);
         return tab;
     }
     /** IBrowserDriver 接口：新建页面（targetId 为字符串化的 chrome tab id） */
@@ -95,14 +96,16 @@ export class ExtensionBridge {
             url: tab.url,
             title: tab.title,
             type: 'page',
+            managed: tab.managed,
         };
     }
     async closeTab(tabId) {
-        await this.httpServer.sendCommand('tabs_close', { tabId });
+        const result = (await this.httpServer.sendCommand('tabs_close', { tabId }));
         if (this.currentTabId === tabId) {
             this.currentTabId = null;
             this.state = null;
         }
+        return this.normalizePageChange(result);
     }
     /** IBrowserDriver 接口：关闭页面（targetId 是 chrome tab id 的字符串形式，省略时关闭当前 tab） */
     async closePage(targetId) {
@@ -110,13 +113,104 @@ export class ExtensionBridge {
         if (tabId === null) {
             throw new DriverCapabilityError('没有可关闭的页面，请指定 targetId');
         }
-        await this.closeTab(tabId);
+        return this.closeTab(tabId);
+    }
+    async adoptPage(targetId) {
+        const tabId = this.parseTargetId(targetId);
+        const result = (await this.httpServer.sendCommand('tabs_adopt', { tabId }));
+        this.currentTabId = result.tab.id;
+        this.updateState(result.tab);
+        return {
+            target: this.tabToTarget(result.tab),
+            managedBefore: result.managedBefore,
+            managedAfter: result.managedAfter,
+        };
+    }
+    async releasePage(targetId) {
+        const tabId = this.parseTargetId(targetId);
+        const result = (await this.httpServer.sendCommand('tabs_release', { tabId }));
+        if (this.currentTabId === result.tab.id) {
+            this.currentTabId = null;
+            this.state = null;
+        }
+        return {
+            target: this.tabToTarget(result.tab),
+            managedBefore: result.managedBefore,
+            managedAfter: result.managedAfter,
+        };
+    }
+    async movePage(targetId, options) {
+        const tabId = this.parseTargetId(targetId);
+        const result = (await this.httpServer.sendCommand('tabs_move', {
+            tabId,
+            windowId: options.windowId,
+            index: options.index,
+            active: options.activate,
+        }));
+        return this.normalizePageChange(result);
+    }
+    async reorderPage(targetId, index) {
+        const tabId = this.parseTargetId(targetId);
+        const result = (await this.httpServer.sendCommand('tabs_reorder', {
+            tabId,
+            index,
+        }));
+        return this.normalizePageChange(result);
+    }
+    async pinPage(targetId, pinned) {
+        const tabId = this.parseTargetId(targetId);
+        const result = (await this.httpServer.sendCommand('tabs_pin', { tabId, pinned }));
+        return this.normalizePageChange(result);
+    }
+    async focusWindow(windowId) {
+        const result = (await this.httpServer.sendCommand('window_focus', { windowId }));
+        return this.normalizePageChange(result);
+    }
+    async resizeWindow(windowId, options) {
+        const result = (await this.httpServer.sendCommand('window_resize', {
+            windowId,
+            ...options,
+        }));
+        return this.normalizePageChange(result);
+    }
+    async newWindow(options) {
+        const result = (await this.httpServer.sendCommand('window_create', options));
+        if (result.targetId) {
+            this.currentTabId = this.parseTargetId(result.targetId);
+            const after = result.after;
+            const tab = after?.tabs.find((item) => String(item.id) === result.targetId);
+            if (tab) {
+                this.updateState(tab);
+            }
+        }
+        return this.normalizePageChange(result);
+    }
+    async closeWindow(windowId) {
+        const result = (await this.httpServer.sendCommand('window_close', { windowId }));
+        const before = result.before;
+        if (before?.tabs.some((tab) => tab.id === this.currentTabId)) {
+            this.currentTabId = null;
+            this.state = null;
+        }
+        return this.normalizePageChange(result);
+    }
+    async activatePageWithAffected(targetId) {
+        const tabId = this.parseTargetId(targetId);
+        const result = (await this.httpServer.sendCommand('tabs_activate_managed', {
+            tabId,
+        }));
+        this.currentTabId = tabId;
+        const after = result.after;
+        if (after) {
+            this.updateState(after);
+        }
+        return this.normalizePageChange(result);
     }
     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);
+        this.updateState(tab);
     }
     /** IBrowserDriver 接口：激活页面（切到前台） */
     async activatePage(targetId) {
@@ -125,7 +219,14 @@ export class ExtensionBridge {
     }
     /** IBrowserDriver 接口：选择操作目标 tab（不切换前台，只设置当前 currentTabId） */
     async selectPage(targetId) {
-        this.currentTabId = this.parseTargetId(targetId);
+        const tabId = this.parseTargetId(targetId);
+        const tabs = await this.listTabs();
+        const tab = tabs.find((item) => item.id === tabId);
+        if (!tab) {
+            throw new DriverCapabilityError(`Tab ${targetId} 不存在，请先 browse(action="list") 查看可用页面`);
+        }
+        this.currentTabId = tab.id;
+        this.updateState(tab);
     }
     /** IBrowserDriver 接口：获取当前操作目标 ID（chrome tab id 的字符串形式） */
     getCurrentTargetId() {
@@ -134,6 +235,9 @@ export class ExtensionBridge {
     /** IBrowserDriver 接口：设置当前操作目标 ID */
     setCurrentTargetId(targetId) {
         this.currentTabId = targetId !== null ? this.parseTargetId(targetId) : null;
+        if (targetId === null) {
+            this.state = null;
+        }
     }
     async navigate(url, options) {
         if (this.currentTabId === null) {
@@ -141,7 +245,7 @@ export class ExtensionBridge {
         }
         const rpcTimeout = options?.timeout !== undefined ? options.timeout + RPC_MARGIN : undefined;
         const params = {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             url,
             waitUntil: options?.wait ?? 'load',
             timeout: options?.timeout,
@@ -149,7 +253,7 @@ export class ExtensionBridge {
         const result = await this.httpServer.sendCommand('navigate', params, rpcTimeout);
         const tab = result;
         this.currentTabId = tab.id;
-        this.updateState(tab.url, tab.title);
+        this.updateState(tab);
     }
     // ==================== 导航操作 ====================
     async goBack(timeout) {
@@ -160,12 +264,12 @@ export class ExtensionBridge {
         // 调用方传 timeout 时：timeout 即导航超时 + 信号窗口 + 传输余量
         const rpcTimeout = timeout !== undefined ? timeout + NAV_SIGNAL_WINDOW + RPC_MARGIN : 30000 + NAV_SIGNAL_WINDOW + RPC_MARGIN;
         const params = {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             waitUntil: 'load',
             timeout,
         };
         const result = (await this.httpServer.sendCommand('go_back', params, rpcTimeout));
-        this.updateState(result.url, result.title);
+        this.updateState(result);
         return result;
     }
     async goForward(timeout) {
@@ -176,12 +280,12 @@ export class ExtensionBridge {
         // 调用方传 timeout 时：timeout 即导航超时 + 信号窗口 + 传输余量
         const rpcTimeout = timeout !== undefined ? timeout + NAV_SIGNAL_WINDOW + RPC_MARGIN : 30000 + NAV_SIGNAL_WINDOW + RPC_MARGIN;
         const params = {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             waitUntil: 'load',
             timeout,
         };
         const result = (await this.httpServer.sendCommand('go_forward', params, rpcTimeout));
-        this.updateState(result.url, result.title);
+        this.updateState(result);
         return result;
     }
     async reload(ignoreCache = false, waitUntil, timeout) {
@@ -190,18 +294,18 @@ export class ExtensionBridge {
         }
         const rpcTimeout = timeout !== undefined ? timeout + RPC_MARGIN : undefined;
         const params = {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             ignoreCache,
             waitUntil: waitUntil ?? 'load',
             timeout,
         };
         const result = await this.httpServer.sendCommand('reload', params, rpcTimeout);
         const tab = result;
-        this.updateState(tab.url, tab.title);
+        this.updateState(tab);
     }
     async readPage(options) {
         return (await this.httpServer.sendCommand('read_page', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             ...options,
         }));
@@ -209,7 +313,7 @@ export class ExtensionBridge {
     // ==================== 页面内容 ====================
     async click(refId) {
         const result = (await this.httpServer.sendCommand('click', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             refId,
         }));
@@ -220,15 +324,23 @@ export class ExtensionBridge {
     // ==================== DOM 操作 ====================
     async actionableClick(refId, force) {
         return (await this.httpServer.sendCommand('actionable_click', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             refId,
             force: force ?? false,
         }));
     }
+    async checkActionability(refId) {
+        const result = (await this.httpServer.sendCommand('check_actionability', {
+            tabId: this.requireCurrentTabId(),
+            frameId: this.currentFrameId || undefined,
+            refId,
+        }));
+        return { ...result, success: result.success ?? result.actionable === true };
+    }
     async dispatchInput(refId, text) {
         return (await this.httpServer.sendCommand('dispatch_input', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             refId,
             text,
@@ -236,7 +348,7 @@ export class ExtensionBridge {
     }
     async dragAndDrop(srcRefId, dstRefId) {
         return (await this.httpServer.sendCommand('drag_and_drop', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             srcRefId,
             dstRefId,
@@ -244,7 +356,7 @@ export class ExtensionBridge {
     }
     async getComputedStyle(refId, prop) {
         return (await this.httpServer.sendCommand('get_computed_style', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             refId,
             prop,
@@ -252,7 +364,7 @@ export class ExtensionBridge {
     }
     async type(refId, text, clear = false) {
         const result = (await this.httpServer.sendCommand('type', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             refId,
             text,
@@ -268,7 +380,7 @@ export class ExtensionBridge {
     }
     async scroll(x, y, refId) {
         await this.httpServer.sendCommand('scroll', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             x,
             y,
@@ -283,7 +395,7 @@ export class ExtensionBridge {
         // _args 参数仅满足 IBrowserDriver 接口签名；ExtensionBridge 不消费 args（stealth 路径上层已字符串拼接）
         const rpcTimeout = timeout !== undefined ? timeout + RPC_MARGIN : undefined;
         const result = (await this.httpServer.sendCommand('evaluate', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             code,
             timeout,
@@ -298,12 +410,12 @@ export class ExtensionBridge {
             return JSON.parse(result.result);
         }
         catch (err) {
-            throw new Error(`evaluate 结果 JSON 解析失败: ${err}`);
+            throw new Error(`evaluate 结果 JSON 解析失败: ${err}`, { cause: err });
         }
     }
     async find(selector, text, xpath, timeout) {
         return (await this.httpServer.sendCommand('find', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             selector,
             text,
@@ -312,7 +424,7 @@ export class ExtensionBridge {
     }
     async getText(selector) {
         const result = (await this.httpServer.sendCommand('get_text', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             selector,
         }));
@@ -320,7 +432,7 @@ export class ExtensionBridge {
     }
     async getHtml(selector, outer = true) {
         const result = (await this.httpServer.sendCommand('get_html', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             selector,
             outer,
@@ -343,13 +455,13 @@ export class ExtensionBridge {
     }
     async screenshot(options) {
         return (await this.httpServer.sendCommand('screenshot', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             ...options,
         }));
     }
     async getHtmlWithImages(selector, outer = true) {
         return (await this.httpServer.sendCommand('get_html_with_images', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             selector,
             outer,
@@ -357,7 +469,7 @@ export class ExtensionBridge {
     }
     async getAttribute(selector, refId, attribute) {
         const result = (await this.httpServer.sendCommand('get_attribute', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
             selector,
             refId,
@@ -367,10 +479,15 @@ export class ExtensionBridge {
     }
     async getMetadata() {
         return (await this.httpServer.sendCommand('get_metadata', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId || undefined,
         }));
     }
+    async getFrames() {
+        return (await this.httpServer.sendCommand('get_all_frames', {
+            tabId: this.requireCurrentTabId(),
+        }));
+    }
     async getCookies(filter) {
         return (await this.httpServer.sendCommand('cookies_get', filter ?? {}));
     }
@@ -393,7 +510,7 @@ export class ExtensionBridge {
     }
     async debuggerSend(method, params, tabId, timeout) {
         return await this.httpServer.sendCommand('debugger_send', {
-            tabId: tabId ?? this.currentTabId,
+            tabId: tabId ?? this.requireCurrentTabId(),
             method,
             params,
         }, timeout);
@@ -401,7 +518,7 @@ export class ExtensionBridge {
     // ==================== Debugger (CDP via Extension) ====================
     async inputKey(type, options = {}) {
         await this.httpServer.sendCommand('input_key', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             type,
             ...options,
         });
@@ -409,7 +526,7 @@ export class ExtensionBridge {
     // ==================== 输入事件（通过 CDP）====================
     async inputMouse(type, x, y, options = {}) {
         await this.httpServer.sendCommand('input_mouse', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             type,
             x,
             y,
@@ -418,40 +535,40 @@ export class ExtensionBridge {
     }
     async inputTouch(type, touchPoints) {
         await this.httpServer.sendCommand('input_touch', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             type,
             touchPoints,
         });
     }
     async inputType(text, delay = 0) {
         await this.httpServer.sendCommand('input_type', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             text,
             delay,
         });
     }
     async consoleEnable() {
         await this.httpServer.sendCommand('console_enable', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
         });
     }
     // ==================== 控制台日志 ====================
     async consoleGet(options = {}) {
         const result = (await this.httpServer.sendCommand('console_get', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             ...options,
         }));
         return result.messages;
     }
     async networkEnable() {
         await this.httpServer.sendCommand('network_enable', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
         });
     }
     // ==================== 网络日志 ====================
     async networkGet(options = {}) {
         const result = (await this.httpServer.sendCommand('network_get', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             ...options,
         }));
         return result.requests;
@@ -461,7 +578,7 @@ export class ExtensionBridge {
             throw new DriverCapabilityError('没有当前页面，请先 browse attach 或先 browse open 创建受控页面');
         }
         const params = {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId !== null ? this.currentFrameId : undefined,
             text,
             delay,
@@ -474,7 +591,7 @@ export class ExtensionBridge {
             throw new DriverCapabilityError('没有当前页面，请先 browse attach 或先 browse open 创建受控页面');
         }
         const params = {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId !== null ? this.currentFrameId : undefined,
             key,
             type,
@@ -487,7 +604,7 @@ export class ExtensionBridge {
             throw new DriverCapabilityError('没有当前页面，请先 browse attach 或先 browse open 创建受控页面');
         }
         const params = {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId !== null ? this.currentFrameId : undefined,
             x,
             y,
@@ -504,7 +621,7 @@ export class ExtensionBridge {
             throw new DriverCapabilityError('没有当前页面，请先 browse attach 或先 browse open 创建受控页面');
         }
         const params = {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId !== null ? this.currentFrameId : undefined,
             type,
             x,
@@ -518,7 +635,7 @@ export class ExtensionBridge {
             throw new DriverCapabilityError('没有当前页面，请先 browse attach 或先 browse open 创建受控页面');
         }
         const params = {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId: this.currentFrameId !== null ? this.currentFrameId : undefined,
         };
         await this.httpServer.sendCommand('stealth_inject', params);
@@ -538,7 +655,7 @@ export class ExtensionBridge {
      */
     async evaluateInFrame(frameId, expression, timeout) {
         return (await this.httpServer.sendCommand('evaluate_in_frame', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frameId,
             expression,
             returnByValue: true,
@@ -551,10 +668,36 @@ export class ExtensionBridge {
      */
     async resolveFrame(frame) {
         return (await this.httpServer.sendCommand('resolve_frame', {
-            tabId: this.currentTabId,
+            tabId: this.requireCurrentTabId(),
             frame,
         }));
     }
+    requireCurrentTabId() {
+        if (this.currentTabId === null) {
+            throw new DriverCapabilityError('没有当前页面，请先 browse attach 或先 browse open 创建受控页面');
+        }
+        return this.currentTabId;
+    }
+    normalizePageChange(result) {
+        return {
+            targetId: result.targetId,
+            windowId: result.windowId,
+            before: this.normalizeAffected(result.before),
+            after: this.normalizeAffected(result.after),
+        };
+    }
+    normalizeAffected(value) {
+        if (!value) {
+            return value;
+        }
+        if ('url' in value) {
+            return this.tabToTarget(value);
+        }
+        return {
+            ...value,
+            tabs: value.tabs.map((tab) => this.tabToTarget(tab)),
+        };
+    }
     parseTargetId(targetId) {
         const parsed = parseInt(targetId, 10);
         if (isNaN(parsed)) {
@@ -562,8 +705,25 @@ export class ExtensionBridge {
         }
         return parsed;
     }
-    updateState(url, title) {
-        this.state = { url, title };
+    tabToTarget(tab) {
+        return {
+            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,
+        };
+    }
+    updateState(page) {
+        this.state = { url: page.url, title: page.title, managed: page.managed };
     }
 }
 //# sourceMappingURL=bridge.js.map