@pyrokine/mcp-chrome 1.0.0 → 1.1.0

package/dist/tools/wait.js

@@ -8,8 +8,8 @@
  * - idle: 等待网络空闲
  */
 import { z } from 'zod';
-import { formatErrorResponse, getSession, TimeoutError } from '../core/index.js';
-import { targetJsonSchema, targetZodSchema } from './schema.js';
+import { formatErrorResponse, getSession, getUnifiedSession, TimeoutError } from '../core/index.js';
+import { targetJsonSchema, targetToFindParams, targetZodSchema } from './schema.js';
 /**
  * wait 工具定义
  */
@@ -37,10 +37,18 @@ export const waitToolDefinition = {
                 type: 'number',
                 description: '毫秒（time）',
             },
+            tabId: {
+                type: 'string',
+                description: '目标 Tab ID（可选，仅 Extension 模式）。不指定则使用当前 attach 的 tab。可操作非当前 attach 的 tab。CDP 模式下忽略此参数',
+            },
             timeout: {
                 type: 'number',
                 description: '超时',
             },
+            frame: {
+                oneOf: [{ type: 'string' }, { type: 'number' }],
+                description: 'iframe 定位（可选，仅 Extension 模式）。CSS 选择器（如 "iframe#main"）或索引（如 0）。不指定则在主框架操作',
+            },
         },
         required: ['for'],
     },
