@d-zero/archaeologist 1.1.3 → 2.0.0

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

@@ -0,0 +1,9 @@
+import type { URLPair } from './types.js';
+import type { PageHook } from '@d-zero/puppeteer-page-scan';
+export type ChildProcessParams = {
+    list: readonly URLPair[];
+    dir: string;
+    useOldMode: boolean;
+    htmlDiffOnly: boolean;
+    hooks?: readonly PageHook[];
+};

package/dist/{analyze.js → analyze-child-process.js}

@@ -1,27 +1,16 @@
-import { writeFile, mkdir } from 'node:fs/promises';
+import { writeFile } from 'node:fs/promises';
 import path from 'node:path';
-import { deal } from '@d-zero/puppeteer-dealer';
+import { createChildProcess } from '@d-zero/puppeteer-dealer';
+import { delay } from '@d-zero/shared/delay';
 import c from 'ansi-colors';
-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 { score } from './output-utils.js';
-/**
- *
- * @param list
- * @param options
- */
-export async function analyze(list, options) {
-    const results = [];
-    const dir = path.resolve(process.cwd(), '.archaeologist');
-    await mkdir(dir, { recursive: true }).catch(() => { });
-    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) {
+import { diffImages } from './modules/diff-images.js';
+import { diffTree } from './modules/diff-tree.js';
+import { getData } from './modules/get-data.js';
+import { score } from './utils.js';
+createChildProcess((param) => {
+    const { list, dir, htmlDiffOnly } = param;
+    return {
+        async eachPage({ page, url: urlA, index }, logger) {
             const urlPair = list.find(([url]) => url === urlA);
             if (!urlPair) {
                 throw new Error(`Failed to find urlPair: ${urlA}`);
@@ -29,7 +18,7 @@ export async function analyze(list, options) {
             const dataPair = [];
             for (const url of urlPair) {
                 const data = await getData(page, url, {
-                    ...options,
+                    htmlDiffOnly,
                 }, logger);
                 dataPair.push(data);
                 await delay(600);
@@ -94,18 +83,7 @@ export async function analyze(list, options) {
                 target: [a.url, b.url],
                 screenshots: screenshotResult,
             };
-            results.push(result);
+            return result;
         },
-    }, {
-        ...options,
-        headless: useOldMode ? 'shell' : true,
-    });
-    return results;
-}
-/**
- *
- * @param ms
- */
-function delay(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
+    };
+});

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

@@ -0,0 +1,7 @@
+import type { AnalyzeOptions, URLPair } from './types.js';
+/**
+ *
+ * @param list
+ * @param options
+ */
+export declare function analyze(list: readonly URLPair[], options?: AnalyzeOptions): Promise<void>;

package/dist/analyze-main-process.js

@@ -0,0 +1,46 @@
+import { mkdir } from 'node:fs/promises';
+import path from 'node:path';
+import { createProcess, deal } from '@d-zero/puppeteer-dealer';
+import c from 'ansi-colors';
+import { analyzeUrlList } from './modules/analize-url.js';
+import { score } from './utils.js';
+/**
+ *
+ * @param list
+ * @param options
+ */
+export async function analyze(list, options) {
+    const results = [];
+    const dir = path.resolve(process.cwd(), '.archaeologist');
+    await mkdir(dir, { recursive: true }).catch(() => { });
+    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}`;
+    }, () => {
+        return createProcess(path.resolve(import.meta.dirname, 'analyze-child-process.js'), {
+            list,
+            dir,
+            useOldMode,
+            htmlDiffOnly: options?.htmlDiffOnly ?? false,
+            hooks: options?.hooks ?? [],
+        }, {
+            ...options,
+            headless: useOldMode ? 'shell' : true,
+        });
+    }, (result) => {
+        results.push(result);
+    });
+    const output = [];
+    for (const result of results) {
+        output.push(c.gray(`${result.target.join(' vs ')}`));
+        for (const [sizeName, { image, dom }] of Object.entries(result.screenshots)) {
+            if (image) {
+                const { matches, file } = image;
+                output.push(`  ${c.bgMagenta(` ${sizeName} `)} ${score(matches, 0.9)} ${file}`);
+            }
+            output.push(`  ${c.bgBlueBright(' HTML ')}: ${score(dom.matches, 0.995)} ${dom.file}`);
+        }
+    }
+    process.stdout.write(output.join('\n') + '\n');
+}

package/dist/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import minimist from 'minimist';
-import { archaeologist } from './archaeologist.js';
+import { analyze } from './analyze-main-process.js';
+import { freeze } from './freeze-main-process.js';
 import { readConfig } from './read-config.js';
 const cli = minimist(process.argv.slice(2), {
     alias: {
@@ -9,7 +10,7 @@ const cli = minimist(process.argv.slice(2), {
 });
 if (cli.listfile?.length) {
     const { pairList, hooks } = await readConfig(cli.listfile);
-    await archaeologist(pairList, {
+    await analyze(pairList, {
         hooks,
         limit: cli.limit ? Number.parseInt(cli.limit) : undefined,
         debug: !!cli.debug,
@@ -17,5 +18,15 @@ if (cli.listfile?.length) {
     });
     process.exit(0);
 }
+if (cli.freeze) {
+    const { pairList, hooks } = await readConfig(cli.freeze);
+    const list = pairList.map(([urlA]) => urlA);
+    await freeze(list, {
+        hooks,
+        limit: cli.limit ? Number.parseInt(cli.limit) : undefined,
+        debug: !!cli.debug,
+    });
+    process.exit(0);
+}
 process.stderr.write('Usage: archaeologist -f <listfile> [--limit <number>]\n');
 process.exit(1);

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

@@ -0,0 +1,3 @@
+export type ChildProcessParams = {
+    dir: string;
+};

package/dist/freeze-child-process.js

@@ -0,0 +1,22 @@
+import { writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { createChildProcess } from '@d-zero/puppeteer-dealer';
+import { delay } from '@d-zero/shared/delay';
+import { getData } from './modules/get-data.js';
+createChildProcess((param) => {
+    const { dir } = param;
+    return {
+        async eachPage({ page, id, url }, logger) {
+            const data = await getData(page, url, {}, logger);
+            await delay(600);
+            for (const size of Object.values(data.screenshots)) {
+                const jsonFile = path.resolve(dir, `${id}_${size.id}.html`);
+                const ssFile = path.resolve(dir, `${id}_${size.id}.png`);
+                await writeFile(jsonFile, size.dom, 'utf8');
+                if (size.binary) {
+                    await writeFile(ssFile, size.binary);
+                }
+            }
+        },
+    };
+});

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

@@ -0,0 +1,7 @@
+import type { FreezeOptions } from './types.js';
+/**
+ *
+ * @param list
+ * @param options
+ */
+export declare function freeze(list: readonly string[], options?: FreezeOptions): Promise<string>;

package/dist/freeze-main-process.js

@@ -0,0 +1,34 @@
+import { mkdir, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { zip } from '@d-zero/fs/zip';
+import { createProcess, deal } from '@d-zero/puppeteer-dealer';
+import { timestamp } from '@d-zero/shared/timestamp';
+import c from 'ansi-colors';
+import { analyzeUrlList } from './modules/analize-url.js';
+/**
+ *
+ * @param list
+ * @param options
+ */
+export async function freeze(list, options) {
+    const name = `${timestamp('YYYYMMDD')}.archae`;
+    const dir = path.resolve(process.cwd(), `.${name}`);
+    await mkdir(dir, { recursive: true }).catch(() => { });
+    const urlInfo = analyzeUrlList(list);
+    const useOldMode = urlInfo.hasAuth || urlInfo.hasNoSSL;
+    await deal(list.map((url) => ({ id: null, url })), (_, done, total) => {
+        return `${c.bold.magenta('🕵️  Archaeologist Freeze❄️')} ${done}/${total}`;
+    }, () => {
+        return createProcess(path.resolve(import.meta.dirname, 'freeze-child-process.js'), {
+            dir,
+        }, {
+            ...options,
+            headless: useOldMode ? 'shell' : true,
+        });
+    });
+    const urlListPath = path.resolve(dir, '_URL_LIST.json');
+    await writeFile(urlListPath, JSON.stringify(list, null, '\t'), 'utf8');
+    const zipPath = path.resolve(process.cwd(), `${name}.zip`);
+    await zip(zipPath, dir);
+    return zipPath;
+}

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { archaeologist } from './archaeologist.js';
+export { analyze as archaeologist } from './analyze-main-process.js';
 export * from './types.js';

package/dist/index.js

@@ -1,2 +1,2 @@
-export { archaeologist } from './archaeologist.js';
+export { analyze as archaeologist } from './analyze-main-process.js';
 export * from './types.js';

package/dist/modules/analize-url.d.ts

@@ -0,0 +1,11 @@
+import type { URLPair } from '../types.js';
+type AnalyzedUrlList = {
+    hasAuth: boolean;
+    hasNoSSL: boolean;
+};
+/**
+ *
+ * @param list
+ */
+export declare function analyzeUrlList(list: readonly (URLPair | string)[]): AnalyzedUrlList;
+export {};

package/dist/{analize-url.js → modules/analize-url.js}

@@ -8,6 +8,16 @@ export function analyzeUrlList(list) {
         hasNoSSL: false,
     };
     for (const urlPair of list) {
+        if (typeof urlPair === 'string') {
+            const urlObj = new URL(urlPair);
+            if (urlObj.username || urlObj.password) {
+                result.hasAuth = true;
+            }
+            if (urlObj.protocol === 'http:') {
+                result.hasNoSSL = true;
+            }
+            continue;
+        }
         for (const url of urlPair) {
             const urlObj = new URL(url);
             if (urlObj.username || urlObj.password) {

package/dist/{get-data.d.ts → modules/get-data.d.ts}

@@ -1,6 +1,6 @@
-import type { PageData } from './types.js';
-import type { Page } from '@d-zero/puppeteer-page';
+import type { PageData } from '../types.js';
 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/types.d.ts

@@ -1,5 +1,5 @@
 export type { PageHook } from '@d-zero/puppeteer-screenshot';
-import type { Screenshot } from '@d-zero/puppeteer-screenshot';
+import type { PageHook, Screenshot } from '@d-zero/puppeteer-screenshot';
 export type PageData = {
     url: string;
     screenshots: Record<string, Screenshot & {
@@ -24,3 +24,15 @@ export type DOMResult = {
     diff: string | null;
     file: string;
 };
+export interface ArchaeologistOptions extends AnalyzeOptions {
+}
+export interface AnalyzeOptions extends GeneralOptions {
+    readonly htmlDiffOnly?: boolean;
+}
+export interface FreezeOptions extends GeneralOptions {
+}
+interface GeneralOptions {
+    readonly hooks: readonly PageHook[];
+    readonly limit?: number;
+    readonly debug?: boolean;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/archaeologist",
-	"version": "1.1.3",
+	"version": "2.0.0",
 	"description": "Uncover visual and HTML differences in web pages with precision",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -27,25 +27,27 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/html-distiller": "1.0.2",
-		"@d-zero/puppeteer-dealer": "0.3.0",
-		"@d-zero/puppeteer-page-scan": "3.0.0",
-		"@d-zero/puppeteer-screenshot": "3.0.0",
-		"@d-zero/readtext": "1.1.2",
+		"@d-zero/fs": "0.2.0",
+		"@d-zero/html-distiller": "1.0.3",
+		"@d-zero/puppeteer-dealer": "0.4.0",
+		"@d-zero/puppeteer-page-scan": "4.0.0",
+		"@d-zero/puppeteer-screenshot": "3.0.1",
+		"@d-zero/readtext": "1.1.3",
+		"@d-zero/shared": "0.8.0",
 		"ansi-colors": "4.1.3",
-		"diff": "7.0.0",
+		"diff": "8.0.1",
 		"front-matter": "4.0.2",
 		"jimp": "1.6.0",
 		"minimist": "1.2.8",
 		"parse-diff": "0.11.1",
 		"pixelmatch": "7.1.0",
-		"pngjs": "7.0.0"
+		"pngjs": "7.0.0",
+		"puppeteer": "24.9.0"
 	},
 	"devDependencies": {
-		"@d-zero/puppeteer-page": "0.3.0",
-		"@types/diff": "7.0.1",
+		"@types/diff": "8.0.0",
 		"@types/pixelmatch": "5.2.6",
 		"@types/pngjs": "6.0.5"
 	},
-	"gitHead": "e4fd17857e31022d121527b00fd7f009dbdb2142"
+	"gitHead": "4e9cc7b87e0fef91b6f2d4edfb66ca9134b2491b"
 }

package/dist/analize-url.d.ts

@@ -1,11 +0,0 @@
-import type { URLPair } from './types.js';
-type AnalyzedUrlList = {
-    hasAuth: boolean;
-    hasNoSSL: boolean;
-};
-/**
- *
- * @param list
- */
-export declare function analyzeUrlList(list: readonly URLPair[]): AnalyzedUrlList;
-export {};

package/dist/analyze.d.ts

@@ -1,14 +0,0 @@
-import type { Result, URLPair } from './types.js';
-import type { PageHook } from '@d-zero/puppeteer-screenshot';
-export interface AnalyzeOptions {
-    readonly hooks: readonly PageHook[];
-    readonly htmlDiffOnly?: boolean;
-    readonly limit?: number;
-    readonly debug?: boolean;
-}
-/**
- *
- * @param list
- * @param options
- */
-export declare function analyze(list: readonly URLPair[], options?: AnalyzeOptions): Promise<Result[]>;

package/dist/archaeologist.d.ts

@@ -1,10 +0,0 @@
-import type { AnalyzeOptions } from './analyze.js';
-import type { URLPair } from './types.js';
-export interface ArchaeologistOptions extends AnalyzeOptions {
-}
-/**
- *
- * @param list
- * @param options
- */
-export declare function archaeologist(list: readonly URLPair[], options?: ArchaeologistOptions): Promise<void>;

package/dist/archaeologist.js

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

package/dist/freeze.d.ts

@@ -1,13 +0,0 @@
-import type { PageData } from './types.js';
-import type { PageHook } from '@d-zero/puppeteer-screenshot';
-export interface FreezeOptions {
-    readonly hooks: readonly PageHook[];
-    readonly limit?: number;
-    readonly debug?: boolean;
-}
-/**
- *
- * @param list
- * @param options
- */
-export declare function freeze(list: readonly string[], options?: FreezeOptions): Promise<PageData[]>;

package/dist/freeze.js

@@ -1,34 +0,0 @@
-import { mkdir } from 'node:fs/promises';
-import path from 'node:path';
-import { deal } from '@d-zero/puppeteer-dealer';
-import { delay } from '@d-zero/shared/delay';
-import c from 'ansi-colors';
-import { analyzeUrlList } from './analize-url.js';
-import { getData } from './get-data.js';
-/**
- *
- * @param list
- * @param options
- */
-export async function freeze(list, options) {
-    const results = [];
-    const dir = path.resolve(process.cwd(), '.archaeologist');
-    await mkdir(dir, { recursive: true }).catch(() => { });
-    const urlInfo = analyzeUrlList(list);
-    const useOldMode = urlInfo.hasAuth || urlInfo.hasNoSSL;
-    await deal(list.map((url) => ({ id: null, url })), (_, done, total) => {
-        return `${c.bold.magenta('🕵️  Archaeologist Freeze❄️')} ${done}/${total}`;
-    }, {
-        async deal(page, _, url, logger) {
-            const data = await getData(page, url, {
-                ...options,
-            }, logger);
-            await delay(600);
-            results.push(data);
-        },
-    }, {
-        ...options,
-        headless: useOldMode ? 'shell' : true,
-    });
-    return results;
-}

package/dist/output-utils.d.ts

@@ -1,6 +0,0 @@
-/**
- *
- * @param matches
- * @param threshold
- */
-export declare function score(matches: number, threshold: number): string;

package/dist/output-utils.js

@@ -1,11 +0,0 @@
-import c from 'ansi-colors';
-/**
- *
- * @param matches
- * @param threshold
- */
-export function score(matches, threshold) {
-    const color = matches > threshold ? c.green : c.red;
-    const num = (matches * 100).toFixed(1);
-    return c.bold(color(`${num}%`));
-}