@d-zero/print 2.1.4 → 2.3.0

package/README.md

@@ -4,14 +4,14 @@
 
 - Puppeteerを実行してページのスクリーンショットを撮影します
 - `png`、`pdf`、`note`の3つの形式で出力できます
-- スクリーンショットはデスクトップとモバイルの2つのサイズでそれぞれ撮影します
+- 複数のデバイスサイズでスクリーンショットを撮影可能（7種類のプリセット + カスタム設定）
+- レスポンシブデザインの検証に最適
 
 ## CLI
 
 ```sh
-npx @d-zero/print -f <listfile> [--type <png|pdf|note>] [--limit <number>] [--debug]
-
-npx @d-zero/print <url>... [--type <png|pdf|note>] [--limit <number>] [--debug]
+npx @d-zero/print -f <listfile> [options]
+npx @d-zero/print <url>... [options]
 ```
 
 リストをファイルから読み込むか、URLを直接指定して実行します。
@@ -20,14 +20,42 @@ npx @d-zero/print <url>... [--type <png|pdf|note>] [--limit <number>] [--debug]
 
 ### オプション
 
-- `-f, --file <filepath>`: URLリストを持つファイルのパス
+- `-f, --listfile <file>`: URLリストを持つファイルのパス
 - `<url>`: 対象のURL（複数指定可能）
-- `-t, --type <png|pdf|note>`: 出力形式（デフォルト: png）
-  - `png`: PNG画像（モバイルとデスクトップの2つが生成されます）
+- `-t, --type <type>`: 出力形式（デフォルト: png）
+  - `png`: PNG画像（指定されたデバイスサイズで生成されます）
   - `pdf`: PDFファイル（ブラウザの印刷機能を使用、Print CSSが適用されます）
   - `note`: PNG画像のスクリーンショットに対してメモ欄付きのPDFファイルが生成されます
+- `-d, --devices <devices>`: デバイスプリセット（カンマ区切り、デフォルト: desktop-compact,mobile）
 - `--limit <number>`: 並列実行数の上限（デフォルト: 10）
 - `--debug`: デバッグモード（デフォルト: false）
+- `--verbose`: 詳細ログモード（デフォルト: false）
+
+### 利用可能なデバイスプリセット
+
+- `desktop`: 1400px幅
+- `tablet`: 768px幅
+- `mobile`: 375px幅（2倍解像度）
+- `desktop-hd`: 1920px幅
+- `desktop-compact`: 1280px幅
+- `mobile-large`: 414px幅（3倍解像度）
+- `mobile-small`: 320px幅（2倍解像度）
+
+### 使用例
+
+```sh
+# デフォルトデバイス（desktop-compact, mobile）
+npx @d-zero/print https://example.com
+
+# カスタムデバイス指定
+npx @d-zero/print https://example.com --devices desktop,tablet,mobile
+
+# PDF出力
+npx @d-zero/print -f urls.txt --type pdf
+
+# ファイルから読み込み + デバイス指定
+npx @d-zero/print -f urls.txt --devices desktop,mobile
+```
 
 #### URLリストのファイルフォーマット
 

package/dist/cli.js

@@ -1,27 +1,51 @@
 #!/usr/bin/env node
-import { createCLI, parseCommonOptions } from '@d-zero/cli-core';
+import { createCLI, parseCommonOptions, parseList } from '@d-zero/cli-core';
+import { parseDevicesOption } from '@d-zero/puppeteer-page-scan';
 import { print } from './print-main-process.js';
 import { readConfig } from './read-config.js';
 const { options, args, hasConfigFile } = createCLI({
     aliases: {
         f: 'listfile',
         t: 'type',
+        d: 'devices',
+        T: 'timeout',
     },
     usage: [
         'Usage:',
-        '\tprint -f <listfile> [--type <png|pdf|note>] [--limit <number>] [--debug]',
-        '\tprint <url>... [--type <png|pdf|note>] [--limit <number>] [--debug]',
+        '\tprint -f <listfile> [options]',
+        '\tprint <url>... [options]',
+        '',
+        'Options:',
+        '\t-f, --listfile <file>     File containing URLs to print',
+        '\t-t, --type <type>         Output type: png|pdf|note (default: png)',
+        '\t-d, --devices <devices>   Device presets (comma-separated, default: desktop-compact,mobile)',
+        '\t-T, --timeout <ms>        Request timeout in milliseconds (default: 30000)',
+        '\t--limit <number>          Limit concurrent processes',
+        '\t--debug                   Enable debug mode',
+        '\t--verbose                 Enable verbose logging',
+        '',
+        'Available device presets:',
+        '\tdesktop, tablet, mobile, desktop-hd, desktop-compact, mobile-large, mobile-small',
+        '',
+        'Examples:',
+        '\tprint https://example.com',
+        '\tprint -f urls.txt --type pdf',
+        '\tprint https://example.com --devices desktop,mobile',
     ],
     parseArgs: (cli) => ({
         ...parseCommonOptions(cli),
         listfile: cli.listfile,
         type: cli.type,
+        devices: cli.devices,
+        timeout: cli.timeout ? Number(cli.timeout) : undefined,
     }),
     validateArgs: (options, cli) => {
         return !!(options.listfile?.length || cli._.length > 0);
     },
 });
 const type = options.type === 'note' ? 'note' : options.type === 'pdf' ? 'pdf' : 'png';
