@d-zero/puppeteer-page-scan 4.3.4 → 4.4.0

package/README.md

@@ -46,6 +46,11 @@ const parsedSizes = parseDevicesOption(['desktop', 'tablet']);
 - ページのリロード
 - 任意のフック処理
   - ログインなどの事前処理
+- disclosure要素の展開（オプション）
+  - すべての`<details>`要素を開き、すべての`button[aria-expanded="false"]`要素をクリック
+  - 新しい要素が見つからなくなるまで繰り返し処理（最大1000回）
+  - 各イテレーション後に500ms待機
+  - 最大イテレーション数に達した場合はErrorを投げる
 - ページ全体をスクロール
 
 などを行い、スキャンに必要な状態を整えるためのヘルパー関数です。
@@ -73,5 +78,6 @@ await beforePageScan(page, 'https://example.com', {
 			await page.click('button[type="submit"]');
 		},
 	],
+	openDisclosures: true, // オプション: disclosure要素を展開（<details>とbutton[aria-expanded="false"]）
 });
 ```

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

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

package/dist/before-page-scan.js

@@ -1,4 +1,54 @@
 import { scrollAllOver } from '@d-zero/puppeteer-scroll';
+/**
+ * Open all disclosure elements on the page
+ * This function loops until all disclosure elements are expanded,
+ * including nested elements and dynamically-created buttons.
+ * @param page
+ * @returns The total number of elements opened (details + buttons)
+ * @throws {Error} if the maximum iterations (1000) is reached
+ */
+async function openAllDisclosures(page) {
+    const maxIterations = 1000; // Maximum iterations to prevent infinite loops
+    let totalDetails = 0;
+    let totalButtons = 0;
+    let iteration = 0;
+    while (iteration < maxIterations) {
+        const result = await page.evaluate(() => {
+            // Open all <details> elements
+            const detailsElements = document.querySelectorAll('details:not([open])');
+            for (const details of detailsElements) {
+                details.open = true;
+            }
+            // Click all collapsed buttons
+            const collapsedButtons = document.querySelectorAll('button[aria-expanded="false"]');
+            for (const button of collapsedButtons) {
+                button.click();
+            }
+            return {
+                details: detailsElements.length,
+                buttons: collapsedButtons.length,
+            };
+        });
+        totalDetails += result.details;
+        totalButtons += result.buttons;
+        // If no elements were opened in this iteration, we're done
+        if (result.details === 0 && result.buttons === 0) {
+            break;
+        }
+        // Wait for animations and content rendering before next iteration
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        iteration++;
+    }
+    // If we reached the max iterations, throw an error
+    if (iteration === maxIterations) {
+        throw new Error(`openAllDisclosures: Reached maximum iterations (${maxIterations}). ` +
+            `This may indicate an infinite loop caused by dynamically generated disclosure elements.`);
+    }
+    return {
+        details: totalDetails,
+        buttons: totalButtons,
+    };
+}
 /**
  *
  * @param page
@@ -10,7 +60,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 || 30_000;
+    const timeout = options?.timeout || 5000;
     const countDownId = `${name}${url}_timeout`;
     listener?.('setViewport', { name, width, resolution });
     await page.setViewport({
@@ -36,6 +86,14 @@ export async function beforePageScan(page, url, options) {
             log: (message) => listener?.('hook', { name, message }),
         });
     }
+    if (options?.openDisclosures) {
+        listener?.('hook', { name, message: 'Opening all disclosures...' });
+        const result = await openAllDisclosures(page);
+        listener?.('hook', {
+            name,
+            message: `Opened ${result.details} <details> elements and clicked ${result.buttons} [aria-expanded="false"] buttons`,
+        });
+    }
     listener?.('scroll', {
         name,
         scrollY: 0,
@@ -74,10 +132,10 @@ async function navigateWithFallback(page, url, timeout, isReload, listener, name
             });
             // Retry with networkidle2 (more lenient)
             if (isReload) {
-                await page.reload({ waitUntil: 'networkidle2', timeout });
+                await page.reload({ waitUntil: 'networkidle2', timeout: timeout * 3 });
             }
             else {
-                await page.goto(url, { waitUntil: 'networkidle2', timeout });
+                await page.goto(url, { waitUntil: 'networkidle2', timeout: timeout * 3 });
             }
         }
         else {

package/dist/page-scan-listener.js

@@ -5,7 +5,7 @@ export const pageScanLoggers = (log) => ({
     },
     load({ type, timeout, id }) {
         const timeoutSec = Math.floor(timeout / 1000);
-        log(`%earth% ${type === 'open' ? 'Open' : 'Reload'} page / Timeout: %countdown(${timeoutSec},${id}_timeout,s)%s/${timeoutSec}s`);
+        log(`%earth% ${type === 'open' ? 'Open' : 'Reload'} page / Timeout: %countdown(${timeout},${id}_timeout,s)%s/${timeoutSec}s`);
     },
     hook({ message }) {
         log(message);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/puppeteer-page-scan",
-	"version": "4.3.4",
+	"version": "4.4.0",
 	"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.1.7"
+		"@d-zero/puppeteer-scroll": "3.1.8"
 	},
 	"devDependencies": {
-		"puppeteer": "24.34.0"
+		"puppeteer": "24.36.0"
 	},
 	"peerDependencies": {
-		"puppeteer": "24.34.0"
+		"puppeteer": "24.36.0"
 	},
-	"gitHead": "c976f890ac4225e20df8fc83118f31231bd6323c"
+	"gitHead": "e2189e6878674b8fef5fa3c121ad109c448040fe"
 }