@letsscrapedata/controller 0.0.32 → 0.0.34

package/dist/index.cjs

@@ -58,21 +58,10 @@ __export(src_exports, {
   PuppeteerBrowserContext: () => PuppeteerBrowserContext,
   PuppeteerElement: () => PuppeteerElement,
   PuppeteerPage: () => PuppeteerPage,
-  controller: () => controller,
-  defaultProxy: () => defaultProxy
+  controller: () => controller
 });
 module.exports = __toCommonJS(src_exports);
 
-// src/types/types.ts
-var defaultProxy = {
-  server: "default",
-  proxyIpType: "residential",
-  proxyDurationType: "static",
-  proxySharedType: "dedicated",
-  expireTime: 41024196e5
-  // "2100-01-01 01:00:00"
-};
-
 // src/playwright/browser.ts
 var import_node_events3 = __toESM(require("events"), 1);
 
@@ -588,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;
@@ -697,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");
@@ -1186,6 +1181,9 @@ var PlaywrightPage = class extends import_node_events.default {
     );
     return content;
   }
+  _origPage() {
+    return this.#page;
+  }
 };
 
 // src/playwright/context.ts
@@ -1234,7 +1232,7 @@ var PlaywrightBrowserContext = class extends import_node_events2.default {
     this.#browserContext = browserContext;
     this.#createTime = (0, import_utils3.getCurrentUnixTime)();
     this.#incognito = incognito === false ? false : true;
-    this.#proxy = proxy?.server ? proxy : null;
+    this.#proxy = proxy?.proxyUrl ? proxy : null;
     this.#maxPagesPerBrowserContext = maxPagesPerBrowserContext;
     this.#maxPageFreeSeconds = maxPageFreeSeconds;
     this.#maxViewportOfNewPage = maxViewportOfNewPage;
@@ -1255,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) => {
@@ -1407,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,
@@ -1422,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() {
@@ -1485,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`);
@@ -1494,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`);
@@ -1512,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) {
@@ -1543,7 +1546,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
     }
     const proxy = options?.proxy ? Object.assign({}, options.proxy) : this.#proxy;
     if (proxy) {
-      const { server, username, password } = proxy;
+      const { proxyUrl: server, username, password } = proxy;
       browserContextOptions.proxy = { server, username, password };
     }
     if (options?.userAgent) {
@@ -1583,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();
@@ -1598,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;
   }
 };
 
@@ -2078,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;
@@ -2181,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");
@@ -2661,6 +2670,9 @@ var PuppeteerPage = class extends import_node_events4.default {
     );
     return content;
   }
+  _origPage() {
+    return this.#page;
+  }
 };
 
 // src/puppeteer/context.ts
