@midscene/android 0.29.5 → 0.29.7-beta-20250930025459.0

package/dist/es/index.mjs

@@ -6,7 +6,7 @@ import { getMidsceneLocationSchema, z } from "@midscene/core";
 import { defineAction, defineActionDoubleClick, defineActionDragAndDrop, defineActionKeyboardPress, defineActionScroll, defineActionTap } from "@midscene/core/device";
 import { getTmpFile, sleep } from "@midscene/core/utils";
 import { MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT, MIDSCENE_ANDROID_IME_STRATEGY, globalConfigManager, overrideAIConfig } from "@midscene/shared/env";
-import { createImgBase64ByFormat, isValidPNGImageBuffer, resizeAndConvertImgBuffer } from "@midscene/shared/img";
+import { createImgBase64ByFormat, isValidPNGImageBuffer } from "@midscene/shared/img";
 import { getDebug } from "@midscene/shared/logger";
 import { repeat, uuid } from "@midscene/shared/utils";
 import { ADB } from "appium-adb";
@@ -353,6 +353,13 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         };
         throw new Error(`Failed to get screen size, output: ${stdout}`);
     }
+    async initializeDevicePixelRatio() {
+        if (this.devicePixelRatioInitialized) return;
+        const densityNum = await this.getDisplayDensity();
+        this.devicePixelRatio = Number(densityNum) / 160;
+        debugDevice(`Initialized device pixel ratio: ${this.devicePixelRatio}`);
+        this.devicePixelRatioInitialized = true;
+    }
     async getDisplayDensity() {
         var _this_options;
         const adb = await this.getAdb();
@@ -415,15 +422,15 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         return orientation;
     }
     async size() {
+        await this.initializeDevicePixelRatio();
         const screenSize = await this.getScreenSize();
         const match = (screenSize.override || screenSize.physical).match(/(\d+)x(\d+)/);
         if (!match || match.length < 3) throw new Error(`Unable to parse screen size: ${screenSize}`);
         const isLandscape = 1 === screenSize.orientation || 3 === screenSize.orientation;
         const width = Number.parseInt(match[isLandscape ? 2 : 1], 10);
         const height = Number.parseInt(match[isLandscape ? 1 : 2], 10);
-        const densityNum = await this.getDisplayDensity();
-        this.devicePixelRatio = Number(densityNum) / 160;
-        const { x: logicalWidth, y: logicalHeight } = this.reverseAdjustCoordinates(width, height);
+        const logicalWidth = Math.round(width / this.devicePixelRatio);
+        const logicalHeight = Math.round(height / this.devicePixelRatio);
         return {
             width: logicalWidth,
             height: logicalHeight,
@@ -437,13 +444,6 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             y: Math.round(y * ratio)
         };
     }
-    reverseAdjustCoordinates(x, y) {
-        const ratio = this.devicePixelRatio;
-        return {
-            x: Math.round(x / ratio),
-            y: Math.round(y / ratio)
-        };
-    }
     calculateScrollEndPoint(start, deltaX, deltaY, maxWidth, maxHeight) {
         const minScrollDistance = 50;
         let actualScrollDistanceX = 0;
@@ -470,7 +470,6 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async screenshotBase64() {
         var _this_options;
         debugDevice('screenshotBase64 begin');
-        const { width, height } = await this.size();
         const adb = await this.getAdb();
         let screenshotBuffer;
         const androidScreenshotPath = `/data/local/tmp/midscene_screenshot_${uuid()}.png`;
@@ -512,14 +511,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 await adb.shell(`rm ${androidScreenshotPath}`);
             }
         }
-        debugDevice('Resizing screenshot image');
-        const { buffer, format } = await resizeAndConvertImgBuffer('png', screenshotBuffer, {
-            width,
-            height
-        });
-        debugDevice('Image resize completed');
         debugDevice('Converting to base64');
-        const result = createImgBase64ByFormat(format, buffer.toString('base64'));
+        const result = createImgBase64ByFormat('png', screenshotBuffer.toString('base64'));
         debugDevice('screenshotBase64 end');
         return result;
     }
@@ -905,6 +898,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         _define_property(this, "deviceId", void 0);
         _define_property(this, "yadbPushed", false);
         _define_property(this, "devicePixelRatio", 1);
+        _define_property(this, "devicePixelRatioInitialized", false);
         _define_property(this, "adb", null);
         _define_property(this, "connectingAdb", null);
         _define_property(this, "destroyed", false);

package/dist/lib/index.js

@@ -399,6 +399,13 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         };
         throw new Error(`Failed to get screen size, output: ${stdout}`);
     }
