@letsscrapedata/controller 0.0.16 → 0.0.18

package/dist/index.cjs

@@ -160,7 +160,7 @@ var PlaywrightElement = class _PlaywrightElement {
         if (selector !== ".") {
           locators = await parent2.locator(selector).all();
         } else {
-          throw new Error("Cannot use selector '.' on page");
+          locators = [this.#locator];
         }
       }
       retObj.locators = locators;
@@ -1394,7 +1394,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
     return this.#options.maxPagesPerBrowserContext ? this.#options.maxPagesPerBrowserContext : 20;
   }
   #maxPageFreeSeconds() {
-    return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 600;
+    return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 900;
   }
   // 构造函数：缺省只能由LsdBrowserController.launch/connect调用创建实例!!!
   constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0) {
@@ -1402,7 +1402,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
       throw new Error(`Invalid playwright browser parameter`);
     }
     super();
-    const { closeFreePagesIntervalSeconds = 0, maxPageFreeSeconds = 0, headless = false, executablePath = "" } = options;
+    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
     this.#lsdBrowserContexts = [];
@@ -2862,7 +2862,7 @@ var PuppeteerBrowser = class extends import_node_events6.default {
     return this.#options.maxPagesPerBrowserContext ? this.#options.maxPagesPerBrowserContext : 20;
   }
   #maxPageFreeSeconds() {
-    return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 600;
+    return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 900;
   }
   #userAgent() {
     return this.#options.userAgent ? this.#options.userAgent : "";
@@ -2873,7 +2873,7 @@ var PuppeteerBrowser = class extends import_node_events6.default {
       throw new Error(`Invalid puppeteer browser parameter`);
     }
     super();
-    const { closeFreePagesIntervalSeconds = 0, maxPageFreeSeconds = 0, headless = false, executablePath = "" } = options;
+    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
     this.#lsdBrowserContexts = [];
@@ -17190,19 +17190,19 @@ var LsdBrowserController = class _LsdBrowserController {
       maxBrowserContextsPerBrowser = 10,
       maxPagesPerBrowserContext = 20,
       maxPageFreeSeconds = 900,
+      proxy = null,
       timeout = 3e4,
       args = [],
       executablePath = "",
-      headless = false,
+      headless = true,
       minBrowserContexts = 1,
       // incognito
-      proxy = null,
       proxyPerBrowserContext = false,
       userDataDir = "",
       userAgent = ""
     } = options ? options : {};
     const incognito = typeof options?.incognito === "boolean" ? options.incognito : browserControllerType === "puppeteer" ? false : true;