@@ -2719,7 +2731,7 @@ var PuppeteerBrowserContext = class extends import_node_events5.default {
     this.#userAgent = userAgent;
     this.#createTime = (0, import_utils7.getCurrentUnixTime)();
     this.#incognito = incognito === false ? false : true;
-    this.#proxy = proxy?.server ? proxy : null;
+    this.#proxy = proxy?.proxyUrl ? proxy : null;
     this.#maxPagesPerBrowserContext = maxPagesPerBrowserContext;
     this.#maxPageFreeSeconds = maxPageFreeSeconds;
     this.#maxViewportOfNewPage = maxViewportOfNewPage;
@@ -2748,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`);
         }
       }
     });
@@ -2900,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",
@@ -2915,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() {
@@ -3032,8 +3049,8 @@ var PuppeteerBrowser = class extends import_node_events6.default {
     }
     const browserContextOptions = {};
     const proxy = options?.proxy ? Object.assign({}, options.proxy) : this.#proxy;
-    if (proxy?.server) {
-      browserContextOptions.proxyServer = proxy.server;
+    if (proxy?.proxyUrl) {
+      browserContextOptions.proxyServer = proxy.proxyUrl;
     }
     const browserContext = await this.#browser.createBrowserContext(browserContextOptions);
     const userAgent = options?.userAgent ? options.userAgent : "";
@@ -3087,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;
   }
 };
 
@@ -17076,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.");
   }
@@ -17109,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.");
@@ -17390,8 +17413,9 @@ var LsdBrowserController = class _LsdBrowserController {
       if (maxWindowSize) {
         args.push("--start-maximized");
       }
-      if (proxy?.server && proxy.server !== "default") {
-        launchOptions.proxy = proxy;
+      if (proxy?.proxyUrl && proxy.proxyUrl !== "local") {
+        const { proxyUrl: server, username, password } = proxy;
+        launchOptions.proxy = { server, username, password };
       } else if (proxyPerBrowserContext && browserType === "chromium" && this.#osPlatform.startsWith("win")) {
         launchOptions.proxy = { server: "proxyPerBrowserContext" };
       }
@@ -17430,8 +17454,8 @@ var LsdBrowserController = class _LsdBrowserController {
         } else if (userDataDir) {
           args.push(`--user-data-dir=${userDataDir}`);
         }
-        if (proxy?.server && proxy.server !== "default") {
-          args.push(`--proxy-server=${proxy.server}`);
+        if (proxy?.proxyUrl && proxy.proxyUrl !== "default") {
+          args.push(`--proxy-server=${proxy.proxyUrl}`);
         } else if (proxyPerBrowserContext && browserType === "chromium" && this.#osPlatform.startsWith("win")) {
           args.push(`--proxy-server=proxyPerBrowserContext`);
         }
@@ -17504,6 +17528,5 @@ var controller = new LsdBrowserController();
   PuppeteerBrowserContext,
   PuppeteerElement,
   PuppeteerPage,
-  controller,
-  defaultProxy
+  controller
 });

package/dist/index.d.cts

@@ -17,22 +17,11 @@ type AllPage = Page | Page$1;
 type AllResponse = Response | HTTPResponse;
 type AllApiRequestContext = APIRequestContext;
 type CheerioNode = cheerio.Cheerio<cheerio.Element>;
-type Proxy = {
-    server: string;
+type ProxyInController = {
+    proxyUrl: string;
     username?: string;
     password?: string;
     proxyId?: string;
-    host?: string;
-    port?: number;
-    expireTime?: number;
-    proxyIpType?: string;
-    proxyDurationType?: string;
-    proxySharedType?: string;
-    latitude?: number;
-    longitude?: number;
-    freeable?: boolean;
-    interfaceName?: string;
-    packageName?: string;
 };
 type BrowserControllerType = "puppeteer" | "playwright";
 type BrowserCreationMethod = "launch" | "connect";
@@ -45,7 +34,6 @@ interface PlaywrightBrowserTypes {
 type BrowserControllerOptions = {
     browserControllerType: BrowserControllerType;
 };
-declare const defaultProxy: Proxy;
 interface BrowserOptions {
     /**
      * Interval between closing free pages (seconds) if greater than 0
@@ -76,7 +64,7 @@ interface BrowserOptions {
      * * this will used as default proxy when creating new browserContexts later
      * @default null
      */
-    proxy?: Proxy | null;
+    proxy?: ProxyInController | null;
     /**
      * Maximum time in milliseconds to wait for the browser instance to start. Pass 0 to disable timeout.
      * * default 30_000 (30 seconds)
@@ -143,7 +131,7 @@ interface LsdConnectOptions extends BrowserOptions {
     userAgent?: string;
 }
 type LsdBrowserContextOptions = {
-    proxy: Proxy | null;
+    proxy: ProxyInController | null;
     /**
      * @default browser.options.maxViewportOfNewPage
      */
@@ -154,7 +142,6 @@ type LsdBrowserContextOptions = {
      * * puppeteer: set when creating the new page in the browserContext
      */
     userAgent?: string;
-    fingerPrint: Object;
 };
 type PageStatus = "free" | "busy" | "closed";
 /**
@@ -784,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
@@ -794,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!
@@ -805,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
@@ -875,6 +876,10 @@ interface LsdPage extends EventEmitter {
      * @param stateData
      */
     setStateData(stateData: StateData): Promise<boolean>;
+    /**
+     * valid only in puppeteer
+     * @param userAgent
+     */
     setUserAgent(userAgent: string): Promise<boolean>;
     setViewportSize(viewPortSize: ViewportSize): Promise<boolean>;
     stateData(): Promise<StateData>;
@@ -902,6 +907,7 @@ interface LsdPage extends EventEmitter {
      * @param keys
      */
     windowMember(keys: string[]): Promise<string>;
+    _origPage(): AllPage;
 }
 interface LsdBrowserContext extends EventEmitter {
     browser(): LsdBrowser;
@@ -913,37 +919,51 @@ interface LsdBrowserContext extends EventEmitter {
      */
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
     /**
-     * 获取一个page供执行TE（可能从空闲的page中获取，也可能新建一个page）
-     * * TBD：需要预留pageQuota给需要capName的TE使用
+     * get a free page from current pages or by creating a new page
      */
     getPage(always?: boolean): Promise<LsdPage | null>;
     /**
-     * 是否可以获取新page（现有空闲的或新建page）
-     * @param pageNum default 1，需要的pages数量
+     * whether can get a number of free page(s)
+     * * refer to getPage()
+     * @param pageNum default 1, the number of free pages
      */
     hasNewPage(pageNum?: number): boolean;
     id(): string;
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
     pages(): LsdPage[];
-    proxy(): Proxy | null;
+    proxy(): ProxyInController | null;
     setStateData(stateData: StateData): Promise<boolean>;
     _origBrowserContext(): AllBrowserContext;
 }
 interface LsdBrowser extends EventEmitter {
     newBrowserContext(options?: LsdBrowserContextOptions): Promise<LsdBrowserContext | null>;
+    /**
+     * 1. launched: close all browserContexts and this browser
+     * 2. connected:
+     * * in puppeteer:  close all browserContexts and this browser???
+     * * in playwright: only browserContexts created by newContext will be closed, browser is disconnected and browser will not be closed
+     */
     close(): Promise<boolean>;
     browserContexts(): LsdBrowserContext[];
     browserControllerType(): BrowserControllerType;
     browserCreationMethod(): BrowserCreationMethod;
     browserType(): LsdBrowserType;
+    /**
+     * @returns
+     * 1. launched: actual executable path
+     * 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 {
     /**
@@ -1018,12 +1038,12 @@ 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 {
     #private;
-    constructor(lsdBrowser: LsdBrowser, browserContext: BrowserContext, incognito?: boolean, proxy?: Proxy | null, browserIdx?: number, browserContextIdx?: number, maxPagesPerBrowserContext?: number, maxPageFreeSeconds?: number, maxViewportOfNewPage?: boolean);
+    constructor(lsdBrowser: LsdBrowser, browserContext: BrowserContext, incognito?: boolean, proxy?: ProxyInController | null, browserIdx?: number, browserContextIdx?: number, maxPagesPerBrowserContext?: number, maxPageFreeSeconds?: number, maxViewportOfNewPage?: boolean);
     browser(): LsdBrowser;
     close(): Promise<boolean>;
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
@@ -1033,7 +1053,7 @@ declare class PlaywrightBrowserContext extends EventEmitter implements LsdBrowse
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
     pages(): LsdPage[];
-    proxy(): Proxy | null;
+    proxy(): ProxyInController | null;
     setStateData(stateData: StateData): Promise<boolean>;
     _origBrowserContext(): AllBrowserContext;
 }
@@ -1053,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>;
@@ -1088,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 {
@@ -1127,12 +1149,12 @@ 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 {
     #private;
-    constructor(lsdBrowser: LsdBrowser, browserContext: BrowserContext$1, incognito?: boolean, proxy?: Proxy | null, browserIdx?: number, browserContextIdx?: number, maxPagesPerBrowserContext?: number, maxPageFreeSeconds?: number, userAgent?: string, maxViewportOfNewPage?: boolean);
+    constructor(lsdBrowser: LsdBrowser, browserContext: BrowserContext$1, incognito?: boolean, proxy?: ProxyInController | null, browserIdx?: number, browserContextIdx?: number, maxPagesPerBrowserContext?: number, maxPageFreeSeconds?: number, userAgent?: string, maxViewportOfNewPage?: boolean);
     browser(): LsdBrowser;
     close(): Promise<boolean>;
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
@@ -1142,7 +1164,7 @@ declare class PuppeteerBrowserContext extends EventEmitter implements LsdBrowser
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
     pages(): LsdPage[];
-    proxy(): Proxy | null;
+    proxy(): ProxyInController | null;
     setStateData(stateData: StateData): Promise<boolean>;
     _origBrowserContext(): AllBrowserContext;
 }
@@ -1162,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>;
@@ -1197,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 {
@@ -1229,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;
@@ -1240,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>;
@@ -1310,4 +1336,4 @@ declare class LsdBrowserController implements LsdBrowserController$1 {
 }
 declare const controller: LsdBrowserController;
 
-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 };
+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 ProxyInController, 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 };

package/dist/index.d.ts

@@ -17,22 +17,11 @@ type AllPage = Page | Page$1;
 type AllResponse = Response | HTTPResponse;
 type AllApiRequestContext = APIRequestContext;
 type CheerioNode = cheerio.Cheerio<cheerio.Element>;
-type Proxy = {
-    server: string;
+type ProxyInController = {
+    proxyUrl: string;
     username?: string;
     password?: string;
     proxyId?: string;
-    host?: string;
-    port?: number;
-    expireTime?: number;
-    proxyIpType?: string;
-    proxyDurationType?: string;
-    proxySharedType?: string;
-    latitude?: number;
-    longitude?: number;
-    freeable?: boolean;
-    interfaceName?: string;
-    packageName?: string;
 };
 type BrowserControllerType = "puppeteer" | "playwright";
 type BrowserCreationMethod = "launch" | "connect";
@@ -45,7 +34,6 @@ interface PlaywrightBrowserTypes {
 type BrowserControllerOptions = {
     browserControllerType: BrowserControllerType;
 };
-declare const defaultProxy: Proxy;
 interface BrowserOptions {
     /**
      * Interval between closing free pages (seconds) if greater than 0
@@ -76,7 +64,7 @@ interface BrowserOptions {
      * * this will used as default proxy when creating new browserContexts later
      * @default null
      */
-    proxy?: Proxy | null;
+    proxy?: ProxyInController | null;
     /**
      * Maximum time in milliseconds to wait for the browser instance to start. Pass 0 to disable timeout.
      * * default 30_000 (30 seconds)
@@ -143,7 +131,7 @@ interface LsdConnectOptions extends BrowserOptions {
     userAgent?: string;
 }
 type LsdBrowserContextOptions = {
-    proxy: Proxy | null;
+    proxy: ProxyInController | null;
     /**
      * @default browser.options.maxViewportOfNewPage
      */
@@ -154,7 +142,6 @@ type LsdBrowserContextOptions = {
      * * puppeteer: set when creating the new page in the browserContext
      */
     userAgent?: string;
-    fingerPrint: Object;
 };
 type PageStatus = "free" | "busy" | "closed";
 /**
@@ -784,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
@@ -794,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!
@@ -805,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
@@ -875,6 +876,10 @@ interface LsdPage extends EventEmitter {
      * @param stateData
      */
     setStateData(stateData: StateData): Promise<boolean>;
+    /**
+     * valid only in puppeteer
+     * @param userAgent
+     */
     setUserAgent(userAgent: string): Promise<boolean>;
     setViewportSize(viewPortSize: ViewportSize): Promise<boolean>;
     stateData(): Promise<StateData>;
@@ -902,6 +907,7 @@ interface LsdPage extends EventEmitter {
      * @param keys
      */
     windowMember(keys: string[]): Promise<string>;
+    _origPage(): AllPage;
 }
 interface LsdBrowserContext extends EventEmitter {
     browser(): LsdBrowser;
@@ -913,37 +919,51 @@ interface LsdBrowserContext extends EventEmitter {
      */
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
     /**
-     * 获取一个page供执行TE（可能从空闲的page中获取，也可能新建一个page）
-     * * TBD：需要预留pageQuota给需要capName的TE使用
+     * get a free page from current pages or by creating a new page
      */
     getPage(always?: boolean): Promise<LsdPage | null>;
     /**
-     * 是否可以获取新page（现有空闲的或新建page）
-     * @param pageNum default 1，需要的pages数量
+     * whether can get a number of free page(s)
+     * * refer to getPage()
+     * @param pageNum default 1, the number of free pages
      */
     hasNewPage(pageNum?: number): boolean;
     id(): string;
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
     pages(): LsdPage[];
-    proxy(): Proxy | null;
+    proxy(): ProxyInController | null;
     setStateData(stateData: StateData): Promise<boolean>;
     _origBrowserContext(): AllBrowserContext;
 }
 interface LsdBrowser extends EventEmitter {
     newBrowserContext(options?: LsdBrowserContextOptions): Promise<LsdBrowserContext | null>;
+    /**
+     * 1. launched: close all browserContexts and this browser
+     * 2. connected:
+     * * in puppeteer:  close all browserContexts and this browser???
+     * * in playwright: only browserContexts created by newContext will be closed, browser is disconnected and browser will not be closed
+     */
     close(): Promise<boolean>;
     browserContexts(): LsdBrowserContext[];
     browserControllerType(): BrowserControllerType;
     browserCreationMethod(): BrowserCreationMethod;
     browserType(): LsdBrowserType;
+    /**
+     * @returns
+     * 1. launched: actual executable path
+     * 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 {
     /**
@@ -1018,12 +1038,12 @@ 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 {
     #private;
-    constructor(lsdBrowser: LsdBrowser, browserContext: BrowserContext, incognito?: boolean, proxy?: Proxy | null, browserIdx?: number, browserContextIdx?: number, maxPagesPerBrowserContext?: number, maxPageFreeSeconds?: number, maxViewportOfNewPage?: boolean);
+    constructor(lsdBrowser: LsdBrowser, browserContext: BrowserContext, incognito?: boolean, proxy?: ProxyInController | null, browserIdx?: number, browserContextIdx?: number, maxPagesPerBrowserContext?: number, maxPageFreeSeconds?: number, maxViewportOfNewPage?: boolean);
     browser(): LsdBrowser;
     close(): Promise<boolean>;
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
@@ -1033,7 +1053,7 @@ declare class PlaywrightBrowserContext extends EventEmitter implements LsdBrowse
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
     pages(): LsdPage[];
-    proxy(): Proxy | null;
+    proxy(): ProxyInController | null;
     setStateData(stateData: StateData): Promise<boolean>;
     _origBrowserContext(): AllBrowserContext;
 }
@@ -1053,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>;
@@ -1088,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 {
@@ -1127,12 +1149,12 @@ 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 {
     #private;
-    constructor(lsdBrowser: LsdBrowser, browserContext: BrowserContext$1, incognito?: boolean, proxy?: Proxy | null, browserIdx?: number, browserContextIdx?: number, maxPagesPerBrowserContext?: number, maxPageFreeSeconds?: number, userAgent?: string, maxViewportOfNewPage?: boolean);
+    constructor(lsdBrowser: LsdBrowser, browserContext: BrowserContext$1, incognito?: boolean, proxy?: ProxyInController | null, browserIdx?: number, browserContextIdx?: number, maxPagesPerBrowserContext?: number, maxPageFreeSeconds?: number, userAgent?: string, maxViewportOfNewPage?: boolean);
     browser(): LsdBrowser;
     close(): Promise<boolean>;
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
@@ -1142,7 +1164,7 @@ declare class PuppeteerBrowserContext extends EventEmitter implements LsdBrowser
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
     pages(): LsdPage[];
-    proxy(): Proxy | null;
+    proxy(): ProxyInController | null;
     setStateData(stateData: StateData): Promise<boolean>;
     _origBrowserContext(): AllBrowserContext;
 }
@@ -1162,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>;
@@ -1197,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 {
@@ -1229,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;
@@ -1240,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>;
@@ -1310,4 +1336,4 @@ declare class LsdBrowserController implements LsdBrowserController$1 {
 }
 declare const controller: LsdBrowserController;
 
-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 };
+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 ProxyInController, 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 };

package/dist/index.js

@@ -43,16 +43,6 @@ var require_boolbase = __commonJS({
   }
 });
 
-// src/types/types.ts
-var defaultProxy = {
-  server: "default",
-  proxyIpType: "residential",
-  proxyDurationType: "static",
-  proxySharedType: "dedicated",
-  expireTime: 41024196e5
-  // "2100-01-01 01:00:00"
-};
-
 // src/playwright/browser.ts
 import EventEmitter3 from "events";
 
@@ -568,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;
@@ -677,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");
@@ -1166,6 +1162,9 @@ var PlaywrightPage = class extends EventEmitter {
     );
     return content;
   }
+  _origPage() {
+    return this.#page;
+  }
 };
 
 // src/playwright/context.ts
@@ -1214,7 +1213,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
     this.#browserContext = browserContext;
     this.#createTime = getCurrentUnixTime2();
     this.#incognito = incognito === false ? false : true;
-    this.#proxy = proxy?.server ? proxy : null;
+    this.#proxy = proxy?.proxyUrl ? proxy : null;
     this.#maxPagesPerBrowserContext = maxPagesPerBrowserContext;
     this.#maxPageFreeSeconds = maxPageFreeSeconds;
     this.#maxViewportOfNewPage = maxViewportOfNewPage;
@@ -1235,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) => {
@@ -1387,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,
@@ -1402,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() {
@@ -1465,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`);
@@ -1474,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`);
@@ -1492,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) {
@@ -1523,7 +1527,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     }
     const proxy = options?.proxy ? Object.assign({}, options.proxy) : this.#proxy;
     if (proxy) {
-      const { server, username, password } = proxy;
+      const { proxyUrl: server, username, password } = proxy;
       browserContextOptions.proxy = { server, username, password };
     }
     if (options?.userAgent) {
@@ -1563,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();
@@ -1578,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;
   }
 };
 
@@ -2058,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;
@@ -2161,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");
@@ -2641,6 +2651,9 @@ var PuppeteerPage = class extends EventEmitter4 {
     );
     return content;
   }
+  _origPage() {
+    return this.#page;
+  }
 };
 
 // src/puppeteer/context.ts
@@ -2699,7 +2712,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
     this.#userAgent = userAgent;
     this.#createTime = getCurrentUnixTime4();
     this.#incognito = incognito === false ? false : true;
-    this.#proxy = proxy?.server ? proxy : null;
+    this.#proxy = proxy?.proxyUrl ? proxy : null;
     this.#maxPagesPerBrowserContext = maxPagesPerBrowserContext;
     this.#maxPageFreeSeconds = maxPageFreeSeconds;
     this.#maxViewportOfNewPage = maxViewportOfNewPage;
@@ -2728,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`);
         }
       }
     });
