@d-zero/puppeteer-scroll 1.0.4 → 2.0.0

package/dist/scroll-all-over.d.ts

@@ -1,7 +1,8 @@
-import type { Page } from 'puppeteer';
+import type { Page } from '@d-zero/puppeteer-page';
 export type Options = {
     distance?: number;
     interval?: number;
+    logger?: (scrollY: number, scrollHeight: number, message: string) => void;
 };
 /**
  * Scrolls the page vertically until the end or a maximum height is reached.
@@ -10,5 +11,6 @@ export type Options = {
  * @param options - Optional parameters for scrolling.
  * @param options.distance - The distance to scroll on each iteration (default: 100).
  * @param options.interval - The interval between each scroll iteration in milliseconds (default: 300).
+ * @param options.logger - A function that logs messages.
  */
 export declare function scrollAllOver(page: Page, options?: Options): Promise<void>;

package/dist/scroll-all-over.js

@@ -1,3 +1,4 @@
+import { delay } from '@d-zero/shared/delay';
 /**
  * Scrolls the page vertically until the end or a maximum height is reached.
  *
@@ -5,22 +6,31 @@
  * @param options - Optional parameters for scrolling.
  * @param options.distance - The distance to scroll on each iteration (default: 100).
  * @param options.interval - The interval between each scroll iteration in milliseconds (default: 300).
+ * @param options.logger - A function that logs messages.
  */
 export async function scrollAllOver(page, options) {
-    await page.evaluate(async (distance, interval) => {
-        distance = distance ?? document.documentElement.clientHeight - 5;
-        await new Promise((resolve) => {
-            let totalHeight = 0;
-            const timer = setInterval(() => {
-                const scrollHeight = document.body.scrollHeight;
-                window.scrollBy(0, distance);
-                totalHeight += distance;
-                if (totalHeight >= scrollHeight || totalHeight >= 100_000) {
-                    clearInterval(timer);
-                    window.scrollBy(0, 0);
-                    resolve();
-                }
-            }, interval);
+    const interval = options?.interval ?? 300;
+    let currentScrollY = 0;
+    let scrollHeight = await page.evaluate(() => document.body.scrollHeight);
+    while (currentScrollY < scrollHeight) {
+        [currentScrollY, scrollHeight] = await page.evaluate(() => {
+            // Move the scroll position to the bottom of the page.
+            globalThis.scrollBy(0, document.documentElement.clientHeight);
+            // Return the current scroll position.
+            return [
+                globalThis.scrollY + globalThis.innerHeight,
+                document.body.scrollHeight,
+            ];
         });
-    }, options?.distance, options?.interval ?? 300);
+        options?.logger?.(currentScrollY, scrollHeight, 'Scrolling');
+        await delay(interval);
+    }
+    options?.logger?.(currentScrollY, scrollHeight, 'End of page');
+    await page.evaluate(() => {
+        // Move the scroll position to the top of the page.
+        globalThis.scrollTo(0, 0);
+    });
+    await delay(400);
+    options?.logger?.(currentScrollY, scrollHeight, 'End of page');
+    await delay(400);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/puppeteer-scroll",
-	"version": "1.0.4",
+	"version": "2.0.0",
 	"description": "Scroll function for puppeteer",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -20,10 +20,14 @@
 	],
 	"scripts": {
 		"build": "tsc",
+		"watch": "tsc --watch",
 		"clean": "tsc --build --clean"
 	},
+	"dependencies": {
+		"@d-zero/shared": "0.6.0"
+	},
 	"devDependencies": {
-		"puppeteer": "22.12.0"
+		"@d-zero/puppeteer-page": "0.2.0"
 	},
-	"gitHead": "9b4c167933f33237bb688e4835f17b499dc4c48d"
+	"gitHead": "1eb1c03400580040119121e11ffb33acd876fe1b"
 }