@letsscrapedata/controller 0.0.25 → 0.0.27

package/dist/index.cjs

@@ -1299,6 +1299,7 @@ var PlaywrightBrowserContext = class extends import_node_events2.default {
         return null;
       }
       const page = await this.#browserContext.newPage();
+      await (0, import_utils3.sleep)(2e3);
       const pageInfo = page.pageInfo;
       if (!pageInfo) {
         throw new Error(`Logic error in getPage`);
@@ -1415,7 +1416,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
       throw new Error(`Invalid playwright browser parameter`);
     }
     super();
-    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = false, headless = false, executablePath = "" } = options;
+    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = true, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
     this.#lsdBrowserContexts = [];
@@ -2779,6 +2780,7 @@ var PuppeteerBrowserContext = class extends import_node_events5.default {
         return null;
       }
       const page = await this.#browserContext.newPage();
+      await (0, import_utils7.sleep)(2e3);
       const pageInfo = page.pageInfo;
       if (!pageInfo) {
         throw new Error(`Logic error in getPage`);
@@ -2898,7 +2900,7 @@ var PuppeteerBrowser = class extends import_node_events6.default {
       throw new Error(`Invalid puppeteer browser parameter`);
     }
     super();
-    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = false, headless = false, executablePath = "" } = options;
+    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = true, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
     this.#lsdBrowserContexts = [];