-    const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, timeout, args, executablePath, headless, incognito, proxy, proxyPerBrowserContext, userDataDir, userAgent };
+    const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, proxy, timeout, args, executablePath, headless, minBrowserContexts, incognito, proxyPerBrowserContext, userDataDir, userAgent };
     let idx = args.findIndex((arg) => arg.toLowerCase().startsWith("--incoginto"));
     if (idx >= 0) {
       (0, import_utils15.logwarn)(`Please use options.incognito instead when launching new browser.`);
@@ -17280,14 +17280,27 @@ var LsdBrowserController = class _LsdBrowserController {
     return lsdBrowser;
   }
   async connect(browserControllerType, browserType, options) {
-    const { browserUrl } = options;
+    let {
+      closeFreePagesIntervalSeconds = 300,
+      maxBrowserContextsPerBrowser = 10,
+      maxPagesPerBrowserContext = 20,
+      maxPageFreeSeconds = 900,
+      proxy = null,
+      timeout = 3e4,
+      browserUrl,
+      executablePath = "",
+      headless = false,
+      incognito = false,
+      userAgent = ""
+    } = options;
     if (typeof browserUrl !== "string" || !browserUrl.toLowerCase().startsWith("http://")) {
       throw new Error(`Invalid browserUrl ${browserUrl} in connect`);
     }
+    const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, proxy, timeout, browserUrl, executablePath, headless, incognito, userAgent };
     if (browserControllerType === "playwright") {
       const playwrightBrowserType = this.#playwrightBrowserType(browserType, true);
       const browser = await playwrightBrowserType.connectOverCDP(browserUrl);
-      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "connect", options, this.#nextBrowserIdx++);
+      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "connect", actOptions, this.#nextBrowserIdx++);
       return lsdBrowser;
     } else if (browserControllerType === "puppeteer") {
       this.#puppeteerProduct(browserType);

package/dist/index.d.cts

@@ -42,7 +42,7 @@ type BrowserControllerOptions = {
 declare const defaultProxy: Proxy;
 interface BrowserOptions {
     /**
-     * Interval between closing free pages (seconds) if more than 0
+     * Interval between closing free pages (seconds) if greater than 0
      * @default 300
      */
     closeFreePagesIntervalSeconds?: number;

package/dist/index.d.ts

@@ -42,7 +42,7 @@ type BrowserControllerOptions = {
 declare const defaultProxy: Proxy;
 interface BrowserOptions {
     /**
-     * Interval between closing free pages (seconds) if more than 0
+     * Interval between closing free pages (seconds) if greater than 0
      * @default 300
      */
     closeFreePagesIntervalSeconds?: number;

package/dist/index.js

@@ -140,7 +140,7 @@ var PlaywrightElement = class _PlaywrightElement {
         if (selector !== ".") {
           locators = await parent2.locator(selector).all();
         } else {
-          throw new Error("Cannot use selector '.' on page");
+          locators = [this.#locator];
         }
       }
       retObj.locators = locators;
@@ -1374,7 +1374,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     return this.#options.maxPagesPerBrowserContext ? this.#options.maxPagesPerBrowserContext : 20;
   }
   #maxPageFreeSeconds() {
-    return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 600;
+    return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 900;
   }
   // 构造函数：缺省只能由LsdBrowserController.launch/connect调用创建实例!!!
   constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0) {
@@ -1382,7 +1382,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
       throw new Error(`Invalid playwright browser parameter`);
     }
     super();
-    const { closeFreePagesIntervalSeconds = 0, maxPageFreeSeconds = 0, headless = false, executablePath = "" } = options;
+    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
     this.#lsdBrowserContexts = [];
@@ -2842,7 +2842,7 @@ var PuppeteerBrowser = class extends EventEmitter6 {
     return this.#options.maxPagesPerBrowserContext ? this.#options.maxPagesPerBrowserContext : 20;
   }
   #maxPageFreeSeconds() {
-    return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 600;
+    return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 900;
   }
   #userAgent() {
     return this.#options.userAgent ? this.#options.userAgent : "";
@@ -2853,7 +2853,7 @@ var PuppeteerBrowser = class extends EventEmitter6 {
       throw new Error(`Invalid puppeteer browser parameter`);
     }
     super();
-    const { closeFreePagesIntervalSeconds = 0, maxPageFreeSeconds = 0, headless = false, executablePath = "" } = options;
+    const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
     this.#lsdBrowserContexts = [];
@@ -17170,19 +17170,19 @@ var LsdBrowserController = class _LsdBrowserController {
       maxBrowserContextsPerBrowser = 10,
       maxPagesPerBrowserContext = 20,
       maxPageFreeSeconds = 900,
+      proxy = null,
       timeout = 3e4,
       args = [],
       executablePath = "",
-      headless = false,
+      headless = true,
       minBrowserContexts = 1,
       // incognito
-      proxy = null,
       proxyPerBrowserContext = false,
       userDataDir = "",
       userAgent = ""
     } = options ? options : {};
     const incognito = typeof options?.incognito === "boolean" ? options.incognito : browserControllerType === "puppeteer" ? false : true;
-    const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, timeout, args, executablePath, headless, incognito, proxy, proxyPerBrowserContext, userDataDir, userAgent };
+    const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, proxy, timeout, args, executablePath, 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.`);
@@ -17260,14 +17260,27 @@ var LsdBrowserController = class _LsdBrowserController {
     return lsdBrowser;
   }
   async connect(browserControllerType, browserType, options) {
-    const { browserUrl } = options;
+    let {
+      closeFreePagesIntervalSeconds = 300,
+      maxBrowserContextsPerBrowser = 10,
+      maxPagesPerBrowserContext = 20,
+      maxPageFreeSeconds = 900,
+      proxy = null,
+      timeout = 3e4,
+      browserUrl,
+      executablePath = "",
+      headless = false,
+      incognito = false,
+      userAgent = ""
+    } = options;
     if (typeof browserUrl !== "string" || !browserUrl.toLowerCase().startsWith("http://")) {
       throw new Error(`Invalid browserUrl ${browserUrl} in connect`);
     }
+    const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, proxy, timeout, browserUrl, executablePath, headless, incognito, userAgent };
     if (browserControllerType === "playwright") {
       const playwrightBrowserType = this.#playwrightBrowserType(browserType, true);
       const browser = await playwrightBrowserType.connectOverCDP(browserUrl);
-      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "connect", options, this.#nextBrowserIdx++);
+      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "connect", actOptions, this.#nextBrowserIdx++);
       return lsdBrowser;
     } else if (browserControllerType === "puppeteer") {
       this.#puppeteerProduct(browserType);

package/package.json

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