@d-zero/archaeologist 1.1.0 → 1.1.2

package/dist/analyze.js

@@ -1,76 +1,31 @@
 import { writeFile, 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 { analyzeUrlList } from './analize-url.js';
 import { diffImages } from './diff-images.js';
 import { diffTree } from './diff-tree.js';
 import { getData } from './get-data.js';
-import { label, score } from './output-utils.js';
+import { score } from './output-utils.js';
 export async function analyze(list, options) {
-    const urlInfo = analyzeUrlList(list);
-    const useOldMode = urlInfo.hasAuth && urlInfo.hasNoSSL;
-    const browser = await puppeteer.launch({
-        headless: useOldMode ? 'shell' : true,
-        args: [
-            //
-            '--lang=ja',
-            '--no-zygote',
-            '--ignore-certificate-errors',
-        ],
-    });
     const results = [];
     const dir = path.resolve(process.cwd(), '.archaeologist');
     await mkdir(dir, { recursive: true }).catch(() => { });
-    await deal(list, 
-    //
-    async (urlPair, update, index) => {
-        const page = await browser.newPage();
-        page.setDefaultNavigationTimeout(0);
-        await page.setUserAgent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36');
-        await page.setExtraHTTPHeaders({
-            'Accept-Language': 'ja-JP',
-        });
-        return async () => {
+    const urlInfo = analyzeUrlList(list);
+    const useOldMode = urlInfo.hasAuth || urlInfo.hasNoSSL;
+    await deal(list.map(([urlA]) => ({ id: null, url: urlA })), (_, done, total) => {
+        return `${c.bold.magenta('🕵️  Archaeologist')} ${done}/${total}`;
+    }, {
+        async deal(page, _, urlA, logger, index) {
+            const urlPair = list.find(([url]) => url === urlA);
+            if (!urlPair) {
+                throw new Error(`Failed to find urlPair: ${urlA}`);
+            }
             const dataPair = [];
             for (const url of urlPair) {
                 const data = await getData(page, url, {
                     ...options,
-                }, (phase, data) => {
-                    const outputUrl = c.gray(url);
-                    const sizeName = label(data.name);
-                    switch (phase) {
-                        case 'setViewport': {
-                            const { width } = data;
-                            update(`%braille% ${outputUrl} ${sizeName}: ↔️ Change viewport size to ${width}px`);
-                            break;
-                        }
-                        case 'load': {
-                            const { type } = data;
-                            update(`%braille% ${outputUrl} ${sizeName}: %earth% ${type === 'open' ? 'Open' : 'Reload'} page`);
-                            break;
-                        }
-                        case 'hook': {
-                            const { message } = data;
-                            update(`%braille% ${outputUrl} ${sizeName}: ${message}`);
-                            break;
-                        }
-                        case 'scroll': {
-                            update(`%braille% ${outputUrl} ${sizeName}: %propeller% Scroll the page`);
-                            break;
-                        }
-                        case 'screenshotStart': {
-                            update(`%braille% ${outputUrl} ${sizeName}: 📸 Take a screenshot`);
-                            break;
-                        }
-                        case 'screenshotEnd': {
-                            const { binary } = data;
-                            update(`%braille% ${outputUrl} ${sizeName}: 📸 Screenshot taken (${binary.length} bytes)`);
-                            break;
-                        }
-                    }
-                });
+                }, logger);
                 dataPair.push(data);
                 await delay(600);
             }
@@ -79,10 +34,10 @@ export async function analyze(list, options) {
                 throw new Error('Failed to get screenshots');
             }
             const screenshotResult = {};
-            const outputUrl = c.gray(urlPair.join(' vs '));
+            const outputUrl = 'vs ' + c.gray(urlPair[1]);
             for (const [name, screenshotA] of Object.entries(a.screenshots)) {
                 const screenshotB = b.screenshots[name];
-                const sizeName = label(name);
+                const sizeName = c.bgMagenta(` ${name} `);
                 const id = `${index}_${name}`;
                 if (!screenshotB) {
                     throw new Error(`Failed to get screenshotB: ${id}`);
@@ -90,28 +45,28 @@ export async function analyze(list, options) {
                 const imageDiff = await diffImages(screenshotA, screenshotB, (phase, data) => {
                     switch (phase) {
                         case 'create': {
-                            update(`%braille% ${outputUrl} ${sizeName}: 🖼️ Create images`);
+                            logger(`${sizeName} ${outputUrl} 🖼️ Create images`);
                             break;
                         }
                         case 'resize': {
                             const { width, height } = data;
-                            update(`%braille% ${outputUrl} ${sizeName}: ↔️ Resize images to ${width}x${height}`);
+                            logger(`${sizeName} ${outputUrl} ↔️ Resize images to ${width}x${height}`);
                             break;
                         }
                         case 'diff': {
-                            update(`%braille% ${outputUrl} ${sizeName}: 📊 Compare images`);
+                            logger(`${sizeName} ${outputUrl} 📊 Compare images`);
                             break;
                         }
                     }
                 });
                 let image = null;
                 if (imageDiff) {
-                    update(`%braille% ${outputUrl} ${sizeName}: 🧩 Matches ${score(imageDiff.matches, 0.9)}`);
+                    logger(`${sizeName} ${outputUrl} 🧩 Matches ${score(imageDiff.matches, 0.9)}`);
                     await delay(1500);
                     await writeFile(path.resolve(dir, `${id}_a.png`), imageDiff.images.a);
                     await writeFile(path.resolve(dir, `${id}_b.png`), imageDiff.images.b);
                     const outFilePath = path.resolve(dir, `${id}_diff.png`);
-                    update(`%braille% ${outputUrl} ${sizeName}: 📊 Save diff image to ${path.relative(dir, outFilePath)}`);
+                    logger(`${sizeName} ${outputUrl} 📊 Save diff image to ${path.relative(dir, outFilePath)}`);
                     await writeFile(outFilePath, imageDiff.images.diff);
                     image = {
                         matches: imageDiff.matches,
@@ -135,15 +90,11 @@ export async function analyze(list, options) {
                 screenshots: screenshotResult,
             };
             results.push(result);
-        };
-    }, {
-        limit: options?.limit,
-        debug: options?.debug,
-        header(_, done, total) {
-            return `${c.bold.magenta('🕵️  Archaeologist')} ${done}/${total}`;
         },
+    }, {
+        ...options,
+        headless: useOldMode ? 'shell' : true,
     });
-    await browser.close();
     return results;
 }
 function delay(ms) {

package/dist/archaeologist.js

@@ -1,6 +1,6 @@
 import c from 'ansi-colors';
 import { analyze } from './analyze.js';
-import { label, score } from './output-utils.js';
+import { score } from './output-utils.js';
 export async function archaeologist(list, options) {
     const results = await analyze(list, options);
     const output = [];
@@ -9,9 +9,9 @@ export async function archaeologist(list, options) {
         for (const [sizeName, { image, dom }] of Object.entries(result.screenshots)) {
             if (image) {
                 const { matches, file } = image;
-                output.push(`  ${label(sizeName)} ${score(matches, 0.9)} ${file}`);
+                output.push(`  ${c.bgMagenta(` ${sizeName} `)} ${score(matches, 0.9)} ${file}`);
             }
-            output.push(`  ${label('HTML', c.bgBlueBright)}: ${score(dom.matches, 0.995)} ${dom.file}`);
+            output.push(`  ${c.bgBlueBright(' HTML ')}: ${score(dom.matches, 0.995)} ${dom.file}`);
         }
     }
     process.stdout.write(output.join('\n') + '\n');

package/dist/cli.js

@@ -7,7 +7,7 @@ const cli = minimist(process.argv.slice(2), {
         f: 'listfile',
     },
 });
-if (cli.listfile) {
+if (cli.listfile?.length) {
     const { pairList, hooks } = await readConfig(cli.listfile);
     await archaeologist(pairList, {
         hooks,
@@ -17,5 +17,5 @@ if (cli.listfile) {
     });
     process.exit(0);
 }
-process.stdout.write('Usage: archaeologist -f <listfile> [--limit <number>]');
+process.stderr.write('Usage: archaeologist -f <listfile> [--limit <number>]\n');
 process.exit(1);

package/dist/diff-images.d.ts

@@ -1,18 +1,18 @@
 import type { Screenshot } from '@d-zero/puppeteer-screenshot';
 export type DiffImagesPhase = {
     create: {
-        a: Buffer;
-        b: Buffer;
+        a: Uint8Array;
+        b: Uint8Array;
     };
     resize: {
-        a: Buffer;
-        b: Buffer;
+        a: Uint8Array;
+        b: Uint8Array;
         width: number;
         height: number;
     };
     diff: {
-        a: Buffer;
-        b: Buffer;
+        a: Uint8Array;
+        b: Uint8Array;
     };
 };
 type DiffImagesListener = (phase: keyof DiffImagesPhase, data: DiffImagesPhase[keyof DiffImagesPhase]) => void;

package/dist/diff-images.js

@@ -1,4 +1,4 @@
-import Jimp from 'jimp';
+import { Jimp, HorizontalAlign, VerticalAlign, JimpMime } from 'jimp';
 import pixelmatch from 'pixelmatch';
 import { PNG } from 'pngjs';
 export async function diffImages(dataA, dataB, listener) {
@@ -6,13 +6,13 @@ export async function diffImages(dataA, dataB, listener) {
         return null;
     }
     listener('create', { a: dataA.binary, b: dataB.binary });
-    const imgA = PNG.sync.read(dataA.binary);
-    const imgB = PNG.sync.read(dataB.binary);
+    const imgA = PNG.sync.read(Buffer.from(dataA.binary));
+    const imgB = PNG.sync.read(Buffer.from(dataB.binary));
     const width = Math.max(imgA.width, imgB.width);
     const height = Math.max(imgA.height, imgB.height);
     listener('resize', { a: dataA.binary, b: dataB.binary, width, height });
-    const resizedA = await resizeImg(dataA.binary, width, height);
-    const resizedB = await resizeImg(dataB.binary, width, height);
+    const resizedA = await resizeImg(Buffer.from(dataA.binary), width, height);
+    const resizedB = await resizeImg(Buffer.from(dataB.binary), width, height);
     listener('diff', { a: resizedA, b: resizedB });
     const imgA_ = PNG.sync.read(resizedA);
     const imgB_ = PNG.sync.read(resizedB);
@@ -33,12 +33,10 @@ export async function diffImages(dataA, dataB, listener) {
 }
 async function resizeImg(bin, width, height) {
     const img = await Jimp.read(bin);
-    img.contain(width, height, Jimp.HORIZONTAL_ALIGN_LEFT | Jimp.VERTICAL_ALIGN_TOP);
-    return new Promise((resolve, reject) => {
-        img.getBuffer(Jimp.MIME_PNG, (err, buffer) => {
-            if (err)
-                reject(err);
-            resolve(buffer);
-        });
+    img.contain({
+        w: width,
+        h: height,
+        align: HorizontalAlign.LEFT | VerticalAlign.TOP,
     });
+    return img.getBuffer(JimpMime.png);
 }

package/dist/get-data.d.ts

@@ -1,8 +1,8 @@
 import type { PageData } from './types.js';
-import type { Listener, PageHook } from '@d-zero/puppeteer-screenshot';
-import type { Page } from 'puppeteer';
+import type { Page } from '@d-zero/puppeteer-page';
+import type { PageHook } from '@d-zero/puppeteer-screenshot';
 export interface GetDataOptions {
     readonly hooks?: readonly PageHook[];
     readonly htmlDiffOnly?: boolean;
 }
-export declare function getData(page: Page, url: string, options: GetDataOptions, listener: Listener): Promise<PageData>;
+export declare function getData(page: Page, url: string, options: GetDataOptions, update: (log: string) => void): Promise<PageData>;

package/dist/get-data.js

@@ -1,6 +1,6 @@
 import { distill } from '@d-zero/html-distiller';
-import { screenshot } from '@d-zero/puppeteer-screenshot';
-export async function getData(page, url, options, listener) {
+import { screenshotListener, screenshot } from '@d-zero/puppeteer-screenshot';
+export async function getData(page, url, options, update) {
     const htmlDiffOnly = options.htmlDiffOnly ?? false;
     const screenshots = await screenshot(page, url, {
         sizes: {
@@ -13,7 +13,7 @@ export async function getData(page, url, options, listener) {
             },
         },
         hooks: options?.hooks ?? [],
-        listener,
+        listener: screenshotListener(update),
         domOnly: htmlDiffOnly,
     });
     const data = { url, screenshots: {} };

package/dist/output-utils.d.ts

@@ -1,3 +1 @@
-import c from 'ansi-colors';
-export declare function label(str: string, color?: c.StyleFunction): string;
 export declare function score(matches: number, threshold: number): string;

package/dist/output-utils.js

@@ -1,7 +1,4 @@
 import c from 'ansi-colors';
-export function label(str, color = c.bgMagenta) {
-    return color(` ${str} `);
-}
 export function score(matches, threshold) {
     const color = matches > threshold ? c.green : c.red;
     const num = (matches * 100).toFixed(1);

package/dist/read-config.d.ts

@@ -1,4 +1,4 @@
 export declare function readConfig(filePath: string): Promise<{
     pairList: [string, string][];
-    hooks: import("@d-zero/puppeteer-screenshot").PageHook[];
+    hooks: import("@d-zero/puppeteer-page-scan").PageHook[];
 }>;

package/dist/read-config.js

@@ -1,7 +1,8 @@
 import fs from 'node:fs/promises';
+import path from 'node:path';
+import { readPageHooks } from '@d-zero/puppeteer-page-scan';
 import { toList } from '@d-zero/readtext/list';
 import fm from 'front-matter';
-import { readHooks } from './read-hooks.js';
 export async function readConfig(filePath) {
     const fileContent = await fs.readFile(filePath, 'utf8');
     const content = 
@@ -15,7 +16,8 @@ export async function readConfig(filePath) {
             `${content.attributes.comparisonHost}${url.pathname}${url.search}`,
         ];
     });
-    const hooks = await readHooks(content.attributes?.hooks ?? [], filePath);
+    const baseDir = path.dirname(filePath);
+    const hooks = await readPageHooks(content.attributes?.hooks ?? [], baseDir);
     return {
         pairList,
         hooks,

package/dist/utils.d.ts

@@ -1,2 +1 @@
-export declare function label(str: string): string;
 export declare function score(matches: number, threshold: number): string;

package/dist/utils.js

@@ -1,7 +1,4 @@
 import c from 'ansi-colors';
-export function label(str) {
-    return c.bgMagenta(` ${str} `);
-}
 export function score(matches, threshold) {
     const color = matches > threshold ? c.green : c.red;
     const num = (matches * 100).toFixed(1);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/archaeologist",
-	"version": "1.1.0",
+	"version": "1.1.2",
 	"description": "Uncover visual and HTML differences in web pages with precision",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -23,28 +23,29 @@
 	],
 	"scripts": {
 		"build": "tsc",
+		"watch": "tsc --watch",
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/dealer": "1.0.2",
-		"@d-zero/html-distiller": "1.0.0",
-		"@d-zero/puppeteer-screenshot": "1.1.0",
-		"@d-zero/readtext": "1.0.3",
+		"@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",
-		"diff": "5.2.0",
+		"diff": "7.0.0",
 		"front-matter": "4.0.2",
-		"jimp": "0.22.12",
+		"jimp": "1.6.0",
 		"minimist": "1.2.8",
 		"parse-diff": "0.11.1",
-		"pixelmatch": "5.3.0",
-		"pngjs": "7.0.0",
-		"puppeteer": "22.12.0"
+		"pixelmatch": "6.0.0",
+		"pngjs": "7.0.0"
 	},
 	"devDependencies": {
-		"@types/diff": "5.2.1",
+		"@d-zero/puppeteer-page": "0.2.0",
+		"@types/diff": "6.0.0",
 		"@types/pixelmatch": "5.2.6",
-		"@types/pngjs": "6.0.5",
-		"puppeteer": "22.12.0"
+		"@types/pngjs": "6.0.5"
 	},
-	"gitHead": "9b4c167933f33237bb688e4835f17b499dc4c48d"
+	"gitHead": "1eb1c03400580040119121e11ffb33acd876fe1b"
 }