@d-zero/puppeteer-screenshot 1.1.0 → 2.0.0

package/README.md

@@ -16,7 +16,9 @@ import { screenshot } from '@d-zero/puppeteer-screenshot';
 const browser = await puppeteer.launch();
 const page = await browser.newPage();
 
+// スクリーンショットのバイナリデータを持つオブジェクトを返します
 const result = await screenshot(page, 'https://example.com', {
+	path: 'path/to/save.png', // 保存先のパスを指定することでファイルに保存できます（省略可）
 	sizes: {
 		desktop: { width: 1400 },
 		mobile: { width: 375, resolution: 2 },

package/dist/get-binary.d.ts

@@ -1,2 +1,2 @@
-import type { Page } from 'puppeteer';
-export declare function getBinary(page: Page): Promise<Buffer>;
+import type { Page } from '@d-zero/puppeteer-page';
+export declare function getBinary(page: Page): Promise<Uint8Array>;

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { screenshot } from './screenshot.js';
+export { screenshotListener } from './screenshot-listener.js';
 export type * from './types.js';

package/dist/index.js

@@ -1 +1,2 @@
 export { screenshot } from './screenshot.js';
+export { screenshotListener } from './screenshot-listener.js';

package/dist/screenshot-listener.d.ts

@@ -0,0 +1,2 @@
+import type { ScreenshotPhase } from './types.js';
+export declare const screenshotListener: (log: (log: string) => void) => import("@d-zero/puppeteer-general-actions").Listener<ScreenshotPhase>;

package/dist/screenshot-listener.js

@@ -0,0 +1,18 @@
+import path from 'node:path';
+import { createListener } from '@d-zero/puppeteer-general-actions';
+import { pageScanLoggers } from '@d-zero/puppeteer-page-scan';
+export const screenshotListener = createListener((log) => {
+    return {
+        ...pageScanLoggers(log),
+        screenshotStart() {
+            log(`📸 Take a screenshot`);
+        },
+        screenshotSaving({ path: filePath }) {
+            const name = path.basename(filePath);
+            log(`🖼  Save a file ${name}`);
+        },
+        screenshotError({ error }) {
+            log(`❌️ ${error.message}`);
+        },
+    };
+});

package/dist/screenshot.d.ts

@@ -1,10 +1,14 @@
-import type { Listener, PageHook, Screenshot, Sizes } from './types.js';
-import type { Page } from 'puppeteer';
+import type { Screenshot, ScreenshotPhase } from './types.js';
+import type { Listener } from '@d-zero/puppeteer-general-actions';
+import type { Page } from '@d-zero/puppeteer-page';
+import type { PageHook, Sizes } from '@d-zero/puppeteer-page-scan';
 type Options = {
+    id?: string;
     sizes?: Sizes;
     hooks?: readonly PageHook[];
-    listener?: Listener;
+    listener?: Listener<ScreenshotPhase>;
     domOnly?: boolean;
+    path?: string;
 };
 /**
  * Takes screenshots of a web page at different sizes and resolutions.

package/dist/screenshot.js

@@ -1,10 +1,6 @@
-import { scrollAllOver } from '@d-zero/puppeteer-scroll';
+import { beforePageScan, defaultSizes } from '@d-zero/puppeteer-page-scan';
+import { urlToFileName } from '@d-zero/shared/url-to-file-name';
 import { getBinary } from './get-binary.js';
-const defaultSizes = {
-    desktop: { width: 1400 },
-    tablet: { width: 768 },
-    mobile: { width: 375, resolution: 2 },
-};
 /**
  * Takes screenshots of a web page at different sizes and resolutions.
  *
@@ -20,42 +16,56 @@ export async function screenshot(page, url, options) {
     const listener = options?.listener;
     const result = {};
     for (const [name, { width, resolution }] of Object.entries(sizes)) {
-        listener?.('setViewport', { name, width, resolution });
-        await page.setViewport({
+        await beforePageScan(page, url, {
+            ...options,
+            name,
             width,
-            height: 
-            // Landscape or portrait
-            width > 1000 ? Math.floor(width * 0.75) : Math.floor(width * 1.5),
-            deviceScaleFactor: resolution ?? 1,
+            resolution,
+            listener(phase, data) {
+                listener?.(phase, data);
+            },
         });
-        if (page.url() === url) {
-            listener?.('load', { name, type: 'reaload' });
-            await page.reload({ waitUntil: 'networkidle0' });
-        }
-        else {
-            listener?.('load', { name, type: 'open' });
-            await page.goto(url, { waitUntil: 'networkidle0' });
-        }
-        for (const hook of options?.hooks ?? []) {
-            await hook(page, {
-                name,
-                width,
-                resolution,
-                log: (message) => listener?.('hook', { name, message }),
-            });
-        }
-        listener?.('scroll', { name });
-        await scrollAllOver(page);
         let binary = null;
+        const filePath = options?.path?.replace(/\.png$/i, `@${name}.png`) ?? null;
         if (!options?.domOnly) {
             listener?.('screenshotStart', { name });
-            binary = await getBinary(page);
-            listener?.('screenshotEnd', { name, binary });
+            try {
+                if (filePath && options?.path) {
+                    listener?.('screenshotSaving', { name, path: options.path });
+                    await page.screenshot({
+                        path: filePath,
+                        fullPage: true,
+                        type: 'png',
+                    });
+                }
+                else {
+                    binary = await getBinary(page);
+                    listener?.('screenshotEnd', { name, binary });
+                }
+            }
+            catch (error) {
+                if (error instanceof Error) {
+                    listener?.('screenshotError', { name, error });
+                }
+                else {
+                    throw error;
+                }
+            }
         }
         listener?.('getDOMStart', { name });
+        const title = await page.evaluate(() => document.title);
         const dom = await page.content();
         listener?.('getDOMEnd', { name, dom });
-        result[name] = { binary, dom, width, resolution };
+        result[name] = {
+            id: options?.id ?? urlToFileName(url),
+            filePath,
+            url,
+            title,
+            binary,
+            dom,
+            width,
+            resolution,
+        };
     }
     return result;
 }

package/dist/types.d.ts

@@ -1,36 +1,29 @@
-import type { Page } from 'puppeteer';
-export type Sizes = Record<string, Size>;
-export type Size = {
-    width: number;
-    resolution?: number;
-};
+export type { PageHook } from '@d-zero/puppeteer-page-scan';
+import type { Listener as GeneralListener } from '@d-zero/puppeteer-general-actions';
+import type { PageScanPhase, Size } from '@d-zero/puppeteer-page-scan';
 export type Screenshot = {
-    binary: Buffer | null;
+    id: string;
+    filePath: string | null;
+    url: string;
+    title: string;
+    binary: Uint8Array | null;
     dom: string;
 } & Size;
-export type Phase = {
-    setViewport: {
-        name: string;
-        width: number;
-        resolution?: number;
-    };
-    hook: {
-        name: string;
-        message: string;
-    };
-    load: {
+export type ScreenshotPhase = {
+    screenshotStart: {
         name: string;
-        type: 'open' | 'reaload';
     };
-    scroll: {
+    screenshotEnd: {
         name: string;
+        binary: Uint8Array;
     };
-    screenshotStart: {
+    screenshotSaving: {
         name: string;
+        path: string;
     };
-    screenshotEnd: {
+    screenshotError: {
         name: string;
-        binary: Buffer;
+        error: Error;
     };
     getDOMStart: {
         name: string;
@@ -39,9 +32,16 @@ export type Phase = {
         name: string;
         dom: string;
     };
-};
-export type Listener = (phase: keyof Phase, data: Phase[keyof Phase]) => void;
-export type PageHook = (page: Page, size: Size & {
-    name: string;
-    log: (message: string) => void;
-}) => Promise<void>;
+} & PageScanPhase;
+/**
+ * @deprecated
+ */
+export type ScreenshotListener = GeneralListener<ScreenshotPhase>;
+/**
+ * @deprecated
+ */
+export type Phase = ScreenshotPhase;
+/**
+ * @deprecated
+ */
+export type Listener = ScreenshotListener;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/puppeteer-screenshot",
-	"version": "1.1.0",
+	"version": "2.0.0",
 	"description": "Screenshot utility for puppeteer",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -20,13 +20,16 @@
 	],
 	"scripts": {
 		"build": "tsc",
+		"watch": "tsc --watch",
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/puppeteer-scroll": "1.0.4"
+		"@d-zero/puppeteer-general-actions": "1.1.0",
+		"@d-zero/puppeteer-page-scan": "2.0.0",
+		"@d-zero/shared": "0.6.0"
 	},
 	"devDependencies": {
-		"puppeteer": "22.12.0"
+		"@d-zero/puppeteer-page": "0.2.0"
 	},
-	"gitHead": "9b4c167933f33237bb688e4835f17b499dc4c48d"
+	"gitHead": "1eb1c03400580040119121e11ffb33acd876fe1b"
 }