@midscene/android 0.23.0 → 0.23.1

package/dist/es/index.d.ts

@@ -13,7 +13,6 @@ type AndroidDeviceOpt = {
 } & AndroidDeviceInputOpt;
 declare class AndroidDevice implements AndroidDevicePage {
     private deviceId;
-    private screenSize;
     private yadbPushed;
     private devicePixelRatio;
     private adb;

package/dist/es/index.js

@@ -21,7 +21,6 @@ var defaultNormalScrollDuration = 1e3;
 var debugPage = getDebug("android:device");
 var AndroidDevice = class {
   constructor(deviceId, options) {
-    this.screenSize = null;
     this.yadbPushed = false;
     this.devicePixelRatio = 1;
     this.adb = null;
@@ -185,10 +184,29 @@ ${Object.keys(size).filter((key) => size[key]).map(
       const orientationMatch = orientationStdout.match(
         /SurfaceOrientation:\s*(\d)/
       );
-      orientation = orientationMatch ? Number(orientationMatch[1]) : 0;
+      if (!orientationMatch) {
+        throw new Error("Failed to get orientation from input");
+      }
+      orientation = Number(orientationMatch[1]);
       debugPage(`Screen orientation: ${orientation}`);
     } catch (e) {
-      debugPage("Failed to get orientation, default to 0");
+      debugPage("Failed to get orientation from input, try display");
+      try {
+        const orientationStdout = await adb.shell(
+          "dumpsys display | grep mCurrentOrientation"
+        );
+        const orientationMatch = orientationStdout.match(
+          /mCurrentOrientation=(\d)/
+        );
+        if (!orientationMatch) {
+          throw new Error("Failed to get orientation from display");
+        }
+        orientation = Number(orientationMatch[1]);
+        debugPage(`Screen orientation (fallback): ${orientation}`);
+      } catch (e2) {
+        orientation = 0;
+        debugPage("Failed to get orientation from display, default to 0");
+      }
     }
     if (size.override || size.physical) {
       return { ...size, orientation };
@@ -196,9 +214,6 @@ ${Object.keys(size).filter((key) => size[key]).map(
     throw new Error(`Failed to get screen size, output: ${stdout}`);
   }
   async size() {
-    if (this.screenSize) {
-      return this.screenSize;
-    }
     const adb = await this.getAdb();
     const screenSize = await this.getScreenSize();
     const match = (screenSize.override || screenSize.physical).match(
@@ -216,12 +231,11 @@ ${Object.keys(size).filter((key) => size[key]).map(
       width,
       height
     );
-    this.screenSize = {
+    return {
       width: logicalWidth,
       height: logicalHeight,
       dpr: this.devicePixelRatio
     };
-    return this.screenSize;
   }
   adjustCoordinates(x, y) {
     const ratio = this.devicePixelRatio;
@@ -533,7 +547,6 @@ ${Object.keys(size).filter((key) => size[key]).map(
       console.error("Error during cleanup:", error);
     }
     this.connectingAdb = null;
-    this.screenSize = null;
     this.yadbPushed = false;
   }
   async back() {

package/dist/lib/index.d.ts

@@ -13,7 +13,6 @@ type AndroidDeviceOpt = {
 } & AndroidDeviceInputOpt;
 declare class AndroidDevice implements AndroidDevicePage {
     private deviceId;
-    private screenSize;
     private yadbPushed;
     private devicePixelRatio;
     private adb;

package/dist/lib/index.js

@@ -56,7 +56,6 @@ var defaultNormalScrollDuration = 1e3;
 var debugPage = (0, import_logger.getDebug)("android:device");
 var AndroidDevice = class {
   constructor(deviceId, options) {
-    this.screenSize = null;
     this.yadbPushed = false;
     this.devicePixelRatio = 1;
     this.adb = null;
@@ -220,10 +219,29 @@ ${Object.keys(size).filter((key) => size[key]).map(
       const orientationMatch = orientationStdout.match(
         /SurfaceOrientation:\s*(\d)/
       );
-      orientation = orientationMatch ? Number(orientationMatch[1]) : 0;
+      if (!orientationMatch) {
+        throw new Error("Failed to get orientation from input");
+      }
+      orientation = Number(orientationMatch[1]);
       debugPage(`Screen orientation: ${orientation}`);
     } catch (e) {
-      debugPage("Failed to get orientation, default to 0");
+      debugPage("Failed to get orientation from input, try display");
+      try {
+        const orientationStdout = await adb.shell(
+          "dumpsys display | grep mCurrentOrientation"
+        );
+        const orientationMatch = orientationStdout.match(
+          /mCurrentOrientation=(\d)/
+        );
+        if (!orientationMatch) {
+          throw new Error("Failed to get orientation from display");
+        }
+        orientation = Number(orientationMatch[1]);
+        debugPage(`Screen orientation (fallback): ${orientation}`);
+      } catch (e2) {
+        orientation = 0;
+        debugPage("Failed to get orientation from display, default to 0");
+      }
     }
     if (size.override || size.physical) {
       return { ...size, orientation };
@@ -231,9 +249,6 @@ ${Object.keys(size).filter((key) => size[key]).map(
     throw new Error(`Failed to get screen size, output: ${stdout}`);
   }
   async size() {
-    if (this.screenSize) {
-      return this.screenSize;
-    }
     const adb = await this.getAdb();
     const screenSize = await this.getScreenSize();
     const match = (screenSize.override || screenSize.physical).match(
@@ -251,12 +266,11 @@ ${Object.keys(size).filter((key) => size[key]).map(
       width,
       height
     );
-    this.screenSize = {
+    return {
       width: logicalWidth,
       height: logicalHeight,
       dpr: this.devicePixelRatio
     };
-    return this.screenSize;
   }
   adjustCoordinates(x, y) {
     const ratio = this.devicePixelRatio;
@@ -568,7 +582,6 @@ ${Object.keys(size).filter((key) => size[key]).map(
       console.error("Error during cleanup:", error);
     }
     this.connectingAdb = null;
-    this.screenSize = null;
     this.yadbPushed = false;
   }
   async back() {

package/dist/types/index.d.ts

@@ -13,7 +13,6 @@ type AndroidDeviceOpt = {
 } & AndroidDeviceInputOpt;
 declare class AndroidDevice implements AndroidDevicePage {
     private deviceId;
-    private screenSize;
     private yadbPushed;
     private devicePixelRatio;
     private adb;

package/package.json

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