@letsscrapedata/controller 0.0.5 → 0.0.7

package/dist/index.cjs

@@ -233,9 +233,15 @@ var PlaywrightElement = class _PlaywrightElement {
     return text3 ? text3 : "";
   }
   async click(options = {}) {
-    const { button, clickCount: count, delay, position: offset } = options;
+    const { button, clickCount: count, delay, position: offset, clickType = "click" } = options;
     const actOptions = { button, count, delay, offset };
-    await this.#locator.click(actOptions);
+    if (clickType === "click") {
+      await this.#locator.click(actOptions);
+    } else if (clickType === "evaluate") {
+      await this.#locator.evaluate(async (ev) => await ev.click());
+    } else {
+      (0, import_utils.unreachable)(clickType);
+    }
     return true;
   }
   async focus() {
@@ -527,8 +533,8 @@ var PlaywrightPage = class extends import_node_events.default {
     this.#page = page;
     this.#status = "free";
     const currentTime = (0, import_utils2.getCurrentUnixTime)();
-    const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0, relatedId = 0 } = pageInfo ? pageInfo : {};
-    this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId, relatedId, misc: {} };
+    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.#resquestInterceptionOptions = [];
     this.#responseInterceptionOptions = [];
@@ -1650,9 +1656,16 @@ var PuppeteerElement = class _PuppeteerElement {
     return text3 ? text3 : "";
   }
   async click(options = {}) {
-    const { button, clickCount: count, delay, position: offset } = options;
+    const { button, clickCount: count, delay, position: offset, clickType = "click" } = options;
     const actOptions = { button, count, delay, offset };
-    await this.#$ele.click(actOptions);
+    if (clickType === "click") {
+      await this.#$ele.click(actOptions);
+    } else if (clickType === "evaluate") {
+      await this.#frame.evaluate(async (ev) => await ev.click(), this.#$ele);
+      await this.#$ele.click(actOptions);
+    } else {
+      (0, import_utils5.unreachable)(clickType);
+    }
     return true;
   }
   async focus() {
@@ -1947,8 +1960,8 @@ var PuppeteerPage = class extends import_node_events4.default {
     this.#page = page;
     this.#status = "free";
     const currentTime = (0, import_utils6.getCurrentUnixTime)();
-    const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0, relatedId = 0 } = pageInfo ? pageInfo : {};
-    this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId, relatedId, misc: {} };
+    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.#requestInterceptionNum = 0;
     this.#responseInterceptionNum = 0;

package/dist/index.d.cts

@@ -222,6 +222,7 @@ interface PageExtInPuppeteer extends Page$1 {
 interface PageExtInPlaywright extends Page {
     pageInfo?: PageInfo;
 }
+type MouseClickType = "click" | "evaluate";
 interface MouseClickOptions {
     /**
      * Which button will be pressed.
@@ -252,6 +253,10 @@ interface MouseClickOptions {
      * * puppeteer: not supported, ignored
      */
     modifiers?: Array<"Alt" | "Control" | "Meta" | "Shift">;
+    /**
+     * @default click
+     */
+    clickType?: MouseClickType;
 }
 interface SelectOptions {
     /**
@@ -1211,4 +1216,4 @@ declare class CheerioElement implements LsdElement {
     scrollIntoView(): Promise<boolean>;
 }
 
-export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, PlaywrightElement, PlaywrightPage, type Proxy, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, defaultProxy };
+export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController, 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, PlaywrightElement, PlaywrightPage, type Proxy, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, defaultProxy };

package/dist/index.d.ts

@@ -222,6 +222,7 @@ interface PageExtInPuppeteer extends Page$1 {
 interface PageExtInPlaywright extends Page {
     pageInfo?: PageInfo;
 }
+type MouseClickType = "click" | "evaluate";
 interface MouseClickOptions {
     /**
      * Which button will be pressed.
@@ -252,6 +253,10 @@ interface MouseClickOptions {
      * * puppeteer: not supported, ignored
      */
     modifiers?: Array<"Alt" | "Control" | "Meta" | "Shift">;
+    /**
+     * @default click
+     */
+    clickType?: MouseClickType;
 }
 interface SelectOptions {
     /**
@@ -1211,4 +1216,4 @@ declare class CheerioElement implements LsdElement {
     scrollIntoView(): Promise<boolean>;
 }
 
-export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, PlaywrightElement, PlaywrightPage, type Proxy, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, defaultProxy };
+export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController, 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, PlaywrightElement, PlaywrightPage, type Proxy, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, defaultProxy };

package/dist/index.js

@@ -214,9 +214,15 @@ var PlaywrightElement = class _PlaywrightElement {
     return text3 ? text3 : "";
   }
   async click(options = {}) {
-    const { button, clickCount: count, delay, position: offset } = options;
+    const { button, clickCount: count, delay, position: offset, clickType = "click" } = options;
     const actOptions = { button, count, delay, offset };
-    await this.#locator.click(actOptions);
+    if (clickType === "click") {
+      await this.#locator.click(actOptions);
+    } else if (clickType === "evaluate") {
+      await this.#locator.evaluate(async (ev) => await ev.click());
+    } else {
+      unreachable(clickType);
+    }
     return true;
   }
   async focus() {
@@ -508,8 +514,8 @@ var PlaywrightPage = class extends EventEmitter {
     this.#page = page;
     this.#status = "free";
     const currentTime = getCurrentUnixTime();
-    const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0, relatedId = 0 } = pageInfo ? pageInfo : {};
-    this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId, relatedId, misc: {} };
+    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.#resquestInterceptionOptions = [];
     this.#responseInterceptionOptions = [];
@@ -1631,9 +1637,16 @@ var PuppeteerElement = class _PuppeteerElement {
     return text3 ? text3 : "";
   }
   async click(options = {}) {
-    const { button, clickCount: count, delay, position: offset } = options;
+    const { button, clickCount: count, delay, position: offset, clickType = "click" } = options;
     const actOptions = { button, count, delay, offset };
-    await this.#$ele.click(actOptions);
+    if (clickType === "click") {
+      await this.#$ele.click(actOptions);
+    } else if (clickType === "evaluate") {
+      await this.#frame.evaluate(async (ev) => await ev.click(), this.#$ele);
+      await this.#$ele.click(actOptions);
+    } else {
+      unreachable3(clickType);
+    }
     return true;
   }
   async focus() {
@@ -1928,8 +1941,8 @@ var PuppeteerPage = class extends EventEmitter4 {
     this.#page = page;
     this.#status = "free";
     const currentTime = getCurrentUnixTime3();
-    const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0, relatedId = 0 } = pageInfo ? pageInfo : {};
-    this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId, relatedId, misc: {} };
+    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.#requestInterceptionNum = 0;
     this.#responseInterceptionNum = 0;

package/package.json

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