@d-zero/puppeteer-dealer 0.4.0 → 0.5.1

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

@@ -1,28 +1,6 @@
-import type { Logger } from './types.js';
-import type { Page } from 'puppeteer';
-export type ChildProcessMethods<R> = {
-    eachPage: (params: EachPageParams, logger: Logger) => Promise<R>;
-};
-type EachPageParams = {
-    readonly page: Page;
-    readonly id: string;
-    readonly url: string;
-    readonly index: number;
-};
-export type ChildProcessCommonParams = {
-    readonly id: string;
-    readonly url: string;
-    readonly logger: Logger;
-};
-export type ChildProcessHandler<P, R> = (params: P) => Promise<ChildProcessMethods<R>> | ChildProcessMethods<R>;
-export type ChildProcessCommands<P, R> = {
-    init: () => Promise<P>;
-    each: (id: string, url: string, index: number) => Promise<R>;
-    log: Logger;
-};
+import type { ChildProcessHandler, CommonParams } from './types.js';
 /**
  *
  * @param handler
  */
-export declare function createChildProcess<P, R = void>(handler: ChildProcessHandler<P, R>): void;
-export {};
+export declare function createChildProcess<P, R = void>(handler: ChildProcessHandler<P & CommonParams, R>): void;

package/dist/create-child-process.js

@@ -1,5 +1,5 @@
 import { ProcTalk } from '@d-zero/proc-talk';
-import puppeteer from 'puppeteer';
+import { launch } from 'puppeteer';
 import { log } from './debug.js';
 const childLog = log.extend(`child:${process.pid}`);
 /**
@@ -18,19 +18,23 @@ export function createChildProcess(handler) {
             childLog('Process started: %O', config);
             const params = await this.call('init');
             childLog('Params: %O', params);
+            childLog('Needs auth: %s', params.needAuth);
             const { eachPage } = await handler(params);
             const launchOptions = {
-                headless: true,
+                headless: config.headless ?? (params.needAuth ? 'shell' : true),
                 args: [
                     //
                     `--lang=${config.locale}`,
                     '--no-zygote',
                     '--ignore-certificate-errors',
+                    '--no-sandbox',
+                    '--disable-web-security',
+                    '--disable-features=SafeBrowsing',
                 ],
                 ...config,
             };
             childLog('Launch options: %O', launchOptions);
-            const browser = await puppeteer.launch(launchOptions);
+            const browser = await launch(launchOptions);
             const page = await browser?.newPage();
             if (!page) {
                 throw new Error('Failed to create page');

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

@@ -1,4 +1,4 @@
-import type { Logger, PuppeteerDealerOptions } from './types.js';
+import type { CommonParams, Logger, PuppeteerDealerOptions } from './types.js';
 import type { LaunchOptions } from 'puppeteer';
 /**
  *
@@ -6,10 +6,10 @@ import type { LaunchOptions } from 'puppeteer';
  * @param params
  * @param options
  */
