@midscene/web 0.8.9 → 0.8.10-beta-20241225120902.0

package/dist/es/chrome-extension.js

@@ -1945,33 +1945,11 @@ var scriptFileContent = async () => {
   }
   return import_node_fs3.default.readFileSync(scriptFileToRetrieve, "utf8");
 };
-var lastTwoCallTime = [0, 0];
-var callInterval = 1050;
-async function getScreenshotBase64FromWindowId(windowId) {
-  const activeWindow = await chrome.windows.getAll({ populate: true });
-  if (activeWindow.find((w) => w.id === windowId) === void 0) {
-    throw new Error(`Window with id ${windowId} is not active`);
-  }
-  const now = Date.now();
-  if (now - lastTwoCallTime[0] < callInterval) {
-    const sleepTime = callInterval - (now - lastTwoCallTime[0]);
-    console.warn(
-      `Sleep for ${sleepTime}ms to avoid too frequent screenshot calls`
-    );
-    await new Promise((resolve) => setTimeout(resolve, sleepTime));
-  }
-  const base64 = await chrome.tabs.captureVisibleTab(windowId, {
-    format: "jpeg",
-    quality: 70
-  });
-  lastTwoCallTime.shift();
-  lastTwoCallTime.push(Date.now());
-  return base64;
-}
 var ChromeExtensionProxyPage = class {
   constructor(tabId, windowId) {
     this.pageType = "chrome-extension-proxy";
     this.debuggerAttached = false;
+    this.attachingDebugger = null;
     this.mouse = {
       click: async (x, y) => {
         await this.sendCommandToDebugger("Input.dispatchMouseEvent", {
@@ -2026,14 +2004,25 @@ var ChromeExtensionProxyPage = class {
   async attachDebugger() {
     if (this.debuggerAttached)
       return;
-    await chrome.debugger.attach({ tabId: this.tabId }, "1.3");
-    this.debuggerAttached = true;
-    chrome.debugger.onEvent.addListener((source, method, params) => {
-      console.log("debugger event", source, method, params);
-      if (method === "Debugger.detached") {
-        this.debuggerAttached = false;
+    if (this.attachingDebugger) {
+      await this.attachingDebugger;
+      return;
+    }
+    this.attachingDebugger = (async () => {
+      try {
+        await chrome.debugger.attach({ tabId: this.tabId }, "1.3");
+        this.debuggerAttached = true;
+        chrome.debugger.onEvent.addListener((source, method, params) => {
+          console.log("debugger event", source, method, params);
+          if (method === "Debugger.detached") {
+            this.debuggerAttached = false;
+          }
+        });
+      } finally {
+        this.attachingDebugger = null;
       }
-    });
+    })();
+    await this.attachingDebugger;
   }
   async detachDebugger() {
     if (!this.debuggerAttached)
@@ -2073,23 +2062,24 @@ var ChromeExtensionProxyPage = class {
     }
     return returnValue.result.value;
   }
-  async rectOfNodeId(nodeId) {
-    try {
-      const { model } = await this.sendCommandToDebugger(
-        "DOM.getBoxModel",
-        { nodeId }
-      );
-      return {
-        left: model.border[0],
-        top: model.border[1],
-        width: model.border[2] - model.border[0],
-        height: model.border[5] - model.border[1]
-      };
-    } catch (error) {
-      console.error("Error getting box model for nodeId", nodeId, error);
-      return null;
-    }
-  }
+  // private async rectOfNodeId(nodeId: number): Promise<Rect | null> {
+  //   try {
+  //     const { model } =
+  //       await this.sendCommandToDebugger<CDPTypes.DOM.GetBoxModelResponse>(
+  //         'DOM.getBoxModel',
+  //         { nodeId },
+  //       );
+  //     return {
+  //       left: model.border[0],
+  //       top: model.border[1],
+  //       width: model.border[2] - model.border[0],
+  //       height: model.border[5] - model.border[1],
+  //     };
+  //   } catch (error) {
+  //     console.error('Error getting box model for nodeId', nodeId, error);
+  //     return null;
+  //   }
+  // }
   async getElementInfos() {
     const content = await this.getPageContentByCDP();
     if (content == null ? void 0 : content.size) {
@@ -2104,8 +2094,11 @@ var ChromeExtensionProxyPage = class {
     return content.size;
   }
   async screenshotBase64() {
-    const base64 = await getScreenshotBase64FromWindowId(this.windowId);
-    return base64;
+    const base64 = await this.sendCommandToDebugger("Page.captureScreenshot", {
+      format: "jpeg",
+      quality: 70
+    });
+    return `data:image/jpeg;base64,${base64.data}`;
   }
   async url() {
     const url = await chrome.tabs.get(this.tabId).then((tab) => tab.url);