@d-zero/archaeologist 1.1.1 → 1.1.2

package/dist/analyze.js

@@ -1,43 +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,
-                }, update);
+                }, logger);
                 dataPair.push(data);
                 await delay(600);
             }
@@ -46,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}`);
@@ -57,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,
@@ -102,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/get-data.d.ts

@@ -1,6 +1,6 @@
 import type { PageData } from './types.js';
+import type { Page } from '@d-zero/puppeteer-page';
 import type { PageHook } from '@d-zero/puppeteer-screenshot';
-import type { Page } from 'puppeteer';
 export interface GetDataOptions {
     readonly hooks?: readonly PageHook[];
     readonly htmlDiffOnly?: boolean;

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/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.1",
+	"version": "1.1.2",
 	"description": "Uncover visual and HTML differences in web pages with precision",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -23,14 +23,15 @@
 	],
 	"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",
 		"diff": "7.0.0",
 		"front-matter": "4.0.2",
@@ -38,13 +39,13 @@
 		"minimist": "1.2.8",
 		"parse-diff": "0.11.1",
 		"pixelmatch": "6.0.0",
-		"pngjs": "7.0.0",
-		"puppeteer": "23.5.0"
+		"pngjs": "7.0.0"
 	},
 	"devDependencies": {
-		"@types/diff": "5.2.2",
+		"@d-zero/puppeteer-page": "0.2.0",
+		"@types/diff": "6.0.0",
 		"@types/pixelmatch": "5.2.6",
 		"@types/pngjs": "6.0.5"
 	},
-	"gitHead": "e8f65086bf7c316dda6667f1173da8585a5ef19c"
+	"gitHead": "1eb1c03400580040119121e11ffb33acd876fe1b"
 }