@crouton-kit/capture 1.3.10 → 1.3.12

package/bin/capture

@@ -8391,19 +8391,42 @@ async function navigateAndWait(port, url, options = {}) {
     throw new Error("New tab has no WebSocket debugger URL");
   }
   const client = new CDPClient(tab.webSocketDebuggerUrl);
-  await client.waitReady();
-  await client.send("Page.enable");
-  await new Promise((resolve11, reject) => {
-    const timer = setTimeout(
-      () => reject(new Error(`Page load timeout: ${url}`)),
-      timeout
-    );
-    client.on("Page.loadEventFired", () => {
-      clearTimeout(timer);
-      resolve11();
+  try {
+    await client.waitReady();
+    await client.send("Page.enable");
+    let timer;
+    let loadHandler;
+    let loadTimeoutError;
+    let resolveLoad;
+    const loadPromise = new Promise((resolve11) => {
+      resolveLoad = resolve11;
+      loadHandler = () => {
+        if (timer) clearTimeout(timer);
+        resolveLoad();
+      };
+      client.on("Page.loadEventFired", loadHandler);
+      timer = setTimeout(() => {
+        loadTimeoutError = new Error(`Page load timeout: ${url}`);
+        resolveLoad();
+      }, timeout);
     });
-  });
-  client.close();
+    try {
+      const result = await client.send("Runtime.evaluate", {
+        expression: "document.readyState",
+        returnByValue: true
+      });
+      const readyState = result?.result?.value;
+      if (readyState !== "complete") {
+        await loadPromise;
+        if (loadTimeoutError) throw loadTimeoutError;
+      }
+    } finally {
+      if (timer) clearTimeout(timer);
+      if (loadHandler) client.off("Page.loadEventFired", loadHandler);
+    }
+  } finally {
+    client.close();
+  }
   const targets = await listTargets(port);
   const refreshed = targets.find((t) => t.id === tab.id);
   return refreshed ?? tab;
@@ -9799,7 +9822,7 @@ function validateHarAppendBatch(value, source) {
   return { entries, incompleteLifecycles };
 }
 function captureVersion() {
-  const version = "1.3.10";
+  const version = "1.3.12";
   return typeof version === "string" && version.length > 0 ? version : "development";
 }
 function token() {
@@ -11558,7 +11581,7 @@ function wallTime(value) {
   }
 }
 function captureVersion2() {
-  const version = "1.3.10";
+  const version = "1.3.12";
   return typeof version === "string" && version.length > 0 ? version : "development";
 }
 function deepFreeze(value) {
@@ -241019,7 +241042,7 @@ CDP_PORT / CDP_TARGET pin the browser + tab for orchestrators \u2014 precedence:
 explicit flag > active session > env.`;
 }
 function printVersion() {
-  const declared = "1.3.10";
+  const declared = "1.3.12";
   if (declared) {
     console.log(declared);
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crouton-kit/capture",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "description": "Browser automation and UI validation via CDP — session-based screenshots, HAR, a11y, click/type, and JS exec",
   "bin": {
     "capture": "./bin/capture"

package/src/cdp/record.ts

@@ -3,8 +3,8 @@ import {
   findTab,
   listTargets,
   openTab,
-  type CDPTarget,
 } from './targets.js';
+import { type CDPTarget } from './types.js';
 
 /**
  * Opens (or reuses) a tab for `url` and waits for its load event — `tab open`'s
@@ -32,23 +32,49 @@ export async function navigateAndWait(
     throw new Error('New tab has no WebSocket debugger URL');
   }
 
-  // Wait for page load
+  // Wait for page load. The client owns a page WebSocket, so close it even
+  // when connection, readiness, timeout, or target-refresh work fails.
   const client = new CDPClient(tab.webSocketDebuggerUrl);
-  await client.waitReady();
-  await client.send('Page.enable');
+  try {
+    await client.waitReady();
+    await client.send('Page.enable');
 
-  await new Promise<void>((resolve, reject) => {
-    const timer = setTimeout(
-      () => reject(new Error(`Page load timeout: ${url}`)),
-      timeout,
-    );
-    client.on('Page.loadEventFired', () => {
-      clearTimeout(timer);
-      resolve();
+    let timer: NodeJS.Timeout | undefined;
+    let loadHandler: ((params: unknown) => void) | undefined;
+    let loadTimeoutError: Error | undefined;
+    let resolveLoad!: () => void;
+    const loadPromise = new Promise<void>((resolve) => {
+      resolveLoad = resolve;
+      loadHandler = () => {
+        if (timer) clearTimeout(timer);
+        resolveLoad();
+      };
+      // Arm the event before checking readyState: the load event may fire
+      // while the readiness query is in flight.
+      client.on('Page.loadEventFired', loadHandler);
+      timer = setTimeout(() => {
+        loadTimeoutError = new Error(`Page load timeout: ${url}`);
+        resolveLoad();
+      }, timeout);
     });
-  });
 
-  client.close();
+    try {
+      const result = await client.send('Runtime.evaluate', {
+        expression: 'document.readyState',
+        returnByValue: true,
+      });
+      const readyState = (result as { result?: { value?: unknown } } | undefined)?.result?.value;
+      if (readyState !== 'complete') {
+        await loadPromise;
+        if (loadTimeoutError) throw loadTimeoutError;
+      }
+    } finally {
+      if (timer) clearTimeout(timer);
+      if (loadHandler) client.off('Page.loadEventFired', loadHandler);
+    }
+  } finally {
+    client.close();
+  }
 
   // Refresh target info — find by ID to avoid returning a different tab with same URL
   const targets = await listTargets(port);