@letsscrapedata/controller 0.0.49 → 0.0.51

package/dist/index.d.cts

@@ -1,6 +1,7 @@
 import EventEmitter from 'node:events';
 import { Browser as Browser$1, BrowserContext as BrowserContext$1, Frame as Frame$1, Page as Page$1, ElementHandle, HTTPResponse, PuppeteerNode } from 'puppeteer';
 import { Browser, BrowserContext, Frame, Page, Locator, Response, APIRequestContext, BrowserType, FrameLocator } from 'playwright';
+import { LogFunction } from '@letsscrapedata/utils';
 
 type AllBrowser = Browser | Browser$1;
 type AllBrowserContext = BrowserContext | BrowserContext$1;
@@ -982,6 +983,11 @@ interface LsdBrowserContext extends EventEmitter {
      */
     apiContext(): LsdApiContext;
     browser(): LsdBrowser;
+    /**
+     * close this BrowserContext
+     * * For BrowserContext that cannot be closed directly, it is only marked as closed; it will be closed when browser is closed.
+     * * refer to " Error: Non-incognito profiles cannot be closed" in puppeteer
+     */
     close(): Promise<boolean>;
     /**
      * close pages that are free more than maxPageFreeSeconds if maxPageFreeSeconds > 0
@@ -1103,6 +1109,8 @@ interface LsdBrowserController$1 {
     newApiContext(options?: LsdApiContextOptions): Promise<LsdApiContext>;
 }
 
+declare function setControllerLogFun(logFun: LogFunction): boolean;
+
 declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
     #private;
     constructor(browser: Browser, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number, pid?: number);
@@ -1452,4 +1460,4 @@ declare class LsdBrowserController implements LsdBrowserController$1 {
 }
 declare const controller: LsdBrowserController;
 
-export { type AllApiRequestContext, type AllBrowser, type AllBrowserContext, type AllElement, type AllFrame, type AllPage, type AllResponse, type BrowserContextCreationMethod, type BrowserContextRequirements, type BrowserContextStatus, type BrowserControllerType, type BrowserCreationMethod, type BrowserLaunchMethod, type BrowserStateData, CheerioElement, type CheerioNode, CheerioPage, type ClientCertificate, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdApiContext, type LsdApiContextOptions, type LsdApiResponse, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdFetchOptions, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type MouseClickType, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, type PlaywrightBrowserTypes, PlaywrightElement, PlaywrightPage, type ProxyInController, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ResponsePageData, type ScreenshotOptions, type SelectOptions, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller };
+export { type AllApiRequestContext, type AllBrowser, type AllBrowserContext, type AllElement, type AllFrame, type AllPage, type AllResponse, type BrowserContextCreationMethod, type BrowserContextRequirements, type BrowserContextStatus, type BrowserControllerType, type BrowserCreationMethod, type BrowserLaunchMethod, type BrowserStateData, CheerioElement, type CheerioNode, CheerioPage, type ClientCertificate, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdApiContext, type LsdApiContextOptions, type LsdApiResponse, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdFetchOptions, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type MouseClickType, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, type PlaywrightBrowserTypes, PlaywrightElement, PlaywrightPage, type ProxyInController, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ResponsePageData, type ScreenshotOptions, type SelectOptions, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller, setControllerLogFun };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import EventEmitter from 'node:events';
 import { Browser as Browser$1, BrowserContext as BrowserContext$1, Frame as Frame$1, Page as Page$1, ElementHandle, HTTPResponse, PuppeteerNode } from 'puppeteer';
 import { Browser, BrowserContext, Frame, Page, Locator, Response, APIRequestContext, BrowserType, FrameLocator } from 'playwright';
+import { LogFunction } from '@letsscrapedata/utils';
 
 type AllBrowser = Browser | Browser$1;
 type AllBrowserContext = BrowserContext | BrowserContext$1;
@@ -982,6 +983,11 @@ interface LsdBrowserContext extends EventEmitter {
      */
     apiContext(): LsdApiContext;
     browser(): LsdBrowser;
+    /**
+     * close this BrowserContext
+     * * For BrowserContext that cannot be closed directly, it is only marked as closed; it will be closed when browser is closed.
+     * * refer to " Error: Non-incognito profiles cannot be closed" in puppeteer
+     */
     close(): Promise<boolean>;
     /**
      * close pages that are free more than maxPageFreeSeconds if maxPageFreeSeconds > 0
@@ -1103,6 +1109,8 @@ interface LsdBrowserController$1 {
     newApiContext(options?: LsdApiContextOptions): Promise<LsdApiContext>;
 }
 
+declare function setControllerLogFun(logFun: LogFunction): boolean;
+
 declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
     #private;
     constructor(browser: Browser, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number, pid?: number);
@@ -1452,4 +1460,4 @@ declare class LsdBrowserController implements LsdBrowserController$1 {
 }
 declare const controller: LsdBrowserController;
 
-export { type AllApiRequestContext, type AllBrowser, type AllBrowserContext, type AllElement, type AllFrame, type AllPage, type AllResponse, type BrowserContextCreationMethod, type BrowserContextRequirements, type BrowserContextStatus, type BrowserControllerType, type BrowserCreationMethod, type BrowserLaunchMethod, type BrowserStateData, CheerioElement, type CheerioNode, CheerioPage, type ClientCertificate, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdApiContext, type LsdApiContextOptions, type LsdApiResponse, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdFetchOptions, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type MouseClickType, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, type PlaywrightBrowserTypes, PlaywrightElement, PlaywrightPage, type ProxyInController, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ResponsePageData, type ScreenshotOptions, type SelectOptions, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller };
+export { type AllApiRequestContext, type AllBrowser, type AllBrowserContext, type AllElement, type AllFrame, type AllPage, type AllResponse, type BrowserContextCreationMethod, type BrowserContextRequirements, type BrowserContextStatus, type BrowserControllerType, type BrowserCreationMethod, type BrowserLaunchMethod, type BrowserStateData, CheerioElement, type CheerioNode, CheerioPage, type ClientCertificate, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdApiContext, type LsdApiContextOptions, type LsdApiResponse, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdFetchOptions, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type MouseClickType, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, type PlaywrightBrowserTypes, PlaywrightElement, PlaywrightPage, type ProxyInController, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ResponsePageData, type ScreenshotOptions, type SelectOptions, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller, setControllerLogFun };

package/dist/index.js

@@ -1,16 +1,38 @@
+// src/utils/log.ts
+import { log, LogLevel } from "@letsscrapedata/utils";
+var pkgLog = log;
+function setControllerLogFun(logFun) {
+  if (typeof logFun === "function") {
+    pkgLog = logFun;
+    return true;
+  } else {
+    return false;
+  }
+}
+async function loginfo(...args) {
+  await pkgLog(LogLevel.INF, ...args);
+}
+async function logwarn(...args) {
+  await pkgLog(LogLevel.WRN, ...args);
+}
+async function logerr(...args) {
+  await pkgLog(LogLevel.ERR, ...args);
+}
+
 // src/playwright/browser.ts
 import EventEmitter3 from "events";
+import { getCurrentUnixTime as getCurrentUnixTime3, getPerformanceOfPidTree } from "@letsscrapedata/utils";
 
 // src/playwright/context.ts
 import EventEmitter2 from "events";
-import { getCurrentUnixTime as getCurrentUnixTime2, logerr as logerr2, loginfo as loginfo3, logwarn as logwarn2, sleep } from "@letsscrapedata/utils";
+import { getCurrentUnixTime as getCurrentUnixTime2, sleep } from "@letsscrapedata/utils";
 
 // src/playwright/page.ts
 import EventEmitter from "events";
-import { getCurrentUnixTime, logerr, loginfo as loginfo2, logwarn, unreachable as unreachable2 } from "@letsscrapedata/utils";
+import { getCurrentUnixTime, unreachable as unreachable2 } from "@letsscrapedata/utils";
 
 // src/playwright/element.ts
-import { loginfo, unreachable } from "@letsscrapedata/utils";
+import { unreachable } from "@letsscrapedata/utils";
 var PlaywrightElement = class _PlaywrightElement {
   #frame;
   #locator;
@@ -468,7 +490,7 @@ var PlaywrightPage = class extends EventEmitter {
       retObj.locators = locators;
       return retObj;
     } catch (err) {
-      loginfo2(err);
+      loginfo(err);
       return retObj;
     }
   }
@@ -479,7 +501,7 @@ var PlaywrightPage = class extends EventEmitter {
     const page = this.#page;
     const pageId = this.#pageId;
     page.on("close", async () => {
-      loginfo2(`##browser  ${pageId} closed`);
+      loginfo(`##browser  ${pageId} closed`);
       if (!page.pageInfo) {
         logerr(`Logic error in page.on("close")`);
       }
@@ -502,7 +524,7 @@ var PlaywrightPage = class extends EventEmitter {
         } else {
           logerr(`##browser  ${pageId} has popup without page.pageInfo`);
         }
-        loginfo2(`##browser  ${pageId} has popup ${popupPageId}`);
+        loginfo(`##browser  ${pageId} has popup ${popupPageId}`);
         this.emit("pagePopup", evtData);
       } else {
         logerr(`##browser  ${pageId} has popup page with null page`);
@@ -973,7 +995,7 @@ var PlaywrightPage = class extends EventEmitter {
             requestData,
             responseData
           });
-          loginfo2(`##browser cache matched response: ${requestUrl}`);
+          loginfo(`##browser cache matched response: ${requestUrl}`);
         }
         if (typeof handler === "function") {
           const pageData = { pageUrl, cookies: "" };
@@ -1195,7 +1217,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
         await lsdPage.maximizeViewport();
       }
       this.#lsdPages.push(lsdPage);
-      loginfo3(`##browser  ${lsdPage.id()} ${openType}ed`);
+      loginfo(`##browser  ${lsdPage.id()} ${openType}ed`);
     }
   }
   constructor(lsdBrowser, browserContext, browserContextCreationMethod, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, maxViewportOfNewPage = true) {
@@ -1230,7 +1252,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
       const pageInfo = page.pageInfo;
       if (pageInfo) {
         const { browserIdx: browserIdx2, browserContextIdx: browserContextIdx2, pageIdx } = pageInfo;
-        logwarn2(`##browser page-${browserIdx2}-${browserContextIdx2}-${pageIdx} has been already created`);
+        logwarn(`##browser page-${browserIdx2}-${browserContextIdx2}-${pageIdx} has been already created`);
       } else {
         const currentTime2 = getCurrentUnixTime2();
         const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime2, lastStatusUpdateTime: currentTime2, taskId: 0, relatedId: 0, misc: {} };
@@ -1239,23 +1261,23 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
           await lsdPage.maximizeViewport();
         }
         this.#lsdPages.push(lsdPage);
-        loginfo3(`##page ${lsdPage.id()} created`);
+        loginfo(`##page ${lsdPage.id()} created`);
       }
     });
     browserContext.on("close", (bc) => {
       if (browserContext !== bc) {
-        logerr2(`##browser different browserContext in browserContext.on("close")`);
+        logerr(`##browser different browserContext in browserContext.on("close")`);
       }
       this.#lsdBrowser.emit("browserContextClose", this);
     });
     this.on("pageClose", (lsdPage) => {
       if (!(lsdPage instanceof PlaywrightPage)) {
-        logerr2(`Invalid data in LsdBrowserContext.on("pageClose)`);
+        logerr(`Invalid data in LsdBrowserContext.on("pageClose)`);
         return;
       }
       const idx = this.#lsdPages.findIndex((p) => p === lsdPage);
       if (idx < 0) {
-        logerr2(`Invalid lsdPage in LsdBrowserContext.on("pageClose)`);
+        logerr(`Invalid lsdPage in LsdBrowserContext.on("pageClose)`);
         return;
       }
       this.#lsdPages.splice(idx, 1);
@@ -1272,7 +1294,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
     if (this.#browserContext) {
       this.#status = "closed";
       this.#lastStatusUpdateTime = getCurrentUnixTime2();
-      loginfo3(`browserContext ${this.id()} closed at ${this.#lastStatusUpdateTime}`);
+      loginfo(`browserContext ${this.id()} closed at ${this.#lastStatusUpdateTime}`);
       await this.#browserContext.close();
     }
     return true;
@@ -1287,12 +1309,12 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
         await sleep(200);
       }
     }
-    logwarn2(`Cannot get the gettingLock.`);
+    logwarn(`Cannot get the gettingLock.`);
     return false;
   }
   #freeGettingLock() {
     if (!this.#gettingPage) {
-      logwarn2(`Getting lock is already free now.`);
+      logwarn(`Getting lock is already free now.`);
     }
     this.#gettingPage = false;
   }
@@ -1301,7 +1323,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
       maxPageFreeSeconds = this.#maxPageFreeSeconds;
     }
     if (maxPageFreeSeconds <= 0) {
-      logwarn2(`Please set valid maxPageFreeSeconds to close free pages`);
+      logwarn(`Please set valid maxPageFreeSeconds to close free pages`);
       return false;
     }
     const gotLock = await this.#tryToGetGettingLock();
@@ -1320,7 +1342,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
       this.#freeGettingLock();
       return true;
     } catch (err) {
-      logerr2(err);
+      logerr(err);
       this.#freeGettingLock();
       return false;
     }
@@ -1372,7 +1394,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
         return null;
       }
     } catch (err) {
-      logerr2(err);
+      logerr(err);
       this.#freeGettingLock();
       return null;
     }
@@ -1454,7 +1476,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
       await page.free();
       return true;
     } catch (err) {
-      logerr2(err);
+      logerr(err);
       return false;
     }
   }
@@ -1476,7 +1498,6 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
 };
 
 // src/playwright/browser.ts
-import { getCurrentUnixTime as getCurrentUnixTime3, getPerformanceOfPidTree, logerr as logerr3, loginfo as loginfo4, logwarn as logwarn3 } from "@letsscrapedata/utils";
 var PlaywrightBrowser = class extends EventEmitter3 {
   #browser;
   #browserIdx;
@@ -1526,38 +1547,38 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     this.#executablePath = executablePath;
     this.#nextBrowserContextIdx = 1;
     this.#closeFreePagesIntervalId = null;
-    loginfo4(`##browser ${this.id()} ${this.#browserCreationMethod}ed by ${this.#browserControllerType}`);
+    loginfo(`##browser ${this.id()} ${this.#browserCreationMethod}ed by ${this.#browserControllerType}`);
     const browserContexts = browser.contexts();
     if (browserContexts.length > 0) {
-      logwarn3(`There are ${browserContexts.length} new browserContexts when playwright launches new browser`);
+      logwarn(`There are ${browserContexts.length} new browserContexts when playwright launches new browser`);
     }
     const incognito = typeof options?.incognito === "boolean" ? options.incognito : true;
     for (const browserContext of browserContexts) {
       const lsdBrowserContext = new PlaywrightBrowserContext(this, browserContext, "launch", incognito, this.#proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
       this.#lsdBrowserContexts.push(lsdBrowserContext);
-      loginfo4(`##browserContext  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
+      loginfo(`##browserContext  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
     }
     browser.on("disconnected", () => {
-      loginfo4(`##browser  ${this.id()} disconnected`);
+      loginfo(`##browser  ${this.id()} disconnected`);
       if (this.#lsdBrowserContexts.length > 0) {
-        logerr3(`${this.id()} has browserContexts when disconnected`);
+        logerr(`${this.id()} has browserContexts when disconnected`);
       }
     });
     this.on("browserContextClose", (lsdBrowserContext) => {
       if (!(lsdBrowserContext instanceof PlaywrightBrowserContext)) {
-        logerr3(`Invalid data in LsdBrowser.on("browserContextClose)`);
+        logerr(`Invalid data in LsdBrowser.on("browserContextClose)`);
         return;
       }
       const idx = this.#lsdBrowserContexts.findIndex((bc) => bc === lsdBrowserContext);
       if (idx < 0) {
-        logerr3(`Invalid lsdBrowserContext in LsdBrowser.on("browserContextClose)`);
+        logerr(`Invalid lsdBrowserContext in LsdBrowser.on("browserContextClose)`);
         return;
       }
-      loginfo4(`##browserContext  ${lsdBrowserContext.id()} closed
+      loginfo(`##browserContext  ${lsdBrowserContext.id()} closed
 `);
       this.#lsdBrowserContexts.splice(idx, 1);
       if (this.#lsdBrowserContexts.length === 0) {
-        loginfo4(`##browser  ${this.id()} has no browserContexts now`);
+        loginfo(`##browser  ${this.id()} has no browserContexts now`);
       }
       return;
     });
@@ -1574,7 +1595,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
   }
   async newBrowserContext(options) {
     if (this.#lsdBrowserContexts.length >= this.#maxBrowserContextsPerBrowser()) {
-      logwarn3(`##browser ${this.id()} can not create more new browserContext`);
+      logwarn(`##browser ${this.id()} can not create more new browserContext`);
       return null;
     }
     const browserContextOptions = {};
@@ -1593,7 +1614,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     const { maxViewportOfNewPage = this.#options.maxViewportOfNewPage } = options ? options : {};
     const lsdBrowserContext = new PlaywrightBrowserContext(this, browserContext, "new", true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
     this.#lsdBrowserContexts.push(lsdBrowserContext);
-    loginfo4(`##browser  ${lsdBrowserContext.id()} created`);
+    loginfo(`##browser  ${lsdBrowserContext.id()} created`);
     return lsdBrowserContext;
   }
   async close() {
@@ -1665,15 +1686,18 @@ var PlaywrightBrowser = class extends EventEmitter3 {
 
 // src/puppeteer/browser.ts
 import EventEmitter6 from "events";
+import { getCurrentUnixTime as getCurrentUnixTime6, getPerformanceOfPidTree as getPerformanceOfPidTree2 } from "@letsscrapedata/utils";
 
 // src/puppeteer/context.ts
 import EventEmitter5 from "events";
+import { getCurrentUnixTime as getCurrentUnixTime5, sleep as sleep2 } from "@letsscrapedata/utils";
 
 // src/puppeteer/page.ts
 import EventEmitter4 from "events";
+import { getCurrentUnixTime as getCurrentUnixTime4, unreachable as unreachable4 } from "@letsscrapedata/utils";
 
 // src/puppeteer/element.ts
-import { logerr as logerr4, unreachable as unreachable3 } from "@letsscrapedata/utils";
+import { unreachable as unreachable3 } from "@letsscrapedata/utils";
 var PuppeteerElement = class _PuppeteerElement {
   #frame;
   #$ele;
@@ -1762,7 +1786,7 @@ var PuppeteerElement = class _PuppeteerElement {
       }
       return retObj;
     } catch (err) {
-      logerr4(err);
+      logerr(err);
       return retObj;
     }
   }
@@ -1944,7 +1968,6 @@ var PuppeteerElement = class _PuppeteerElement {
 };
 
 // src/puppeteer/page.ts
-import { getCurrentUnixTime as getCurrentUnixTime4, logerr as logerr5, loginfo as loginfo5, unreachable as unreachable4 } from "@letsscrapedata/utils";
 var PuppeteerPage = class extends EventEmitter4 {
   #lsdBrowserContext;
   #page;
@@ -2104,9 +2127,9 @@ var PuppeteerPage = class extends EventEmitter4 {
     const page = this.#page;
     const pageId = this.#pageId;
     page.on("close", async () => {
-      loginfo5(`##browser  ${pageId} closed`);
+      loginfo(`##browser  ${pageId} closed`);
       if (!page.pageInfo) {
-        logerr5(`Logic error in page.on("close")`);
+        logerr(`Logic error in page.on("close")`);
       }
       this.emit("pageClose");
       this.#lsdBrowserContext.emit("pageClose", this);
@@ -2125,12 +2148,12 @@ var PuppeteerPage = class extends EventEmitter4 {
             pageInfo.relatedId = page.pageInfo.taskId;
           }
         } else {
-          logerr5(`##browser  ${pageId} has popup without page.pageInfo`);
+          logerr(`##browser  ${pageId} has popup without page.pageInfo`);
         }
-        loginfo5(`##browser  ${pageId} has popup ${popupPageId}`);
+        loginfo(`##browser  ${pageId} has popup ${popupPageId}`);
         this.emit("pagePopup", evtData);
       } else {
-        logerr5(`##browser  ${pageId} has popup page with null page`);
+        logerr(`##browser  ${pageId} has popup page with null page`);
       }
     });
   }
@@ -2740,7 +2763,6 @@ var PuppeteerPage = class extends EventEmitter4 {
 };
 
 // src/puppeteer/context.ts
-import { getCurrentUnixTime as getCurrentUnixTime5, logerr as logerr6, loginfo as loginfo6, logwarn as logwarn4, sleep as sleep2 } from "@letsscrapedata/utils";
 var PuppeteerBrowserContext = class extends EventEmitter5 {
   #lsdBrowser;
   #browserIdx;
@@ -2780,7 +2802,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
         await lsdPage.setUserAgent(this.#userAgent);
       }
       this.#lsdPages.push(lsdPage);
-      loginfo6(`##browser  ${lsdPage.id()} ${openType}ed`);
+      loginfo(`##browser  ${lsdPage.id()} ${openType}ed`);
     }
   }
   constructor(lsdBrowser, browserContext, browserContextCreationMethod, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, userAgent = "", maxViewportOfNewPage = true) {
@@ -2819,7 +2841,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
         const pageInfo = page.pageInfo;
         if (pageInfo) {
           const { browserIdx: browserIdx2, browserContextIdx: browserContextIdx2, pageIdx } = pageInfo;
-          logwarn4(`##browser page-${browserIdx2}-${browserContextIdx2}-${pageIdx} has been already created`);
+          logwarn(`##browser page-${browserIdx2}-${browserContextIdx2}-${pageIdx} has been already created`);
         } else {
           const currentTime2 = getCurrentUnixTime5();
           const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime2, lastStatusUpdateTime: currentTime2, taskId: 0, relatedId: 0, misc: {} };
@@ -2831,18 +2853,18 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
             await lsdPage.setUserAgent(this.#userAgent);
           }
           this.#lsdPages.push(lsdPage);
-          loginfo6(`##page ${lsdPage.id()} created`);
+          loginfo(`##page ${lsdPage.id()} created`);
         }
       }
     });
     this.on("pageClose", (lsdPage) => {
       if (!(lsdPage instanceof PuppeteerPage)) {
-        logerr6(`Invalid data in LsdBrowserContext.on("pageClose)`);
+        logerr(`Invalid data in LsdBrowserContext.on("pageClose)`);
         return;
       }
       const idx = this.#lsdPages.findIndex((p) => p === lsdPage);
       if (idx < 0) {
-        logerr6(`Invalid lsdPage in LsdBrowserContext.on("pageClose)`);
+        logerr(`Invalid lsdPage in LsdBrowserContext.on("pageClose)`);
         return;
       }
       this.#lsdPages.splice(idx, 1);
@@ -2862,7 +2884,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
     if (this.#browserContext) {
       this.#status = "closed";
       this.#lastStatusUpdateTime = getCurrentUnixTime5();
-      loginfo6(`browserContext ${this.id()} closed at ${this.#lastStatusUpdateTime}`);
+      loginfo(`browserContext ${this.id()} closed at ${this.#lastStatusUpdateTime}`);
       if (this.#browserContextCreationMethod !== "launch") {
         await this.#browserContext.close();
       }
@@ -2879,12 +2901,12 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
         await sleep2(200);
       }
     }
-    logwarn4(`Cannot get the gettingLock.`);
+    logwarn(`Cannot get the gettingLock.`);
     return false;
   }
   #freeGettingLock() {
     if (!this.#gettingPage) {
-      logwarn4(`Getting lock is already free now.`);
+      logwarn(`Getting lock is already free now.`);
     }
     this.#gettingPage = false;
   }
@@ -2893,7 +2915,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
       maxPageFreeSeconds = this.#maxPageFreeSeconds;
     }
     if (maxPageFreeSeconds <= 0) {
-      logwarn4(`Please set valid maxPageFreeSeconds to close free pages`);
+      logwarn(`Please set valid maxPageFreeSeconds to close free pages`);
       return false;
     }
     const gotLock = await this.#tryToGetGettingLock();
@@ -2912,7 +2934,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
       this.#freeGettingLock();
       return true;
     } catch (err) {
-      logerr6(err);
+      logerr(err);
       this.#freeGettingLock();
       return false;
     }
@@ -2966,7 +2988,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
         return null;
       }
     } catch (err) {
-      logerr6(err);
+      logerr(err);
       this.#freeGettingLock();
       return null;
     }
@@ -3048,7 +3070,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
       await page.free();
       return true;
     } catch (err) {
-      logerr6(err);
+      logerr(err);
       return false;
     }
   }
@@ -3070,7 +3092,6 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
 };
 
 // src/puppeteer/browser.ts
-import { getCurrentUnixTime as getCurrentUnixTime6, getPerformanceOfPidTree as getPerformanceOfPidTree2, logerr as logerr7, loginfo as loginfo7, logwarn as logwarn5 } from "@letsscrapedata/utils";
 var PuppeteerBrowser = class extends EventEmitter6 {
   #browser;
   #browserIdx;
@@ -3123,35 +3144,35 @@ var PuppeteerBrowser = class extends EventEmitter6 {
     this.#executablePath = executablePath;
     this.#nextBrowserContextIdx = 1;
     this.#closeFreePagesIntervalId = null;
-    loginfo7(`##browser  ${this.#browserType} ${this.id()} ${this.#browserCreationMethod}ed by ${this.#browserControllerType}`);
+    loginfo(`##browser  ${this.#browserType} ${this.id()} ${this.#browserCreationMethod}ed by ${this.#browserControllerType}`);
     const browserContexts = browser.browserContexts();
     const incognito = typeof options?.incognito === "boolean" ? options.incognito : false;
     for (const browserContext of browserContexts) {
       const lsdBrowserContext = new PuppeteerBrowserContext(this, browserContext, "launch", incognito, this.#proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), this.#userAgent(), maxViewportOfNewPage);
       this.#lsdBrowserContexts.push(lsdBrowserContext);
-      loginfo7(`##browser  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
+      loginfo(`##browser  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
     }
     browser.on("disconnected", () => {
-      loginfo7(`##browser  ${this.id()} disconnected`);
+      loginfo(`##browser  ${this.id()} disconnected`);
       if (this.#lsdBrowserContexts.length > 0) {
-        logerr7(`${this.id()} has browserContexts when disconnected`);
+        logerr(`${this.id()} has browserContexts when disconnected`);
       }
     });
     this.on("browserContextClose", (lsdBrowserContext) => {
       if (!(lsdBrowserContext instanceof PuppeteerBrowserContext)) {
-        logerr7(`Invalid data in LsdBrowser.on("browserContextClose)`);
+        logerr(`Invalid data in LsdBrowser.on("browserContextClose)`);
         return;
       }
       const idx = this.#lsdBrowserContexts.findIndex((bc) => bc === lsdBrowserContext);
       if (idx < 0) {
-        logerr7(`Invalid lsdBrowserContext in LsdBrowser.on("browserContextClose)`);
+        logerr(`Invalid lsdBrowserContext in LsdBrowser.on("browserContextClose)`);
         return;
       }
-      loginfo7(`##browser  ${lsdBrowserContext.id()} closed
+      loginfo(`##browser  ${lsdBrowserContext.id()} closed
 `);
       this.#lsdBrowserContexts.splice(idx, 1);
       if (this.#lsdBrowserContexts.length === 0) {
-        loginfo7(`##browser  ${this.id()} has no browserContexts now`);
+        loginfo(`##browser  ${this.id()} has no browserContexts now`);
       }
       return;
     });
@@ -3168,7 +3189,7 @@ var PuppeteerBrowser = class extends EventEmitter6 {
   }
   async newBrowserContext(options) {
     if (this.#lsdBrowserContexts.length >= this.#maxBrowserContextsPerBrowser()) {
-      logwarn5(`##browser ${this.id()} can not create more new browserContext`);
+      logwarn(`##browser ${this.id()} can not create more new browserContext`);
       return null;
     }
     const browserContextOptions = {};
@@ -3181,7 +3202,7 @@ var PuppeteerBrowser = class extends EventEmitter6 {
     const { maxViewportOfNewPage = this.#options.maxViewportOfNewPage } = options ? options : {};
     const lsdBrowserContext = new PuppeteerBrowserContext(this, browserContext, "new", true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), userAgent, maxViewportOfNewPage);
     this.#lsdBrowserContexts.push(lsdBrowserContext);
-    loginfo7(`##browser  ${lsdBrowserContext.id()} created`);
+    loginfo(`##browser  ${lsdBrowserContext.id()} created`);
     return lsdBrowserContext;
   }
   async close() {
@@ -3580,10 +3601,10 @@ var CheerioPage = class extends EventEmitter7 {
 import os from "os";
 import puppeteer from "puppeteer";
 import playwright, { request as apiRequest } from "playwright";
-import { getPidsListeningOnPort, logerr as logerr8, logwarn as logwarn6, unreachable as unreachable5 } from "@letsscrapedata/utils";
 import puppeteerExtra from "puppeteer-extra";
 import * as playwrightExtra from "playwright-extra";
 import StealthPlugin from "puppeteer-extra-plugin-stealth";
+import { getPidsListeningOnPort, unreachable as unreachable5 } from "@letsscrapedata/utils";
 var LsdBrowserController = class _LsdBrowserController {
   static #forbidConstructor = false;
   #puppeteer;
@@ -3684,22 +3705,22 @@ var LsdBrowserController = class _LsdBrowserController {
     const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, maxViewportOfNewPage, proxy, timeout, args, executablePath, maxWindowSize, headless, minBrowserContexts, incognito, proxyPerBrowserContext, userDataDir, userAgent };
     let idx = args.findIndex((arg) => arg.toLowerCase().startsWith("--incoginto"));
     if (idx >= 0) {
-      logwarn6(`Please use options.incognito instead when launching new browser.`);
+      logwarn(`Please use options.incognito instead when launching new browser.`);
       args.splice(idx, 1);
     }
     idx = args.findIndex((arg) => arg.toLowerCase().startsWith("--proxy-server"));
     if (idx >= 0) {
-      logwarn6(`Please use options.proxy instead when launching new browser.`);
+      logwarn(`Please use options.proxy instead when launching new browser.`);
       args.splice(idx, 1);
     }
     idx = args.findIndex((arg) => arg.toLowerCase().startsWith("--user-data-dir"));
     if (idx >= 0) {
-      logwarn6(`Please use options.userDataDir instead when launching new browser.`);
+      logwarn(`Please use options.userDataDir instead when launching new browser.`);
       args.splice(idx, 1);
     }
     idx = args.findIndex((arg) => arg.toLowerCase().startsWith("--start-maximized"));
     if (idx >= 0) {
-      logwarn6(`Please use options.maxWindowSize instead when launching new browser.`);
+      logwarn(`Please use options.maxWindowSize instead when launching new browser.`);
       args.splice(idx, 1);
     }
     let lsdBrowser;
@@ -3812,7 +3833,7 @@ var LsdBrowserController = class _LsdBrowserController {
     const pids = await getPidsListeningOnPort(port);
     let browserPid = 0;
     if (pids.length !== 1) {
-      logerr8(`##browser pids.length ${pids.length} is not 1 when trying to connect to browserUrl ${browserUrl}`);
+      logerr(`##browser pids.length ${pids.length} is not 1 when trying to connect to browserUrl ${browserUrl}`);
     } else {
       browserPid = pids[0];
     }
@@ -3859,5 +3880,6 @@ export {
   PuppeteerBrowserContext,
   PuppeteerElement,
   PuppeteerPage,
-  controller
+  controller,
+  setControllerLogFun
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@letsscrapedata/controller",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "description": "Unified browser / HTML controller interfaces that support playwright, puppeteer and cheerio",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -46,7 +46,7 @@
     "apify"
   ],
   "dependencies": {
-    "@letsscrapedata/utils": "^0.0.24",
+    "@letsscrapedata/utils": "^0.0.26",
     "cheerio": "^1.0.0",
     "playwright": "^1.43.0",
     "playwright-extra": "^4.3.6",