-export declare function createProcess<P, R = void>(subModulePath: string, params: P, options?: PuppeteerDealerOptions & LaunchOptions): ChildProcessManager<P, R>;
+export declare function createProcess<P, R = void>(subModulePath: string, params: P, options?: PuppeteerDealerOptions & LaunchOptions): (needAuth: boolean) => ChildProcessManager<P, R>;
 export declare class ChildProcessManager<P, R> {
     #private;
-    constructor(subModulePath: string, params: P, options?: PuppeteerDealerOptions & LaunchOptions);
+    constructor(subModulePath: string, params: P & CommonParams, options?: PuppeteerDealerOptions & LaunchOptions);
     close(): Promise<void>;
     each(id: string, url: string, index: number): Promise<R>;
     log(logger: Logger): void;

package/dist/create-main-process.js

@@ -6,7 +6,7 @@ import { ProcTalk } from '@d-zero/proc-talk';
  * @param options
  */
 export function createProcess(subModulePath, params, options) {
-    return new ChildProcessManager(subModulePath, params, options);
+    return (needAuth) => new ChildProcessManager(subModulePath, { ...params, needAuth }, options);
 }
 export class ChildProcessManager {
     #procTalk;

package/dist/deal.d.ts

@@ -1,11 +1,13 @@
 import type { ChildProcessManager } from './create-main-process.js';
 import type { URLInfo } from './types.js';
-import type { DealHeader } from '@d-zero/dealer';
+import type { DealHeader, DealOptions } from '@d-zero/dealer';
 /**
  *
  * @param list
  * @param header
  * @param createProcess
- * @param each
+ * @param options
  */
-export declare function deal<T extends Record<string, unknown>, R = void>(list: readonly URLInfo[], header: DealHeader, createProcess: () => ChildProcessManager<T, R>, each?: (result: R) => void | Promise<void>): Promise<void>;
+export declare function deal<T, R = void>(list: readonly URLInfo[], header: DealHeader, createProcess: () => (needAuth: boolean) => ChildProcessManager<T, R>, options?: Omit<DealOptions, 'header'> & {
+    each?: (result: R) => void | Promise<void>;
+}): Promise<void>;

package/dist/deal.js

@@ -5,26 +5,32 @@ import c from 'ansi-colors';
  * @param list
  * @param header
  * @param createProcess
- * @param each
+ * @param options
  */
-export function deal(list, header, createProcess, each) {
+export function deal(list, header, createProcess, options) {
+    const needAuth = list.some(({ url }) => {
+        const urlObj = new URL(url);
+        return !!(urlObj.username && urlObj.password);
+    });
     return coreDeal(list, ({ id, url }, update, index) => {
         const fileId = id || index.toString().padStart(3, '0');
         const lineHeader = `%braille% ${c.bgWhite(` ${fileId} `)} ${c.gray(url.toString())}: `;
         return async () => {
-            const processManager = createProcess();
+            update(`${lineHeader}Using ${needAuth ? 'auth' : 'no auth'}`);
+            const processManager = createProcess()(needAuth);
             update(`${lineHeader}Booting ChildProcess%dots%`);
             await processManager.ready();
             processManager.log((log) => {
                 update(`${lineHeader}${log}`);
             });
             const result = await processManager.each(fileId, url.toString(), index);
-            if (each) {
-                await each(result);
+            if (options?.each) {
+                await options.each(result);
             }
             await processManager.close();
         };
     }, {
+        ...options,
         header,
     });
 }

package/dist/types.d.ts

@@ -12,3 +12,27 @@ export type URLInfo = {
     readonly url: string | URL;
 };
 export type Logger = (log: string) => void;
+export type CommonParams = {
+    readonly needAuth: boolean;
+};
+export type ChildProcessMethods<R> = {
+    eachPage: (params: EachPageParams, logger: Logger) => Promise<R>;
+};
+type EachPageParams = {
+    readonly page: Page;
+    readonly id: string;
+    readonly url: string;
+    readonly index: number;
+};
+export type ChildProcessCommonParams = {
+    readonly id: string;
+    readonly url: string;
+    readonly logger: Logger;
+};
+export type ChildProcessHandler<P extends CommonParams, R> = (params: P) => Promise<ChildProcessMethods<R>> | ChildProcessMethods<R>;
+export type ChildProcessCommands<P extends CommonParams, R> = {
+    init: () => Promise<P>;
+    each: (id: string, url: string, index: number) => Promise<R>;
+    log: Logger;
+};
+export {};

package/package.json

@@ -1,10 +1,9 @@
 {
 	"name": "@d-zero/puppeteer-dealer",
-	"version": "0.4.0",
+	"version": "0.5.1",
 	"description": "Puppeteer handles each page",
 	"author": "D-ZERO",
 	"license": "MIT",
-	"private": false,
 	"publishConfig": {
 		"access": "public"
 	},
@@ -24,17 +23,17 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/dealer": "1.3.1",
-		"@d-zero/proc-talk": "0.4.0",
-		"@d-zero/shared": "0.8.0",
+		"@d-zero/dealer": "1.3.2",
+		"@d-zero/proc-talk": "0.4.2",
+		"@d-zero/shared": "0.9.1",
 		"ansi-colors": "4.1.3",
 		"debug": "4.4.1"
 	},
 	"devDependencies": {
-		"puppeteer": "24.9.0"
+		"puppeteer": "24.10.2"
 	},
 	"peerDependencies": {
-		"puppeteer": "24.8.2"
+		"puppeteer": "24.10.2"
 	},
-	"gitHead": "4e9cc7b87e0fef91b6f2d4edfb66ca9134b2491b"
+	"gitHead": "1218a023e62c79efeece6350d561f2e1906be7ea"
 }