@letsscrapedata/controller 0.0.17 → 0.0.19

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;
@@ -329,6 +329,7 @@ var PlaywrightPage = class extends import_node_events.default {
   #resquestInterceptionOptions;
   #responseInterceptionOptions;
   #client;
+  #responseCb;
   #hasValidUrl(page) {
     const url = page.url();
     return url.toLowerCase().startsWith("http");
@@ -541,6 +542,7 @@ var PlaywrightPage = class extends import_node_events.default {
     this.#resquestInterceptionOptions = [];
     this.#responseInterceptionOptions = [];
     this.#client = null;
+    this.#responseCb = null;
     this.#addPageOn();
   }
   async bringToFront() {
@@ -578,7 +580,9 @@ var PlaywrightPage = class extends import_node_events.default {
     }
     try {
       if (this.#responseInterceptionOptions.length > 0) {
-        this.#page.removeListener("response", this.#reponseListener);
+        if (this.#responseCb) {
+          this.#page.removeListener("response", this.#responseCb);
+        }
         this.#responseInterceptionOptions = [];
       }
       return true;
@@ -941,7 +945,7 @@ var PlaywrightPage = class extends import_node_events.default {
     }
     return true;
   }
-  async #reponseListener(response) {
+  async #responseListener(response) {
     try {
       const pageUrl = this.#page ? this.#page.url() : "";
       if (!response.ok()) {
@@ -1008,7 +1012,8 @@ var PlaywrightPage = class extends import_node_events.default {
       }
     }
     if (firstResponseInterception && this.#responseInterceptionOptions.length > 0) {
-      this.#page.on("response", this.#reponseListener);
+      this.#responseCb = this.#responseListener.bind(this);
+      this.#page.on("response", this.#responseCb);
     }
     return true;
   }
@@ -1394,7 +1399,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 +1407,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 +2867,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 +2878,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 = [];

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;
@@ -309,6 +309,7 @@ var PlaywrightPage = class extends EventEmitter {
   #resquestInterceptionOptions;
   #responseInterceptionOptions;
   #client;
+  #responseCb;
   #hasValidUrl(page) {
     const url = page.url();
     return url.toLowerCase().startsWith("http");
@@ -521,6 +522,7 @@ var PlaywrightPage = class extends EventEmitter {
     this.#resquestInterceptionOptions = [];
     this.#responseInterceptionOptions = [];
     this.#client = null;
+    this.#responseCb = null;
     this.#addPageOn();
   }
   async bringToFront() {
@@ -558,7 +560,9 @@ var PlaywrightPage = class extends EventEmitter {
     }
     try {
       if (this.#responseInterceptionOptions.length > 0) {
-        this.#page.removeListener("response", this.#reponseListener);
+        if (this.#responseCb) {
+          this.#page.removeListener("response", this.#responseCb);
+        }
         this.#responseInterceptionOptions = [];
       }
       return true;
@@ -921,7 +925,7 @@ var PlaywrightPage = class extends EventEmitter {
     }
     return true;
   }
-  async #reponseListener(response) {
+  async #responseListener(response) {
     try {
       const pageUrl = this.#page ? this.#page.url() : "";
       if (!response.ok()) {
@@ -988,7 +992,8 @@ var PlaywrightPage = class extends EventEmitter {
       }
     }
     if (firstResponseInterception && this.#responseInterceptionOptions.length > 0) {
-      this.#page.on("response", this.#reponseListener);
+      this.#responseCb = this.#responseListener.bind(this);
+      this.#page.on("response", this.#responseCb);
     }
     return true;
   }
@@ -1374,7 +1379,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 +1387,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 +2847,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 +2858,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 = [];

package/package.json

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