@@ -53,7 +61,9 @@ const waitSchema = z.object({
     target: targetZodSchema.optional(),
     state: z.enum(['visible', 'hidden', 'attached', 'detached']).optional(),
     ms: z.number().optional(),
+    tabId: z.string().optional(),
     timeout: z.number().optional(),
+    frame: z.union([z.string(), z.number()]).optional(),
 });
 /**
  * wait 工具处理器
@@ -61,135 +71,339 @@ const waitSchema = z.object({
 export async function handleWait(params) {
     try {
         const args = waitSchema.parse(params);
-        const session = getSession();
+        const unifiedSession = getUnifiedSession();
+        const mode = unifiedSession.getMode();
         const timeout = args.timeout ?? 30000;
-        switch (args.for) {
-            case 'element': {
-                if (!args.target) {
-                    return {
-                        content: [
-                            {
-                                type: 'text',
-                                text: JSON.stringify({
-                                    error: {
-                                        code: 'INVALID_ARGUMENT',
-                                        message: '等待元素需要 target 参数',
+        return await unifiedSession.withTabId(args.tabId, async () => {
+            return await unifiedSession.withFrame(args.frame, async () => {
+                switch (args.for) {
+                    case 'element': {
+                        if (!args.target) {
+                            return {
+                                content: [
+                                    {
+                                        type: 'text',
+                                        text: JSON.stringify({
+                                            error: {
+                                                code: 'INVALID_ARGUMENT',
+                                                message: '等待元素需要 target 参数',
+                                            },
+                                        }),
                                     },
-                                }),
-                            },
-                        ],
-                        isError: true,
-                    };
-                }
-                const state = args.state ?? 'visible';
-                await waitForElement(session, args.target, state, timeout);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                waited: 'element',
-                                state,
-                            }),
-                        },
-                    ],
-                };
-            }
-            case 'navigation': {
-                // 等待页面加载完成
-                await waitForNavigation(session, timeout);
-                const sessionState = session.getState();
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                waited: 'navigation',
-                                url: sessionState?.url,
-                                title: sessionState?.title,
-                            }),
-                        },
-                    ],
-                };
-            }
-            case 'time': {
-                if (!args.ms) {
-                    return {
-                        content: [
-                            {
-                                type: 'text',
-                                text: JSON.stringify({
-                                    error: {
-                                        code: 'INVALID_ARGUMENT',
-                                        message: '等待时间需要 ms 参数',
+                                ],
+                                isError: true,
+                            };
+                        }
+                        const state = args.state ?? 'visible';
+                        if (mode === 'extension') {
+                            await waitForElementExtension(unifiedSession, args.target, state, timeout);
+                        }
+                        else {
+                            const session = getSession();
+                            await waitForElement(session, args.target, state, timeout);
+                        }
+                        return {
+                            content: [
+                                {
+                                    type: 'text',
+                                    text: JSON.stringify({
+                                        success: true,
+                                        waited: 'element',
+                                        state,
+                                        mode,
+                                    }),
+                                },
+                            ],
+                        };
+                    }
+                    case 'navigation': {
+                        if (mode === 'extension') {
+                            // Extension 模式：轮询 document.readyState 等待页面加载完成
+                            const navStart = Date.now();
+                            let navCompleted = false;
+                            let navLastError = null;
+                            while (Date.now() - navStart < timeout) {
+                                if (!unifiedSession.isExtensionConnected()) {
+                                    navLastError = new Error('Extension 未连接');
+                                    await new Promise(resolve => setTimeout(resolve, 100));
+                                    continue;
+                                }
+                                try {
+                                    const remaining = timeout - (Date.now() - navStart);
+                                    const readyState = await unifiedSession.evaluate('document.readyState', undefined, remaining);
+                                    // evaluate 带 timeout 时，Extension 断连会静默回退 CDP，返回错误 tab 的数据
+                                    if (!unifiedSession.isExtensionConnected()) {
+                                        navLastError = new Error('Extension 在 evaluate 期间断开');
+                                        await new Promise(resolve => setTimeout(resolve, 100));
+                                        continue;
+                                    }
+                                    if (readyState === 'complete') {
+                                        navCompleted = true;
+                                        break;
+                                    }
+                                }
+                                catch (err) {
+                                    // 页面正在导航中，evaluate 可能失败
+                                    navLastError = err instanceof Error ? err : new Error(String(err));
+                                }
+                                await new Promise(resolve => setTimeout(resolve, 100));
+                            }
+                            if (!navCompleted) {
+                                const msg = `等待导航完成超时 (${timeout}ms)`;
+                                throw new TimeoutError(navLastError ? `${msg}: ${navLastError.message}` : msg);
+                            }
+                            // 从实际 tab 中查询 URL/title，而非依赖全局缓存状态（支持 tabId 参数）
+                            const navRemaining = timeout - (Date.now() - navStart);
+                            let navUrl = null;
+                            let navTitle = null;
+                            if (navRemaining > 0) {
+                                try {
+                                    const pageInfo = await unifiedSession.evaluate('({url: location.href, title: document.title})', undefined, navRemaining);
+                                    // CDP 回退的数据来自错误 tab，丢弃
+                                    if (unifiedSession.isExtensionConnected()) {
+                                        navUrl = pageInfo.url;
+                                        navTitle = pageInfo.title;
+                                    }
+                                }
+                                catch {
+                                    // 预算耗尽或连接断开，降级返回（导航本身已成功）
+                                }
+                            }
+                            return {
+                                content: [
+                                    {
+                                        type: 'text',
+                                        text: JSON.stringify({
+                                            success: true,
+                                            waited: 'navigation',
+                                            url: navUrl,
+                                            title: navTitle,
+                                            mode,
+                                        }),
                                     },
-                                }),
-                            },
-                        ],
-                        isError: true,
-                    };
-                }
-                await new Promise((resolve) => setTimeout(resolve, args.ms));
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                waited: 'time',
-                                ms: args.ms,
-                            }),
-                        },
-                    ],
-                };
-            }
-            case 'idle': {
-                // 等待网络空闲
-                await waitForNetworkIdle(session, timeout);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                waited: 'idle',
-                            }),
-                        },
-                    ],
-                };
-            }
-            default:
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: {
-                                    code: 'INVALID_ARGUMENT',
-                                    message: `未知等待类型: ${args.for}`,
+                                ],
+                            };
+                        }
+                        // CDP 模式
+                        const session = getSession();
+                        await waitForNavigation(session, timeout);
+                        const sessionState = session.getState();
+                        return {
+                            content: [
+                                {
+                                    type: 'text',
+                                    text: JSON.stringify({
+                                        success: true,
+                                        waited: 'navigation',
+                                        url: sessionState?.url,
+                                        title: sessionState?.title,
+                                        mode,
+                                    }),
                                 },
-                            }),
-                        },
-                    ],
-                    isError: true,
-                };
-        }
+                            ],
+                        };
+                    }
+                    case 'time': {
+                        if (!args.ms) {
+                            return {
+                                content: [
+                                    {
+                                        type: 'text',
+                                        text: JSON.stringify({
+                                            error: {
+                                                code: 'INVALID_ARGUMENT',
+                                                message: '等待时间需要 ms 参数',
+                                            },
+                                        }),
+                                    },
+                                ],
+                                isError: true,
+                            };
+                        }
+                        await new Promise((resolve) => setTimeout(resolve, args.ms));
+                        return {
+                            content: [
+                                {
+                                    type: 'text',
+                                    text: JSON.stringify({
+                                        success: true,
+                                        waited: 'time',
+                                        ms: args.ms,
+                                    }),
+                                },
+                            ],
+                        };
+                    }
+                    case 'idle': {
+                        if (mode === 'extension') {
+                            // Extension 模式：等待 document.readyState === 'complete' + 额外网络静默期
+                            const idleStart = Date.now();
+                            let idleCompleted = false;
+                            let idleLastError = null;
+                            while (Date.now() - idleStart < timeout) {
+                                if (!unifiedSession.isExtensionConnected()) {
+                                    idleLastError = new Error('Extension 未连接');
+                                    await new Promise(resolve => setTimeout(resolve, 100));
+                                    continue;
+                                }
+                                try {
+                                    const remaining = timeout - (Date.now() - idleStart);
+                                    const readyState = await unifiedSession.evaluate('document.readyState', undefined, remaining);
+                                    // evaluate 带 timeout 时，Extension 断连会静默回退 CDP，返回错误 tab 的数据
+                                    if (!unifiedSession.isExtensionConnected()) {
+                                        idleLastError = new Error('Extension 在 evaluate 期间断开');
+                                        await new Promise(resolve => setTimeout(resolve, 100));
+                                        continue;
+                                    }
+                                    if (readyState === 'complete') {
+                                        idleCompleted = true;
+                                        break;
+                                    }
+                                }
+                                catch (err) {
+                                    idleLastError = err instanceof Error ? err : new Error(String(err));
+                                }
+                                await new Promise(resolve => setTimeout(resolve, 100));
+                            }
+                            if (!idleCompleted) {
+                                const msg = `等待网络空闲超时 (${timeout}ms)`;
+                                throw new TimeoutError(idleLastError ? `${msg}: ${idleLastError.message}` : msg);
+                            }
+                            // 额外等待确保网络请求结束，受 timeout 约束
+                            const idleRemaining = timeout - (Date.now() - idleStart);
+                            if (idleRemaining > 0) {
+                                await new Promise(resolve => setTimeout(resolve, Math.min(500, idleRemaining)));
+                            }
+                            return {
+                                content: [
+                                    {
+                                        type: 'text',
+                                        text: JSON.stringify({
+                                            success: true,
+                                            waited: 'idle',
+                                            mode,
+                                        }),
+                                    },
+                                ],
+                            };
+                        }
+                        // CDP 模式
+                        const session = getSession();
+                        await waitForNetworkIdle(session, timeout);
+                        return {
+                            content: [
+                                {
+                                    type: 'text',
+                                    text: JSON.stringify({
+                                        success: true,
+                                        waited: 'idle',
+                                        mode,
+                                    }),
+                                },
+                            ],
+                        };
+                    }
+                    default:
+                        return {
+                            content: [
+                                {
+                                    type: 'text',
+                                    text: JSON.stringify({
+                                        error: {
+                                            code: 'INVALID_ARGUMENT',
+                                            message: `未知等待类型: ${args.for}`,
+                                        },
+                                    }),
+                                },
+                            ],
+                            isError: true,
+                        };
+                }
+            }); // withFrame
+        }); // withTabId
     }
     catch (error) {
         return formatErrorResponse(error);
     }
 }
 /**
- * 等待元素
+ * Extension 模式：等待元素
+ */
+async function waitForElementExtension(unifiedSession, target, state, timeout) {
+    const startTime = Date.now();
+    const retryDelay = 100;
+    const { selector, text, xpath } = targetToFindParams(target);
+    let lastError = null;
+    while (true) {
+        const elapsed = Date.now() - startTime;
+        if (elapsed >= timeout) {
+            const msg = `等待元素 ${JSON.stringify(target)} 状态 ${state} 超时 (${timeout}ms)`;
+            throw new TimeoutError(lastError ? `${msg}: ${lastError.message}` : msg);
+        }
+        // 未连接时跳过 find()，避免阻塞超出用户 timeout
+        if (!unifiedSession.isExtensionConnected()) {
+            lastError = new Error('Extension 未连接');
+            await new Promise(resolve => setTimeout(resolve, retryDelay));
+            continue;
+        }
+        try {
+            const remaining = timeout - elapsed;
+            const elements = await unifiedSession.find(selector, text, xpath, remaining);
+            const found = elements.length > 0;
+            switch (state) {
+                case 'attached':
+                case 'visible': {
+                    if (found) {
+                        if (state === 'visible') {
+                            const rect = elements[0].rect;
+                            if (rect.width > 0 && rect.height > 0) {
+                                return;
+                            }
+                        }
+                        else {
+                            return;
+                        }
+                    }
+                    break;
+                }
+                case 'detached':
+                case 'hidden': {
+                    if (!found) {
+                        return;
+                    }
+                    if (state === 'hidden' && found) {
+                        const rect = elements[0].rect;
+                        if (rect.width === 0 || rect.height === 0) {
+                            return;
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+        catch (err) {
+            // find() 在元素不存在时返回空数组（不抛异常），此处异常是真正的错误。
+            // 暂时性错误（RPC 超时、发送失败、连接断开）可重试，其他确定性错误立即抛出
+            if (err instanceof Error && /Request timeout|Failed to send|disconnect|未连接|stopped|replaced/i.test(err.message)) {
+                lastError = err;
+                await new Promise(resolve => setTimeout(resolve, retryDelay));
+                continue;
+            }
+            throw err;
+        }
+        await new Promise(resolve => setTimeout(resolve, retryDelay));
+    }
+}
+/**
+ * CDP 模式：等待元素
  */
 async function waitForElement(session, target, state, timeout) {
     const startTime = Date.now();
     const retryDelay = 100;
     while (Date.now() - startTime < timeout) {
         try {
-            const locator = session.createLocator(target);
+            const remaining = timeout - (Date.now() - startTime);
+            const locator = session.createLocator(target, { timeout: remaining });
             switch (state) {
                 case 'attached':
                 case 'visible': {

package/dist/tools/wait.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/tools/wait.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/tools/wait.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyrokine/mcp-chrome",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Chrome browser automation MCP Server using Chrome DevTools Protocol",
   "main": "dist/index.js",
   "type": "module",
@@ -22,12 +22,12 @@
   "license": "MIT",
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",
-    "ws": "^8.18.0",
+    "ws": "^8.19.0",
     "zod": "^3.24.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
-    "@types/ws": "^8.5.0",
+    "@types/ws": "^8.18.1",
     "typescript": "^5.7.0"
   },
   "engines": {
@@ -37,7 +37,6 @@
     "mcp-chrome": "./dist/index.js"
   },
   "files": [
-    "dist",
-    "scripts"
+    "dist"
   ]
 }

package/scripts/start-chrome-headless.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# MCP Browser - Chrome 无头模式启动脚本
-# 启动无头 Chrome（适合服务器环境）
-
-PORT="${1:-9222}"
-
-echo "Starting Chrome in headless mode on port $PORT..."
-
-# 检测操作系统和 Chrome 路径
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    CHROME_PATH="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    if command -v google-chrome &> /dev/null; then
-        CHROME_PATH="google-chrome"
-    elif command -v google-chrome-stable &> /dev/null; then
-        CHROME_PATH="google-chrome-stable"
-    elif command -v chromium &> /dev/null; then
-        CHROME_PATH="chromium"
-    else
-        echo "Error: Chrome/Chromium not found"
-        exit 1
-    fi
-else
-    echo "Error: Unsupported OS"
-    exit 1
-fi
-
-# 启动无头 Chrome
-"$CHROME_PATH" \
-    --headless=new \
-    --remote-debugging-port="$PORT" \
-    --disable-gpu \
-    --no-sandbox \
-    --disable-dev-shm-usage \
-    --window-size=1920,1080 \
-    "$@"

package/scripts/start-chrome.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# MCP Browser - Chrome 启动脚本
-# 启动带远程调试端口的 Chrome 浏览器
-
-PORT="${1:-9222}"
-PROFILE_DIR="${HOME}/.chrome-mcp-profile"
-
-echo "Starting Chrome with remote debugging on port $PORT..."
-echo "Profile directory: $PROFILE_DIR"
-
-# 检测操作系统
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    # macOS
-    CHROME_PATH="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    # Linux
-    if command -v google-chrome &> /dev/null; then
-        CHROME_PATH="google-chrome"
-    elif command -v google-chrome-stable &> /dev/null; then
-        CHROME_PATH="google-chrome-stable"
-    elif command -v chromium &> /dev/null; then
-        CHROME_PATH="chromium"
-    elif command -v chromium-browser &> /dev/null; then
-        CHROME_PATH="chromium-browser"
-    else
-        echo "Error: Chrome/Chromium not found"
-        exit 1
-    fi
-else
-    echo "Error: Unsupported OS"
-    exit 1
-fi
-
-# 启动 Chrome
-"$CHROME_PATH" \
-    --remote-debugging-port="$PORT" \
-    --user-data-dir="$PROFILE_DIR" \
-    --no-first-run \
-    --no-default-browser-check \
-    "$@"