@@ -2880,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",
@@ -2895,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() {
@@ -3012,8 +3030,8 @@ var PuppeteerBrowser = class extends EventEmitter6 {
     }
     const browserContextOptions = {};
     const proxy = options?.proxy ? Object.assign({}, options.proxy) : this.#proxy;
-    if (proxy?.server) {
-      browserContextOptions.proxyServer = proxy.server;
+    if (proxy?.proxyUrl) {
+      browserContextOptions.proxyServer = proxy.proxyUrl;
     }
     const browserContext = await this.#browser.createBrowserContext(browserContextOptions);
     const userAgent = options?.userAgent ? options.userAgent : "";
@@ -3067,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;
   }
 };
 
@@ -17056,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.");
   }
@@ -17089,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.");
@@ -17370,8 +17394,9 @@ var LsdBrowserController = class _LsdBrowserController {
       if (maxWindowSize) {
         args.push("--start-maximized");
       }
-      if (proxy?.server && proxy.server !== "default") {
-        launchOptions.proxy = proxy;
+      if (proxy?.proxyUrl && proxy.proxyUrl !== "local") {
+        const { proxyUrl: server, username, password } = proxy;
+        launchOptions.proxy = { server, username, password };
       } else if (proxyPerBrowserContext && browserType === "chromium" && this.#osPlatform.startsWith("win")) {
         launchOptions.proxy = { server: "proxyPerBrowserContext" };
       }
@@ -17410,8 +17435,8 @@ var LsdBrowserController = class _LsdBrowserController {
         } else if (userDataDir) {
           args.push(`--user-data-dir=${userDataDir}`);
         }
-        if (proxy?.server && proxy.server !== "default") {
-          args.push(`--proxy-server=${proxy.server}`);
+        if (proxy?.proxyUrl && proxy.proxyUrl !== "default") {
+          args.push(`--proxy-server=${proxy.proxyUrl}`);
         } else if (proxyPerBrowserContext && browserType === "chromium" && this.#osPlatform.startsWith("win")) {
           args.push(`--proxy-server=proxyPerBrowserContext`);
         }
@@ -17483,6 +17508,5 @@ export {
   PuppeteerBrowserContext,
   PuppeteerElement,
   PuppeteerPage,
-  controller,
-  defaultProxy
+  controller
 };

package/package.json

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