@letsscrapedata/controller 0.0.29 → 0.0.31

package/dist/index.cjs

@@ -90,7 +90,7 @@ var PlaywrightElement = class _PlaywrightElement {
   #frame;
   #locator;
   constructor(locator, frame) {
-    if (!frame.goto || !locator.click) {
+    if (!frame.locator || !locator.click) {
       throw new Error("Invalid paras in new PlaywrightElement");
     }
     this.#frame = frame;
@@ -104,41 +104,66 @@ var PlaywrightElement = class _PlaywrightElement {
     const names = await this.#locator.evaluate((node) => node.getAttributeNames());
     return names;
   }
-  // 如果不存在指定的子iframe，则返回null
-  async #getChildFrame(parentFrame, iframeOption) {
-    if (!parentFrame) {
-      throw new Error("Invalid parent frame");
-    }
-    let { src = "" } = iframeOption;
-    if (!src) {
-      throw new Error("Invalid src in IframeOption");
-    }
-    const childFrames = parentFrame.childFrames();
-    for (const childFrame of childFrames) {
-      const url = childFrame.url();
-      if (typeof src === "string") {
-        if (url.startsWith(src)) {
-          return childFrame;
-        } else if (url.toLowerCase().startsWith(src)) {
-          return childFrame;
-        }
-      } else {
-        if (url.match(src)) {
-          return childFrame;
+  /*
+    // 如果不存在指定的子iframe，则返回null
+    async #getChildFrame(parentFrame: Frame, iframeOption: IframeOption): Promise<Frame | null> {
+      if (!parentFrame) {
+        throw new Error("Invalid parent frame");
+      }
+  
+      let { src = "" } = iframeOption;
+      if (!src) {
+        throw new Error("Invalid src in IframeOption");
+      }
+  
+      // src: use childFrames()
+      const childFrames = parentFrame.childFrames();
+      for (const childFrame of childFrames) {
+        const url = childFrame.url();
+        if (typeof src === "string") {
+          // src: string
+          if (url.startsWith(src)) {
+            return childFrame;
+          } else if (url.toLowerCase().startsWith(src)) {
+            return childFrame;
+          }
+        } else {
+          // src: RegExp
+          if (url.match(src)) {
+            return childFrame;
+          }
         }
       }
+  
+      return null;
     }
-    return null;
+      */
+  #getIframeSelector(iframeOption) {
+    const { src = "", selector = "" } = iframeOption;
+    if (!src && !selector) {
+      throw new Error("Invalid parent frame");
+    }
+    return selector ? selector : `iframe[src^="${src}"]`;
   }
-  async #getDescendantFrame(parentFrame, iframeOptions) {
-    let iframe = parentFrame;
-    for (const iframeOption of iframeOptions) {
-      if (!iframe) {
+  async #getChildFrameLocator(parent2, iframeOption) {
+    return parent2.frameLocator(this.#getIframeSelector(iframeOption));
+  }
+  async #getDescendantFrame(parent2, iframeOptions) {
+    try {
+      if (iframeOptions.length <= 0) {
         return null;
       }
-      iframe = await this.#getChildFrame(iframe, iframeOption);
+      let frameLocator = parent2.frameLocator(this.#getIframeSelector(iframeOptions[0]));
+      for (const iframeOption of iframeOptions.slice(1)) {
+        if (!frameLocator) {
+          return null;
+        }
+        frameLocator = await this.#getChildFrameLocator(frameLocator, iframeOption);
+      }
+      return frameLocator;
+    } catch (err) {
+      throw new Error(`No child iframe: ${JSON.stringify(iframeOptions)}`);
     }
-    return iframe;
   }
   async #findElementHandles(selector, absolute = false, iframeOptions = []) {
     let parent2 = absolute ? this.#frame : this.#locator;
@@ -166,7 +191,7 @@ var PlaywrightElement = class _PlaywrightElement {
       retObj.locators = locators;
       return retObj;
     } catch (err) {
-      console.log(err);
+      (0, import_utils.loginfo)(err);
       return retObj;
     }
   }
@@ -423,41 +448,66 @@ var PlaywrightPage = class extends import_node_events.default {
     });
     return true;
   }
-  // 如果不存在指定的子iframe，则返回null
-  async #getChildFrame(parentFrame, iframeOption) {
-    if (!parentFrame) {
-      throw new Error("Invalid parent frame");
-    }
-    let { src = "" } = iframeOption;
-    if (!src) {
-      throw new Error("Invalid src in IframeOption");
-    }
-    const childFrames = parentFrame.childFrames();
-    for (const childFrame of childFrames) {
-      const url = childFrame.url();
-      if (typeof src === "string") {
-        if (url.startsWith(src)) {
-          return childFrame;
-        } else if (url.toLowerCase().startsWith(src)) {
-          return childFrame;
-        }
-      } else {
-        if (url.match(src)) {
-          return childFrame;
+  /*
+    // 如果不存在指定的子iframe，则返回null
+    async #getChildFrame(parentFrame: Frame, iframeOption: IframeOption): Promise<Frame | null> {
+      if (!parentFrame) {
+        throw new Error("Invalid parent frame");
+      }
+  
+      let { src = "" } = iframeOption;
+      if (!src) {
+        throw new Error("Invalid src in IframeOption");
+      }
+  
+      // src: use childFrames()
+      const childFrames = parentFrame.childFrames();
+      for (const childFrame of childFrames) {
+        const url = childFrame.url();
+        if (typeof src === "string") {
+          // src: string
+          if (url.startsWith(src)) {
+            return childFrame;
+          } else if (url.toLowerCase().startsWith(src)) {
+            return childFrame;
+          }
+        } else {
+          // src: RegExp
+          if (url.match(src)) {
+            return childFrame;
+          }
         }
       }
+  
+      return null;
     }
-    return null;
+    */
+  #getIframeSelector(iframeOption) {
+    const { src = "", selector = "" } = iframeOption;
+    if (!src && !selector) {
+      throw new Error("Invalid parent frame");
+    }
+    return selector ? selector : `iframe[src^="${src}"]`;
   }
-  async #getDescendantFrame(parentFrame, iframeOptions) {
-    let iframe = parentFrame;
-    for (const iframeOption of iframeOptions) {
-      if (!iframe) {
+  async #getChildFrameLocator(parent2, iframeOption) {
+    return parent2.frameLocator(this.#getIframeSelector(iframeOption));
+  }
+  async #getDescendantFrameLocator(mainFrame, iframeOptions) {
+    try {
+      if (iframeOptions.length <= 0) {
         return null;
       }
-      iframe = await this.#getChildFrame(iframe, iframeOption);
+      let frameLocator = mainFrame.frameLocator(this.#getIframeSelector(iframeOptions[0]));
+      for (const iframeOption of iframeOptions.slice(1)) {
+        if (!frameLocator) {
+          return null;
+        }
+        frameLocator = await this.#getChildFrameLocator(frameLocator, iframeOption);
+      }
+      return frameLocator;
+    } catch (err) {
+      throw new Error(`No child iframe: ${JSON.stringify(iframeOptions)}`);
     }
-    return iframe;
   }
   async #findElementHandles(selector, iframeOptions = []) {
     if (!this.#page) {
@@ -466,7 +516,7 @@ var PlaywrightPage = class extends import_node_events.default {
     let frame = this.#page.mainFrame();
     const retObj = { frame, locators: [] };
     if (iframeOptions.length > 0) {
-      frame = await this.#getDescendantFrame(frame, iframeOptions);
+      frame = await this.#getDescendantFrameLocator(frame, iframeOptions);
       if (!frame) {
         return retObj;
       }
@@ -486,7 +536,7 @@ var PlaywrightPage = class extends import_node_events.default {
       retObj.locators = locators;
       return retObj;
     } catch (err) {
-      console.log(err);
+      (0, import_utils2.loginfo)(err);
       return retObj;
     }
   }
@@ -545,6 +595,11 @@ var PlaywrightPage = class extends import_node_events.default {
     this.#responseCb = null;
     this.#addPageOn();
   }
+  apiRequestContext() {
+    const origBrowserContext = this.browserContext()._origBrowserContext();
+    const apiRequestContext = origBrowserContext.request;
+    return apiRequestContext;
+  }
   async bringToFront() {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -620,9 +675,9 @@ var PlaywrightPage = class extends import_node_events.default {
     }
     let content = "";
     if (iframeOptions.length > 0) {
-      const frame = await this.#getDescendantFrame(this.#page.mainFrame(), iframeOptions);
-      if (frame) {
-        content = await frame.content();
+      const frameLocator = await this.#getDescendantFrameLocator(this.#page.mainFrame(), iframeOptions);
+      if (frameLocator) {
+        content = await frameLocator.locator(":root").evaluate(() => document.documentElement.outerHTML);
       }
     } else {
       content = await this.#page.content();
@@ -985,7 +1040,8 @@ 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, pageUrl);
+          const pageData = { pageUrl, cookies: "" };
+          await handler(response, handlerOptions, pageData);
         }
       }
       return;
@@ -2026,6 +2082,9 @@ var PuppeteerPage = class extends import_node_events4.default {
     this.#client = null;
     this.#addPageOn();
   }
+  apiRequestContext() {
+    throw new Error("Not supported in PuppeteerPage.");
+  }
   async bringToFront() {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -2465,7 +2524,14 @@ var PuppeteerPage = class extends import_node_events4.default {
             });
           }
           if (typeof handler === "function") {
-            await handler(response, handlerOptions, pageUrl);
+            const pageData = { pageUrl, cookies: "" };
+            if (handlerOptions?.requestHeadersFlag) {
+              const cookies = (await this.#page.cookies()).map((cookie) => {
+                return `${cookie.name}=${cookie.value}`;
+              }).join("; ");
+              pageData.cookies = cookies;
+            }
+            await handler(response, handlerOptions, pageData);
           }
         }
         return true;
@@ -17008,6 +17074,9 @@ var CheerioPage = class extends import_node_events7.default {
       this.#document = load(html3, { xml: true }).root();
     }
   }
+  apiRequestContext() {
+    throw new Error("Not supported in CheerioPage.");
+  }
   async bringToFront() {
     throw new Error("Not supported in CheerioPage.");
   }
@@ -17350,6 +17419,9 @@ var LsdBrowserController = class _LsdBrowserController {
         args.push("--start-maximized");
         launchOptions.defaultViewport = null;
       }
+      if (!args.includes("--no-sandbox")) {
+        args.push("--no-sandbox");
+      }
       if (browserType === "chromium") {
         if (incognito) {
           args.push("--incognito");
@@ -17412,6 +17484,10 @@ var LsdBrowserController = class _LsdBrowserController {
       throw new Error(`Invalid browserControllerType: ${browserControllerType} in connect`);
     }
   }
+  async newApiRequestContext(options) {
+    const apiRequestContext = await import_playwright.request.newContext(options);
+    return apiRequestContext;
+  }
 };
 var controller = new LsdBrowserController();
 // Annotate the CommonJS export names for ESM import in node:

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, PuppeteerNode, ElementHandle } from 'puppeteer';
-import { Browser, BrowserContext, Frame, Page, Response, BrowserType, Locator } from 'playwright';
+import { Browser, BrowserContext, Frame, Page, Response, APIRequestContext, BrowserType, Locator, FrameLocator } from 'playwright';
 import * as cheerio from 'cheerio';
 
 /**
@@ -15,6 +15,7 @@ type AllBrowserContext = BrowserContext | BrowserContext$1;
 type AllFrame = Frame | Frame$1;
 type AllPage = Page | Page$1;
 type AllResponse = Response | HTTPResponse;
+type AllApiRequestContext = APIRequestContext;
 type CheerioNode = cheerio.Cheerio<cheerio.Element>;
 type Proxy = {
     server: string;
@@ -478,7 +479,11 @@ interface ResponseMatch {
     maxLength?: number;
 }
 type ResponseHandlerOptions = Record<string, any>;
-type ResponseHandler = (response: AllResponse, options: ResponseHandlerOptions, pageUrl: string) => Promise<void> | void;
+interface ResponsePageData {
+    pageUrl: string;
+    cookies: string;
+}
+type ResponseHandler = (response: AllResponse, options: ResponseHandlerOptions, pageData: ResponsePageData) => Promise<void> | void;
 interface ResponseInterceptionItem {
     /**
      * page.url()
@@ -772,6 +777,11 @@ interface WaitNavigationOptions {
 }
 type PageEvent = "pageClose" | "pagePopup";
 interface LsdPage extends EventEmitter {
+    /**
+     * Get the APIRequestContext associated with this page's browser context.
+     * * only vaild in playwright
+     */
+    apiRequestContext(): AllApiRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
     clearCookies(): Promise<boolean>;
@@ -918,7 +928,7 @@ interface LsdBrowserContext extends EventEmitter {
     pages(): LsdPage[];
     proxy(): Proxy | null;
     setStateData(stateData: StateData): Promise<boolean>;
-    _origBrowserContext(): AllBrowserContext | null;
+    _origBrowserContext(): AllBrowserContext;
 }
 interface LsdBrowser extends EventEmitter {
     newBrowserContext(options?: LsdBrowserContextOptions): Promise<LsdBrowserContext | null>;
@@ -960,6 +970,10 @@ interface LsdBrowserController$1 {
      * @param puppeteer  null means use puppeteer-extra-plugin-stealth based on playwright-extra
      */
     setPlaywrightBrowserType(browserType: LsdBrowserType, playwrightBrowserType: BrowserType | null): boolean;
+    /**
+     * Create a new APIRequestContext, valid in playwright;
+     */
+    newApiRequestContext(options?: any): Promise<AllApiRequestContext>;
 }
 /**
  * globObj.cfg.XXX:
@@ -1021,12 +1035,13 @@ declare class PlaywrightBrowserContext extends EventEmitter implements LsdBrowse
     pages(): LsdPage[];
     proxy(): Proxy | null;
     setStateData(stateData: StateData): Promise<boolean>;
-    _origBrowserContext(): AllBrowserContext | null;
+    _origBrowserContext(): AllBrowserContext;
 }
 
 declare class PlaywrightPage extends EventEmitter implements LsdPage {
     #private;
     constructor(browserContext: LsdBrowserContext, page: Page, pageInfo?: PageInfo);
+    apiRequestContext(): APIRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
     clearCookies(): Promise<boolean>;
@@ -1077,7 +1092,7 @@ declare class PlaywrightPage extends EventEmitter implements LsdPage {
 
 declare class PlaywrightElement implements LsdElement {
     #private;
-    constructor(locator: Locator, frame: Frame);
+    constructor(locator: Locator, frame: Frame | FrameLocator);
     attribute(attributeName: string): Promise<string>;
     attributeNames(): Promise<string[]>;
     findElement(selectorOrXpath: string | string[], iframeOptions?: IframeOption[], absolute?: boolean): Promise<LsdElement | null>;
@@ -1129,12 +1144,13 @@ declare class PuppeteerBrowserContext extends EventEmitter implements LsdBrowser
     pages(): LsdPage[];
     proxy(): Proxy | null;
     setStateData(stateData: StateData): Promise<boolean>;
-    _origBrowserContext(): AllBrowserContext | null;
+    _origBrowserContext(): AllBrowserContext;
 }
 
 declare class PuppeteerPage extends EventEmitter implements LsdPage {
     #private;
     constructor(browserContext: LsdBrowserContext, page: Page$1, pageInfo?: PageInfo);
+    apiRequestContext(): APIRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
     clearCookies(): Promise<boolean>;
@@ -1213,6 +1229,7 @@ declare class CheerioPage extends EventEmitter implements LsdPage {
      * @param isHtml  default true
      */
     constructor(html?: string, isHtml?: boolean);
+    apiRequestContext(): APIRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
     clearCookies(): Promise<boolean>;
@@ -1289,7 +1306,8 @@ declare class LsdBrowserController implements LsdBrowserController$1 {
     setPlaywrightBrowserType(browserType: LsdBrowserType, playwrightBrowserType: BrowserType | null): boolean;
     launch(browserControllerType: BrowserControllerType, browserType: LsdBrowserType, options: LsdLaunchOptions): Promise<LsdBrowser>;
     connect(browserControllerType: BrowserControllerType, browserType: LsdBrowserType, options: LsdConnectOptions): Promise<LsdBrowser>;
+    newApiRequestContext(options?: any): Promise<AllApiRequestContext>;
 }
 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, 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 };
+export { type AllApiRequestContext, 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 ResponsePageData, 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, PuppeteerNode, ElementHandle } from 'puppeteer';
-import { Browser, BrowserContext, Frame, Page, Response, BrowserType, Locator } from 'playwright';
+import { Browser, BrowserContext, Frame, Page, Response, APIRequestContext, BrowserType, Locator, FrameLocator } from 'playwright';
 import * as cheerio from 'cheerio';
 
 /**
@@ -15,6 +15,7 @@ type AllBrowserContext = BrowserContext | BrowserContext$1;
 type AllFrame = Frame | Frame$1;
 type AllPage = Page | Page$1;
 type AllResponse = Response | HTTPResponse;
+type AllApiRequestContext = APIRequestContext;
 type CheerioNode = cheerio.Cheerio<cheerio.Element>;
 type Proxy = {
     server: string;
@@ -478,7 +479,11 @@ interface ResponseMatch {
     maxLength?: number;
 }
 type ResponseHandlerOptions = Record<string, any>;
-type ResponseHandler = (response: AllResponse, options: ResponseHandlerOptions, pageUrl: string) => Promise<void> | void;
+interface ResponsePageData {
+    pageUrl: string;
+    cookies: string;
+}
+type ResponseHandler = (response: AllResponse, options: ResponseHandlerOptions, pageData: ResponsePageData) => Promise<void> | void;
 interface ResponseInterceptionItem {
     /**
      * page.url()
@@ -772,6 +777,11 @@ interface WaitNavigationOptions {
 }
 type PageEvent = "pageClose" | "pagePopup";
 interface LsdPage extends EventEmitter {
+    /**
+     * Get the APIRequestContext associated with this page's browser context.
+     * * only vaild in playwright
+     */
+    apiRequestContext(): AllApiRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
     clearCookies(): Promise<boolean>;
@@ -918,7 +928,7 @@ interface LsdBrowserContext extends EventEmitter {
     pages(): LsdPage[];
     proxy(): Proxy | null;
     setStateData(stateData: StateData): Promise<boolean>;
-    _origBrowserContext(): AllBrowserContext | null;
+    _origBrowserContext(): AllBrowserContext;
 }
 interface LsdBrowser extends EventEmitter {
     newBrowserContext(options?: LsdBrowserContextOptions): Promise<LsdBrowserContext | null>;
@@ -960,6 +970,10 @@ interface LsdBrowserController$1 {
      * @param puppeteer  null means use puppeteer-extra-plugin-stealth based on playwright-extra
      */
     setPlaywrightBrowserType(browserType: LsdBrowserType, playwrightBrowserType: BrowserType | null): boolean;
+    /**
+     * Create a new APIRequestContext, valid in playwright;
+     */
+    newApiRequestContext(options?: any): Promise<AllApiRequestContext>;
 }
 /**
  * globObj.cfg.XXX:
@@ -1021,12 +1035,13 @@ declare class PlaywrightBrowserContext extends EventEmitter implements LsdBrowse
     pages(): LsdPage[];
     proxy(): Proxy | null;
     setStateData(stateData: StateData): Promise<boolean>;
-    _origBrowserContext(): AllBrowserContext | null;
+    _origBrowserContext(): AllBrowserContext;
 }
 
 declare class PlaywrightPage extends EventEmitter implements LsdPage {
     #private;
     constructor(browserContext: LsdBrowserContext, page: Page, pageInfo?: PageInfo);
+    apiRequestContext(): APIRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
     clearCookies(): Promise<boolean>;
@@ -1077,7 +1092,7 @@ declare class PlaywrightPage extends EventEmitter implements LsdPage {
 
 declare class PlaywrightElement implements LsdElement {
     #private;
-    constructor(locator: Locator, frame: Frame);
+    constructor(locator: Locator, frame: Frame | FrameLocator);
     attribute(attributeName: string): Promise<string>;
     attributeNames(): Promise<string[]>;
     findElement(selectorOrXpath: string | string[], iframeOptions?: IframeOption[], absolute?: boolean): Promise<LsdElement | null>;
@@ -1129,12 +1144,13 @@ declare class PuppeteerBrowserContext extends EventEmitter implements LsdBrowser
     pages(): LsdPage[];
     proxy(): Proxy | null;
     setStateData(stateData: StateData): Promise<boolean>;
-    _origBrowserContext(): AllBrowserContext | null;
+    _origBrowserContext(): AllBrowserContext;
 }
 
 declare class PuppeteerPage extends EventEmitter implements LsdPage {
     #private;
     constructor(browserContext: LsdBrowserContext, page: Page$1, pageInfo?: PageInfo);
+    apiRequestContext(): APIRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
     clearCookies(): Promise<boolean>;
@@ -1213,6 +1229,7 @@ declare class CheerioPage extends EventEmitter implements LsdPage {
      * @param isHtml  default true
      */
     constructor(html?: string, isHtml?: boolean);
+    apiRequestContext(): APIRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
     clearCookies(): Promise<boolean>;
@@ -1289,7 +1306,8 @@ declare class LsdBrowserController implements LsdBrowserController$1 {
     setPlaywrightBrowserType(browserType: LsdBrowserType, playwrightBrowserType: BrowserType | null): boolean;
     launch(browserControllerType: BrowserControllerType, browserType: LsdBrowserType, options: LsdLaunchOptions): Promise<LsdBrowser>;
     connect(browserControllerType: BrowserControllerType, browserType: LsdBrowserType, options: LsdConnectOptions): Promise<LsdBrowser>;
+    newApiRequestContext(options?: any): Promise<AllApiRequestContext>;
 }
 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, 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 };
+export { type AllApiRequestContext, 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 ResponsePageData, type ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller, defaultProxy };

package/dist/index.js

@@ -58,19 +58,19 @@ import EventEmitter3 from "events";
 
 // src/playwright/context.ts
 import EventEmitter2 from "events";
-import { getCurrentUnixTime as getCurrentUnixTime2, logerr as logerr2, loginfo as loginfo2, logwarn as logwarn2, sleep } from "@letsscrapedata/utils";
+import { getCurrentUnixTime as getCurrentUnixTime2, logerr as logerr2, loginfo as loginfo3, logwarn as logwarn2, sleep } from "@letsscrapedata/utils";
 
 // src/playwright/page.ts
 import EventEmitter from "events";
-import { getCurrentUnixTime, logerr, loginfo, logwarn, unreachable as unreachable2 } from "@letsscrapedata/utils";
+import { getCurrentUnixTime, logerr, loginfo as loginfo2, logwarn, unreachable as unreachable2 } from "@letsscrapedata/utils";
 
 // src/playwright/element.ts
-import { unreachable } from "@letsscrapedata/utils";
+import { loginfo, unreachable } from "@letsscrapedata/utils";
 var PlaywrightElement = class _PlaywrightElement {
   #frame;
   #locator;
   constructor(locator, frame) {
-    if (!frame.goto || !locator.click) {
+    if (!frame.locator || !locator.click) {
       throw new Error("Invalid paras in new PlaywrightElement");
     }
     this.#frame = frame;
@@ -84,41 +84,66 @@ var PlaywrightElement = class _PlaywrightElement {
     const names = await this.#locator.evaluate((node) => node.getAttributeNames());
     return names;
   }
-  // 如果不存在指定的子iframe，则返回null
-  async #getChildFrame(parentFrame, iframeOption) {
-    if (!parentFrame) {
-      throw new Error("Invalid parent frame");
-    }
-    let { src = "" } = iframeOption;
-    if (!src) {
-      throw new Error("Invalid src in IframeOption");
-    }
-    const childFrames = parentFrame.childFrames();
-    for (const childFrame of childFrames) {
-      const url = childFrame.url();
-      if (typeof src === "string") {
-        if (url.startsWith(src)) {
-          return childFrame;
-        } else if (url.toLowerCase().startsWith(src)) {
-          return childFrame;
-        }
-      } else {
-        if (url.match(src)) {
-          return childFrame;
+  /*
+    // 如果不存在指定的子iframe，则返回null
+    async #getChildFrame(parentFrame: Frame, iframeOption: IframeOption): Promise<Frame | null> {
+      if (!parentFrame) {
+        throw new Error("Invalid parent frame");
+      }
+  
+      let { src = "" } = iframeOption;
+      if (!src) {
+        throw new Error("Invalid src in IframeOption");
+      }
+  
+      // src: use childFrames()
+      const childFrames = parentFrame.childFrames();
+      for (const childFrame of childFrames) {
+        const url = childFrame.url();
+        if (typeof src === "string") {
+          // src: string
+          if (url.startsWith(src)) {
+            return childFrame;
+          } else if (url.toLowerCase().startsWith(src)) {
+            return childFrame;
+          }
+        } else {
+          // src: RegExp
+          if (url.match(src)) {
+            return childFrame;
+          }
         }
       }
+  
+      return null;
     }
-    return null;
+      */
+  #getIframeSelector(iframeOption) {
+    const { src = "", selector = "" } = iframeOption;
+    if (!src && !selector) {
+      throw new Error("Invalid parent frame");
+    }
+    return selector ? selector : `iframe[src^="${src}"]`;
   }
-  async #getDescendantFrame(parentFrame, iframeOptions) {
-    let iframe = parentFrame;
-    for (const iframeOption of iframeOptions) {
-      if (!iframe) {
+  async #getChildFrameLocator(parent2, iframeOption) {
+    return parent2.frameLocator(this.#getIframeSelector(iframeOption));
+  }
+  async #getDescendantFrame(parent2, iframeOptions) {
+    try {
+      if (iframeOptions.length <= 0) {
         return null;
       }
-      iframe = await this.#getChildFrame(iframe, iframeOption);
+      let frameLocator = parent2.frameLocator(this.#getIframeSelector(iframeOptions[0]));
+      for (const iframeOption of iframeOptions.slice(1)) {
+        if (!frameLocator) {
+          return null;
+        }
+        frameLocator = await this.#getChildFrameLocator(frameLocator, iframeOption);
+      }
+      return frameLocator;
+    } catch (err) {
+      throw new Error(`No child iframe: ${JSON.stringify(iframeOptions)}`);
     }
-    return iframe;
   }
   async #findElementHandles(selector, absolute = false, iframeOptions = []) {
     let parent2 = absolute ? this.#frame : this.#locator;
@@ -146,7 +171,7 @@ var PlaywrightElement = class _PlaywrightElement {
       retObj.locators = locators;
       return retObj;
     } catch (err) {
-      console.log(err);
+      loginfo(err);
       return retObj;
     }
   }
@@ -403,41 +428,66 @@ var PlaywrightPage = class extends EventEmitter {
     });
     return true;
   }
-  // 如果不存在指定的子iframe，则返回null
-  async #getChildFrame(parentFrame, iframeOption) {
-    if (!parentFrame) {
-      throw new Error("Invalid parent frame");
-    }
-    let { src = "" } = iframeOption;
-    if (!src) {
-      throw new Error("Invalid src in IframeOption");
-    }
-    const childFrames = parentFrame.childFrames();
-    for (const childFrame of childFrames) {
-      const url = childFrame.url();
-      if (typeof src === "string") {
-        if (url.startsWith(src)) {
-          return childFrame;
-        } else if (url.toLowerCase().startsWith(src)) {
-          return childFrame;
-        }
-      } else {
-        if (url.match(src)) {
-          return childFrame;
+  /*
+    // 如果不存在指定的子iframe，则返回null
+    async #getChildFrame(parentFrame: Frame, iframeOption: IframeOption): Promise<Frame | null> {
+      if (!parentFrame) {
+        throw new Error("Invalid parent frame");
+      }
+  
+      let { src = "" } = iframeOption;
+      if (!src) {
+        throw new Error("Invalid src in IframeOption");
+      }
+  
+      // src: use childFrames()
+      const childFrames = parentFrame.childFrames();
+      for (const childFrame of childFrames) {
+        const url = childFrame.url();
+        if (typeof src === "string") {
+          // src: string
+          if (url.startsWith(src)) {
+            return childFrame;
+          } else if (url.toLowerCase().startsWith(src)) {
+            return childFrame;
+          }
+        } else {
+          // src: RegExp
+          if (url.match(src)) {
+            return childFrame;
+          }
         }
       }
+  
+      return null;
     }
-    return null;
+    */
+  #getIframeSelector(iframeOption) {
+    const { src = "", selector = "" } = iframeOption;
+    if (!src && !selector) {
+      throw new Error("Invalid parent frame");
+    }
+    return selector ? selector : `iframe[src^="${src}"]`;
   }
-  async #getDescendantFrame(parentFrame, iframeOptions) {
-    let iframe = parentFrame;
-    for (const iframeOption of iframeOptions) {
-      if (!iframe) {
+  async #getChildFrameLocator(parent2, iframeOption) {
+    return parent2.frameLocator(this.#getIframeSelector(iframeOption));
+  }
+  async #getDescendantFrameLocator(mainFrame, iframeOptions) {
+    try {
+      if (iframeOptions.length <= 0) {
         return null;
       }
-      iframe = await this.#getChildFrame(iframe, iframeOption);
+      let frameLocator = mainFrame.frameLocator(this.#getIframeSelector(iframeOptions[0]));
+      for (const iframeOption of iframeOptions.slice(1)) {
+        if (!frameLocator) {
+          return null;
+        }
+        frameLocator = await this.#getChildFrameLocator(frameLocator, iframeOption);
+      }
+      return frameLocator;
+    } catch (err) {
+      throw new Error(`No child iframe: ${JSON.stringify(iframeOptions)}`);
     }
-    return iframe;
   }
   async #findElementHandles(selector, iframeOptions = []) {
     if (!this.#page) {
@@ -446,7 +496,7 @@ var PlaywrightPage = class extends EventEmitter {
     let frame = this.#page.mainFrame();
     const retObj = { frame, locators: [] };
     if (iframeOptions.length > 0) {
-      frame = await this.#getDescendantFrame(frame, iframeOptions);
+      frame = await this.#getDescendantFrameLocator(frame, iframeOptions);
       if (!frame) {
         return retObj;
       }
@@ -466,7 +516,7 @@ var PlaywrightPage = class extends EventEmitter {
       retObj.locators = locators;
       return retObj;
     } catch (err) {
-      console.log(err);
+      loginfo2(err);
       return retObj;
     }
   }
@@ -477,7 +527,7 @@ var PlaywrightPage = class extends EventEmitter {
     const page = this.#page;
     const pageId = this.#pageId;
     page.on("close", async () => {
-      loginfo(`##browser  ${pageId} closed`);
+      loginfo2(`##browser  ${pageId} closed`);
       if (!page.pageInfo) {
         logerr(`Logic error in page.on("close")`);
       }
@@ -500,7 +550,7 @@ var PlaywrightPage = class extends EventEmitter {
         } else {
           logerr(`##browser  ${pageId} has popup without page.pageInfo`);
         }
-        loginfo(`##browser  ${pageId} has popup ${popupPageId}`);
+        loginfo2(`##browser  ${pageId} has popup ${popupPageId}`);
         this.emit("pagePopup", evtData);
       } else {
         logerr(`##browser  ${pageId} has popup page with null page`);
@@ -525,6 +575,11 @@ var PlaywrightPage = class extends EventEmitter {
     this.#responseCb = null;
     this.#addPageOn();
   }
+  apiRequestContext() {
+    const origBrowserContext = this.browserContext()._origBrowserContext();
+    const apiRequestContext = origBrowserContext.request;
+    return apiRequestContext;
+  }
   async bringToFront() {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -600,9 +655,9 @@ var PlaywrightPage = class extends EventEmitter {
     }
     let content = "";
     if (iframeOptions.length > 0) {
-      const frame = await this.#getDescendantFrame(this.#page.mainFrame(), iframeOptions);
-      if (frame) {
-        content = await frame.content();
+      const frameLocator = await this.#getDescendantFrameLocator(this.#page.mainFrame(), iframeOptions);
+      if (frameLocator) {
+        content = await frameLocator.locator(":root").evaluate(() => document.documentElement.outerHTML);
       }
     } else {
       content = await this.#page.content();
@@ -962,10 +1017,11 @@ var PlaywrightPage = class extends EventEmitter {
             requestData,
             responseData
           });
-          loginfo(`##browser cache matched response: ${requestUrl}`);
+          loginfo2(`##browser cache matched response: ${requestUrl}`);
         }
         if (typeof handler === "function") {
-          await handler(response, handlerOptions, pageUrl);
+          const pageData = { pageUrl, cookies: "" };
+          await handler(response, handlerOptions, pageData);
         }
       }
       return;
@@ -1141,7 +1197,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
         await lsdPage.maximizeViewport();
       }
       this.#lsdPages.push(lsdPage);
-      loginfo2(`##browser  ${lsdPage.id()} ${openType}ed`);
+      loginfo3(`##browser  ${lsdPage.id()} ${openType}ed`);
     }
   }
   constructor(lsdBrowser, browserContext, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, maxViewportOfNewPage = true) {
@@ -1179,7 +1235,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
           await lsdPage.maximizeViewport();
         }
         this.#lsdPages.push(lsdPage);
-        loginfo2(`##browser ${lsdPage.id()} created`);
+        loginfo3(`##browser ${lsdPage.id()} created`);
       }
     });
     browserContext.on("close", (bc) => {
@@ -1363,7 +1419,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
 };
 
 // src/playwright/browser.ts
-import { logerr as logerr3, loginfo as loginfo3, logwarn as logwarn3 } from "@letsscrapedata/utils";
+import { logerr as logerr3, loginfo as loginfo4, logwarn as logwarn3 } from "@letsscrapedata/utils";
 var PlaywrightBrowser = class extends EventEmitter3 {
   #browser;
   #browserIdx;
@@ -1409,7 +1465,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     this.#executablePath = executablePath;
     this.#nextBrowserContextIdx = 1;
     this.#closeFreePagesIntervalId = null;
-    loginfo3(`##browser  ${this.#browserType} ${this.id()} ${this.#browserCreationMethod}ed by ${this.#browserControllerType}`);
+    loginfo4(`##browser  ${this.#browserType} ${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`);
@@ -1418,10 +1474,10 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     for (const browserContext of browserContexts) {
       const lsdBrowserContext = new PlaywrightBrowserContext(this, browserContext, incognito, this.#proxy, this.#browserIdx++, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
       this.#lsdBrowserContexts.push(lsdBrowserContext);
-      loginfo3(`##browser  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
+      loginfo4(`##browser  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
     }
     browser.on("disconnected", () => {
-      loginfo3(`##browser  ${this.id()} disconnected`);
+      loginfo4(`##browser  ${this.id()} disconnected`);
       if (this.#lsdBrowserContexts.length > 0) {
         logerr3(`${this.id()} has browserContexts when disconnected`);
       }
@@ -1436,11 +1492,11 @@ var PlaywrightBrowser = class extends EventEmitter3 {
         logerr3(`Invalid lsdBrowserContext in LsdBrowser.on("browserContextClose)`);
         return;
       }
-      loginfo3(`##browser  ${lsdBrowserContext.id()} closed
+      loginfo4(`##browser  ${lsdBrowserContext.id()} closed
 `);
       this.#lsdBrowserContexts.splice(idx, 1);
       if (this.#lsdBrowserContexts.length === 0) {
-        loginfo3(`##browser  ${this.id()} has no browserContexts now`);
+        loginfo4(`##browser  ${this.id()} has no browserContexts now`);
       }
       return;
     });
@@ -1477,7 +1533,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     const { maxViewportOfNewPage = this.#options.maxViewportOfNewPage } = options ? options : {};
     const lsdBrowserContext = new PlaywrightBrowserContext(this, browserContext, true, proxy, this.#browserIdx++, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
     this.#lsdBrowserContexts.push(lsdBrowserContext);
-    loginfo3(`##browser  ${lsdBrowserContext.id()} created`);
+    loginfo4(`##browser  ${lsdBrowserContext.id()} created`);
     return lsdBrowserContext;
   }
   async close() {
@@ -1798,7 +1854,7 @@ var PuppeteerElement = class _PuppeteerElement {
 };
 
 // src/puppeteer/page.ts
-import { getCurrentUnixTime as getCurrentUnixTime3, logerr as logerr5, loginfo as loginfo4, unreachable as unreachable4 } from "@letsscrapedata/utils";
+import { getCurrentUnixTime as getCurrentUnixTime3, logerr as logerr5, loginfo as loginfo5, unreachable as unreachable4 } from "@letsscrapedata/utils";
 var PuppeteerPage = class extends EventEmitter4 {
   #lsdBrowserContext;
   #page;
@@ -1959,7 +2015,7 @@ var PuppeteerPage = class extends EventEmitter4 {
     const page = this.#page;
     const pageId = this.#pageId;
     page.on("close", async () => {
-      loginfo4(`##browser  ${pageId} closed`);
+      loginfo5(`##browser  ${pageId} closed`);
       if (!page.pageInfo) {
         logerr5(`Logic error in page.on("close")`);
       }
@@ -1982,7 +2038,7 @@ var PuppeteerPage = class extends EventEmitter4 {
         } else {
           logerr5(`##browser  ${pageId} has popup without page.pageInfo`);
         }
-        loginfo4(`##browser  ${pageId} has popup ${popupPageId}`);
+        loginfo5(`##browser  ${pageId} has popup ${popupPageId}`);
         this.emit("pagePopup", evtData);
       } else {
         logerr5(`##browser  ${pageId} has popup page with null page`);
@@ -2006,6 +2062,9 @@ var PuppeteerPage = class extends EventEmitter4 {
     this.#client = null;
     this.#addPageOn();
   }
+  apiRequestContext() {
+    throw new Error("Not supported in PuppeteerPage.");
+  }
   async bringToFront() {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -2445,7 +2504,14 @@ var PuppeteerPage = class extends EventEmitter4 {
             });
           }
           if (typeof handler === "function") {
-            await handler(response, handlerOptions, pageUrl);
+            const pageData = { pageUrl, cookies: "" };
+            if (handlerOptions?.requestHeadersFlag) {
+              const cookies = (await this.#page.cookies()).map((cookie) => {
+                return `${cookie.name}=${cookie.value}`;
+              }).join("; ");
+              pageData.cookies = cookies;
+            }
+            await handler(response, handlerOptions, pageData);
           }
         }
         return true;
@@ -2576,7 +2642,7 @@ var PuppeteerPage = class extends EventEmitter4 {
 };
 
 // src/puppeteer/context.ts
-import { getCurrentUnixTime as getCurrentUnixTime4, logerr as logerr6, loginfo as loginfo5, logwarn as logwarn4, sleep as sleep2 } from "@letsscrapedata/utils";
+import { getCurrentUnixTime as getCurrentUnixTime4, logerr as logerr6, loginfo as loginfo6, logwarn as logwarn4, sleep as sleep2 } from "@letsscrapedata/utils";
 var PuppeteerBrowserContext = class extends EventEmitter5 {
   #lsdBrowser;
   #browserIdx;
@@ -2613,7 +2679,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
         await lsdPage.setUserAgent(this.#userAgent);
       }
       this.#lsdPages.push(lsdPage);
-      loginfo5(`##browser  ${lsdPage.id()} ${openType}ed`);
+      loginfo6(`##browser  ${lsdPage.id()} ${openType}ed`);
     }
   }
   constructor(lsdBrowser, browserContext, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, userAgent = "", maxViewportOfNewPage = true) {
@@ -2660,7 +2726,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
             await lsdPage.setUserAgent(this.#userAgent);
           }
           this.#lsdPages.push(lsdPage);
-          loginfo5(`##browser ${lsdPage.id()} created`);
+          loginfo6(`##browser ${lsdPage.id()} created`);
         }
       }
     });
@@ -2844,7 +2910,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
 };
 
 // src/puppeteer/browser.ts
-import { logerr as logerr7, loginfo as loginfo6, logwarn as logwarn5 } from "@letsscrapedata/utils";
+import { logerr as logerr7, loginfo as loginfo7, logwarn as logwarn5 } from "@letsscrapedata/utils";
 var PuppeteerBrowser = class extends EventEmitter6 {
   #browser;
   #browserIdx;
@@ -2893,16 +2959,16 @@ var PuppeteerBrowser = class extends EventEmitter6 {
     this.#executablePath = executablePath;
     this.#nextBrowserContextIdx = 1;
     this.#closeFreePagesIntervalId = null;
-    loginfo6(`##browser  ${this.#browserType} ${this.id()} ${this.#browserCreationMethod}ed by ${this.#browserControllerType}`);
+    loginfo7(`##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, incognito, this.#proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), this.#userAgent(), maxViewportOfNewPage);
       this.#lsdBrowserContexts.push(lsdBrowserContext);
-      loginfo6(`##browser  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
+      loginfo7(`##browser  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
     }
     browser.on("disconnected", () => {
-      loginfo6(`##browser  ${this.id()} disconnected`);
+      loginfo7(`##browser  ${this.id()} disconnected`);
       if (this.#lsdBrowserContexts.length > 0) {
         logerr7(`${this.id()} has browserContexts when disconnected`);
       }
@@ -2917,11 +2983,11 @@ var PuppeteerBrowser = class extends EventEmitter6 {
         logerr7(`Invalid lsdBrowserContext in LsdBrowser.on("browserContextClose)`);
         return;
       }
-      loginfo6(`##browser  ${lsdBrowserContext.id()} closed
+      loginfo7(`##browser  ${lsdBrowserContext.id()} closed
 `);
       this.#lsdBrowserContexts.splice(idx, 1);
       if (this.#lsdBrowserContexts.length === 0) {
-        loginfo6(`##browser  ${this.id()} has no browserContexts now`);
+        loginfo7(`##browser  ${this.id()} has no browserContexts now`);
       }
       return;
     });
@@ -2952,7 +3018,7 @@ var PuppeteerBrowser = class extends EventEmitter6 {
     const { maxViewportOfNewPage = this.#options.maxViewportOfNewPage } = options ? options : {};
     const lsdBrowserContext = new PuppeteerBrowserContext(this, browserContext, true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), userAgent, maxViewportOfNewPage);
     this.#lsdBrowserContexts.push(lsdBrowserContext);
-    loginfo6(`##browser  ${lsdBrowserContext.id()} created`);
+    loginfo7(`##browser  ${lsdBrowserContext.id()} created`);
     return lsdBrowserContext;
   }
   async close() {
@@ -16988,6 +17054,9 @@ var CheerioPage = class extends EventEmitter7 {
       this.#document = load(html3, { xml: true }).root();
     }
   }
+  apiRequestContext() {
+    throw new Error("Not supported in CheerioPage.");
+  }
   async bringToFront() {
     throw new Error("Not supported in CheerioPage.");
   }
@@ -17168,7 +17237,7 @@ var CheerioPage = class extends EventEmitter7 {
 // src/controller/controller.ts
 import os from "os";
 import puppeteer from "puppeteer";
-import playwright from "playwright";
+import playwright, { request as apiRequest } from "playwright";
 import { logwarn as logwarn6, unreachable as unreachable5 } from "@letsscrapedata/utils";
 import puppeteerExtra from "puppeteer-extra";
 import * as playwrightExtra from "playwright-extra";
@@ -17330,6 +17399,9 @@ var LsdBrowserController = class _LsdBrowserController {
         args.push("--start-maximized");
         launchOptions.defaultViewport = null;
       }
+      if (!args.includes("--no-sandbox")) {
+        args.push("--no-sandbox");
+      }
       if (browserType === "chromium") {
         if (incognito) {
           args.push("--incognito");
@@ -17392,6 +17464,10 @@ var LsdBrowserController = class _LsdBrowserController {
       throw new Error(`Invalid browserControllerType: ${browserControllerType} in connect`);
     }
   }
+  async newApiRequestContext(options) {
+    const apiRequestContext = await apiRequest.newContext(options);
+    return apiRequestContext;
+  }
 };
 var controller = new LsdBrowserController();
 export {

package/package.json

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