@jshookmcp/jshook 0.1.4 → 0.1.6

package/dist/modules/browser/CamoufoxBrowserManager.js

@@ -1,8 +1,11 @@
 import { logger } from '../../utils/logger.js';
+import { PrerequisiteError } from '../../errors/PrerequisiteError.js';
 export class CamoufoxBrowserManager {
     browser = null;
     browserServer = null;
     config;
+    isClosing = false;
+    launchPromise;
     constructor(config = {}) {
         this.config = {
             os: config.os ?? 'windows',
@@ -15,8 +18,37 @@ export class CamoufoxBrowserManager {
         };
     }
     async launch() {
+        if (this.browser?.isConnected()) {
+            return this.browser;
+        }
+        if (this.isClosing) {
+            throw new Error('Cannot launch browser while closing');
+        }
+        if (this.launchPromise) {
+            return this.launchPromise;
+        }
+        this.launchPromise = this.doLaunch();
+        try {
+            return await this.launchPromise;
+        }
+        finally {
+            this.launchPromise = undefined;
+        }
+    }
+    async doLaunch() {
+        if (this.browser) {
+            logger.info('Closing existing Camoufox browser before relaunch');
+            await this.browser.close().catch(err => logger.warn('Failed to close previous browser:', err));
+            this.browser = null;
+        }
         logger.info(`Launching Camoufox (Firefox) [os=${this.config.os}, headless=${this.config.headless}]...`);
-        const { Camoufox } = await import('camoufox-js');
+        let Camoufox;
+        try {
+            ({ Camoufox } = await import('camoufox-js'));
+        }
+        catch (error) {
+            throw new PrerequisiteError(`camoufox-js is not installed or its binaries are missing. Run \`pnpm run install:full\` or \`pnpm exec camoufox-js fetch\` before using the Camoufox driver. Root cause: ${error instanceof Error ? error.message : String(error)}`);
+        }
         this.browser = (await Camoufox({
             os: this.config.os,
             headless: this.config.headless,
@@ -26,6 +58,13 @@ export class CamoufoxBrowserManager {
             block_images: this.config.blockImages,
             block_webrtc: this.config.blockWebrtc,
         }));
+        if (this.isClosing) {
+            await this.browser.close().catch(error => {
+                logger.warn('Failed to close Camoufox browser launched during shutdown:', error);
+            });
+            this.browser = null;
+            throw new Error('Camoufox launch aborted because close was requested');
+        }
         logger.info('Camoufox browser launched');
         return this.browser;
     }
@@ -44,15 +83,40 @@ export class CamoufoxBrowserManager {
         return targetPage;
     }
     async close() {
-        if (this.browser) {
-            await this.browser.close();
+        this.isClosing = true;
+        const pendingLaunch = this.launchPromise;
+        if (pendingLaunch) {
+            void pendingLaunch
+                .catch(() => undefined)
+                .finally(() => {
+                void this.finalizeClose();
+            });
+            return;
+        }
+        await this.finalizeClose();
+    }
+    async finalizeClose() {
+        try {
+            const browser = this.browser;
             this.browser = null;
-            logger.info('Camoufox browser closed');
+            if (browser) {
+                await browser.close();
+                logger.info('Camoufox browser closed');
+            }
+        }
+        finally {
+            this.isClosing = false;
         }
     }
     async launchAsServer(port, ws_path) {
         logger.info(`Launching Camoufox server [os=${this.config.os}, port=${port ?? 'auto'}]...`);
-        const { launchServer } = await import('camoufox-js');
+        let launchServer;
+        try {
+            ({ launchServer } = await import('camoufox-js'));
+        }
+        catch (error) {
+            throw new PrerequisiteError(`camoufox-js server support is unavailable. Run \`pnpm run install:full\` or \`pnpm exec camoufox-js fetch\` before launching a Camoufox WebSocket server. Root cause: ${error instanceof Error ? error.message : String(error)}`);
+        }
         const serverOptions = {
             os: this.config.os,
             headless: this.config.headless,
@@ -64,6 +128,11 @@ export class CamoufoxBrowserManager {
             port,
             ws_path,
         };
+        if (this.browserServer) {
+            logger.info('Closing existing Camoufox server before relaunch');
+            await this.browserServer.close().catch(err => logger.warn('Failed to close previous server:', err));
+            this.browserServer = null;
+        }
         this.browserServer = await launchServer(serverOptions);
         const endpoint = this.browserServer.wsEndpoint();
         logger.info(`Camoufox server listening on: ${endpoint}`);
@@ -71,6 +140,11 @@ export class CamoufoxBrowserManager {
     }
     async connectToServer(wsEndpoint) {
         logger.info(`Connecting to Camoufox server: ${wsEndpoint}`);
+        if (this.browser) {
+            logger.info('Disconnecting existing browser before new connection');
+            await this.browser.close().catch(err => logger.warn('Failed to close previous browser:', err));
+            this.browser = null;
+        }
         const playwrightModule = await import('playwright-core');
         const firefox = playwrightModule.firefox;
         this.browser = (await firefox.connect(wsEndpoint));
@@ -96,4 +170,3 @@ export class CamoufoxBrowserManager {
         return context.newCDPSession(page);
     }
 }
-//# sourceMappingURL=CamoufoxBrowserManager.js.map

package/dist/modules/browser/TabRegistry.d.ts

@@ -64,4 +64,3 @@ export declare class TabRegistry<PageLike = unknown> {
     clear(): void;
     private getAliasesForPageId;
 }
-//# sourceMappingURL=TabRegistry.d.ts.map

package/dist/modules/browser/TabRegistry.js

@@ -113,7 +113,8 @@ export class TabRegistry {
         return null;
     }
     setCurrentPageId(pageId) {
-        if (!this.tabsById.has(pageId))
+        const entry = this.tabsById.get(pageId);
+        if (!entry || entry.stale)
             return false;
         this.currentPageId = pageId;
         return true;
@@ -167,7 +168,7 @@ export class TabRegistry {
             url: current?.meta.url ?? null,
             title: current?.meta.title ?? null,
             tabIndex: current?.meta.index ?? null,
-            pageId: this.currentPageId,
+            pageId: current ? this.currentPageId : null,
         };
     }
     listTabs() {
@@ -235,4 +236,3 @@ export class TabRegistry {
         return aliases;
     }
 }
-//# sourceMappingURL=TabRegistry.js.map

package/dist/modules/browser/UnifiedBrowserManager.d.ts

@@ -46,10 +46,15 @@ export declare class UnifiedBrowserManager implements IBrowserManager {
     private camoufoxManager;
     private browserDiscovery;
     private activePage;
+    private chromeLaunchPromise?;
+    private camoufoxLaunchPromise?;
+    private isClosing;
     constructor(config?: UnifiedBrowserConfig);
     launch(): Promise<PuppeteerBrowser | CamoufoxBrowserLike>;
     private launchChrome;
+    private doLaunchChrome;
     private launchCamoufox;
+    private doLaunchCamoufox;
     connect(wsEndpoint: string): Promise<PuppeteerBrowser | CamoufoxBrowserLike>;
     private connectChrome;
     private connectCamoufox;
@@ -74,4 +79,3 @@ export { CamoufoxBrowserManager } from '../browser/CamoufoxBrowserManager.js';
 export type { CamoufoxBrowserConfig } from '../browser/CamoufoxBrowserManager.js';
 export { BrowserDiscovery } from '../browser/BrowserDiscovery.js';
 export type { BrowserInfo, BrowserSignature } from '../browser/BrowserDiscovery.js';
-//# sourceMappingURL=UnifiedBrowserManager.d.ts.map

package/dist/modules/browser/UnifiedBrowserManager.js

@@ -9,6 +9,9 @@ export class UnifiedBrowserManager {
     camoufoxManager = null;
     browserDiscovery;
     activePage = null;
+    chromeLaunchPromise;
+    camoufoxLaunchPromise;
+    isClosing = false;
     constructor(config = {}) {
         this.config = config;
         this.driver = config.driver ?? 'chrome';
@@ -21,6 +24,25 @@ export class UnifiedBrowserManager {
         return this.launchChrome();
     }
     async launchChrome() {
+        if (this.isClosing) {
+            throw new Error('Cannot launch browser while closing');
+        }
+        const existingBrowser = this.chromeManager?.getBrowser();
+        if (existingBrowser?.isConnected()) {
+            return existingBrowser;
+        }
+        if (this.chromeLaunchPromise) {
+            return this.chromeLaunchPromise;
+        }
+        this.chromeLaunchPromise = this.doLaunchChrome();
+        try {
+            return await this.chromeLaunchPromise;
+        }
+        finally {
+            this.chromeLaunchPromise = undefined;
+        }
+    }
+    async doLaunchChrome() {
         logger.info(`Launching Chrome [headless=${this.config.headless ?? true}]...`);
         const modeConfig = {
             autoDetectCaptcha: this.config.autoDetectCaptcha,
@@ -46,6 +68,25 @@ export class UnifiedBrowserManager {
         return browser;
     }
     async launchCamoufox() {
+        if (this.isClosing) {
+            throw new Error('Cannot launch browser while closing');
+        }
+        const existingBrowser = this.camoufoxManager?.getBrowser();
+        if (existingBrowser?.isConnected()) {
+            return existingBrowser;
+        }
+        if (this.camoufoxLaunchPromise) {
+            return this.camoufoxLaunchPromise;
+        }
+        this.camoufoxLaunchPromise = this.doLaunchCamoufox();
+        try {
+            return await this.camoufoxLaunchPromise;
+        }
+        finally {
+            this.camoufoxLaunchPromise = undefined;
+        }
+    }
+    async doLaunchCamoufox() {
         const headless = this.normalizeCamoufoxHeadless();
         logger.info(`Launching Camoufox (Firefox) [os=${this.config.os ?? 'windows'}, headless=${headless}]...`);
         const camoufoxConfig = {
@@ -114,18 +155,30 @@ export class UnifiedBrowserManager {
         return this.chromeManager.goto(url, targetPage);
     }
     async close() {
-        if (this.driver === 'camoufox' && this.camoufoxManager) {
-            await this.camoufoxManager.close();
+        this.isClosing = true;
+        try {
+            const camoufoxManager = this.camoufoxManager;
+            const chromeManager = this.chromeManager;
             this.camoufoxManager = null;
-            this.activePage = null;
-            logger.info('Camoufox browser closed');
-            return;
-        }
-        if (this.chromeManager) {
-            await this.chromeManager.close();
             this.chromeManager = null;
+            this.chromeLaunchPromise = undefined;
+            this.camoufoxLaunchPromise = undefined;
             this.activePage = null;
-            logger.info('Chrome browser closed');
+            const closeTasks = [];
+            if (camoufoxManager) {
+                closeTasks.push(camoufoxManager.close().then(() => {
+                    logger.info('Camoufox browser closed');
+                }));
+            }
+            if (chromeManager) {
+                closeTasks.push(chromeManager.close().then(() => {
+                    logger.info('Chrome browser closed');
+                }));
+            }
+            await Promise.all(closeTasks);
+        }
+        finally {
+            this.isClosing = false;
         }
     }
     getBrowser() {
@@ -214,4 +267,3 @@ export class UnifiedBrowserManager {
 export { BrowserModeManager } from '../browser/BrowserModeManager.js';
 export { CamoufoxBrowserManager } from '../browser/CamoufoxBrowserManager.js';
 export { BrowserDiscovery } from '../browser/BrowserDiscovery.js';
-//# sourceMappingURL=UnifiedBrowserManager.js.map

package/dist/modules/browser/index.d.ts

@@ -2,4 +2,3 @@ export { UnifiedBrowserManager, type BrowserDriver, type HeadlessMode, type Prox
 export { BrowserModeManager, type BrowserModeConfig } from '../browser/BrowserModeManager.js';
 export { CamoufoxBrowserManager, type CamoufoxBrowserConfig } from '../browser/CamoufoxBrowserManager.js';
 export { BrowserDiscovery, type BrowserInfo, type BrowserSignature } from '../browser/BrowserDiscovery.js';
-//# sourceMappingURL=index.d.ts.map

package/dist/modules/browser/index.js

@@ -2,4 +2,3 @@ export { UnifiedBrowserManager, } from '../browser/UnifiedBrowserManager.js';
 export { BrowserModeManager } from '../browser/BrowserModeManager.js';
 export { CamoufoxBrowserManager } from '../browser/CamoufoxBrowserManager.js';
 export { BrowserDiscovery } from '../browser/BrowserDiscovery.js';
-//# sourceMappingURL=index.js.map

package/dist/modules/captcha/AICaptchaDetector.d.ts

@@ -30,4 +30,3 @@ export declare class AICaptchaDetector {
     private fallbackTextAnalysis;
     waitForCompletion(page: Page, timeout?: number): Promise<boolean>;
 }
-//# sourceMappingURL=AICaptchaDetector.d.ts.map

package/dist/modules/captcha/AICaptchaDetector.js

@@ -127,21 +127,22 @@ export class AICaptchaDetector {
         }
     }
     buildAnalysisPrompt(pageInfo) {
-        return `# 
+        const promptPayload = {
+            url: pageInfo.url,
+            title: pageInfo.title,
+            hasIframes: pageInfo.hasIframes,
+            suspiciousElements: pageInfo.suspiciousElements,
+            bodyTextPreview: `${pageInfo.bodyText.substring(0, 200)}...`,
+        };
+        return `# 
 
 ## 
 ，（CAPTCHA），。
 
 ## 
-\`\`\`json
-{
-  "url": "${pageInfo.url}",
-  "title": "${pageInfo.title}",
-  "hasIframes": ${pageInfo.hasIframes},
-  "suspiciousElements": ${JSON.stringify(pageInfo.suspiciousElements)},
-  "bodyTextPreview": "${pageInfo.bodyText.substring(0, 200).replace(/"/g, '\\"')}..."
-}
-\`\`\`
+\`\`\`json
+${JSON.stringify(promptPayload, null, 2)}
+\`\`\`
 
 ## 
 
@@ -388,4 +389,3 @@ export class AICaptchaDetector {
         return false;
     }
 }
-//# sourceMappingURL=AICaptchaDetector.js.map

package/dist/modules/captcha/CaptchaDetector.constants.d.ts

@@ -17,4 +17,3 @@ export declare const EXCLUDE_KEYWORDS: {
     url: string[];
     text: string[];
 };
-//# sourceMappingURL=CaptchaDetector.constants.d.ts.map

package/dist/modules/captcha/CaptchaDetector.constants.js

@@ -162,4 +162,3 @@ export const EXCLUDE_KEYWORDS = {
     ],
     text: ['', '', '', '', '', 'Enter verification code', 'Get code', 'Send code'],
 };
-//# sourceMappingURL=CaptchaDetector.constants.js.map

package/dist/modules/captcha/CaptchaDetector.d.ts

@@ -25,4 +25,3 @@ export declare class CaptchaDetector {
     private verifyByDOM;
     private verifySliderElement;
 }
-//# sourceMappingURL=CaptchaDetector.d.ts.map

package/dist/modules/captcha/CaptchaDetector.js

@@ -386,4 +386,3 @@ export class CaptchaDetector {
         }
     }
 }
-//# sourceMappingURL=CaptchaDetector.js.map

package/dist/modules/collector/CodeCache.d.ts

@@ -36,4 +36,3 @@ export declare class CodeCache {
     }>;
     warmup(urls: string[]): Promise<void>;
 }
-//# sourceMappingURL=CodeCache.d.ts.map

package/dist/modules/collector/CodeCache.js

@@ -195,4 +195,3 @@ export class CodeCache {
         logger.info('Cache warmup completed');
     }
 }
-//# sourceMappingURL=CodeCache.js.map

package/dist/modules/collector/CodeCollector.d.ts

@@ -113,4 +113,3 @@ export declare class CodeCollector {
     };
     clearCollectedFilesCache(): void;
 }
-//# sourceMappingURL=CodeCollector.d.ts.map

package/dist/modules/collector/CodeCollector.js

@@ -460,4 +460,3 @@ export class CodeCollector {
         logger.info(`Cleared collected files cache (${count} files)`);
     }
 }
-//# sourceMappingURL=CodeCollector.js.map

package/dist/modules/collector/CodeCollectorCollectInternal.d.ts

@@ -1,3 +1,2 @@
 import type { CollectCodeOptions, CollectCodeResult } from '../../types/index.js';
 export declare function collectInnerImpl(self: unknown, options: CollectCodeOptions): Promise<CollectCodeResult>;
-//# sourceMappingURL=CodeCollectorCollectInternal.d.ts.map

package/dist/modules/collector/CodeCollectorCollectInternal.js

@@ -286,4 +286,3 @@ export async function collectInnerImpl(self, options) {
         await page.close();
     }
 }
-//# sourceMappingURL=CodeCollectorCollectInternal.js.map

package/dist/modules/collector/CodeCollectorUtilsInternal.d.ts

@@ -3,4 +3,3 @@ export declare function shouldCollectUrlImpl(url: string, filterRules?: string[]
 export declare function navigateWithRetryImpl(page: Page, url: string, options: Parameters<Page['goto']>[1], maxRetries?: number): Promise<void>;
 export declare function getPerformanceMetricsImpl(page: Page): Promise<Record<string, number>>;
 export declare function collectPageMetadataImpl(page: Page): Promise<Record<string, unknown>>;
-//# sourceMappingURL=CodeCollectorUtilsInternal.d.ts.map

package/dist/modules/collector/CodeCollectorUtilsInternal.js

@@ -69,4 +69,3 @@ export async function collectPageMetadataImpl(page) {
         return {};
     }
 }
-//# sourceMappingURL=CodeCollectorUtilsInternal.js.map

package/dist/modules/collector/CodeCompressor.d.ts

@@ -62,4 +62,3 @@ export declare class CodeCompressor {
     private generateCacheKey;
     private addToCache;
 }
-//# sourceMappingURL=CodeCompressor.d.ts.map

package/dist/modules/collector/CodeCompressor.js

@@ -243,4 +243,3 @@ export class CodeCompressor {
         this.cache.set(key, entry);
     }
 }
-//# sourceMappingURL=CodeCompressor.js.map

package/dist/modules/collector/DOMInspector.d.ts

@@ -25,6 +25,21 @@ export interface ClickableElement {
         height: number;
     };
 }
+export interface DOMQueryDiagnostics {
+    readyState: string;
+    frameCount: number;
+    shadowRootCount: number;
+    retried: boolean;
+    waitedForReadyState: boolean;
+}
+export interface DOMQueryAllResult {
+    elements: ElementInfo[];
+    diagnostics: DOMQueryDiagnostics;
+}
+export interface DOMFindClickableResult {
+    elements: ClickableElement[];
+    diagnostics: DOMQueryDiagnostics;
+}
 interface DOMStructureNode {
     tag: string;
     id?: string;
@@ -36,10 +51,11 @@ export declare class DOMInspector {
     private collector;
     private cdpSession;
     constructor(collector: CodeCollector);
+    private waitForReadyState;
     querySelector(selector: string, _getAttributes?: boolean): Promise<ElementInfo>;
-    querySelectorAll(selector: string, limit?: number): Promise<ElementInfo[]>;
+    querySelectorAll(selector: string, limit?: number): Promise<DOMQueryAllResult>;
     getStructure(maxDepth?: number, includeText?: boolean): Promise<DOMStructureNode | null>;
-    findClickable(filterText?: string): Promise<ClickableElement[]>;
+    findClickable(filterText?: string): Promise<DOMFindClickableResult>;
     getComputedStyle(selector: string): Promise<Record<string, string> | null>;
     waitForElement(selector: string, timeout?: number): Promise<ElementInfo | null>;
     observeDOMChanges(options?: {
@@ -56,4 +72,3 @@ export declare class DOMInspector {
     close(): Promise<void>;
 }
 export {};
-//# sourceMappingURL=DOMInspector.d.ts.map