@letsscrapedata/controller 0.0.33 → 0.0.34

package/dist/index.cjs

@@ -577,7 +577,7 @@ var PlaywrightPage = class extends import_node_events.default {
     const currentTime = (0, import_utils2.getCurrentUnixTime)();
     const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0, relatedId = 0, misc = {} } = pageInfo ? pageInfo : {};
     this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId, relatedId, misc };
-    this.#pageId = `page${browserIdx}-${browserContextIdx}-${pageIdx}`;
+    this.#pageId = `page-${browserIdx}-${browserContextIdx}-${pageIdx}`;
     this.#resquestInterceptionOptions = [];
     this.#responseInterceptionOptions = [];
     this.#client = null;
@@ -686,6 +686,12 @@ var PlaywrightPage = class extends import_node_events.default {
     const height = await this.#page.evaluate(() => document.documentElement.scrollHeight);
     return height;
   }
+  async evalute(fun, args) {
+    if (!this.#page) {
+      throw new Error("No valid page");
+    }
+    return this.#page.evaluate(fun, args);
+  }
   async findElement(selectorOrXpath, iframeOptions = []) {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -1175,6 +1181,9 @@ var PlaywrightPage = class extends import_node_events.default {
     );
     return content;
   }
+  _origPage() {
+    return this.#page;
+  }
 };
 
 // src/playwright/context.ts
@@ -1244,7 +1253,7 @@ var PlaywrightBrowserContext = class extends import_node_events2.default {
           await lsdPage.maximizeViewport();
         }
         this.#lsdPages.push(lsdPage);
