@midscene/android 1.0.1-beta-20251104075048.0 → 1.0.1-beta-20251106111345.0

package/dist/es/index.mjs

@@ -105,30 +105,6 @@ class AndroidDevice {
             defineActionKeyboardPress(async (param)=>{
                 await this.keyboardPress(param.keyName);
             }),
-            defineAction({
-                name: 'AndroidBackButton',
-                description: 'Trigger the system "back" operation on Android devices',
-                paramSchema: z.object({}),
-                call: async ()=>{
-                    await this.back();
-                }
-            }),
-            defineAction({
-                name: 'AndroidHomeButton',
-                description: 'Trigger the system "home" operation on Android devices',
-                paramSchema: z.object({}),
-                call: async ()=>{
-                    await this.home();
-                }
-            }),
-            defineAction({
-                name: 'AndroidRecentAppsButton',
-                description: 'Trigger the system "recent apps" operation on Android devices',
-                paramSchema: z.object({}),
-                call: async ()=>{
-                    await this.recentApps();
-                }
-            }),
             defineAction({
                 name: 'AndroidLongPress',
                 description: 'Trigger a long press on the screen at specified coordinates on Android devices',
@@ -314,7 +290,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                             const result = {
                                 override: sizeStr,
                                 physical: sizeStr,
-                                orientation: rotation
+                                orientation: rotation,
+                                isCurrentOrientation: true
                             };
                             if (shouldCache) this.cachedScreenSize = result;
                             return result;
@@ -337,7 +314,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                         const result = {
                             override: sizeStr,
                             physical: sizeStr,
-                            orientation: rotation
+                            orientation: rotation,
+                            isCurrentOrientation: true
                         };
                         if (shouldCache) this.cachedScreenSize = result;
                         return result;
@@ -370,7 +348,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         if (size.override || size.physical) {
             const result = {
                 ...size,
-                orientation
+                orientation,
+                isCurrentOrientation: false
             };
             if (shouldCache) this.cachedScreenSize = result;
             return result;
@@ -456,8 +435,9 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         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 shouldSwap = true !== screenSize.isCurrentOrientation && isLandscape;
+        const width = Number.parseInt(match[shouldSwap ? 2 : 1], 10);
+        const height = Number.parseInt(match[shouldSwap ? 1 : 2], 10);
         const scale = (null == (_this_options = this.options) ? void 0 : _this_options.screenshotResizeScale) ?? 1 / this.devicePixelRatio;
         this.scalingRatio = scale;
         const logicalWidth = Math.round(width * scale);
@@ -968,6 +948,30 @@ const createPlatformActions = (device)=>({
             call: async (param)=>{
                 await device.launch(param);
             }
+        }),
+        AndroidBackButton: defineAction({
+            name: 'AndroidBackButton',
+            description: 'Trigger the system "back" operation on Android devices',
+            paramSchema: z["void"]().describe('No parameters required'),
+            call: async ()=>{
+                await device.back();
+            }
+        }),
+        AndroidHomeButton: defineAction({
+            name: 'AndroidHomeButton',
+            description: 'Trigger the system "home" operation on Android devices',
+            paramSchema: z["void"]().describe('No parameters required'),
+            call: async ()=>{
+                await device.home();
+            }
+        }),
+        AndroidRecentAppsButton: defineAction({
+            name: 'AndroidRecentAppsButton',
+            description: 'Trigger the system "recent apps" operation on Android devices',
+            paramSchema: z["void"]().describe('No parameters required'),
+            call: async ()=>{
+                await device.recentApps();
+            }
         })
     });
 const debugUtils = getDebug('android:utils');
@@ -998,10 +1002,17 @@ function agent_define_property(obj, key, value) {
 }
 const debugAgent = getDebug('android:agent');
 class AndroidAgent extends Agent {
+    createActionWrapper(name) {
+        const action = this.wrapActionInActionSpace(name);
+        return (...args)=>action(args[0]);
+    }
     constructor(device, opts){
-        super(device, opts), agent_define_property(this, "launch", void 0), agent_define_property(this, "runAdbShell", void 0);
-        this.launch = this.wrapActionInActionSpace('Launch');
-        this.runAdbShell = this.wrapActionInActionSpace('RunAdbShell');
+        super(device, opts), agent_define_property(this, "launch", void 0), agent_define_property(this, "runAdbShell", void 0), agent_define_property(this, "back", void 0), agent_define_property(this, "home", void 0), agent_define_property(this, "recentApps", void 0);
+        this.launch = this.createActionWrapper('Launch');
+        this.runAdbShell = this.createActionWrapper('RunAdbShell');
+        this.back = this.createActionWrapper('AndroidBackButton');
+        this.home = this.createActionWrapper('AndroidHomeButton');
+        this.recentApps = this.createActionWrapper('AndroidRecentAppsButton');
     }
 }
 async function agentFromAdbDevice(deviceId, opts) {

package/dist/lib/index.js

@@ -151,30 +151,6 @@ class AndroidDevice {
             (0, device_namespaceObject.defineActionKeyboardPress)(async (param)=>{
                 await this.keyboardPress(param.keyName);
             }),
-            (0, device_namespaceObject.defineAction)({
-                name: 'AndroidBackButton',
-                description: 'Trigger the system "back" operation on Android devices',
-                paramSchema: core_namespaceObject.z.object({}),
-                call: async ()=>{
-                    await this.back();
-                }
-            }),
-            (0, device_namespaceObject.defineAction)({
-                name: 'AndroidHomeButton',
-                description: 'Trigger the system "home" operation on Android devices',
-                paramSchema: core_namespaceObject.z.object({}),
-                call: async ()=>{
-                    await this.home();
-                }
-            }),
-            (0, device_namespaceObject.defineAction)({
-                name: 'AndroidRecentAppsButton',
-                description: 'Trigger the system "recent apps" operation on Android devices',
-                paramSchema: core_namespaceObject.z.object({}),
-                call: async ()=>{
-                    await this.recentApps();
-                }
-            }),
             (0, device_namespaceObject.defineAction)({
                 name: 'AndroidLongPress',
                 description: 'Trigger a long press on the screen at specified coordinates on Android devices',
@@ -360,7 +336,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                             const result = {
                                 override: sizeStr,
                                 physical: sizeStr,
-                                orientation: rotation
+                                orientation: rotation,
+                                isCurrentOrientation: true
                             };
                             if (shouldCache) this.cachedScreenSize = result;
                             return result;
@@ -383,7 +360,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                         const result = {
                             override: sizeStr,
                             physical: sizeStr,
-                            orientation: rotation
+                            orientation: rotation,
+                            isCurrentOrientation: true
                         };
                         if (shouldCache) this.cachedScreenSize = result;
                         return result;
@@ -416,7 +394,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         if (size.override || size.physical) {
             const result = {
                 ...size,
-                orientation
+                orientation,
+                isCurrentOrientation: false
             };
             if (shouldCache) this.cachedScreenSize = result;
             return result;
@@ -502,8 +481,9 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         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 shouldSwap = true !== screenSize.isCurrentOrientation && isLandscape;
+        const width = Number.parseInt(match[shouldSwap ? 2 : 1], 10);
+        const height = Number.parseInt(match[shouldSwap ? 1 : 2], 10);
         const scale = (null == (_this_options = this.options) ? void 0 : _this_options.screenshotResizeScale) ?? 1 / this.devicePixelRatio;
         this.scalingRatio = scale;
         const logicalWidth = Math.round(width * scale);
@@ -1014,6 +994,30 @@ const createPlatformActions = (device)=>({
             call: async (param)=>{
                 await device.launch(param);
             }
+        }),
+        AndroidBackButton: (0, device_namespaceObject.defineAction)({
+            name: 'AndroidBackButton',
+            description: 'Trigger the system "back" operation on Android devices',
+            paramSchema: core_namespaceObject.z["void"]().describe('No parameters required'),
+            call: async ()=>{
+                await device.back();
+            }
+        }),
+        AndroidHomeButton: (0, device_namespaceObject.defineAction)({
+            name: 'AndroidHomeButton',
+            description: 'Trigger the system "home" operation on Android devices',
+            paramSchema: core_namespaceObject.z["void"]().describe('No parameters required'),
+            call: async ()=>{
+                await device.home();
+            }
+        }),
+        AndroidRecentAppsButton: (0, device_namespaceObject.defineAction)({
+            name: 'AndroidRecentAppsButton',
+            description: 'Trigger the system "recent apps" operation on Android devices',
+            paramSchema: core_namespaceObject.z["void"]().describe('No parameters required'),
+            call: async ()=>{
+                await device.recentApps();
+            }
         })
     });
 const agent_namespaceObject = require("@midscene/core/agent");
@@ -1045,10 +1049,17 @@ function agent_define_property(obj, key, value) {
 }
 const debugAgent = (0, logger_namespaceObject.getDebug)('android:agent');
 class AndroidAgent extends agent_namespaceObject.Agent {
+    createActionWrapper(name) {
+        const action = this.wrapActionInActionSpace(name);
+        return (...args)=>action(args[0]);
+    }
     constructor(device, opts){
-        super(device, opts), agent_define_property(this, "launch", void 0), agent_define_property(this, "runAdbShell", void 0);
-        this.launch = this.wrapActionInActionSpace('Launch');
-        this.runAdbShell = this.wrapActionInActionSpace('RunAdbShell');
+        super(device, opts), agent_define_property(this, "launch", void 0), agent_define_property(this, "runAdbShell", void 0), agent_define_property(this, "back", void 0), agent_define_property(this, "home", void 0), agent_define_property(this, "recentApps", void 0);
+        this.launch = this.createActionWrapper('Launch');
+        this.runAdbShell = this.createActionWrapper('RunAdbShell');
+        this.back = this.createActionWrapper('AndroidBackButton');
+        this.home = this.createActionWrapper('AndroidHomeButton');
+        this.recentApps = this.createActionWrapper('AndroidRecentAppsButton');
     }
 }
 async function agentFromAdbDevice(deviceId, opts) {

package/dist/types/index.d.ts

@@ -15,6 +15,8 @@ import { Point } from '@midscene/core';
 import { Size } from '@midscene/core';
 import { z } from '@midscene/core';
 
+declare type ActionArgs<T extends DeviceAction> = [ActionParam<T>] extends [undefined] ? [] : [ActionParam<T>];
+
 export declare function agentFromAdbDevice(deviceId?: string, opts?: AndroidAgentOpt & AndroidDeviceOpt): Promise<AndroidAgent>;
 
 export declare class AndroidAgent extends Agent<AndroidDevice> {
@@ -26,7 +28,20 @@ export declare class AndroidAgent extends Agent<AndroidDevice> {
      * Execute ADB shell command on Android device
      */
     runAdbShell: WrappedAction<DeviceActionRunAdbShell>;
+    /**
+     * Trigger the system back operation on Android devices
+     */
+    back: WrappedAction<DeviceActionAndroidBackButton>;
+    /**
+     * Trigger the system home operation on Android devices
+     */
+    home: WrappedAction<DeviceActionAndroidHomeButton>;
+    /**
+     * Trigger the system recent apps operation on Android devices
+     */
+    recentApps: WrappedAction<DeviceActionAndroidRecentAppsButton>;
     constructor(device: AndroidDevice, opts?: AndroidAgentOpt);
+    private createActionWrapper;
 }
 
 declare type AndroidAgentOpt = AgentOpt;
@@ -61,6 +76,7 @@ export declare class AndroidDevice implements AbstractInterface {
         override: string;
         physical: string;
         orientation: number;
+        isCurrentOrientation?: boolean;
     }>;
     private initializeDevicePixelRatio;
     getDisplayDensity(): Promise<number>;
@@ -126,6 +142,12 @@ export declare class AndroidDevice implements AbstractInterface {
     hideKeyboard(options?: AndroidDeviceInputOpt, timeoutMs?: number): Promise<boolean>;
 }
 
+declare type DeviceActionAndroidBackButton = DeviceAction<void, void>;
+
+declare type DeviceActionAndroidHomeButton = DeviceAction<void, void>;
+
+declare type DeviceActionAndroidRecentAppsButton = DeviceAction<void, void>;
+
 declare type DeviceActionLaunch = DeviceAction<LaunchParam, void>;
 
 declare type DeviceActionRunAdbShell = DeviceAction<RunAdbShellParam, string>;
@@ -149,6 +171,6 @@ declare const runAdbShellParamSchema: z.ZodString;
 /**
  * Helper type to convert DeviceAction to wrapped method signature
  */
-declare type WrappedAction<T extends DeviceAction> = (param: ActionParam<T>) => Promise<ActionReturn<T>>;
+declare type WrappedAction<T extends DeviceAction> = (...args: ActionArgs<T>) => Promise<ActionReturn<T>>;
 
 export { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "1.0.1-beta-20251104075048.0",
+  "version": "1.0.1-beta-20251106111345.0",
   "description": "Android automation library for Midscene",
   "keywords": [
     "Android UI automation",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "appium-adb": "12.12.1",
-    "@midscene/shared": "1.0.1-beta-20251104075048.0",
-    "@midscene/core": "1.0.1-beta-20251104075048.0"
+    "@midscene/shared": "1.0.1-beta-20251106111345.0",
+    "@midscene/core": "1.0.1-beta-20251106111345.0"
   },
   "devDependencies": {
     "@rslib/core": "^0.11.2",
@@ -38,7 +38,7 @@
     "tsx": "^4.19.2",
     "vitest": "3.0.5",
     "zod": "3.24.3",
-    "@midscene/playground": "1.0.1-beta-20251104075048.0"
+    "@midscene/playground": "1.0.1-beta-20251106111345.0"
   },
   "license": "MIT",
   "scripts": {