@pyrokine/mcp-chrome 1.1.0 → 1.3.0

package/dist/core/session.d.ts

@@ -10,7 +10,7 @@
 import { BehaviorSimulator } from '../anti-detection/index.js';
 import { AutoWait } from './auto-wait.js';
 import { Locator } from './locator.js';
-import type { ConnectOptions, ConsoleLogEntry, Cookie, CookieOptions, LaunchOptions, NetworkRequestEntry, PageState, Target, TargetInfo, WaitUntil } from './types.js';
+import { type ConnectOptions, type ConsoleLogEntry, type Cookie, type CookieOptions, type LaunchOptions, type NetworkRequestEntry, type PageState, type Target, type TargetInfo, type WaitUntil } from './types.js';
 /**
  * 会话状态
  */
@@ -33,17 +33,19 @@ declare class SessionManager {
     private state;
     private behaviorSimulator;
     private stealthMode;
+    /** 当前按下的修饰键位掩码 */
+    private modifiers;
     private operationLock;
     private consoleLogs;
     private networkRequests;
     private requestMap;
     private listenersInstalled;
     private constructor();
-    static getInstance(): SessionManager;
     /**
      * 获取当前调试端口
      */
     get port(): number | null;
+    static getInstance(): SessionManager;
     /**
      * 启动浏览器
      *
@@ -63,10 +65,6 @@ declare class SessionManager {
      * 附加到指定页面（外部入口，加锁）
      */
     attachToTarget(targetId: string): Promise<void>;
-    /**
-     * 附加到指定页面（内部版本，不加锁，供 launch/connect 等已持锁方法调用）
-     */
-    private attachToTargetInternal;
     /**
      * 导航到 URL
      */
@@ -108,6 +106,7 @@ declare class SessionManager {
      */
     createLocator(target: Target, options?: {
         timeout?: number;
+        nth?: number;
     }): Locator;
     /**
      * 创建自动等待器
@@ -162,7 +161,7 @@ declare class SessionManager {
     /**
      * 截图
      */
-    screenshot(fullPage?: boolean): Promise<string>;
+    screenshot(fullPage?: boolean, scale?: number, format?: string, quality?: number): Promise<string>;
     /**
      * 获取页面状态
      */
@@ -216,10 +215,6 @@ declare class SessionManager {
      * 新建页面（外部入口，加锁）
      */
     newPage(): Promise<TargetInfo>;
-    /**
-     * 新建页面（内部版本，不加锁，供 launch 等已持锁方法调用）
-     */
-    private newPageInternal;
     /**
      * 激活页面（切到前台）
      */
@@ -237,13 +232,6 @@ declare class SessionManager {
      * 2. 通过 withLock 串行化状态清理：等 withLock 中的操作处理完错误后再置空引用
      */
     close(): Promise<void>;
-    /**
-     * 重置所有状态（同步，不加锁）
-     *
-     * 供已持有 withLock 的方法调用（launch/connect），避免 close() 的 withLock 重入死锁。
-     * 外部调用请使用 close()。
-     */
-    private resetState;
     /**
      * 获取当前状态
      */
@@ -253,9 +241,33 @@ declare class SessionManager {
      */
     isConnected(): boolean;
     /**
-     * 是否有活跃会话
+     * 发送 CDP 命令（page-level，携带 sessionId）
+     *
+     * 每次调用都检查连接状态，防止 close() 并发置空 this.cdp 后崩溃。
+     * 多步操作（type 循环、fullPage 截图等）的 await 间隙可能被 close() 打断，
+     * ensureSession() 确保在当前 tick 内 this.cdp 非空。
+     */
+    send<T>(method: string, params?: object, timeout?: number): Promise<T>;
+    /**
+     * 发送 browser-level CDP 命令（不携带 sessionId）
+     * 用于 Target.*、Browser.* 等浏览器级命令
+     */
+    sendBrowserCommand<T>(method: string, params?: object): Promise<T>;
+    /**
+     * 附加到指定页面（内部版本，不加锁，供 launch/connect 等已持锁方法调用）
+     */
+    private attachToTargetInternal;
+    /**
+     * 新建页面（内部版本，不加锁，供 launch 等已持锁方法调用）
+     */
+    private newPageInternal;
+    /**
+     * 重置所有状态（同步，不加锁）
+     *
+     * 供已持有 withLock 的方法调用（launch/connect），避免 close() 的 withLock 重入死锁。
+     * 外部调用请使用 close()。
      */
-    hasSession(): boolean;
+    private resetState;
     /**
      * 串行执行操作（防止并发竞态）
      */
@@ -280,19 +292,6 @@ declare class SessionManager {
      * 更新页面状态
      */
     private updateState;
-    /**
-     * 发送 CDP 命令（page-level，携带 sessionId）
-     *
-     * 每次调用都检查连接状态，防止 close() 并发置空 this.cdp 后崩溃。
-     * 多步操作（type 循环、fullPage 截图等）的 await 间隙可能被 close() 打断，
-     * ensureSession() 确保在当前 tick 内 this.cdp 非空。
-     */
-    send<T>(method: string, params?: object, timeout?: number): Promise<T>;
-    /**
-     * 发送 browser-level CDP 命令（不携带 sessionId）
-     * 用于 Target.*、Browser.* 等浏览器级命令
-     */
-    sendBrowserCommand<T>(method: string, params?: object): Promise<T>;
     /**
      * 确保已连接
      */

package/dist/core/session.d.ts.map

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

package/dist/core/session.js

@@ -12,6 +12,7 @@ import { BrowserLauncher, CDPClient, getBrowserWSEndpoint, getTargets } from '..
 import { AutoWait } from './auto-wait.js';
 import { NavigationTimeoutError, SessionNotFoundError, TargetNotFoundError } from './errors.js';
 import { Locator } from './locator.js';
+import { DEFAULT_TIMEOUT, MODIFIER_KEYS, } from './types.js';
 /**
  * 会话管理器（单例）
  */
@@ -27,6 +28,8 @@ class SessionManager {
     state = null;
     behaviorSimulator = new BehaviorSimulator();
     stealthMode = 'safe';
+    /** 当前按下的修饰键位掩码 */
+    modifiers = 0;
     // 操作锁（防止并发竞态）
     operationLock = Promise.resolve();
     consoleLogs = [];
@@ -36,18 +39,18 @@ class SessionManager {
     listenersInstalled = false;
     constructor() {
     }
-    static getInstance() {
-        if (!SessionManager.instance) {
-            SessionManager.instance = new SessionManager();
-        }
-        return SessionManager.instance;
-    }
     /**
      * 获取当前调试端口
      */
     get port() {
         return this.launcher?.port ?? (this.connectedPort || null);
     }
+    static getInstance() {
+        if (!SessionManager.instance) {
+            SessionManager.instance = new SessionManager();
+        }
+        return SessionManager.instance;
+    }
     /**
      * 启动浏览器
      *
@@ -132,7 +135,7 @@ class SessionManager {
      */
     async connect(options) {
         return this.withLock(async () => {
-            const { host = '127.0.0.1', port, timeout = 30000, stealth = 'safe' } = options;
+            const { host = '127.0.0.1', port, timeout = DEFAULT_TIMEOUT, stealth = 'safe' } = options;
             // 关闭现有会话
             this.resetState();
             // 保存 stealth 模式
@@ -142,6 +145,7 @@ class SessionManager {
             // 连接 CDP
             this.cdp = new CDPClient();
             await this.cdp.connect(endpoint, timeout);
+            this.connectedPort = port;
             // 获取第一个页面
             const targets = await getTargets(host, port);
             const pageTarget = targets.find((t) => t.type === 'page');
@@ -180,43 +184,13 @@ class SessionManager {
     async attachToTarget(targetId) {
         return this.withLock(async () => this.attachToTargetInternal(targetId));
     }
-    /**
-     * 附加到指定页面（内部版本，不加锁，供 launch/connect 等已持锁方法调用）
-     */
-    async attachToTargetInternal(targetId) {
-        this.ensureConnected();
-        // 如果已经附加到同一个 target，跳过
-        if (this.currentTargetId === targetId && this.sessionId) {
-            return;
-        }
-        // 如果有之前的 session，先分离
-        if (this.sessionId) {
-            try {
-                await this.cdp.send('Target.detachFromTarget', {
-                    sessionId: this.sessionId,
-                });
-            }
-            catch {
-                // 忽略分离错误
-            }
-        }
-        // 附加到目标
-        const { sessionId } = (await this.cdp.send('Target.attachToTarget', {
-            targetId,
-            flatten: true,
-        }));
-        this.sessionId = sessionId;
-        this.currentTargetId = targetId;
-        // 初始化会话
-        await this.initSession();
-    }
     /**
      * 导航到 URL
      */
     async navigate(url, options = {}) {
         return this.withLock(async () => {
             this.ensureSession();
-            const { wait = 'load', timeout = 30000 } = options;
+            const { wait = 'load', timeout = DEFAULT_TIMEOUT } = options;
             // 导航（传 timeout 防止 CDP 默认 30s 截断用户预算）
             const { errorText } = (await this.send('Page.navigate', { url }, timeout));
             if (errorText) {
@@ -309,14 +283,14 @@ class SessionManager {
     /**
      * 等待导航完成（跨文档导航或同文档导航）
      */
-    async waitForNavigation(timeout = 30000) {
+    async waitForNavigation(timeout = DEFAULT_TIMEOUT) {
         this.ensureSession();
         await this.waitForAnyEvent(['Page.loadEventFired', 'Page.navigatedWithinDocument'], timeout);
     }
     /**
      * 后退
      */
-    async goBack(timeout = 30000) {
+    async goBack(timeout = DEFAULT_TIMEOUT) {
         return this.withLock(async () => {
             this.ensureSession();
             const { currentIndex, entries } = await this.send('Page.getNavigationHistory', undefined, timeout);
@@ -327,7 +301,8 @@ class SessionManager {
             const waitPromise = this.waitForAnyEvent(['Page.loadEventFired', 'Page.navigatedWithinDocument'], timeout);
             // 预注册 rejection handler：若 send() 抛错导致 waitPromise 永远不被 await，
             // 其 timer reject 不会成为 unhandled rejection（Node 20 默认会退出进程）
-            waitPromise.catch(() => { });
+            waitPromise.catch(() => {
+            });
             await this.send('Page.navigateToHistoryEntry', { entryId: entries[currentIndex - 1].id }, timeout);
             await waitPromise;
             await this.updateState();
@@ -337,7 +312,7 @@ class SessionManager {
     /**
      * 前进
      */
-    async goForward(timeout = 30000) {
+    async goForward(timeout = DEFAULT_TIMEOUT) {
         return this.withLock(async () => {
             this.ensureSession();
             const { currentIndex, entries } = await this.send('Page.getNavigationHistory', undefined, timeout);
@@ -346,7 +321,8 @@ class SessionManager {
             }
             // 跨文档导航触发 loadEventFired，同文档导航（hash/pushState）触发 navigatedWithinDocument
             const waitPromise = this.waitForAnyEvent(['Page.loadEventFired', 'Page.navigatedWithinDocument'], timeout);
-            waitPromise.catch(() => { });
+            waitPromise.catch(() => {
+            });
             await this.send('Page.navigateToHistoryEntry', { entryId: entries[currentIndex + 1].id }, timeout);
             await waitPromise;
             await this.updateState();
@@ -359,9 +335,10 @@ class SessionManager {
     async reload(options = {}) {
         return this.withLock(async () => {
             this.ensureSession();
-            const { ignoreCache = false, timeout = 30000 } = options;
+            const { ignoreCache = false, timeout = DEFAULT_TIMEOUT } = options;
             const waitPromise = this.cdp.waitForEvent('Page.loadEventFired', undefined, timeout);
-            waitPromise.catch(() => { });
+            waitPromise.catch(() => {
+            });
             await this.send('Page.reload', { ignoreCache }, timeout);
             await waitPromise;
             await this.updateState();
@@ -374,6 +351,7 @@ class SessionManager {
         this.ensureSession();
         return new Locator(this.cdp, target, this.sessionId, {
             ...options,
+            nth: options?.nth ?? target.nth,
             getUrl: () => this.state?.url,
         });
     }
@@ -399,6 +377,7 @@ class SessionManager {
             type: 'mouseMoved',
             x,
             y,
+            modifiers: this.modifiers,
         });
         this.behaviorSimulator.setCurrentPosition({ x, y });
     }
@@ -413,6 +392,7 @@ class SessionManager {
             clickCount: 1,
             x: this.behaviorSimulator.getCurrentPosition().x,
             y: this.behaviorSimulator.getCurrentPosition().y,
+            modifiers: this.modifiers,
         });
     }
     /**
@@ -426,6 +406,7 @@ class SessionManager {
             clickCount: 1,
             x: this.behaviorSimulator.getCurrentPosition().x,
             y: this.behaviorSimulator.getCurrentPosition().y,
+            modifiers: this.modifiers,
         });
     }
     /**
@@ -440,6 +421,7 @@ class SessionManager {
             y: pos.y,
             deltaX,
             deltaY,
+            modifiers: this.modifiers,
         });
     }
     /**
@@ -447,9 +429,13 @@ class SessionManager {
      */
     async keyDown(key) {
         this.ensureSession();
+        if (MODIFIER_KEYS[key]) {
+            this.modifiers |= MODIFIER_KEYS[key];
+        }
         const keyDefinition = getKeyDefinition(key);
         await this.send('Input.dispatchKeyEvent', {
             type: 'keyDown',
+            modifiers: this.modifiers,
             ...keyDefinition,
         });
     }
@@ -461,8 +447,12 @@ class SessionManager {
         const keyDefinition = getKeyDefinition(key);
         await this.send('Input.dispatchKeyEvent', {
             type: 'keyUp',
+            modifiers: this.modifiers,
             ...keyDefinition,
         });
+        if (MODIFIER_KEYS[key]) {
+            this.modifiers &= ~MODIFIER_KEYS[key];
+        }
     }
     /**
      * 输入文本
@@ -472,10 +462,12 @@ class SessionManager {
         for (const char of text) {
             await this.send('Input.dispatchKeyEvent', {
                 type: 'keyDown',
+                modifiers: this.modifiers,
                 text: char,
             });
             await this.send('Input.dispatchKeyEvent', {
                 type: 'keyUp',
+                modifiers: this.modifiers,
                 text: char,
             });
             if (delay > 0) {
@@ -516,8 +508,12 @@ class SessionManager {
     /**
      * 截图
      */
-    async screenshot(fullPage = false) {
+    async screenshot(fullPage = false, scale, format, quality) {
         this.ensureSession();
+        const captureParams = { format: format ?? 'png' };
+        if (quality !== undefined) {
+            captureParams.quality = quality;
+        }
         if (fullPage) {
             // 获取页面完整高度
             const { result } = (await this.send('Runtime.evaluate', {
@@ -529,22 +525,18 @@ class SessionManager {
             await this.send('Emulation.setDeviceMetricsOverride', {
                 width,
                 height,
-                deviceScaleFactor: 1,
+                deviceScaleFactor: scale ?? 1,
                 mobile: false,
             });
             try {
-                const { data } = (await this.send('Page.captureScreenshot', {
-                    format: 'png',
-                }));
+                const { data } = (await this.send('Page.captureScreenshot', captureParams));
                 return data;
             }
             finally {
                 await this.send('Emulation.clearDeviceMetricsOverride');
             }
         }
-        const { data } = (await this.send('Page.captureScreenshot', {
-            format: 'png',
-        }));
+        const { data } = (await this.send('Page.captureScreenshot', captureParams));
         return data;
     }
     /**
@@ -671,23 +663,45 @@ class SessionManager {
      */
     async evaluate(script, args, timeout) {
         this.ensureSession();
-        let expression = script;
+        // CDP 命令超时需大于脚本执行超时，给 WebSocket 通信留余量
+        const CDP_MARGIN = 5000;
+        const sendTimeout = timeout !== undefined ? timeout + CDP_MARGIN : undefined;
+        // 有参数时使用 callFunctionOn：避免大 payload 字符串拼接，参数通过协议结构化传递
         if (args && args.length > 0) {
-            // 将参数序列化并注入
-            const argsStr = args.map((a) => JSON.stringify(a)).join(', ');
-            expression = `(${script})(${argsStr})`;
+            const { result: globalResult } = (await this.send('Runtime.evaluate', {
+                expression: 'globalThis',
+                returnByValue: false,
+            }));
+            try {
+                const callParams = {
+                    functionDeclaration: script,
+                    objectId: globalResult.objectId,
+                    arguments: args.map(a => ({ value: a })),
+                    returnByValue: true,
+                    awaitPromise: true,
+                };
+                if (timeout !== undefined) {
+                    callParams.timeout = timeout;
+                }
+                const { result, exceptionDetails } = (await this.send('Runtime.callFunctionOn', callParams, sendTimeout));
+                if (exceptionDetails) {
+                    throw new Error(exceptionDetails.exception.description);
+                }
+                return result.value;
+            }
+            finally {
+                this.send('Runtime.releaseObject', { objectId: globalResult.objectId }).catch(() => {
+                });
+            }
         }
         const evalParams = {
-            expression,
+            expression: script,
             returnByValue: true,
             awaitPromise: true,
         };
         if (timeout !== undefined) {
             evalParams.timeout = timeout;
         }
-        // CDP 命令超时需大于脚本执行超时，给 WebSocket 通信留余量
-        const CDP_MARGIN = 5000;
-        const sendTimeout = timeout !== undefined ? timeout + CDP_MARGIN : undefined;
         const { result, exceptionDetails } = (await this.send('Runtime.evaluate', evalParams, sendTimeout));
         if (exceptionDetails) {
             throw new Error(exceptionDetails.exception.description);
@@ -739,22 +753,6 @@ class SessionManager {
     async newPage() {
         return this.withLock(async () => this.newPageInternal());
     }
-    /**
-     * 新建页面（内部版本，不加锁，供 launch 等已持锁方法调用）
-     */
-    async newPageInternal() {
-        this.ensureConnected();
-        const { targetId } = (await this.cdp.send('Target.createTarget', {
-            url: 'about:blank',
-        }));
-        await this.attachToTargetInternal(targetId);
-        return {
-            targetId,
-            type: 'page',
-            url: 'about:blank',
-            title: '',
-        };
-    }
     /**
      * 激活页面（切到前台）
      */
@@ -800,6 +798,83 @@ class SessionManager {
             this.resetState();
         });
     }
+    /**
+     * 获取当前状态
+     */
+    getState() {
+        return this.state;
+    }
+    /**
+     * 是否已连接
+     */
+    isConnected() {
+        return this.cdp !== null && this.cdp.isConnected;
+    }
+    /**
+     * 发送 CDP 命令（page-level，携带 sessionId）
+     *
+     * 每次调用都检查连接状态，防止 close() 并发置空 this.cdp 后崩溃。
+     * 多步操作（type 循环、fullPage 截图等）的 await 间隙可能被 close() 打断，
+     * ensureSession() 确保在当前 tick 内 this.cdp 非空。
+     */
+    send(method, params, timeout) {
+        this.ensureSession();
+        return this.cdp.send(method, params, this.sessionId ?? undefined, timeout);
+    }
+    /**
+     * 发送 browser-level CDP 命令（不携带 sessionId）
+     * 用于 Target.*、Browser.* 等浏览器级命令
+     */
+    sendBrowserCommand(method, params) {
+        this.ensureConnected();
+        return this.cdp.send(method, params);
+    }
+    /**
+     * 附加到指定页面（内部版本，不加锁，供 launch/connect 等已持锁方法调用）
+     */
+    async attachToTargetInternal(targetId) {
+        this.ensureConnected();
+        // 如果已经附加到同一个 target，跳过
+        if (this.currentTargetId === targetId && this.sessionId) {
+            return;
+        }
+        // 如果有之前的 session，先分离
+        if (this.sessionId) {
+            try {
+                await this.cdp.send('Target.detachFromTarget', {
+                    sessionId: this.sessionId,
+                });
+            }
+            catch {
+                // 忽略分离错误
+            }
+        }
+        // 附加到目标
+        const { sessionId } = (await this.cdp.send('Target.attachToTarget', {
+            targetId,
+            flatten: true,
+        }));
+        this.sessionId = sessionId;
+        this.currentTargetId = targetId;
+        // 初始化会话
+        await this.initSession();
+    }
+    /**
+     * 新建页面（内部版本，不加锁，供 launch 等已持锁方法调用）
+     */
+    async newPageInternal() {
+        this.ensureConnected();
+        const { targetId } = (await this.cdp.send('Target.createTarget', {
+            url: 'about:blank',
+        }));
+        await this.attachToTargetInternal(targetId);
+        return {
+            targetId,
+            type: 'page',
+            url: 'about:blank',
+            title: '',
+        };
+    }
     /**
      * 重置所有状态（同步，不加锁）
      *
@@ -816,30 +891,14 @@ class SessionManager {
             this.launcher = null;
         }
         this.clearLogs();
+        this.modifiers = 0;
+        this.behaviorSimulator.setCurrentPosition({ x: 0, y: 0 });
         this.sessionId = null;
         this.currentTargetId = null;
         this.state = null;
         this.listenersInstalled = false;
         this.connectedPort = 0;
     }
-    /**
-     * 获取当前状态
-     */
-    getState() {
-        return this.state;
-    }
-    /**
-     * 是否已连接
-     */
-    isConnected() {
-        return this.cdp !== null && this.cdp.isConnected;
-    }
-    /**
-     * 是否有活跃会话
-     */
-    hasSession() {
-        return this.sessionId !== null;
-    }
     /**
      * 串行执行操作（防止并发竞态）
      */
@@ -996,25 +1055,6 @@ class SessionManager {
             targetId: this.currentTargetId,
         };
     }
-    /**
-     * 发送 CDP 命令（page-level，携带 sessionId）
-     *
-     * 每次调用都检查连接状态，防止 close() 并发置空 this.cdp 后崩溃。
-     * 多步操作（type 循环、fullPage 截图等）的 await 间隙可能被 close() 打断，
-     * ensureSession() 确保在当前 tick 内 this.cdp 非空。
-     */
-    send(method, params, timeout) {
-        this.ensureSession();
-        return this.cdp.send(method, params, this.sessionId ?? undefined, timeout);
-    }
-    /**
-     * 发送 browser-level CDP 命令（不携带 sessionId）
-     * 用于 Target.*、Browser.* 等浏览器级命令
-     */
-    sendBrowserCommand(method, params) {
-        this.ensureConnected();
-        return this.cdp.send(method, params);
-    }
     /**
      * 确保已连接
      */