@d-zero/print 1.0.0 → 1.1.0

package/dist/cli.js

@@ -10,14 +10,15 @@ const cli = minimist(process.argv.slice(2), {
 });
 const limit = cli.limit ? Number.parseInt(cli.limit) : undefined;
 const debug = !!cli.debug;
+const verbose = !!cli.verbose;
 const type = cli.type === 'note' ? 'note' : cli.type === 'pdf' ? 'pdf' : 'png';
 if (cli.listfile?.length) {
     const { urlList, hooks } = await readConfig(cli.listfile);
-    await print(urlList, { type, limit, debug, hooks });
+    await print(urlList, { type, limit, debug, verbose, hooks });
     process.exit(0);
 }
 if (cli._.length > 0) {
-    await print(cli._, { type, limit, debug });
+    await print(cli._, { type, limit, verbose, debug });
     process.exit(0);
 }
 process.stderr.write([

package/dist/png-to-pdf.d.ts

@@ -1,3 +1,3 @@
+import type { Page } from '@d-zero/puppeteer-page';
 import type { Screenshot } from '@d-zero/puppeteer-screenshot';
-import type { Browser } from 'puppeteer';
-export declare function pngToPdf(browser: Browser, screenshots: Record<string, Screenshot>, update: (log: string) => void): Promise<void>;
+export declare function pngToPdf(page: Page, screenshots: Record<string, Screenshot>, update: (log: string) => void): Promise<void>;

package/dist/png-to-pdf.js

@@ -2,9 +2,7 @@ import { rm } from 'node:fs/promises';
 import path from 'node:path';
 import c from 'ansi-colors';
 import { printPdfWithNote } from './print-pdf-with-note.js';
-export async function pngToPdf(browser, screenshots, update) {
-    const page = await browser.newPage();
-    page.setDefaultNavigationTimeout(0);
+export async function pngToPdf(page, screenshots, update) {
     for (const [sizeName, screenshot] of Object.entries(screenshots)) {
         if (!screenshot.filePath) {
             continue;

package/dist/print-pdf-with-note.d.ts

@@ -1,3 +1,3 @@
+import type { Page } from '@d-zero/puppeteer-page';
 import type { Screenshot } from '@d-zero/puppeteer-screenshot';
-import type { Page } from 'puppeteer';
 export declare function printPdfWithNote(page: Page, { id, filePath, url, title }: Screenshot): Promise<void>;

package/dist/print-pdf.d.ts

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

package/dist/print-pdf.js

@@ -1,10 +1,9 @@
-import { beforePageScan } from '@d-zero/puppeteer-page-scan';
-import { screenshotListener } from '@d-zero/puppeteer-screenshot';
+import { beforePageScan, pageScanListener } from '@d-zero/puppeteer-page-scan';
 export async function printPdf(page, url, filePath, update, hooks) {
     await beforePageScan(page, url, {
         name: 'pdf',
         width: 1400,
-        listener: screenshotListener(update),
+        listener: pageScanListener(update),
         hooks,
     });
     update('📄 Save as PDF');

package/dist/print-png.d.ts

@@ -1,3 +1,3 @@
+import type { Page } from '@d-zero/puppeteer-page';
 import type { PageHook } from '@d-zero/puppeteer-screenshot';
-import type { Page } from 'puppeteer';
 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>>;

package/dist/print.d.ts

@@ -4,6 +4,7 @@ export interface PrintOptions {
     readonly type?: PrintType;
     readonly limit?: number;
     readonly debug?: boolean;
+    readonly verbose?: boolean;
     readonly hooks?: readonly PageHook[];
 }
 export declare function print(urlList: readonly (string | {

package/dist/print.js

@@ -1,21 +1,11 @@
 import { mkdir } from 'node:fs/promises';
 import path from 'node:path';
-import { deal } from '@d-zero/dealer';
+import { deal } from '@d-zero/puppeteer-dealer';
 import c from 'ansi-colors';
-import puppeteer from 'puppeteer';
 import { pngToPdf } from './png-to-pdf.js';
 import { printPdf } from './print-pdf.js';
 import { printPng } from './print-png.js';
 export async function print(urlList, options) {
-    const browser = await puppeteer.launch({
-        headless: true,
-        args: [
-            //
-            '--lang=ja',
-            '--no-zygote',
-            '--ignore-certificate-errors',
-        ],
-    });
     const dir = path.resolve(process.cwd(), '.print');
     await mkdir(dir, { recursive: true }).catch(() => { });
     const type = options?.type ?? 'png';
@@ -25,41 +15,25 @@ export async function print(urlList, options) {
             return { id: null, url };
         }
         return url;
-    }), ({ id, url }, update, index) => {
-        return async () => {
-            const page = await browser.newPage();
-            page.setDefaultNavigationTimeout(0);
-            await page.setExtraHTTPHeaders({
-                'Accept-Language': 'ja-JP',
-            });
-            const fileId = id || index.toString().padStart(3, '0');
+    }), (_, done, total) => {
+        return `${c.bold.magenta('🎨 Print pages')} ${c.bgBlueBright(` ${type} `)} ${done}/${total}`;
+    }, {
+        async deal(page, id, url, logger) {
             const ext = type === 'pdf' ? 'pdf' : 'png';
-            const fileName = `${fileId}.${ext}`;
+            const fileName = `${id}.${ext}`;
             const filePath = path.resolve(dir, fileName);
-            const lineHeader = `%braille% ${c.bgWhite(` ${fileId} `)} ${c.gray(url)}: `;
-            update(`${lineHeader}🔗 Open%dots%`);
             if (type === 'pdf') {
-                await printPdf(page, url, filePath, (log) => update(lineHeader + log), hooks);
-                update(`${lineHeader}🔚 Closing`);
-                await page.close();
+                await printPdf(page, url, filePath, logger, hooks);
+                logger('🔚 Closing');
                 return;
             }
-            const result = await printPng(page, url, fileId, filePath, (log) => update(lineHeader + log), hooks);
+            const result = await printPng(page, url, id, filePath, logger, hooks);
             if (type === 'png') {
-                update(`${lineHeader}🔚 Closing`);
-                await page.close();
+                logger('🔚 Closing');
                 return;
             }
-            await pngToPdf(browser, result, (log) => update(lineHeader + log));
-            update(`${lineHeader}🔚 Closing`);
-            await page.close();
-        };
-    }, {
-        limit: options?.limit,
-        debug: options?.debug,
-        header(_, done, total) {
-            return `${c.bold.magenta('🎨 Print pages')} ${c.bgBlueBright(` ${type} `)} ${done}/${total}`;
+            await pngToPdf(page, result, logger);
+            logger('🔚 Closing');
         },
-    });
-    await browser.close();
+    }, options);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/print",
-	"version": "1.0.0",
+	"version": "1.1.0",
 	"description": "Print web pages to PDF or image files.",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -23,19 +23,22 @@
 	],
 	"scripts": {
 		"build": "tsc",
+		"watch": "tsc --watch",
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/dealer": "1.1.0",
-		"@d-zero/html-distiller": "1.0.0",
-		"@d-zero/puppeteer-page-scan": "1.0.0",
-		"@d-zero/puppeteer-screenshot": "1.2.0",
-		"@d-zero/readtext": "1.1.0",
+		"@d-zero/html-distiller": "1.0.1",
+		"@d-zero/puppeteer-dealer": "0.2.0",
+		"@d-zero/puppeteer-page-scan": "2.0.0",
+		"@d-zero/puppeteer-screenshot": "2.0.0",
+		"@d-zero/readtext": "1.1.1",
 		"ansi-colors": "4.1.3",
 		"dayjs": "1.11.13",
 		"front-matter": "4.0.2",
-		"minimist": "1.2.8",
-		"puppeteer": "23.5.0"
+		"minimist": "1.2.8"
 	},
-	"gitHead": "e8f65086bf7c316dda6667f1173da8585a5ef19c"
+	"devDependencies": {
+		"@d-zero/puppeteer-page": "0.2.0"
+	},
+	"gitHead": "1eb1c03400580040119121e11ffb33acd876fe1b"
 }