-        (0, import_utils3.loginfo)(`##browser ${lsdPage.id()} created`);
+        (0, import_utils3.loginfo)(`##page ${lsdPage.id()} created`);
       }
     });
     browserContext.on("close", (bc) => {
@@ -1396,12 +1405,16 @@ var PlaywrightBrowserContext = class extends import_node_events2.default {
       throw new Error("No valid browserContext");
     }
     const { cookies, localStorage: localStorageOrigins } = stateData;
-    const page = await this.#browserContext.newPage();
+    const page = await this.getPage();
+    if (!page) {
+      return false;
+    }
+    const origPage = page._origPage();
     if (cookies.length > 0) {
       await this.#browserContext.addCookies(cookies);
     }
     if (localStorageOrigins.length > 0) {
-      await page.route("**/*", async (route) => {
+      await origPage.route("**/*", async (route) => {
         const request = route.request();
         await route.fulfill({
           status: 200,
@@ -1411,15 +1424,16 @@ var PlaywrightBrowserContext = class extends import_node_events2.default {
       });
       for (const localStorageOrigin of localStorageOrigins) {
         const { origin, localStorage } = localStorageOrigin;
-        await page.goto(origin);
-        await page.evaluate((localStorageItems) => {
+        await origPage.goto(origin);
+        await origPage.evaluate((localStorageItems) => {
           for (const item of localStorageItems) {
             window.localStorage.setItem(item.name, item.value);
           }
         }, localStorage);
       }
     }
-    await page.close();
+    await origPage.unrouteAll();
+    await page.free();
     return true;
   }
   _origBrowserContext() {
@@ -1474,7 +1488,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
     this.#executablePath = executablePath;
     this.#nextBrowserContextIdx = 1;
     this.#closeFreePagesIntervalId = null;
-    (0, import_utils4.loginfo)(`##browser  ${this.#browserType} ${this.id()} ${this.#browserCreationMethod}ed by ${this.#browserControllerType}`);
+    (0, import_utils4.loginfo)(`##browser ${this.id()} ${this.#browserCreationMethod}ed by ${this.#browserControllerType}`);
     const browserContexts = browser.contexts();
     if (browserContexts.length > 0) {
       (0, import_utils4.logwarn)(`There are ${browserContexts.length} new browserContexts when playwright launches new browser`);
@@ -1483,7 +1497,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
     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);
-      (0, import_utils4.loginfo)(`##browser  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
+      (0, import_utils4.loginfo)(`##browserContext  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
     }
     browser.on("disconnected", () => {
       (0, import_utils4.loginfo)(`##browser  ${this.id()} disconnected`);
@@ -1501,7 +1515,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
         (0, import_utils4.logerr)(`Invalid lsdBrowserContext in LsdBrowser.on("browserContextClose)`);
         return;
       }
-      (0, import_utils4.loginfo)(`##browser  ${lsdBrowserContext.id()} closed
+      (0, import_utils4.loginfo)(`##browserContext  ${lsdBrowserContext.id()} closed
 `);
       this.#lsdBrowserContexts.splice(idx, 1);
       if (this.#lsdBrowserContexts.length === 0) {
@@ -1572,7 +1586,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
     return this.#executablePath;
   }
   id() {
-    return `browser-${this.#browserIdx}`;
+    return `browser-${this.#browserType}-${this.#browserIdx}`;
   }
   isConnected() {
     return this.#browser.isConnected();
@@ -1587,8 +1601,8 @@ var PlaywrightBrowser = class extends import_node_events3.default {
     const version = await this.#browser.version();
     return version;
   }
-  _origBrowserContexts() {
-    return this.#browser.contexts();
+  _origBrowser() {
+    return this.#browser;
   }
 };
 
@@ -2067,7 +2081,7 @@ var PuppeteerPage = class extends import_node_events4.default {
     const currentTime = (0, import_utils6.getCurrentUnixTime)();
     const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0, relatedId = 0, misc = {} } = pageInfo ? pageInfo : {};
     this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId, relatedId, misc };
-    this.#pageId = `page${browserIdx}-${browserContextIdx}-${pageIdx}`;
+    this.#pageId = `page-${browserIdx}-${browserContextIdx}-${pageIdx}`;
     this.#requestInterceptionNum = 0;
     this.#responseInterceptionNum = 0;
     this.#client = null;
@@ -2170,6 +2184,12 @@ var PuppeteerPage = class extends import_node_events4.default {
     const height = await this.#page.evaluate(() => document.documentElement.scrollHeight);
     return height;
   }
+  async evalute(fun, args) {
+    if (!this.#page) {
+      throw new Error("No valid page");
+    }
+    return this.#page.evaluate(fun, args);
+  }
   async findElement(selectorOrXpath, iframeOptions = []) {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -2650,6 +2670,9 @@ var PuppeteerPage = class extends import_node_events4.default {
     );
     return content;
   }
+  _origPage() {
+    return this.#page;
+  }
 };
 
 // src/puppeteer/context.ts
@@ -2737,7 +2760,7 @@ var PuppeteerBrowserContext = class extends import_node_events5.default {
             await lsdPage.setUserAgent(this.#userAgent);
           }
           this.#lsdPages.push(lsdPage);
-          (0, import_utils7.loginfo)(`##browser ${lsdPage.id()} created`);
+          (0, import_utils7.loginfo)(`##page ${lsdPage.id()} created`);
         }
       }
     });
@@ -2889,13 +2912,17 @@ var PuppeteerBrowserContext = class extends import_node_events5.default {
       throw new Error("No valid browserContext");
     }
     const { cookies, localStorage: localStorageOrigins } = stateData;
-    const page = await this.#browserContext.newPage();
+    const page = await this.getPage();
+    if (!page) {
+      return false;
+    }
+    const origPage = page._origPage();
     if (cookies.length > 0) {
-      await page.setCookie(...cookies);
+      await origPage.setCookie(...cookies);
     }
     if (localStorageOrigins.length > 0) {
-      await page.setRequestInterception(true);
-      page.on("request", (request) => {
+      await origPage.setRequestInterception(true);
+      origPage.on("request", (request) => {
         request.respond({
           status: 200,
           // contentType: "text/html; charset=utf-8", // "text/plain",
@@ -2904,15 +2931,16 @@ var PuppeteerBrowserContext = class extends import_node_events5.default {
       });
       for (const localStorageOrigin of localStorageOrigins) {
         const { origin, localStorage } = localStorageOrigin;
-        await page.goto(origin);
-        await page.evaluate((localStorageItems) => {
+        await origPage.goto(origin);
+        await origPage.evaluate((localStorageItems) => {
           for (const item of localStorageItems) {
             window.localStorage.setItem(item.name, item.value);
           }
         }, localStorage);
       }
     }
-    await page.close();
+    await origPage.setRequestInterception(false);
+    await page.free();
     return true;
   }
   _origBrowserContext() {
@@ -3076,8 +3104,8 @@ var PuppeteerBrowser = class extends import_node_events6.default {
     const version = await this.#browser.version();
     return version;
   }
-  _origBrowserContexts() {
-    return this.#browser.browserContexts();
+  _origBrowser() {
+    return this.#browser;
   }
 };
 
@@ -17065,6 +17093,9 @@ var CheerioPage = class extends import_node_events7.default {
       this.#document = load(html3, { xml: true }).root();
     }
   }
+  _origPage() {
+    throw new Error("Method not implemented.");
+  }
   apiRequestContext() {
     throw new Error("Not supported in CheerioPage.");
   }
@@ -17098,6 +17129,9 @@ var CheerioPage = class extends import_node_events7.default {
   async cookies() {
     throw new Error("Not supported in CheerioPage.");
   }
+  async evalute() {
+    throw new Error("Not supported in CheerioPage.");
+  }
   #findNodes(selector) {
     if (selector.startsWith("./") || selector.startsWith("/")) {
       throw new Error("Do not support XPath in cheerio.");

package/dist/index.d.cts

@@ -771,7 +771,15 @@ interface LsdPage extends EventEmitter {
     apiRequestContext(): AllApiRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
+    /**
+     * clear the cookies of the current page(url)
+     * * Prerequisites: page must has a valid url, such as by calling goto(url)
+     */
     clearCookies(): Promise<boolean>;
+    /**
+     * clear the localStorage of the current page(url)
+     * * Prerequisites: page must has a valid url, such as by calling goto(url)
+     */
     clearLocalStorage(): Promise<boolean>;
     /**
      * Clear all request interceptions on the page
@@ -781,6 +789,11 @@ interface LsdPage extends EventEmitter {
      * Clear all response interceptions on the page
      */
     clearResponseInterceptions(): Promise<boolean>;
+    /**
+     * clear the stateData of the current page(url):
+     * * stateData: cookies, localStorage, indexedDB
+     * * Prerequisites: page must has a valid url, such as by calling goto(url)
+     */
     clearStateData(): Promise<boolean>;
     /**
      * Only free page can be closed!
@@ -792,6 +805,7 @@ interface LsdPage extends EventEmitter {
      */
     content(iframeOptions?: IframeOption[]): Promise<string>;
     cookies(): Promise<CookieItem[]>;
+    evalute(fun: Function, args?: any[]): Promise<any>;
     /**
      * @returns the first element matching the given CSS selector or XPath
      * @param selectorOrXpath CSS selector or XPath; if this parameter is an array, each selectorOrXpath in the array will be tried until elements are selected
@@ -893,6 +907,7 @@ interface LsdPage extends EventEmitter {
      * @param keys
      */
     windowMember(keys: string[]): Promise<string>;
+    _origPage(): AllPage;
 }
 interface LsdBrowserContext extends EventEmitter {
     browser(): LsdBrowser;
@@ -940,12 +955,15 @@ interface LsdBrowser extends EventEmitter {
      * 2. connected: exectuablePath in LsdConnectOptions, default ""(unkown)
      */
     executablePath(): string;
+    /**
+     * get a free BrowserContext from current free browserContexts or new browserContext
+     */
     id(): string;
     isConnected(): boolean;
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
     version(): Promise<string>;
-    _origBrowserContexts(): AllBrowserContext[];
+    _origBrowser(): AllBrowser;
 }
 interface LsdBrowserController$1 {
     /**
@@ -1020,7 +1038,7 @@ declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
     version(): Promise<string>;
-    _origBrowserContexts(): AllBrowserContext[];
+    _origBrowser(): AllBrowser;
 }
 
 declare class PlaywrightBrowserContext extends EventEmitter implements LsdBrowserContext {
@@ -1055,6 +1073,7 @@ declare class PlaywrightPage extends EventEmitter implements LsdPage {
     content(iframeOptions?: IframeOption[]): Promise<string>;
     cookies(): Promise<CookieItem[]>;
     documentHeight(): Promise<number>;
+    evalute(fun: Function, args?: any[]): Promise<any>;
     findElement(selectorOrXpath: string | string[], iframeOptions?: IframeOption[]): Promise<LsdElement | null>;
     findElements(selectorOrXpath: string | string[], iframeOptions?: IframeOption[]): Promise<LsdElement[]>;
     free(): Promise<boolean>;
@@ -1090,6 +1109,7 @@ declare class PlaywrightPage extends EventEmitter implements LsdPage {
     waitForElement(selector: string, options?: WaitElementOptions): Promise<boolean>;
     waitForNavigation(options: WaitNavigationOptions): Promise<boolean>;
     windowMember(keys: string[]): Promise<string>;
+    _origPage(): AllPage;
 }
 
 declare class PlaywrightElement implements LsdElement {
@@ -1129,7 +1149,7 @@ declare class PuppeteerBrowser extends EventEmitter implements LsdBrowser {
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
     version(): Promise<string>;
-    _origBrowserContexts(): AllBrowserContext[];
+    _origBrowser(): AllBrowser;
 }
 
 declare class PuppeteerBrowserContext extends EventEmitter implements LsdBrowserContext {
@@ -1164,6 +1184,7 @@ declare class PuppeteerPage extends EventEmitter implements LsdPage {
     content(iframeOptions?: IframeOption[]): Promise<string>;
     cookies(): Promise<CookieItem[]>;
     documentHeight(): Promise<number>;
+    evalute(fun: Function, args?: any[]): Promise<any>;
     findElement(selectorOrXpath: string | string[], iframeOptions?: IframeOption[]): Promise<LsdElement | null>;
     findElements(selectorOrXpath: string | string[], iframeOptions?: IframeOption[]): Promise<LsdElement[]>;
     free(): Promise<boolean>;
@@ -1199,6 +1220,7 @@ declare class PuppeteerPage extends EventEmitter implements LsdPage {
     waitForElement(selector: string, options?: WaitElementOptions): Promise<boolean>;
     waitForNavigation(options: WaitNavigationOptions): Promise<boolean>;
     windowMember(keys: string[]): Promise<string>;
+    _origPage(): AllPage;
 }
 
 declare class PuppeteerElement implements LsdElement {
@@ -1231,6 +1253,7 @@ declare class CheerioPage extends EventEmitter implements LsdPage {
      * @param isHtml  default true
      */
     constructor(html?: string, isHtml?: boolean);
+    _origPage(): AllPage;
     apiRequestContext(): APIRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
@@ -1242,6 +1265,7 @@ declare class CheerioPage extends EventEmitter implements LsdPage {
     close(): Promise<boolean>;
     content(): Promise<string>;
     cookies(): Promise<CookieItem[]>;
+    evalute(): Promise<any>;
     findElement(selectorOrXpath: string | string[]): Promise<LsdElement | null>;
     findElements(selectorOrXpath: string | string[]): Promise<LsdElement[]>;
     free(): Promise<boolean>;

package/dist/index.d.ts

@@ -771,7 +771,15 @@ interface LsdPage extends EventEmitter {
     apiRequestContext(): AllApiRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
+    /**
+     * clear the cookies of the current page(url)
+     * * Prerequisites: page must has a valid url, such as by calling goto(url)
+     */
     clearCookies(): Promise<boolean>;
+    /**
+     * clear the localStorage of the current page(url)
+     * * Prerequisites: page must has a valid url, such as by calling goto(url)
+     */
     clearLocalStorage(): Promise<boolean>;
     /**
      * Clear all request interceptions on the page
@@ -781,6 +789,11 @@ interface LsdPage extends EventEmitter {
      * Clear all response interceptions on the page
      */
     clearResponseInterceptions(): Promise<boolean>;
+    /**
+     * clear the stateData of the current page(url):
+     * * stateData: cookies, localStorage, indexedDB
+     * * Prerequisites: page must has a valid url, such as by calling goto(url)
+     */
     clearStateData(): Promise<boolean>;
     /**
      * Only free page can be closed!
@@ -792,6 +805,7 @@ interface LsdPage extends EventEmitter {
      */
     content(iframeOptions?: IframeOption[]): Promise<string>;
     cookies(): Promise<CookieItem[]>;
+    evalute(fun: Function, args?: any[]): Promise<any>;
     /**
      * @returns the first element matching the given CSS selector or XPath
      * @param selectorOrXpath CSS selector or XPath; if this parameter is an array, each selectorOrXpath in the array will be tried until elements are selected
@@ -893,6 +907,7 @@ interface LsdPage extends EventEmitter {
      * @param keys
      */
     windowMember(keys: string[]): Promise<string>;
+    _origPage(): AllPage;
 }
 interface LsdBrowserContext extends EventEmitter {
     browser(): LsdBrowser;
@@ -940,12 +955,15 @@ interface LsdBrowser extends EventEmitter {
      * 2. connected: exectuablePath in LsdConnectOptions, default ""(unkown)
      */
     executablePath(): string;
+    /**
+     * get a free BrowserContext from current free browserContexts or new browserContext
+     */
     id(): string;
     isConnected(): boolean;
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
     version(): Promise<string>;
-    _origBrowserContexts(): AllBrowserContext[];
+    _origBrowser(): AllBrowser;
 }
 interface LsdBrowserController$1 {
     /**
@@ -1020,7 +1038,7 @@ declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
     version(): Promise<string>;
-    _origBrowserContexts(): AllBrowserContext[];
+    _origBrowser(): AllBrowser;
 }
 
 declare class PlaywrightBrowserContext extends EventEmitter implements LsdBrowserContext {
@@ -1055,6 +1073,7 @@ declare class PlaywrightPage extends EventEmitter implements LsdPage {
     content(iframeOptions?: IframeOption[]): Promise<string>;
     cookies(): Promise<CookieItem[]>;
     documentHeight(): Promise<number>;
+    evalute(fun: Function, args?: any[]): Promise<any>;
     findElement(selectorOrXpath: string | string[], iframeOptions?: IframeOption[]): Promise<LsdElement | null>;
     findElements(selectorOrXpath: string | string[], iframeOptions?: IframeOption[]): Promise<LsdElement[]>;
     free(): Promise<boolean>;
@@ -1090,6 +1109,7 @@ declare class PlaywrightPage extends EventEmitter implements LsdPage {
     waitForElement(selector: string, options?: WaitElementOptions): Promise<boolean>;
     waitForNavigation(options: WaitNavigationOptions): Promise<boolean>;
     windowMember(keys: string[]): Promise<string>;
+    _origPage(): AllPage;
 }
 
 declare class PlaywrightElement implements LsdElement {
@@ -1129,7 +1149,7 @@ declare class PuppeteerBrowser extends EventEmitter implements LsdBrowser {
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
     version(): Promise<string>;
-    _origBrowserContexts(): AllBrowserContext[];
+    _origBrowser(): AllBrowser;
 }
 
 declare class PuppeteerBrowserContext extends EventEmitter implements LsdBrowserContext {
@@ -1164,6 +1184,7 @@ declare class PuppeteerPage extends EventEmitter implements LsdPage {
     content(iframeOptions?: IframeOption[]): Promise<string>;
     cookies(): Promise<CookieItem[]>;
     documentHeight(): Promise<number>;
+    evalute(fun: Function, args?: any[]): Promise<any>;
     findElement(selectorOrXpath: string | string[], iframeOptions?: IframeOption[]): Promise<LsdElement | null>;
     findElements(selectorOrXpath: string | string[], iframeOptions?: IframeOption[]): Promise<LsdElement[]>;
     free(): Promise<boolean>;
@@ -1199,6 +1220,7 @@ declare class PuppeteerPage extends EventEmitter implements LsdPage {
     waitForElement(selector: string, options?: WaitElementOptions): Promise<boolean>;
     waitForNavigation(options: WaitNavigationOptions): Promise<boolean>;
     windowMember(keys: string[]): Promise<string>;
+    _origPage(): AllPage;
 }
 
 declare class PuppeteerElement implements LsdElement {
@@ -1231,6 +1253,7 @@ declare class CheerioPage extends EventEmitter implements LsdPage {
      * @param isHtml  default true
      */
     constructor(html?: string, isHtml?: boolean);
+    _origPage(): AllPage;
     apiRequestContext(): APIRequestContext;
     bringToFront(): Promise<boolean>;
     browserContext(): LsdBrowserContext;
@@ -1242,6 +1265,7 @@ declare class CheerioPage extends EventEmitter implements LsdPage {
     close(): Promise<boolean>;
     content(): Promise<string>;
     cookies(): Promise<CookieItem[]>;
+    evalute(): Promise<any>;
     findElement(selectorOrXpath: string | string[]): Promise<LsdElement | null>;
     findElements(selectorOrXpath: string | string[]): Promise<LsdElement[]>;
     free(): Promise<boolean>;

package/dist/index.js

@@ -558,7 +558,7 @@ var PlaywrightPage = class extends EventEmitter {
     const currentTime = getCurrentUnixTime();
     const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0, relatedId = 0, misc = {} } = pageInfo ? pageInfo : {};
     this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId, relatedId, misc };
-    this.#pageId = `page${browserIdx}-${browserContextIdx}-${pageIdx}`;
+    this.#pageId = `page-${browserIdx}-${browserContextIdx}-${pageIdx}`;
     this.#resquestInterceptionOptions = [];
     this.#responseInterceptionOptions = [];
     this.#client = null;
@@ -667,6 +667,12 @@ var PlaywrightPage = class extends EventEmitter {
     const height = await this.#page.evaluate(() => document.documentElement.scrollHeight);
     return height;
   }
+  async evalute(fun, args) {
+    if (!this.#page) {
+      throw new Error("No valid page");
+    }
+    return this.#page.evaluate(fun, args);
+  }
   async findElement(selectorOrXpath, iframeOptions = []) {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -1156,6 +1162,9 @@ var PlaywrightPage = class extends EventEmitter {
     );
     return content;
   }
+  _origPage() {
+    return this.#page;
+  }
 };
 
 // src/playwright/context.ts
@@ -1225,7 +1234,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
           await lsdPage.maximizeViewport();
         }
         this.#lsdPages.push(lsdPage);
-        loginfo3(`##browser ${lsdPage.id()} created`);
+        loginfo3(`##page ${lsdPage.id()} created`);
       }
     });
     browserContext.on("close", (bc) => {
@@ -1377,12 +1386,16 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
       throw new Error("No valid browserContext");
     }
     const { cookies, localStorage: localStorageOrigins } = stateData;
-    const page = await this.#browserContext.newPage();
+    const page = await this.getPage();
+    if (!page) {
+      return false;
+    }
+    const origPage = page._origPage();
     if (cookies.length > 0) {
       await this.#browserContext.addCookies(cookies);
     }
     if (localStorageOrigins.length > 0) {
-      await page.route("**/*", async (route) => {
+      await origPage.route("**/*", async (route) => {
         const request = route.request();
         await route.fulfill({
           status: 200,
@@ -1392,15 +1405,16 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
       });
       for (const localStorageOrigin of localStorageOrigins) {
         const { origin, localStorage } = localStorageOrigin;
-        await page.goto(origin);
-        await page.evaluate((localStorageItems) => {
+        await origPage.goto(origin);
+        await origPage.evaluate((localStorageItems) => {
           for (const item of localStorageItems) {
             window.localStorage.setItem(item.name, item.value);
           }
         }, localStorage);
       }
     }
-    await page.close();
+    await origPage.unrouteAll();
+    await page.free();
     return true;
   }
   _origBrowserContext() {
@@ -1455,7 +1469,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     this.#executablePath = executablePath;
     this.#nextBrowserContextIdx = 1;
     this.#closeFreePagesIntervalId = null;
-    loginfo4(`##browser  ${this.#browserType} ${this.id()} ${this.#browserCreationMethod}ed by ${this.#browserControllerType}`);
+    loginfo4(`##browser ${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`);
@@ -1464,7 +1478,7 @@ 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);
-      loginfo4(`##browser  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
+      loginfo4(`##browserContext  ${lsdBrowserContext.id()} ${this.#browserCreationMethod}ed`);
     }
     browser.on("disconnected", () => {
       loginfo4(`##browser  ${this.id()} disconnected`);
@@ -1482,7 +1496,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
         logerr3(`Invalid lsdBrowserContext in LsdBrowser.on("browserContextClose)`);
         return;
       }
-      loginfo4(`##browser  ${lsdBrowserContext.id()} closed
+      loginfo4(`##browserContext  ${lsdBrowserContext.id()} closed
 `);
       this.#lsdBrowserContexts.splice(idx, 1);
       if (this.#lsdBrowserContexts.length === 0) {
@@ -1553,7 +1567,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     return this.#executablePath;
   }
   id() {
-    return `browser-${this.#browserIdx}`;
+    return `browser-${this.#browserType}-${this.#browserIdx}`;
   }
   isConnected() {
     return this.#browser.isConnected();
@@ -1568,8 +1582,8 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     const version = await this.#browser.version();
     return version;
   }
-  _origBrowserContexts() {
-    return this.#browser.contexts();
+  _origBrowser() {
+    return this.#browser;
   }
 };
 
@@ -2048,7 +2062,7 @@ var PuppeteerPage = class extends EventEmitter4 {
     const currentTime = getCurrentUnixTime3();
     const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0, relatedId = 0, misc = {} } = pageInfo ? pageInfo : {};
     this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId, relatedId, misc };
-    this.#pageId = `page${browserIdx}-${browserContextIdx}-${pageIdx}`;
+    this.#pageId = `page-${browserIdx}-${browserContextIdx}-${pageIdx}`;
     this.#requestInterceptionNum = 0;
     this.#responseInterceptionNum = 0;
     this.#client = null;
@@ -2151,6 +2165,12 @@ var PuppeteerPage = class extends EventEmitter4 {
     const height = await this.#page.evaluate(() => document.documentElement.scrollHeight);
     return height;
   }
+  async evalute(fun, args) {
+    if (!this.#page) {
+      throw new Error("No valid page");
+    }
+    return this.#page.evaluate(fun, args);
+  }
   async findElement(selectorOrXpath, iframeOptions = []) {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -2631,6 +2651,9 @@ var PuppeteerPage = class extends EventEmitter4 {
     );
     return content;
   }
+  _origPage() {
+    return this.#page;
+  }
 };
 
 // src/puppeteer/context.ts
@@ -2718,7 +2741,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
             await lsdPage.setUserAgent(this.#userAgent);
           }
           this.#lsdPages.push(lsdPage);
-          loginfo6(`##browser ${lsdPage.id()} created`);
+          loginfo6(`##page ${lsdPage.id()} created`);
         }
       }
     });
@@ -2870,13 +2893,17 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
       throw new Error("No valid browserContext");
     }
     const { cookies, localStorage: localStorageOrigins } = stateData;
-    const page = await this.#browserContext.newPage();
+    const page = await this.getPage();
+    if (!page) {
+      return false;
+    }
+    const origPage = page._origPage();
     if (cookies.length > 0) {
-      await page.setCookie(...cookies);
+      await origPage.setCookie(...cookies);
     }
     if (localStorageOrigins.length > 0) {
-      await page.setRequestInterception(true);
-      page.on("request", (request) => {
+      await origPage.setRequestInterception(true);
+      origPage.on("request", (request) => {
         request.respond({
           status: 200,
           // contentType: "text/html; charset=utf-8", // "text/plain",
@@ -2885,15 +2912,16 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
       });
       for (const localStorageOrigin of localStorageOrigins) {
         const { origin, localStorage } = localStorageOrigin;
-        await page.goto(origin);
-        await page.evaluate((localStorageItems) => {
+        await origPage.goto(origin);
+        await origPage.evaluate((localStorageItems) => {
           for (const item of localStorageItems) {
             window.localStorage.setItem(item.name, item.value);
           }
         }, localStorage);
       }
     }
-    await page.close();
+    await origPage.setRequestInterception(false);
+    await page.free();
     return true;
   }
   _origBrowserContext() {
@@ -3057,8 +3085,8 @@ var PuppeteerBrowser = class extends EventEmitter6 {
     const version = await this.#browser.version();
     return version;
   }
-  _origBrowserContexts() {
-    return this.#browser.browserContexts();
+  _origBrowser() {
+    return this.#browser;
   }
 };
 
@@ -17046,6 +17074,9 @@ var CheerioPage = class extends EventEmitter7 {
       this.#document = load(html3, { xml: true }).root();
     }
   }
+  _origPage() {
+    throw new Error("Method not implemented.");
+  }
   apiRequestContext() {
     throw new Error("Not supported in CheerioPage.");
   }
@@ -17079,6 +17110,9 @@ var CheerioPage = class extends EventEmitter7 {
   async cookies() {
     throw new Error("Not supported in CheerioPage.");
   }
+  async evalute() {
+    throw new Error("Not supported in CheerioPage.");
+  }
   #findNodes(selector) {
     if (selector.startsWith("./") || selector.startsWith("/")) {
       throw new Error("Do not support XPath in cheerio.");

package/package.json

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