+    async initializeDevicePixelRatio() {
+        if (this.devicePixelRatioInitialized) return;
+        const densityNum = await this.getDisplayDensity();
+        this.devicePixelRatio = Number(densityNum) / 160;
+        debugDevice(`Initialized device pixel ratio: ${this.devicePixelRatio}`);
+        this.devicePixelRatioInitialized = true;
+    }
     async getDisplayDensity() {
         var _this_options;
         const adb = await this.getAdb();
@@ -461,15 +468,15 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         return orientation;
     }
     async size() {
+        await this.initializeDevicePixelRatio();
         const screenSize = await this.getScreenSize();
         const match = (screenSize.override || screenSize.physical).match(/(\d+)x(\d+)/);
         if (!match || match.length < 3) throw new Error(`Unable to parse screen size: ${screenSize}`);
         const isLandscape = 1 === screenSize.orientation || 3 === screenSize.orientation;
         const width = Number.parseInt(match[isLandscape ? 2 : 1], 10);
         const height = Number.parseInt(match[isLandscape ? 1 : 2], 10);
-        const densityNum = await this.getDisplayDensity();
-        this.devicePixelRatio = Number(densityNum) / 160;
-        const { x: logicalWidth, y: logicalHeight } = this.reverseAdjustCoordinates(width, height);
+        const logicalWidth = Math.round(width / this.devicePixelRatio);
+        const logicalHeight = Math.round(height / this.devicePixelRatio);
         return {
             width: logicalWidth,
             height: logicalHeight,
@@ -483,13 +490,6 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             y: Math.round(y * ratio)
         };
     }
-    reverseAdjustCoordinates(x, y) {
-        const ratio = this.devicePixelRatio;
-        return {
-            x: Math.round(x / ratio),
-            y: Math.round(y / ratio)
-        };
-    }
     calculateScrollEndPoint(start, deltaX, deltaY, maxWidth, maxHeight) {
         const minScrollDistance = 50;
         let actualScrollDistanceX = 0;
@@ -516,7 +516,6 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async screenshotBase64() {
         var _this_options;
         debugDevice('screenshotBase64 begin');
-        const { width, height } = await this.size();
         const adb = await this.getAdb();
         let screenshotBuffer;
         const androidScreenshotPath = `/data/local/tmp/midscene_screenshot_${(0, shared_utils_namespaceObject.uuid)()}.png`;
@@ -558,14 +557,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 await adb.shell(`rm ${androidScreenshotPath}`);
             }
         }
-        debugDevice('Resizing screenshot image');
-        const { buffer, format } = await (0, img_namespaceObject.resizeAndConvertImgBuffer)('png', screenshotBuffer, {
-            width,
-            height
-        });
-        debugDevice('Image resize completed');
         debugDevice('Converting to base64');
-        const result = (0, img_namespaceObject.createImgBase64ByFormat)(format, buffer.toString('base64'));
+        const result = (0, img_namespaceObject.createImgBase64ByFormat)('png', screenshotBuffer.toString('base64'));
         debugDevice('screenshotBase64 end');
         return result;
     }
@@ -951,6 +944,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         _define_property(this, "deviceId", void 0);
         _define_property(this, "yadbPushed", false);
         _define_property(this, "devicePixelRatio", 1);
+        _define_property(this, "devicePixelRatioInitialized", false);
         _define_property(this, "adb", null);
         _define_property(this, "connectingAdb", null);
         _define_property(this, "destroyed", false);

package/dist/types/index.d.ts

@@ -22,6 +22,7 @@ export declare class AndroidDevice implements AbstractInterface {
     private deviceId;
     private yadbPushed;
     private devicePixelRatio;
+    private devicePixelRatioInitialized;
     private adb;
     private connectingAdb;
     private destroyed;
@@ -45,11 +46,11 @@ export declare class AndroidDevice implements AbstractInterface {
         physical: string;
         orientation: number;
     }>;
+    private initializeDevicePixelRatio;
     getDisplayDensity(): Promise<number>;
     getDisplayOrientation(): Promise<number>;
     size(): Promise<Size>;
     private adjustCoordinates;
-    private reverseAdjustCoordinates;
     /**
      * Calculate the end point for scroll operations based on start point, scroll delta, and screen boundaries.
      * This method ensures that scroll operations stay within screen bounds and maintain a minimum scroll distance

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "0.29.5",
+  "version": "0.29.7-beta-20250930025459.0",
   "description": "Android automation library for Midscene",
   "keywords": [
     "Android UI automation",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "appium-adb": "12.12.1",
-    "@midscene/core": "0.29.5",
-    "@midscene/shared": "0.29.5"
+    "@midscene/shared": "0.29.7-beta-20250930025459.0",
+    "@midscene/core": "0.29.7-beta-20250930025459.0"
   },
   "devDependencies": {
     "@rslib/core": "^0.11.2",
@@ -37,7 +37,7 @@
     "typescript": "^5.8.3",
     "tsx": "^4.19.2",
     "vitest": "3.0.5",
-    "@midscene/playground": "0.29.5"
+    "@midscene/playground": "0.29.7-beta-20250930025459.0"
   },
   "license": "MIT",
   "scripts": {