@@ -17190,6 +17192,8 @@ var import_playwright = __toESM(require("playwright"), 1);
 var import_utils15 = require("@letsscrapedata/utils");
 var LsdBrowserController = class _LsdBrowserController {
   static #forbidConstructor = false;
+  #puppeteer;
+  #playwrightBrowserTypes;
   #nextBrowserIdx;
   /**
    * Possible values are 'aix', 'darwin', 'freebsd','linux', 'openbsd', 'sunos', and 'win32'.
@@ -17199,19 +17203,22 @@ var LsdBrowserController = class _LsdBrowserController {
     if (_LsdBrowserController.#forbidConstructor) {
       throw new Error("Only one LsdBrowserController instance can be created!");
     }
+    this.#puppeteer = import_puppeteer.default;
+    const { chromium, firefox, webkit } = import_playwright.default;
+    this.#playwrightBrowserTypes = { chromium, firefox, webkit };
     this.#osPlatform = import_os.default.platform();
     this.#nextBrowserIdx = 1;
     _LsdBrowserController.#forbidConstructor = true;
   }
   #playwrightBrowserType(browserType, connectFlag = false) {
     if (browserType === "chromium") {
-      return import_playwright.default.chromium;
+      return this.#playwrightBrowserTypes.chromium;
     } else if (connectFlag) {
       throw new Error(`playwright only can connect to chromium browser, not support ${browserType} browser`);
     } else if (browserType === "firefox") {
-      return import_playwright.default.firefox;
+      return this.#playwrightBrowserTypes.firefox;
     } else if (browserType === "webkit") {
-      return import_playwright.default.webkit;
+      return this.#playwrightBrowserTypes.webkit;
     } else {
       throw new Error(`Invalid playwright browserType ${browserType}`);
     }
@@ -17223,18 +17230,24 @@ var LsdBrowserController = class _LsdBrowserController {
       throw new Error(`Invalid puppeteer product ${browserType}`);
     }
   }
+  setPuppeteerNode(puppeteer2) {
+    this.#puppeteer = puppeteer2;
+  }
+  setPlaywrightBrowserTypes(playwrightBrowserTypes) {
+    this.#playwrightBrowserTypes = playwrightBrowserTypes;
+  }
   async launch(browserControllerType, browserType, options) {
     let {
       closeFreePagesIntervalSeconds = 300,
       maxBrowserContextsPerBrowser = 10,
       maxPagesPerBrowserContext = 20,
       maxPageFreeSeconds = 900,
-      maxViewportOfNewPage = false,
+      maxViewportOfNewPage = true,
       proxy = null,
       timeout = 3e4,
       args = [],
       executablePath = "",
-      maxWindowSize = false,
+      maxWindowSize = true,
       headless = true,
       minBrowserContexts = 1,
       // incognito
@@ -17320,9 +17333,9 @@ var LsdBrowserController = class _LsdBrowserController {
         launchOptions.args = args;
       }
       if (!actOptions.executablePath) {
-        actOptions.executablePath = import_puppeteer.default.executablePath();
+        actOptions.executablePath = this.#puppeteer.executablePath();
       }
-      const browser = await import_puppeteer.default.launch(launchOptions);
+      const browser = await this.#puppeteer.launch(launchOptions);
       lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
     } else {
       throw new Error(`Invalid browserControllerType: ${browserControllerType} in launch`);
@@ -17338,7 +17351,7 @@ var LsdBrowserController = class _LsdBrowserController {
       maxBrowserContextsPerBrowser = 10,
       maxPagesPerBrowserContext = 20,
       maxPageFreeSeconds = 900,
-      maxViewportOfNewPage = false,
+      maxViewportOfNewPage = true,
       proxy = null,
       timeout = 3e4,
       browserUrl,
@@ -17358,7 +17371,7 @@ var LsdBrowserController = class _LsdBrowserController {
       return lsdBrowser;
     } else if (browserControllerType === "puppeteer") {
       this.#puppeteerProduct(browserType);
-      const browser = await import_puppeteer.default.connect({ browserURL: browserUrl });
+      const browser = await this.#puppeteer.connect({ browserURL: browserUrl });
       const lsdBrowser = new PuppeteerBrowser(browser, browserType, "connect", options, this.#nextBrowserIdx++);
       ;
       return lsdBrowser;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import EventEmitter from 'node:events';
-import { Browser as Browser$1, BrowserContext as BrowserContext$1, Frame as Frame$1, Page as Page$1, HTTPResponse, ElementHandle } from 'puppeteer';
-import { Browser, BrowserContext, Frame, Page, Response, Locator } from 'playwright';
+import { Browser as Browser$1, BrowserContext as BrowserContext$1, Frame as Frame$1, Page as Page$1, HTTPResponse, ElementHandle, PuppeteerNode } from 'puppeteer';
+import { Browser, BrowserContext, Frame, Page, Response, BrowserType, Locator } from 'playwright';
 import * as cheerio from 'cheerio';
 
 /**
@@ -36,6 +36,11 @@ type Proxy = {
 type BrowserControllerType = "puppeteer" | "playwright";
 type BrowserCreationMethod = "launch" | "connect";
 type LsdBrowserType = "chromium" | "firefox" | "webkit";
+interface PlaywrightBrowserTypes {
+    chromium: BrowserType;
+    firefox: BrowserType;
+    webkit: BrowserType;
+}
 type BrowserControllerOptions = {
     browserControllerType: BrowserControllerType;
 };
@@ -62,7 +67,7 @@ interface BrowserOptions {
      */
     maxPageFreeSeconds?: number;
     /**
-     * @default false
+     * @default true
      */
     maxViewportOfNewPage?: boolean;
     /**
@@ -81,7 +86,7 @@ interface LsdLaunchOptions extends BrowserOptions {
     args?: string[];
     executablePath?: string;
     /**
-     * @default false
+     * @default true
      */
     maxWindowSize?: boolean;
     /**
@@ -1258,9 +1263,11 @@ declare class CheerioElement implements LsdElement {
 declare class LsdBrowserController implements LsdBrowserController$1 {
     #private;
     constructor();
+    setPuppeteerNode(puppeteer: PuppeteerNode): void;
+    setPlaywrightBrowserTypes(playwrightBrowserTypes: PlaywrightBrowserTypes): void;
     launch(browserControllerType: BrowserControllerType, browserType: LsdBrowserType, options: LsdLaunchOptions): Promise<LsdBrowser>;
     connect(browserControllerType: BrowserControllerType, browserType: LsdBrowserType, options: LsdConnectOptions): Promise<LsdBrowser>;
 }
 declare const controller: LsdBrowserController;
 
-export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, 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, PlaywrightElement, PlaywrightPage, type Proxy, 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 ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller, defaultProxy };
+export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, 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 Proxy, 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 ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller, defaultProxy };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import EventEmitter from 'node:events';
-import { Browser as Browser$1, BrowserContext as BrowserContext$1, Frame as Frame$1, Page as Page$1, HTTPResponse, ElementHandle } from 'puppeteer';
-import { Browser, BrowserContext, Frame, Page, Response, Locator } from 'playwright';
+import { Browser as Browser$1, BrowserContext as BrowserContext$1, Frame as Frame$1, Page as Page$1, HTTPResponse, ElementHandle, PuppeteerNode } from 'puppeteer';
+import { Browser, BrowserContext, Frame, Page, Response, BrowserType, Locator } from 'playwright';
 import * as cheerio from 'cheerio';
 
 /**
@@ -36,6 +36,11 @@ type Proxy = {
 type BrowserControllerType = "puppeteer" | "playwright";
 type BrowserCreationMethod = "launch" | "connect";
 type LsdBrowserType = "chromium" | "firefox" | "webkit";
+interface PlaywrightBrowserTypes {
+    chromium: BrowserType;
+    firefox: BrowserType;
+    webkit: BrowserType;
+}
 type BrowserControllerOptions = {
     browserControllerType: BrowserControllerType;
 };
@@ -62,7 +67,7 @@ interface BrowserOptions {
      */
     maxPageFreeSeconds?: number;
     /**
-     * @default false
+     * @default true
      */
     maxViewportOfNewPage?: boolean;
     /**
@@ -81,7 +86,7 @@ interface LsdLaunchOptions extends BrowserOptions {
     args?: string[];
     executablePath?: string;
     /**
-     * @default false
+     * @default true
      */
     maxWindowSize?: boolean;
     /**
@@ -1258,9 +1263,11 @@ declare class CheerioElement implements LsdElement {
 declare class LsdBrowserController implements LsdBrowserController$1 {
     #private;
     constructor();
+    setPuppeteerNode(puppeteer: PuppeteerNode): void;
+    setPlaywrightBrowserTypes(playwrightBrowserTypes: PlaywrightBrowserTypes): void;
     launch(browserControllerType: BrowserControllerType, browserType: LsdBrowserType, options: LsdLaunchOptions): Promise<LsdBrowser>;
     connect(browserControllerType: BrowserControllerType, browserType: LsdBrowserType, options: LsdConnectOptions): Promise<LsdBrowser>;
 }
 declare const controller: LsdBrowserController;
 
-export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, 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, PlaywrightElement, PlaywrightPage, type Proxy, 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 ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller, defaultProxy };
+export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, 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 Proxy, 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 ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller, defaultProxy };

package/dist/index.js

@@ -1279,6 +1279,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
         return null;
       }
       const page = await this.#browserContext.newPage();
+      await sleep(2e3);
       const pageInfo = page.pageInfo;
       if (!pageInfo) {
         throw new Error(`Logic error in getPage`);
@@ -1395,7 +1396,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
       throw new Error(`Invalid playwright browser parameter`);
     }
     super();
-    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = false, headless = false, executablePath = "" } = options;
+    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = true, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
     this.#lsdBrowserContexts = [];
@@ -2759,6 +2760,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
         return null;
       }
       const page = await this.#browserContext.newPage();
+      await sleep2(2e3);
       const pageInfo = page.pageInfo;
       if (!pageInfo) {
         throw new Error(`Logic error in getPage`);
@@ -2878,7 +2880,7 @@ var PuppeteerBrowser = class extends EventEmitter6 {
       throw new Error(`Invalid puppeteer browser parameter`);
     }
     super();
-    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = false, headless = false, executablePath = "" } = options;
+    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = true, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
     this.#lsdBrowserContexts = [];
@@ -17170,6 +17172,8 @@ import playwright from "playwright";
 import { logwarn as logwarn6 } from "@letsscrapedata/utils";
 var LsdBrowserController = class _LsdBrowserController {
   static #forbidConstructor = false;
+  #puppeteer;
+  #playwrightBrowserTypes;
   #nextBrowserIdx;
   /**
    * Possible values are 'aix', 'darwin', 'freebsd','linux', 'openbsd', 'sunos', and 'win32'.
@@ -17179,19 +17183,22 @@ var LsdBrowserController = class _LsdBrowserController {
     if (_LsdBrowserController.#forbidConstructor) {
       throw new Error("Only one LsdBrowserController instance can be created!");
     }
+    this.#puppeteer = puppeteer;
+    const { chromium, firefox, webkit } = playwright;
+    this.#playwrightBrowserTypes = { chromium, firefox, webkit };
     this.#osPlatform = os.platform();
     this.#nextBrowserIdx = 1;
     _LsdBrowserController.#forbidConstructor = true;
   }
   #playwrightBrowserType(browserType, connectFlag = false) {
     if (browserType === "chromium") {
-      return playwright.chromium;
+      return this.#playwrightBrowserTypes.chromium;
     } else if (connectFlag) {
       throw new Error(`playwright only can connect to chromium browser, not support ${browserType} browser`);
     } else if (browserType === "firefox") {
-      return playwright.firefox;
+      return this.#playwrightBrowserTypes.firefox;
     } else if (browserType === "webkit") {
-      return playwright.webkit;
+      return this.#playwrightBrowserTypes.webkit;
     } else {
       throw new Error(`Invalid playwright browserType ${browserType}`);
     }
@@ -17203,18 +17210,24 @@ var LsdBrowserController = class _LsdBrowserController {
       throw new Error(`Invalid puppeteer product ${browserType}`);
     }
   }
+  setPuppeteerNode(puppeteer2) {
+    this.#puppeteer = puppeteer2;
+  }
+  setPlaywrightBrowserTypes(playwrightBrowserTypes) {
+    this.#playwrightBrowserTypes = playwrightBrowserTypes;
+  }
   async launch(browserControllerType, browserType, options) {
     let {
       closeFreePagesIntervalSeconds = 300,
       maxBrowserContextsPerBrowser = 10,
       maxPagesPerBrowserContext = 20,
       maxPageFreeSeconds = 900,
-      maxViewportOfNewPage = false,
+      maxViewportOfNewPage = true,
       proxy = null,
       timeout = 3e4,
       args = [],
       executablePath = "",
-      maxWindowSize = false,
+      maxWindowSize = true,
       headless = true,
       minBrowserContexts = 1,
       // incognito
@@ -17300,9 +17313,9 @@ var LsdBrowserController = class _LsdBrowserController {
         launchOptions.args = args;
       }
       if (!actOptions.executablePath) {
-        actOptions.executablePath = puppeteer.executablePath();
+        actOptions.executablePath = this.#puppeteer.executablePath();
       }
-      const browser = await puppeteer.launch(launchOptions);
+      const browser = await this.#puppeteer.launch(launchOptions);
       lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
     } else {
       throw new Error(`Invalid browserControllerType: ${browserControllerType} in launch`);
@@ -17318,7 +17331,7 @@ var LsdBrowserController = class _LsdBrowserController {
       maxBrowserContextsPerBrowser = 10,
       maxPagesPerBrowserContext = 20,
       maxPageFreeSeconds = 900,
-      maxViewportOfNewPage = false,
+      maxViewportOfNewPage = true,
       proxy = null,
       timeout = 3e4,
       browserUrl,
@@ -17338,7 +17351,7 @@ var LsdBrowserController = class _LsdBrowserController {
       return lsdBrowser;
     } else if (browserControllerType === "puppeteer") {
       this.#puppeteerProduct(browserType);
-      const browser = await puppeteer.connect({ browserURL: browserUrl });
+      const browser = await this.#puppeteer.connect({ browserURL: browserUrl });
       const lsdBrowser = new PuppeteerBrowser(browser, browserType, "connect", options, this.#nextBrowserIdx++);
       ;
       return lsdBrowser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@letsscrapedata/controller",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "description": "Unified browser / HTML controller interfaces that support playwright, puppeteer and cheerio",
   "type": "module",
   "main": "./dist/index.mjs",