@d-zero/puppeteer-page-scan 4.1.0 → 4.2.1

package/dist/before-page-scan.d.ts

@@ -5,6 +5,7 @@ type Options = {
     name: string;
     hooks?: readonly PageHook[];
     listener?: Listener<PageScanPhase>;
+    timeout?: number;
 } & Size;
 /**
  *

package/dist/before-page-scan.js

@@ -10,6 +10,7 @@ export async function beforePageScan(page, url, options) {
     const name = options?.name ?? 'default';
     const width = options?.width ?? 1400;
     const resolution = options?.resolution;
+    const timeout = options?.timeout;
     listener?.('setViewport', { name, width, resolution });
     await page.setViewport({
         width,
@@ -20,11 +21,11 @@ export async function beforePageScan(page, url, options) {
     });
     if (page.url() === url) {
         listener?.('load', { name, type: 'reaload' });
-        await page.reload({ waitUntil: 'networkidle0' });
+        await navigateWithFallback(page, url, timeout, true, listener, name);
     }
     else {
         listener?.('load', { name, type: 'open' });
-        await page.goto(url, { waitUntil: 'networkidle0' });
+        await navigateWithFallback(page, url, timeout, false, listener, name);
     }
     for (const hook of options?.hooks ?? []) {
         await hook(page, {
@@ -44,3 +45,43 @@ export async function beforePageScan(page, url, options) {
         logger: (scrollY, scrollHeight, message) => listener?.('scroll', { name, scrollY, scrollHeight, message }),
     });
 }
+/**
+ * Navigate with fallback from networkidle0 to networkidle2 on timeout
+ * @param page
+ * @param url
+ * @param timeout
+ * @param isReload
+ * @param listener
+ * @param name
+ */
+async function navigateWithFallback(page, url, timeout, isReload, listener, name) {
+    try {
+        // First attempt: networkidle0 (stricter)
+        if (isReload) {
+            await page.reload({ waitUntil: 'networkidle0', timeout });
+        }
+        else {
+            await page.goto(url, { waitUntil: 'networkidle0', timeout });
+        }
+    }
+    catch (error) {
+        // Check if it's a timeout error
+        if (error instanceof Error && error.message.includes('timeout')) {
+            listener?.('hook', {
+                name,
+                message: `networkidle0 timeout, retrying with networkidle2...`,
+            });
+            // Retry with networkidle2 (more lenient)
+            if (isReload) {
+                await page.reload({ waitUntil: 'networkidle2', timeout });
+            }
+            else {
+                await page.goto(url, { waitUntil: 'networkidle2', timeout });
+            }
+        }
+        else {
+            // Re-throw non-timeout errors
+            throw error;
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/puppeteer-page-scan",
-	"version": "4.1.0",
+	"version": "4.2.1",
 	"description": "Scanning page function for puppeteer",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -24,13 +24,13 @@
 	},
 	"dependencies": {
 		"@d-zero/puppeteer-general-actions": "1.2.1",
-		"@d-zero/puppeteer-scroll": "3.0.6"
+		"@d-zero/puppeteer-scroll": "3.0.7"
 	},
 	"devDependencies": {
-		"puppeteer": "24.18.0"
+		"puppeteer": "24.23.0"
 	},
 	"peerDependencies": {
-		"puppeteer": "24.18.0"
+		"puppeteer": "24.23.0"
 	},
-	"gitHead": "8081edac801400fed7c0b7ebeccc0ce66ccfe131"
+	"gitHead": "85b9a1f15d2db8798cf24a6a3f035cee1db6ba3d"
 }