+const deviceNames = options.devices ? parseList(options.devices) : undefined;
+const devices = parseDevicesOption(deviceNames);
 if (hasConfigFile) {
     const { urlList, hooks } = await readConfig(options.listfile);
     await print(urlList, {
@@ -30,6 +54,8 @@ if (hasConfigFile) {
         debug: options.debug,
         verbose: options.verbose,
         hooks,
+        devices,
+        timeout: options.timeout,
     });
     process.exit(0);
 }
@@ -39,6 +65,8 @@ if (args.length > 0) {
         limit: options.limit,
         verbose: options.verbose,
         debug: options.debug,
+        devices,
+        timeout: options.timeout,
     });
     process.exit(0);
 }

package/dist/modules/print-pdf.d.ts

@@ -1,4 +1,4 @@
-import type { PageHook } from '@d-zero/puppeteer-page-scan';
+import type { PageHook, Sizes } from '@d-zero/puppeteer-page-scan';
 import type { Page } from 'puppeteer';
 /**
  *
@@ -7,5 +7,7 @@ import type { Page } from 'puppeteer';
  * @param filePath
  * @param update
  * @param hooks
+ * @param devices
+ * @param timeout
  */
-export declare function printPdf(page: Page, url: string, filePath: string, update: (log: string) => void, hooks?: readonly PageHook[]): Promise<void>;
+export declare function printPdf(page: Page, url: string, filePath: string, update: (log: string) => void, hooks?: readonly PageHook[], devices?: Sizes, timeout?: number): Promise<void>;

package/dist/modules/print-pdf.js

@@ -1,4 +1,4 @@
-import { beforePageScan, pageScanListener } from '@d-zero/puppeteer-page-scan';
+import { beforePageScan, pageScanListener, devicePresets, } from '@d-zero/puppeteer-page-scan';
 /**
  *
  * @param page
@@ -6,18 +6,37 @@ import { beforePageScan, pageScanListener } from '@d-zero/puppeteer-page-scan';
  * @param filePath
  * @param update
  * @param hooks
+ * @param devices
+ * @param timeout
  */
