dev3000 0.0.173 → 0.0.174

package/dist/cdp-monitor.d.ts

@@ -10,6 +10,18 @@ export interface CDPConnection {
     sessionId: string | null;
     nextId: number;
 }
+export interface CDPTargetInfo {
+    id?: string;
+    type?: string;
+    title?: string;
+    url?: string;
+    webSocketDebuggerUrl?: string;
+}
+export declare function getLoadingHtmlCandidates(currentDir: string, execPath?: string): string[];
+export declare function selectCDPTarget(targets: CDPTargetInfo[], options?: {
+    appServerPort?: string;
+    initialAppUrl?: string;
+}): CDPTargetInfo;
 export declare class CDPMonitor {
     private browser;
     private connection;
@@ -36,7 +48,9 @@ export declare class CDPMonitor {
     private framework?;
     private reactTrackingEnabled;
     private lastReactSnapshotLogTime;
-    constructor(profileDir: string, screenshotDir: string, logger: (source: string, message: string) => void, debug?: boolean, browserPath?: string, pluginReactScan?: boolean, appServerPort?: string, initialAppUrl?: string, debugPort?: number, headless?: boolean, framework?: "nextjs" | "svelte" | "other");
+    private pendingCommands;
+    private navigationTimeoutMs;
+    constructor(profileDir: string, screenshotDir: string, logger: (source: string, message: string) => void, debug?: boolean, browserPath?: string, pluginReactScan?: boolean, appServerPort?: string, initialAppUrl?: string, navigationTimeoutMs?: number, debugPort?: number, headless?: boolean, framework?: "nextjs" | "svelte" | "other");
     private resolveReactDevToolsExtensionPath;
     private debugLog;
     private runCommand;
@@ -68,8 +82,9 @@ export declare class CDPMonitor {
     private enableCDPDomains;
     private setupEventHandlers;
     private onCDPEvent;
+    private rejectPendingCDPCommands;
     private handleCDPMessage;
-    navigateToUrl(url: string): Promise<void>;
+    navigateToUrl(url: string, timeoutMs?: number): Promise<void>;
     navigateToApp(port: string, useHttps?: boolean): Promise<void>;
     private setupInteractionTracking;
     private startInteractionPolling;
@@ -98,6 +113,7 @@ export declare class CDPMonitor {
      * Call this before killing the app server to prevent CDP reconnection loops.
      */
     prepareShutdown(): void;
+    private waitForBrowserExit;
     shutdown(): Promise<void>;
     private killInstanceChromeProcesses;
 }

package/dist/cdp-monitor.d.ts.map

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

package/dist/cdp-monitor.js

@@ -43,6 +43,98 @@ const EMBEDDED_LOADING_HTML = `<!DOCTYPE html>
   </div>
 </body>
 </html>`;
+const DEFAULT_CDP_COMMAND_TIMEOUT_MS = 10000;
+const DEFAULT_NAVIGATION_TIMEOUT_MS = 60000;
+export function getLoadingHtmlCandidates(currentDir, execPath = process.execPath) {
+    const candidates = [join(currentDir, "src/loading.html"), join(currentDir, "loading.html")];
+    const packageRoot = dirname(dirname(execPath));
+    candidates.push(join(packageRoot, "src/loading.html"));
+    candidates.push(join(packageRoot, "loading.html"));
+    candidates.push(join(process.cwd(), "src/loading.html"));
+    return candidates;
+}
+function isD3kLoadingPageUrl(url) {
+    if (!url?.startsWith("file://")) {
+        return false;
+    }
+    try {
+        const pathname = decodeURIComponent(new URL(url).pathname);
+        return pathname.includes("/dev3000-loading-") && pathname.endsWith("/loading.html");
+    }
+    catch {
+        return false;
+    }
+}
+function matchesAppServerPort(url, appServerPort) {
+    if (!url || !appServerPort) {
+        return false;
+    }
+    try {
+        const parsed = new URL(url);
+        const hostname = parsed.hostname;
+        const port = parsed.port || (parsed.protocol === "https:" ? "443" : "80");
+        return (hostname === "localhost" || hostname === "127.0.0.1" || hostname === "0.0.0.0") && port === appServerPort;
+    }
+    catch {
+        return false;
+    }
+}
+function matchesInitialAppUrl(url, initialAppUrl) {
+    if (!url || !initialAppUrl) {
+        return false;
+    }
+    try {
+        const actual = new URL(url);
+        const expected = new URL(initialAppUrl);
+        const actualPort = actual.port || (actual.protocol === "https:" ? "443" : "80");
+        const expectedPort = expected.port || (expected.protocol === "https:" ? "443" : "80");
+        return (actual.protocol === expected.protocol &&
+            actual.hostname === expected.hostname &&
+            actualPort === expectedPort &&
+            actual.pathname === expected.pathname);
+    }
+    catch {
+        return false;
+    }
+}
+function formatTargetForLog(target) {
+    return `${target.type || "unknown"}:${target.url || "<no-url>"}`;
+}
+export function selectCDPTarget(targets, options = {}) {
+    const debuggableTargets = targets.filter((target) => target.webSocketDebuggerUrl);
+    if (debuggableTargets.length === 0) {
+        throw new Error(`No debuggable target found in Chrome (found ${targets.length} targets)`);
+    }
+    const contextualMatches = debuggableTargets
+        .map((target) => ({
+        target,
+        score: (matchesInitialAppUrl(target.url, options.initialAppUrl) ? 100 : 0) +
+            (matchesAppServerPort(target.url, options.appServerPort) ? 70 : 0) +
+            (isD3kLoadingPageUrl(target.url) ? 90 : 0) +
+            (target.type === "page" ? 10 : 0)
+    }))
+        .sort((left, right) => right.score - left.score);
+    const bestContextualScore = contextualMatches[0]?.score || 0;
+    const minimumContextualScore = 70;
+    if (bestContextualScore >= minimumContextualScore) {
+        return contextualMatches[0].target;
+    }
+    const pageTarget = debuggableTargets.find((target) => target.type === "page");
+    if (!options.appServerPort && !options.initialAppUrl) {
+        return pageTarget || debuggableTargets[0];
+    }
+    if (debuggableTargets.length === 1 && debuggableTargets[0]?.url === "about:blank") {
+        return debuggableTargets[0];
+    }
+    const expectedDetails = [
+        options.initialAppUrl ? `url ${options.initialAppUrl}` : null,
+        options.appServerPort ? `port ${options.appServerPort}` : null,
+        "d3k loading page"
+    ]
+        .filter(Boolean)
+        .join(", ");
+    throw new Error(`CDP target mismatch on port ${options.appServerPort || "unknown"}; expected ${expectedDetails}, found ${debuggableTargets.map(formatTargetForLog).join(", ")}`);
+}
 export class CDPMonitor {
     browser = null;
     connection = null;
@@ -69,7 +161,9 @@ export class CDPMonitor {
     framework; // Framework hint from project detection
     reactTrackingEnabled = false;
     lastReactSnapshotLogTime = 0;
-    constructor(profileDir, screenshotDir, logger, debug = false, browserPath, pluginReactScan = false, appServerPort, initialAppUrl, debugPort, headless = false, framework) {
+    pendingCommands = new Map();
+    navigationTimeoutMs = DEFAULT_NAVIGATION_TIMEOUT_MS;
+    constructor(profileDir, screenshotDir, logger, debug = false, browserPath, pluginReactScan = false, appServerPort, initialAppUrl, navigationTimeoutMs = DEFAULT_NAVIGATION_TIMEOUT_MS, debugPort, headless = false, framework) {
         this.profileDir = profileDir;
         this.screenshotDir = screenshotDir;
         this.appServerPort = appServerPort;
@@ -78,6 +172,7 @@ export class CDPMonitor {
         this.browserPath = browserPath;
         this.pluginReactScan = pluginReactScan;
         this.initialAppUrl = initialAppUrl;
+        this.navigationTimeoutMs = navigationTimeoutMs;
         this.headless = headless;
         this.framework = framework;
         this.reactTrackingEnabled = framework === "nextjs";
@@ -269,11 +364,7 @@ export class CDPMonitor {
         const currentDir = dirname(currentFile);
         let loadingHtml;
         try {
-            const loadingHtmlCandidates = [
-                join(currentDir, "src/loading.html"),
-                join(currentDir, "loading.html"),
-                join(process.cwd(), "src/loading.html")
-            ];
+            const loadingHtmlCandidates = getLoadingHtmlCandidates(currentDir);
             const loadingHtmlPath = loadingHtmlCandidates.find((path) => existsSync(path));
             if (!loadingHtmlPath) {
                 throw new Error("No loading.html found in expected locations");
@@ -442,6 +533,10 @@ export class CDPMonitor {
                     chromeArgs.push("--disable-setuid-sandbox");
                     chromeArgs.push("--disable-gpu");
                     chromeArgs.push("--disable-dev-shm-usage");
+                    chromeArgs.push("--disable-background-timer-throttling");
+                    chromeArgs.push("--disable-backgrounding-occluded-windows");
+                    chromeArgs.push("--disable-renderer-backgrounding");
+                    chromeArgs.push("--window-size=1920,1080");
                     this.debugLog("Launching Chrome in headless mode");
                 }
                 else {
@@ -538,15 +633,15 @@ export class CDPMonitor {
             try {
                 // Get the WebSocket URL from Chrome's debug endpoint
                 const targetsResponse = await fetch(`http://localhost:${this.debugPort}/json`);
-                let targets = await targetsResponse.json();
-                this.debugLog(`Found ${targets.length} targets: ${JSON.stringify(targets.map((t) => ({ type: t.type, url: t.url })))}`);
+                let targets = (await targetsResponse.json());
+                this.debugLog(`Found ${targets.length} targets: ${JSON.stringify(targets.map((target) => ({ type: target.type ?? "unknown", url: target.url ?? "" })))}`);
                 if (targets.length === 0) {
                     this.debugLog("No debuggable targets found; creating a blank page target");
                     const newTargetResponse = await fetch(`http://localhost:${this.debugPort}/json/new?about:blank`, {
                         method: "PUT"
                     });
                     if (newTargetResponse.ok) {
-                        const createdTarget = await newTargetResponse.json();
+                        const createdTarget = (await newTargetResponse.json());
                         targets = [createdTarget];
                         this.debugLog(`Created page target: ${createdTarget.id || "unknown"} - ${createdTarget.url || ""}`);
                     }
@@ -554,19 +649,14 @@ export class CDPMonitor {
                         this.debugLog(`Failed to create page target: HTTP ${newTargetResponse.status}`);
                     }
                 }
-                // Find the first page target (tab) - prefer 'page' type but accept any target with a webSocketDebuggerUrl
-                let pageTarget = targets.find((target) => target.type === "page");
-                // Fallback: if no 'page' type found, try to use any target with a debugger URL
-                if (!pageTarget && targets.length > 0) {
-                    pageTarget = targets.find((target) => target.webSocketDebuggerUrl);
-                    if (pageTarget) {
-                        this.debugLog(`No 'page' type target found, using target of type '${pageTarget.type}' instead`);
-                    }
-                }
-                if (!pageTarget) {
-                    throw new Error(`No debuggable target found in Chrome (found ${targets.length} targets)`);
-                }
+                const pageTarget = selectCDPTarget(targets, {
+                    appServerPort: this.appServerPort,
+                    initialAppUrl: this.initialAppUrl
+                });
                 const wsUrl = pageTarget.webSocketDebuggerUrl;
+                if (!wsUrl) {
+                    throw new Error(`Selected CDP target does not have a websocket URL: ${formatTargetForLog(pageTarget)}`);
+                }
                 this.cdpUrl = wsUrl; // Store the CDP URL
                 this.debugLog(`Found page target: ${pageTarget.title || "Unknown"} - ${pageTarget.url}`);
                 this.debugLog(`Got CDP WebSocket URL: ${wsUrl}`);
@@ -599,6 +689,7 @@ export class CDPMonitor {
                     });
                     ws.on("close", (code, reason) => {
                         this.debugLog(`WebSocket closed with code ${code}, reason: ${reason}`);
+                        this.rejectPendingCDPCommands(new Error(`CDP connection closed before response (code=${code})`));
                         if (!this.isShuttingDown) {
                             this.logger("browser", `[CDP] Connection lost unexpectedly (code: ${code}, reason: ${reason})`);
                             this.logger("browser", "[CDP] CDP connection lost - check for Chrome crash or server issues");
@@ -682,7 +773,7 @@ export class CDPMonitor {
             throw err;
         }
     }
-    async sendCDPCommand(method, params = {}) {
+    async sendCDPCommand(method, params = {}, timeoutMs = DEFAULT_CDP_COMMAND_TIMEOUT_MS) {
         if (!this.connection) {
             throw new Error("No CDP connection available");
         }
@@ -693,42 +784,32 @@ export class CDPMonitor {
                 method,
                 params
             };
-            const messageHandler = (data) => {
-                try {
-                    const message = JSON.parse(data.toString());
-                    if (message.id === id) {
-                        this.connection?.ws.removeListener("message", messageHandler);
-                        if (message.error) {
-                            reject(new Error(message.error.message));
-                        }
-                        else {
-                            resolve(message.result);
-                        }
-                    }
-                }
-                catch (error) {
-                    this.connection?.ws.removeListener("message", messageHandler);
-                    reject(error);
-                }
-            };
-            this.connection?.ws.on("message", messageHandler);
-            // Command timeout
             const timeout = setTimeout(() => {
-                this.connection?.ws.removeListener("message", messageHandler);
+                this.pendingCommands.delete(id);
+                this.debugLog(`CDP command #${id} timed out after ${timeoutMs}ms: ${method}`);
                 reject(new Error(`CDP command timeout: ${method}`));
-            }, 10000);
-            // Clear timeout if command succeeds/fails
-            const originalResolve = resolve;
-            const originalReject = reject;
-            resolve = (value) => {
-                clearTimeout(timeout);
-                originalResolve(value);
-            };
-            reject = (reason) => {
-                clearTimeout(timeout);
-                originalReject(reason);
-            };
-            this.connection?.ws.send(JSON.stringify(command));
+            }, timeoutMs);
+            this.pendingCommands.set(id, {
+                method,
+                startedAt: Date.now(),
+                timeout,
+                resolve,
+                reject: (error) => reject(error)
+            });
+            this.debugLog(`Sending CDP command #${id}: ${method} ${JSON.stringify(params)}`);
+            this.connection?.ws.send(JSON.stringify(command), (error) => {
+                if (!error) {
+                    return;
+                }
+                const pending = this.pendingCommands.get(id);
+                if (!pending) {
+                    return;
+                }
+                clearTimeout(pending.timeout);
+                this.pendingCommands.delete(id);
+                this.debugLog(`Failed to send CDP command #${id}: ${method}: ${String(error)}`);
+                reject(error instanceof Error ? error : new Error(String(error)));
+            });
         });
     }
     getBundleTypeLabel(bundleType) {
@@ -808,39 +889,39 @@ export class CDPMonitor {
     }
     async enableCDPDomains() {
         const domains = [
-            "Runtime", // Console logs, exceptions
-            "Network", // Network requests/responses
-            "Page", // Page events, navigation
-            "DOM", // DOM mutations
-            "Performance", // Performance metrics
-            "Security", // Security events
-            "Log", // Browser console logs
-            "Target" // Target events (window/tab creation/destruction)
+            { name: "Runtime", required: true },
+            { name: "Network", required: true },
+            { name: "Page", required: true },
+            { name: "DOM", required: true },
+            { name: "Performance", required: false },
+            { name: "Security", required: false },
+            { name: "Log", required: true },
+            { name: "Target", required: false }
             // Note: Input domain is for dispatching events, not monitoring them - we use JS injection instead
         ];
         for (const domain of domains) {
             try {
-                this.debugLog(`Enabling CDP domain: ${domain}`);
-                await this.sendCDPCommand(`${domain}.enable`);
-                this.debugLog(`Successfully enabled CDP domain: ${domain}`);
+                this.debugLog(`Enabling CDP domain: ${domain.name}`);
+                await this.sendCDPCommand(`${domain.name}.enable`, {}, 3000);
+                this.debugLog(`Successfully enabled CDP domain: ${domain.name}`);
                 if (this.debug) {
-                    this.logger("browser", `[CDP] Enabled ${domain} domain`);
+                    this.logger("browser", `[CDP] Enabled ${domain.name} domain`);
                 }
             }
             catch (error) {
-                this.debugLog(`Failed to enable CDP domain ${domain}: ${error}`);
-                // Only log CDP errors when debug mode is enabled
+                this.debugLog(`Failed to enable CDP domain ${domain.name}: ${error}`);
+                if (domain.required) {
+                    throw new Error(`Failed to enable required CDP domain ${domain.name}: ${String(error)}`);
+                }
                 if (this.debug) {
-                    this.logger("browser", `[CDP] Failed to enable ${domain}: ${error}`);
+                    this.logger("browser", `[CDP] Failed to enable optional ${domain.name}: ${error}`);
                 }
-                // Continue with other domains instead of throwing
             }
         }
-        this.debugLog("Enabling runtime for console and exception capture");
-        await this.sendCDPCommand("Runtime.enable");
+        this.debugLog("Setting async call stack depth for console and exception capture");
         await this.sendCDPCommand("Runtime.setAsyncCallStackDepth", {
             maxDepth: 32
-        });
+        }, 3000);
         this.debugLog("CDP domains enabled successfully");
         // Set viewport for headless mode to ensure consistent CLS measurements
         // Without this, headless Chrome defaults to 800x600 which can cause
@@ -859,6 +940,18 @@ export class CDPMonitor {
             catch (error) {
                 this.debugLog(`Failed to set viewport: ${error}`);
             }
+            try {
+                await this.sendCDPCommand("Page.bringToFront", {});
+            }
+            catch (error) {
+                this.debugLog(`Failed to bring headless page to front: ${error}`);
+            }
+            try {
+                await this.sendCDPCommand("Emulation.setFocusEmulationEnabled", { enabled: true });
+            }
+            catch (error) {
+                this.debugLog(`Failed to enable focus emulation: ${error}`);
+            }
         }
     }
     setupEventHandlers() {
@@ -1089,8 +1182,34 @@ export class CDPMonitor {
     onCDPEvent(method, handler) {
         this.eventHandlers.set(method, handler);
     }
+    rejectPendingCDPCommands(error) {
+        for (const [id, pending] of this.pendingCommands) {
+            clearTimeout(pending.timeout);
+            this.pendingCommands.delete(id);
+            pending.reject(error);
+        }
+    }
     handleCDPMessage(message) {
+        if (typeof message.id === "number") {
+            const pending = this.pendingCommands.get(message.id);
+            if (!pending) {
+                this.debugLog(`Received CDP response for unknown command #${message.id}`);
+                return;
+            }
+            clearTimeout(pending.timeout);
+            this.pendingCommands.delete(message.id);
+            const duration = Date.now() - pending.startedAt;
+            if (message.error) {
+                this.debugLog(`Received CDP error for #${message.id} (${pending.method}) after ${duration}ms: ${message.error.message}`);
+                pending.reject(new Error(message.error.message || `CDP command failed: ${pending.method}`));
+                return;
+            }
+            this.debugLog(`Received CDP response for #${message.id} (${pending.method}) after ${duration}ms`);
+            pending.resolve(message.result || {});
+            return;
+        }
         if (message.method) {
+            this.debugLog(`Received CDP event: ${message.method}`);
             const handler = this.eventHandlers.get(message.method);
             if (handler) {
                 const event = {
@@ -1103,7 +1222,7 @@ export class CDPMonitor {
             }
         }
     }
-    async navigateToUrl(url) {
+    async navigateToUrl(url, timeoutMs = this.navigationTimeoutMs) {
         if (!this.connection) {
             throw new Error("No CDP connection available");
         }
@@ -1113,7 +1232,7 @@ export class CDPMonitor {
         try {
             const result = await this.sendCDPCommand("Page.navigate", {
                 url
-            });
+            }, timeoutMs);
             const navigationTime = Date.now() - navigationStartTime;
             this.debugLog(`Navigation command sent successfully (${navigationTime}ms)`);
             this.debugLog(`Navigation result: ${JSON.stringify(result)}`);
@@ -1635,10 +1754,39 @@ export class CDPMonitor {
         this.isShuttingDown = true;
         this.debugLog("Shutdown signaled - reconnection attempts will be blocked");
     }
+    async waitForBrowserExit(timeoutMs) {
+        const browser = this.browser;
+        if (!browser) {
+            return true;
+        }
+        if (browser.exitCode !== null || browser.killed) {
+            return true;
+        }
+        return await new Promise((resolve) => {
+            const onExit = () => {
+                clearTimeout(timer);
+                resolve(true);
+            };
+            const timer = setTimeout(() => {
+                browser.removeListener("exit", onExit);
+                resolve(false);
+            }, timeoutMs);
+            browser.once("exit", onExit);
+        });
+    }
     async shutdown() {
         this.isShuttingDown = true;
-        // Try to close the page first, then the tab
+        let browserClosedCleanly = false;
+        // Ask the browser process to exit first so Chrome doesn't think it crashed.
         if (this.connection?.sessionId) {
+            try {
+                await this.sendCDPCommand("Browser.close");
+                this.debugLog("Sent Browser.close command");
+                browserClosedCleanly = await this.waitForBrowserExit(2000);
+            }
+            catch (_e) {
+                this.debugLog("Browser.close failed, trying page/tab close fallback");
+            }
             try {
                 // Try to close the page
                 await this.sendCDPCommand("Page.close");
@@ -1667,6 +1815,9 @@ export class CDPMonitor {
             catch (_e) {
                 this.debugLog("Failed to close tab via CDP, will force close Chrome");
             }
+            if (!browserClosedCleanly) {
+                browserClosedCleanly = await this.waitForBrowserExit(1500);
+            }
         }
         // Close CDP connection
         if (this.connection) {
@@ -1678,7 +1829,11 @@ export class CDPMonitor {
             }
             this.connection = null;
         }
-        // Kill only the Chrome processes for THIS instance
+        if (browserClosedCleanly) {
+            this.chromePids.clear();
+            return;
+        }
+        // Kill only the Chrome processes for THIS instance as a fallback.
         await this.killInstanceChromeProcesses();
     }
     async killInstanceChromeProcesses() {