@letsscrapedata/controller 0.0.13 → 0.0.15

package/dist/index.cjs

@@ -952,7 +952,7 @@ var PlaywrightPage = class extends import_node_events.default {
         return;
       }
       for (const option of this.#responseInterceptionOptions) {
-        const { requestMatch, responseMatch, responseItems, handler, handlerOptions } = option;
+        const { requestMatch, responseMatch, responseItems, handler, handlerOptions = {} } = option;
         let matchedFlag = !requestMatch || this.#checkRequestMatch(request, requestMatch);
         if (matchedFlag && responseMatch) {
           const { minLength, maxLength } = responseMatch;
@@ -981,7 +981,7 @@ var PlaywrightPage = class extends import_node_events.default {
           (0, import_utils2.loginfo)(`##browser cache matched response: ${requestUrl}`);
         }
         if (typeof handler === "function") {
-          await handler(response, handlerOptions);
+          await handler(response, handlerOptions, pageUrl);
         }
       }
       return;
@@ -2408,18 +2408,18 @@ var PuppeteerPage = class extends import_node_events4.default {
       return false;
     }
     this.#responseInterceptionNum++;
-    const pageUrl = this.#page.url();
     this.#page.on("response", async (response) => {
       try {
-        if (!response.ok()) {
+        if (!response.ok() || !this.#page) {
           return false;
         }
+        const pageUrl = this.#page.url();
         const request = response.request();
         if (!request) {
           return false;
         }
         for (const option of actOptions) {
-          const { requestMatch, responseMatch, responseItems, handler, handlerOptions } = option;
+          const { requestMatch, responseMatch, responseItems, handler, handlerOptions = {} } = option;
           let matchedFlag = !requestMatch || this.#checkRequestMatch(request, requestMatch);
           if (matchedFlag && responseMatch) {
             const { minLength, maxLength } = responseMatch;
@@ -2447,7 +2447,7 @@ var PuppeteerPage = class extends import_node_events4.default {
             });
           }
           if (typeof handler === "function") {
-            await handler(response, handlerOptions);
+            await handler(response, handlerOptions, pageUrl);
           }
         }
         return true;
@@ -17194,6 +17194,7 @@ var LsdBrowserController = class _LsdBrowserController {
       args = [],
       executablePath = "",
       headless = false,
+      minBrowserContexts = 1,
       // incognito
       proxy = null,
       proxyPerBrowserContext = false,
@@ -17217,6 +17218,7 @@ var LsdBrowserController = class _LsdBrowserController {
       (0, import_utils15.logwarn)(`Please use options.userDataDir instead when launching new browser.`);
       args.splice(idx, 1);
     }
+    let lsdBrowser;
     if (browserControllerType === "playwright") {
       const launchOptions = { headless, timeout };
       if (executablePath) {
@@ -17242,8 +17244,7 @@ var LsdBrowserController = class _LsdBrowserController {
         actOptions.executablePath = playwrightBrowserType.executablePath();
       }
       const browser = await playwrightBrowserType.launch(launchOptions);
-      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
-      return lsdBrowser;
+      lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
     } else if (browserControllerType === "puppeteer") {
       const product = this.#puppeteerProduct(browserType);
       const launchOptions = { headless, timeout, product };
@@ -17269,11 +17270,14 @@ var LsdBrowserController = class _LsdBrowserController {
         actOptions.executablePath = import_puppeteer.default.executablePath();
       }
       const browser = await import_puppeteer.default.launch(launchOptions);
-      const lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
-      return lsdBrowser;
+      lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
     } else {
       throw new Error(`Invalid browserControllerType: ${browserControllerType} in launch`);
     }
+    for (let i = lsdBrowser.browserContexts().length; i < minBrowserContexts; i++) {
+      lsdBrowser.newBrowserContext();
+    }
+    return lsdBrowser;
   }
   async connect(browserControllerType, browserType, options) {
     const { browserUrl } = options;

package/dist/index.d.cts

@@ -80,6 +80,11 @@ interface LsdLaunchOptions extends BrowserOptions {
      * @default true
      */
     headless?: boolean;
+    /**
+     * min number of browserContexts
+     * @default 1
+     */
+    minBrowserContexts?: number;
     /** * @default false for puppeteer, true for playwright
      */
     incognito?: boolean;
@@ -456,7 +461,7 @@ interface ResponseMatch {
     maxLength?: number;
 }
 type ResponseHandlerOptions = Record<string, any>;
-type ResponseHandler = (response: AllResponse, options?: ResponseHandlerOptions) => Promise<void> | void;
+type ResponseHandler = (response: AllResponse, options: ResponseHandlerOptions, pageUrl: string) => Promise<void> | void;
 interface ResponseInterceptionItem {
     /**
      * page.url()
@@ -490,6 +495,10 @@ interface ResponseInterceptionOption {
      * handler will be called if handler is a function
      */
     handler?: ResponseHandler;
+    /**
+     * valid only if handler is a function
+     * @default {}
+     */
     handlerOptions?: ResponseHandlerOptions;
 }
 interface PDFMargin {

package/dist/index.d.ts

@@ -80,6 +80,11 @@ interface LsdLaunchOptions extends BrowserOptions {
      * @default true
      */
     headless?: boolean;
+    /**
+     * min number of browserContexts
+     * @default 1
+     */
+    minBrowserContexts?: number;
     /** * @default false for puppeteer, true for playwright
      */
     incognito?: boolean;
@@ -456,7 +461,7 @@ interface ResponseMatch {
     maxLength?: number;
 }
 type ResponseHandlerOptions = Record<string, any>;
-type ResponseHandler = (response: AllResponse, options?: ResponseHandlerOptions) => Promise<void> | void;
+type ResponseHandler = (response: AllResponse, options: ResponseHandlerOptions, pageUrl: string) => Promise<void> | void;
 interface ResponseInterceptionItem {
     /**
      * page.url()
@@ -490,6 +495,10 @@ interface ResponseInterceptionOption {
      * handler will be called if handler is a function
      */
     handler?: ResponseHandler;
+    /**
+     * valid only if handler is a function
+     * @default {}
+     */
     handlerOptions?: ResponseHandlerOptions;
 }
 interface PDFMargin {

package/dist/index.js

@@ -932,7 +932,7 @@ var PlaywrightPage = class extends EventEmitter {
         return;
       }
       for (const option of this.#responseInterceptionOptions) {
-        const { requestMatch, responseMatch, responseItems, handler, handlerOptions } = option;
+        const { requestMatch, responseMatch, responseItems, handler, handlerOptions = {} } = option;
         let matchedFlag = !requestMatch || this.#checkRequestMatch(request, requestMatch);
         if (matchedFlag && responseMatch) {
           const { minLength, maxLength } = responseMatch;
@@ -961,7 +961,7 @@ var PlaywrightPage = class extends EventEmitter {
           loginfo(`##browser cache matched response: ${requestUrl}`);
         }
         if (typeof handler === "function") {
-          await handler(response, handlerOptions);
+          await handler(response, handlerOptions, pageUrl);
         }
       }
       return;
@@ -2388,18 +2388,18 @@ var PuppeteerPage = class extends EventEmitter4 {
       return false;
     }
     this.#responseInterceptionNum++;
-    const pageUrl = this.#page.url();
     this.#page.on("response", async (response) => {
       try {
-        if (!response.ok()) {
+        if (!response.ok() || !this.#page) {
           return false;
         }
+        const pageUrl = this.#page.url();
         const request = response.request();
         if (!request) {
           return false;
         }
         for (const option of actOptions) {
-          const { requestMatch, responseMatch, responseItems, handler, handlerOptions } = option;
+          const { requestMatch, responseMatch, responseItems, handler, handlerOptions = {} } = option;
           let matchedFlag = !requestMatch || this.#checkRequestMatch(request, requestMatch);
           if (matchedFlag && responseMatch) {
             const { minLength, maxLength } = responseMatch;
@@ -2427,7 +2427,7 @@ var PuppeteerPage = class extends EventEmitter4 {
             });
           }
           if (typeof handler === "function") {
-            await handler(response, handlerOptions);
+            await handler(response, handlerOptions, pageUrl);
           }
         }
         return true;
@@ -17174,6 +17174,7 @@ var LsdBrowserController = class _LsdBrowserController {
       args = [],
       executablePath = "",
       headless = false,
+      minBrowserContexts = 1,
       // incognito
       proxy = null,
       proxyPerBrowserContext = false,
@@ -17197,6 +17198,7 @@ var LsdBrowserController = class _LsdBrowserController {
       logwarn6(`Please use options.userDataDir instead when launching new browser.`);
       args.splice(idx, 1);
     }
+    let lsdBrowser;
     if (browserControllerType === "playwright") {
       const launchOptions = { headless, timeout };
       if (executablePath) {
@@ -17222,8 +17224,7 @@ var LsdBrowserController = class _LsdBrowserController {
         actOptions.executablePath = playwrightBrowserType.executablePath();
       }
       const browser = await playwrightBrowserType.launch(launchOptions);
-      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
-      return lsdBrowser;
+      lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
     } else if (browserControllerType === "puppeteer") {
       const product = this.#puppeteerProduct(browserType);
       const launchOptions = { headless, timeout, product };
@@ -17249,11 +17250,14 @@ var LsdBrowserController = class _LsdBrowserController {
         actOptions.executablePath = puppeteer.executablePath();
       }
       const browser = await puppeteer.launch(launchOptions);
-      const lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
-      return lsdBrowser;
+      lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
     } else {
       throw new Error(`Invalid browserControllerType: ${browserControllerType} in launch`);
     }
+    for (let i = lsdBrowser.browserContexts().length; i < minBrowserContexts; i++) {
+      lsdBrowser.newBrowserContext();
+    }
+    return lsdBrowser;
   }
   async connect(browserControllerType, browserType, options) {
     const { browserUrl } = options;

package/package.json

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