@midscene/android 0.22.1-beta-20250717053953.0 → 0.22.1

package/dist/es/index.js

@@ -1,5 +1,6 @@
 // src/page/index.ts
 import assert from "assert";
+import { randomUUID } from "crypto";
 import fs from "fs";
 import path from "path";
 import { getAIConfig } from "@midscene/core";
@@ -14,7 +15,6 @@ import { isValidPNGImageBuffer, resizeImg } from "@midscene/shared/img";
 import { getDebug } from "@midscene/shared/logger";
 import { repeat } from "@midscene/shared/utils";
 import { ADB } from "appium-adb";
-var androidScreenshotPath = "/data/local/tmp/midscene_screenshot.png";
 var defaultScrollUntilTimes = 10;
 var defaultFastScrollDuration = 100;
 var defaultNormalScrollDuration = 1e3;
@@ -239,34 +239,32 @@ ${Object.keys(size).filter((key) => size[key]).map(
     const { width, height } = await this.size();
     const adb = await this.getAdb();
     let screenshotBuffer;
+    const androidScreenshotPath = `/data/local/tmp/midscene_screenshot_${randomUUID()}.png`;
     try {
-      const screenshotPath = getTmpFile("png");
-      await this.forceScreenshot(androidScreenshotPath);
-      await adb.pull(androidScreenshotPath, screenshotPath);
-      screenshotBuffer = await fs.promises.readFile(screenshotPath);
+      screenshotBuffer = await adb.takeScreenshot(null);
+      if (!screenshotBuffer) {
+        throw new Error(
+          "Failed to capture screenshot: screenshotBuffer is null"
+        );
+      }
+      if (!isValidPNGImageBuffer(screenshotBuffer)) {
+        debugPage("Invalid image buffer detected: not a valid image format");
+        throw new Error(
+          "Screenshot buffer has invalid format: could not find valid image signature"
+        );
+      }
     } catch (error) {
+      const screenshotPath = getTmpFile("png");
       try {
-        screenshotBuffer = await adb.takeScreenshot(null);
-        if (!screenshotBuffer) {
-          throw new Error(
-            "Failed to capture screenshot: screenshotBuffer is null"
-          );
-        }
-        if (!isValidPNGImageBuffer(screenshotBuffer)) {
-          debugPage("Invalid image buffer detected: not a valid image format");
-          throw new Error(
-            "Screenshot buffer has invalid format: could not find valid image signature"
-          );
-        }
-      } catch (fallbackError) {
-        const screenshotPath = getTmpFile("png");
         try {
           await adb.shell(`screencap -p ${androidScreenshotPath}`);
         } catch (error2) {
-          throw new Error("All screenshot methods failed");
+          await this.forceScreenshot(androidScreenshotPath);
         }
         await adb.pull(androidScreenshotPath, screenshotPath);
         screenshotBuffer = await fs.promises.readFile(screenshotPath);
+      } finally {
+        await adb.shell(`rm -f ${androidScreenshotPath}`);
       }
     }
     const resizedScreenshotBuffer = await resizeImg(screenshotBuffer, {
@@ -526,7 +524,6 @@ ${Object.keys(size).filter((key) => size[key]).map(
     this.destroyed = true;
     try {
       if (this.adb) {
-        await this.adb.shell(`rm -f ${androidScreenshotPath}`);
         this.adb = null;
       }
     } catch (error) {

package/dist/lib/index.js

@@ -40,6 +40,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/page/index.ts
 var import_node_assert = __toESM(require("assert"));
+var import_node_crypto = require("crypto");
 var import_node_fs = __toESM(require("fs"));
 var import_node_path = __toESM(require("path"));
 var import_core = require("@midscene/core");
@@ -49,7 +50,6 @@ var import_img = require("@midscene/shared/img");
 var import_logger = require("@midscene/shared/logger");
 var import_utils2 = require("@midscene/shared/utils");
 var import_appium_adb = require("appium-adb");
-var androidScreenshotPath = "/data/local/tmp/midscene_screenshot.png";
 var defaultScrollUntilTimes = 10;
 var defaultFastScrollDuration = 100;
 var defaultNormalScrollDuration = 1e3;
@@ -274,34 +274,32 @@ ${Object.keys(size).filter((key) => size[key]).map(
     const { width, height } = await this.size();
     const adb = await this.getAdb();
     let screenshotBuffer;
+    const androidScreenshotPath = `/data/local/tmp/midscene_screenshot_${(0, import_node_crypto.randomUUID)()}.png`;
     try {
-      const screenshotPath = (0, import_utils.getTmpFile)("png");
-      await this.forceScreenshot(androidScreenshotPath);
-      await adb.pull(androidScreenshotPath, screenshotPath);
-      screenshotBuffer = await import_node_fs.default.promises.readFile(screenshotPath);
+      screenshotBuffer = await adb.takeScreenshot(null);
+      if (!screenshotBuffer) {
+        throw new Error(
+          "Failed to capture screenshot: screenshotBuffer is null"
+        );
+      }
+      if (!(0, import_img.isValidPNGImageBuffer)(screenshotBuffer)) {
+        debugPage("Invalid image buffer detected: not a valid image format");
+        throw new Error(
+          "Screenshot buffer has invalid format: could not find valid image signature"
+        );
+      }
     } catch (error) {
+      const screenshotPath = (0, import_utils.getTmpFile)("png");
       try {
-        screenshotBuffer = await adb.takeScreenshot(null);
-        if (!screenshotBuffer) {
-          throw new Error(
-            "Failed to capture screenshot: screenshotBuffer is null"
-          );
-        }
-        if (!(0, import_img.isValidPNGImageBuffer)(screenshotBuffer)) {
-          debugPage("Invalid image buffer detected: not a valid image format");
-          throw new Error(
-            "Screenshot buffer has invalid format: could not find valid image signature"
-          );
-        }
-      } catch (fallbackError) {
-        const screenshotPath = (0, import_utils.getTmpFile)("png");
         try {
           await adb.shell(`screencap -p ${androidScreenshotPath}`);
         } catch (error2) {
-          throw new Error("All screenshot methods failed");
+          await this.forceScreenshot(androidScreenshotPath);
         }
         await adb.pull(androidScreenshotPath, screenshotPath);
         screenshotBuffer = await import_node_fs.default.promises.readFile(screenshotPath);
+      } finally {
+        await adb.shell(`rm -f ${androidScreenshotPath}`);
       }
     }
     const resizedScreenshotBuffer = await (0, import_img.resizeImg)(screenshotBuffer, {
@@ -561,7 +559,6 @@ ${Object.keys(size).filter((key) => size[key]).map(
     this.destroyed = true;
     try {
       if (this.adb) {
-        await this.adb.shell(`rm -f ${androidScreenshotPath}`);
         this.adb = null;
       }
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "0.22.1-beta-20250717053953.0",
+  "version": "0.22.1",
   "description": "Android automation library for Midscene",
   "keywords": [
     "Android UI automation",
@@ -24,9 +24,9 @@
   },
   "dependencies": {
     "appium-adb": "12.12.1",
-    "@midscene/shared": "0.22.1-beta-20250717053953.0",
-    "@midscene/core": "0.22.1-beta-20250717053953.0",
-    "@midscene/web": "0.22.1-beta-20250717053953.0"
+    "@midscene/core": "0.22.1",
+    "@midscene/web": "0.22.1",
+    "@midscene/shared": "0.22.1"
   },
   "devDependencies": {
     "@modern-js/module-tools": "2.60.6",