@letsscrapedata/controller 0.0.31 → 0.0.33

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);
 
@@ -179,8 +168,8 @@ var PlaywrightElement = class _PlaywrightElement {
     }
     try {
       let locators = [];
-      if (selector.startsWith("./") || selector.startsWith("/")) {
-        locators = await parent2.locator(selector).all();
+      if (selector.startsWith("./") || selector.startsWith("/") || selector.startsWith("..")) {
+        locators = await parent2.locator(`xpath=${selector}`).all();
       } else {
         if (selector !== ".") {
           locators = await parent2.locator(selector).all();
@@ -524,8 +513,8 @@ var PlaywrightPage = class extends import_node_events.default {
     }
     try {
       let locators = [];
-      if (selector.startsWith("./") || selector.startsWith("/")) {
-        locators = await frame.locator(selector).all();
+      if (selector.startsWith("./") || selector.startsWith("/") || selector.startsWith("..")) {
+        locators = await frame.locator(`xpath=${selector}`).all();
       } else {
         if (selector !== ".") {
           locators = await frame.locator(selector).all();
@@ -1234,7 +1223,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;
@@ -1543,7 +1532,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) {
@@ -1687,11 +1676,13 @@ var PuppeteerElement = class _PuppeteerElement {
         return retObj;
       }
       retObj.frame = frame;
+      absolute = true;
       parent2 = frame;
     }
     try {
-      if (selector.startsWith("./") || selector.startsWith("/")) {
-        retObj.elementHandles = await parent2.$$(selector);
+      if (selector.startsWith("./") || selector.startsWith("/") || selector.startsWith("..")) {
+        const newSelector = !absolute && selector.startsWith("/") ? `.${selector}` : selector;
+        retObj.elementHandles = await parent2.$$(`::-p-xpath(${newSelector})`);
       } else {
         if (selector !== ".") {
           retObj.elementHandles = await parent2.$$(selector);
@@ -2013,8 +2004,8 @@ var PuppeteerPage = class extends import_node_events4.default {
       retObj.frame = frame;
     }
     try {
-      if (selector.startsWith("./") || selector.startsWith("/")) {
-        retObj.elementHandles = await frame.$$(selector);
+      if (selector.startsWith("./") || selector.startsWith("/") || selector.startsWith("..")) {
+        retObj.elementHandles = await frame.$$(`::-p-xpath(${selector})`);
       } else {
         if (selector !== ".") {
           retObj.elementHandles = await frame.$$(selector);
@@ -2717,7 +2708,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;
@@ -3030,8 +3021,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 : "";
@@ -17388,8 +17379,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" };
       }
@@ -17428,8 +17420,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`);
         }
@@ -17502,6 +17494,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";
 /**
@@ -875,6 +862,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>;
@@ -913,30 +904,41 @@ 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;
     id(): string;
     isConnected(): boolean;
@@ -1023,7 +1025,7 @@ declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
 
 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 +1035,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;
 }
@@ -1132,7 +1134,7 @@ declare class PuppeteerBrowser extends EventEmitter implements LsdBrowser {
 
 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 +1144,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;
 }
@@ -1310,4 +1312,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";
 /**
@@ -875,6 +862,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>;
@@ -913,30 +904,41 @@ 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;
     id(): string;
     isConnected(): boolean;
@@ -1023,7 +1025,7 @@ declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
 
 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 +1035,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;
 }
@@ -1132,7 +1134,7 @@ declare class PuppeteerBrowser extends EventEmitter implements LsdBrowser {
 
 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 +1144,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;
 }
@@ -1310,4 +1312,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";
 
@@ -159,8 +149,8 @@ var PlaywrightElement = class _PlaywrightElement {
     }
     try {
       let locators = [];
-      if (selector.startsWith("./") || selector.startsWith("/")) {
-        locators = await parent2.locator(selector).all();
+      if (selector.startsWith("./") || selector.startsWith("/") || selector.startsWith("..")) {
+        locators = await parent2.locator(`xpath=${selector}`).all();
       } else {
         if (selector !== ".") {
           locators = await parent2.locator(selector).all();
@@ -504,8 +494,8 @@ var PlaywrightPage = class extends EventEmitter {
     }
     try {
       let locators = [];
-      if (selector.startsWith("./") || selector.startsWith("/")) {
-        locators = await frame.locator(selector).all();
+      if (selector.startsWith("./") || selector.startsWith("/") || selector.startsWith("..")) {
+        locators = await frame.locator(`xpath=${selector}`).all();
       } else {
         if (selector !== ".") {
           locators = await frame.locator(selector).all();
@@ -1214,7 +1204,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;
@@ -1523,7 +1513,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) {
@@ -1667,11 +1657,13 @@ var PuppeteerElement = class _PuppeteerElement {
         return retObj;
       }
       retObj.frame = frame;
+      absolute = true;
       parent2 = frame;
     }
     try {
-      if (selector.startsWith("./") || selector.startsWith("/")) {
-        retObj.elementHandles = await parent2.$$(selector);
+      if (selector.startsWith("./") || selector.startsWith("/") || selector.startsWith("..")) {
+        const newSelector = !absolute && selector.startsWith("/") ? `.${selector}` : selector;
+        retObj.elementHandles = await parent2.$$(`::-p-xpath(${newSelector})`);
       } else {
         if (selector !== ".") {
           retObj.elementHandles = await parent2.$$(selector);
@@ -1993,8 +1985,8 @@ var PuppeteerPage = class extends EventEmitter4 {
       retObj.frame = frame;
     }
     try {
-      if (selector.startsWith("./") || selector.startsWith("/")) {
-        retObj.elementHandles = await frame.$$(selector);
+      if (selector.startsWith("./") || selector.startsWith("/") || selector.startsWith("..")) {
+        retObj.elementHandles = await frame.$$(`::-p-xpath(${selector})`);
       } else {
         if (selector !== ".") {
           retObj.elementHandles = await frame.$$(selector);
@@ -2697,7 +2689,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;
@@ -3010,8 +3002,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 : "";
@@ -17368,8 +17360,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" };
       }
@@ -17408,8 +17401,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`);
         }
@@ -17481,6 +17474,5 @@ export {
   PuppeteerBrowserContext,
   PuppeteerElement,
   PuppeteerPage,
-  controller,
-  defaultProxy
+  controller
 };

package/package.json

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