-export async function printPdf(page, url, filePath, update, hooks) {
+export async function printPdf(page, url, filePath, update, hooks, devices, timeout) {
+    // Use the first desktop device or fallback to desktop preset
+    const defaultWidth = devicePresets.desktop.width;
+    let pdfWidth = defaultWidth;
+    if (devices) {
+        // Find the first desktop-like device (width >= 1000) or use the first device
+        const desktopDevice = Object.values(devices).find((device) => device.width >= 1000);
+        if (desktopDevice) {
+            pdfWidth = desktopDevice.width;
+        }
+        else if (Object.values(devices).length > 0) {
+            const firstDevice = Object.values(devices)[0];
+            if (firstDevice) {
+                pdfWidth = firstDevice.width;
+            }
+        }
+    }
     await beforePageScan(page, url, {
         name: 'pdf',
-        width: 1400,
+        width: pdfWidth,
         listener: pageScanListener(update),
         hooks,
+        timeout,
     });
     update('📄 Save as PDF');
     await page.pdf({
         path: filePath,
-        timeout: 30_000 * 10,
+        timeout: timeout ?? 30_000 * 10,
         format: 'A4',
         printBackground: true,
         displayHeaderFooter: false,

package/dist/modules/print-png.d.ts

@@ -1,3 +1,4 @@
+import type { Sizes } from '@d-zero/puppeteer-page-scan';
 import type { PageHook } from '@d-zero/puppeteer-screenshot';
 import type { Page } from 'puppeteer';
 /**
@@ -8,5 +9,7 @@ import type { Page } from 'puppeteer';
  * @param filePath
  * @param update
  * @param hooks
+ * @param devices
+ * @param timeout
  */
-export declare function printPng(page: Page, url: string, fileId: string, filePath: string, update: (log: string) => void, hooks?: readonly PageHook[]): Promise<Record<string, import("@d-zero/puppeteer-screenshot").Screenshot>>;
+export declare function printPng(page: Page, url: string, fileId: string, filePath: string, update: (log: string) => void, hooks?: readonly PageHook[], devices?: Sizes, timeout?: number): Promise<Record<string, import("@d-zero/puppeteer-screenshot").Screenshot>>;

package/dist/modules/print-png.js

@@ -1,3 +1,4 @@
+import { devicePresets } from '@d-zero/puppeteer-page-scan';
 import { screenshot, screenshotListener } from '@d-zero/puppeteer-screenshot';
 /**
  *
@@ -7,21 +8,20 @@ import { screenshot, screenshotListener } from '@d-zero/puppeteer-screenshot';
  * @param filePath
  * @param update
  * @param hooks
+ * @param devices
+ * @param timeout
  */
-export function printPng(page, url, fileId, filePath, update, hooks) {
+export function printPng(page, url, fileId, filePath, update, hooks, devices, timeout) {
+    const defaultSizes = {
+        'desktop-compact': devicePresets['desktop-compact'],
+        mobile: devicePresets.mobile,
+    };
     return screenshot(page, url, {
         id: fileId,
         path: filePath,
-        sizes: {
-            desktop: {
-                width: 1280,
-            },
-            mobile: {
-                width: 375,
-                resolution: 2,
-            },
-        },
+        sizes: devices ?? defaultSizes,
         listener: screenshotListener(update),
         hooks,
+        timeout,
     });
 }

package/dist/print-child-process.d.ts

@@ -1,7 +1,9 @@
 import type { PrintType } from './types.js';
-import type { PageHook } from '@d-zero/puppeteer-page-scan';
+import type { PageHook, Sizes } from '@d-zero/puppeteer-page-scan';
 export type ChildProcessParams = {
     dir: string;
     type: PrintType;
     hooks?: readonly PageHook[];
+    devices?: Sizes;
+    timeout?: number;
 };

package/dist/print-child-process.js

@@ -4,18 +4,18 @@ import { pngToPdf } from './modules/png-to-pdf.js';
 import { printPdf } from './modules/print-pdf.js';
 import { printPng } from './modules/print-png.js';
 createChildProcess((param) => {
-    const { dir, type, hooks } = param;
+    const { dir, type, hooks, devices, timeout } = param;
     return {
         async eachPage({ page, id, url }, logger) {
             const ext = type === 'pdf' ? 'pdf' : 'png';
             const fileName = `${id}.${ext}`;
             const filePath = path.resolve(dir, fileName);
             if (type === 'pdf') {
-                await printPdf(page, url, filePath, logger, hooks);
+                await printPdf(page, url, filePath, logger, hooks, devices, timeout);
                 logger('🔚 Closing');
                 return;
             }
-            const result = await printPng(page, url, id, filePath, logger, hooks);
+            const result = await printPng(page, url, id, filePath, logger, hooks, devices, timeout);
             if (type === 'png') {
                 logger('🔚 Closing');
                 return;

package/dist/print-main-process.d.ts

@@ -1,5 +1,5 @@
 import type { PrintType } from './types.js';
-import type { PageHook } from '@d-zero/puppeteer-page-scan';
+import type { PageHook, Sizes } from '@d-zero/puppeteer-page-scan';
 import type { LaunchOptions } from 'puppeteer';
 export interface PrintOptions {
     readonly type?: PrintType;
@@ -7,6 +7,8 @@ export interface PrintOptions {
     readonly debug?: boolean;
     readonly verbose?: boolean;
     readonly hooks?: readonly PageHook[];
+    readonly devices?: Sizes;
+    readonly timeout?: number;
 }
 /**
  *

package/dist/print-main-process.js

@@ -23,6 +23,8 @@ export async function print(urlList, options) {
             dir,
             type,
             hooks: options?.hooks,
+            devices: options?.devices,
+            timeout: options?.timeout,
         }, {
             ...options,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/print",
-	"version": "2.1.4",
+	"version": "2.3.0",
 	"description": "Print web pages to PDF or image files.",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -26,16 +26,16 @@
 	"dependencies": {
 		"@d-zero/cli-core": "1.1.1",
 		"@d-zero/html-distiller": "2.0.1",
-		"@d-zero/puppeteer-dealer": "0.5.3",
-		"@d-zero/puppeteer-page-scan": "4.0.4",
-		"@d-zero/puppeteer-screenshot": "3.1.3",
+		"@d-zero/puppeteer-dealer": "0.5.4",
+		"@d-zero/puppeteer-page-scan": "4.2.0",
+		"@d-zero/puppeteer-screenshot": "3.2.0",
 		"@d-zero/readtext": "1.1.8",
 		"@d-zero/shared": "0.9.2",
 		"ansi-colors": "4.1.3",
 		"dayjs": "1.11.18",
 		"front-matter": "4.0.2",
 		"minimist": "1.2.8",
-		"puppeteer": "24.17.1"
+		"puppeteer": "24.18.0"
 	},
-	"gitHead": "6fa0fd190c54351762a70039cd8dfcafc51caa0b"
+	"gitHead": "00ab4d99dc17e8f09f1a84e3a02f702629b642fc"
 }