@midscene/android 0.26.7-beta-20250821134240.0 → 0.27.0

package/dist/es/index.mjs

@@ -204,7 +204,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async execYadb(keyboardContent) {
         await this.ensureYadb();
         const adb = await this.getAdb();
-        await adb.shell(`app_process${this.getDisplayArg()} -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "${keyboardContent}"`);
+        await adb.shell(`app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "${keyboardContent}"`);
     }
     async getElementsInfo() {
         return [];
@@ -216,36 +216,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         };
     }
     async getScreenSize() {
-        var _this_options;
         const adb = await this.getAdb();
-        if ('number' == typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId)) try {
-            const longDisplayId = await this.getLongDisplayId();
-            if (longDisplayId) {
-                const stdout = await adb.shell('dumpsys display');
-                const lineRegex = new RegExp(`^.*uniqueId "local:${longDisplayId}".*$`, 'm');
-                const lineMatch = stdout.match(lineRegex);
-                if (lineMatch) {
-                    const targetLine = lineMatch[0];
-                    const realMatch = targetLine.match(/real (\d+) x (\d+)/);
-                    const rotationMatch = targetLine.match(/rotation (\d+)/);
-                    if (realMatch && rotationMatch) {
-                        const width = Number(realMatch[1]);
-                        const height = Number(realMatch[2]);
-                        const rotation = Number(rotationMatch[1]);
-                        const sizeStr = `${width}x${height}`;
-                        debugPage(`Using display info for long ID ${longDisplayId}: ${sizeStr}, rotation: ${rotation}`);
-                        return {
-                            override: sizeStr,
-                            physical: sizeStr,
-                            orientation: rotation
-                        };
-                    }
-                }
-            }
-            debugPage(`Could not find display info for activeDisplayId ${this.options.activeDisplayId}`);
-        } catch (e) {
-            debugPage(`Failed to get size from display info for display ${this.options.activeDisplayId}: ${e}`);
-        }
         const stdout = await adb.shell([
             'wm',
             'size'
@@ -264,43 +235,9 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             debugPage(`Using Physical size: ${physicalSize[1].trim()}`);
             size.physical = physicalSize[1].trim();
         }
-        const orientation = await this.getDisplayOrientation();
-        if (size.override || size.physical) return {
-            ...size,
-            orientation
-        };
-        throw new Error(`Failed to get screen size, output: ${stdout}`);
-    }
-    async getDisplayDensity() {
-        var _this_options;
-        const adb = await this.getAdb();
-        if ('number' == typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId)) try {
-            const longDisplayId = await this.getLongDisplayId();
-            if (longDisplayId) {
-                const stdout = await adb.shell('dumpsys display');
-                const lineRegex = new RegExp(`^.*uniqueId "local:${longDisplayId}".*$`, 'm');
-                const lineMatch = stdout.match(lineRegex);
-                if (lineMatch) {
-                    const targetLine = lineMatch[0];
-                    const densityMatch = targetLine.match(/density (\d+)/);
-                    if (densityMatch) {
-                        const density = Number(densityMatch[1]);
-                        debugPage(`Using display density for long ID ${longDisplayId}: ${density}`);
-                        return density;
-                    }
-                }
-            }
-        } catch (e) {
-            debugPage(`Failed to get density from display info: ${e}`);
-        }
-        const density = await adb.getScreenDensity();
-        return density ?? 160;
-    }
-    async getDisplayOrientation() {
-        const adb = await this.getAdb();
         let orientation = 0;
         try {
-            const orientationStdout = await adb.shell(`dumpsys${this.getDisplayArg()} input | grep SurfaceOrientation`);
+            const orientationStdout = await adb.shell('dumpsys input | grep SurfaceOrientation');
             const orientationMatch = orientationStdout.match(/SurfaceOrientation:\s*(\d)/);
             if (!orientationMatch) throw new Error('Failed to get orientation from input');
             orientation = Number(orientationMatch[1]);
@@ -308,7 +245,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         } catch (e) {
             debugPage('Failed to get orientation from input, try display');
             try {
-                const orientationStdout = await adb.shell(`dumpsys${this.getDisplayArg()} display | grep mCurrentOrientation`);
+                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]);
@@ -318,17 +255,21 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 debugPage('Failed to get orientation from display, default to 0');
             }
         }
-        return orientation;
+        if (size.override || size.physical) return {
+            ...size,
+            orientation
+        };
+        throw new Error(`Failed to get screen size, output: ${stdout}`);
     }
     async size() {
-        await this.getAdb();
+        const adb = await this.getAdb();
         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();
+        const densityNum = await adb.getScreenDensity();
         this.devicePixelRatio = Number(densityNum) / 160;
         const { x: logicalWidth, y: logicalHeight } = this.reverseAdjustCoordinates(width, height);
         return {
@@ -352,18 +293,12 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         };
     }
     async screenshotBase64() {
-        var _this_options;
         debugPage('screenshotBase64 begin');
         const { width, height } = await this.size();
         const adb = await this.getAdb();
         let screenshotBuffer;
         const androidScreenshotPath = `/data/local/tmp/midscene_screenshot_${randomUUID()}.png`;
-        const useShellScreencap = 'number' == typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId);
         try {
-            if (useShellScreencap) {
-                var _this_options1;
-                throw new Error(`Display ${null == (_this_options1 = this.options) ? void 0 : _this_options1.activeDisplayId} requires shell screencap`);
-            }
             debugPage('Taking screenshot via adb.takeScreenshot');
             screenshotBuffer = await adb.takeScreenshot(null);
             debugPage('adb.takeScreenshot completed');
@@ -373,17 +308,13 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 throw new Error('Screenshot buffer has invalid format: could not find valid image signature');
             }
         } catch (error) {
-            debugPage(`Taking screenshot via adb.takeScreenshot failed or was skipped: ${error}`);
             const screenshotPath = getTmpFile('png');
             try {
-                var _this_options2, _this_options3;
                 debugPage('Fallback: taking screenshot via shell screencap');
-                const displayId = (null == (_this_options2 = this.options) ? void 0 : _this_options2.useLongDisplayIdForScreenshot) ? await this.getLongDisplayId() : null == (_this_options3 = this.options) ? void 0 : _this_options3.activeDisplayId;
-                const displayArg = displayId ? `-d ${displayId}` : '';
                 try {
-                    await adb.shell(`screencap -p ${displayArg} ${androidScreenshotPath}`.trim());
+                    await adb.shell(`screencap -p ${androidScreenshotPath}`);
                     debugPage('adb.shell screencap completed');
-                } catch (screencapError) {
+                } catch (error) {
                     debugPage('screencap failed, using forceScreenshot');
                     await this.forceScreenshot(androidScreenshotPath);
                     debugPage('forceScreenshot completed');
@@ -426,7 +357,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         await this.ensureYadb();
         const adb = await this.getAdb();
         await this.mouse.click(element.center[0], element.center[1]);
-        await adb.shell(`app_process${this.getDisplayArg()} -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "~CLEAR~"`);
+        await adb.shell('app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "~CLEAR~"');
         if (await adb.isSoftKeyboardPresent()) return;
         await this.mouse.click(element.center[0], element.center[1]);
     }
@@ -628,7 +559,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async mouseClick(x, y) {
         const adb = await this.getAdb();
         const { x: adjustedX, y: adjustedY } = this.adjustCoordinates(x, y);
-        await adb.shell(`input${this.getDisplayArg()} swipe ${adjustedX} ${adjustedY} ${adjustedX} ${adjustedY} 150`);
+        await adb.shell(`input swipe ${adjustedX} ${adjustedY} ${adjustedX} ${adjustedY} 150`);
     }
     async mouseMove(x, y) {
         return Promise.resolve();
@@ -638,7 +569,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         const { x: fromX, y: fromY } = this.adjustCoordinates(from.x, from.y);
         const { x: toX, y: toY } = this.adjustCoordinates(to.x, to.y);
         const swipeDuration = duration ?? 300;
-        await adb.shell(`input${this.getDisplayArg()} swipe ${fromX} ${fromY} ${toX} ${toY} ${swipeDuration}`);
+        await adb.shell(`input swipe ${fromX} ${fromY} ${toX} ${toY} ${swipeDuration}`);
     }
     async mouseWheel(deltaX, deltaY, duration) {
         const { width, height } = await this.size();
@@ -657,7 +588,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         const { x: adjustedEndX, y: adjustedEndY } = this.adjustCoordinates(endX, endY);
         const adb = await this.getAdb();
         const swipeDuration = duration ?? defaultNormalScrollDuration;
-        await adb.shell(`input${this.getDisplayArg()} swipe ${adjustedStartX} ${adjustedStartY} ${adjustedEndX} ${adjustedEndY} ${swipeDuration}`);
+        await adb.shell(`input swipe ${adjustedStartX} ${adjustedStartY} ${adjustedEndX} ${adjustedEndY} ${swipeDuration}`);
     }
     async destroy() {
         if (this.destroyed) return;
@@ -672,20 +603,20 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async back() {
         const adb = await this.getAdb();
-        await adb.shell(`input${this.getDisplayArg()} keyevent 4`);
+        await adb.shell('input keyevent 4');
     }
     async home() {
         const adb = await this.getAdb();
-        await adb.shell(`input${this.getDisplayArg()} keyevent 3`);
+        await adb.shell('input keyevent 3');
     }
     async recentApps() {
         const adb = await this.getAdb();
-        await adb.shell(`input${this.getDisplayArg()} keyevent 187`);
+        await adb.shell('input keyevent 187');
     }
     async longPress(x, y, duration = 1000) {
         const adb = await this.getAdb();
         const { x: adjustedX, y: adjustedY } = this.adjustCoordinates(x, y);
-        await adb.shell(`input${this.getDisplayArg()} swipe ${adjustedX} ${adjustedY} ${adjustedX} ${adjustedY} ${duration}`);
+        await adb.shell(`input swipe ${adjustedX} ${adjustedY} ${adjustedX} ${adjustedY} ${duration}`);
     }
     async pullDown(startPoint, distance, duration = 800) {
         const { width, height } = await this.size();
@@ -708,7 +639,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         const adb = await this.getAdb();
         const { x: fromX, y: fromY } = this.adjustCoordinates(from.x, from.y);
         const { x: toX, y: toY } = this.adjustCoordinates(to.x, to.y);
-        await adb.shell(`input${this.getDisplayArg()} swipe ${fromX} ${fromY} ${toX} ${toY} ${duration}`);
+        await adb.shell(`input swipe ${fromX} ${fromY} ${toX} ${toY} ${duration}`);
     }
     async pullUp(startPoint, distance, duration = 600) {
         const { width, height } = await this.size();
@@ -736,29 +667,6 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async getElementInfoByXpath(xpath) {
         throw new Error('Not implemented');
     }
-    getDisplayArg() {
-        var _this_options;
-        return 'number' == typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId) ? ` -d ${this.options.activeDisplayId}` : '';
-    }
-    async getLongDisplayId() {
-        var _this_options;
-        if ('number' != typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId)) return null;
-        const adb = await this.getAdb();
-        try {
-            const stdout = await adb.shell(`dumpsys SurfaceFlinger --display-id ${this.options.activeDisplayId}`);
-            const regex = new RegExp(`Display (\\d+) \\(HWC display ${this.options.activeDisplayId}\\):`);
-            const displayMatch = stdout.match(regex);
-            if (null == displayMatch ? void 0 : displayMatch[1]) {
-                debugPage(`Found long display ID: ${displayMatch[1]} for short ID: ${this.options.activeDisplayId}`);
-                return displayMatch[1];
-            }
-            debugPage(`Could not find long display ID for short ID: ${this.options.activeDisplayId}`);
-            return null;
-        } catch (error) {
-            debugPage(`Error getting long display ID: ${error}`);
-            return null;
-        }
-    }
     async hideKeyboard(options, timeoutMs = 1000) {
         var _this_options;
         const adb = await this.getAdb();
@@ -849,9 +757,7 @@ async function agentFromAdbDevice(deviceId, opts) {
         androidAdbPath: null == opts ? void 0 : opts.androidAdbPath,
         remoteAdbHost: null == opts ? void 0 : opts.remoteAdbHost,
         remoteAdbPort: null == opts ? void 0 : opts.remoteAdbPort,
-        imeStrategy: null == opts ? void 0 : opts.imeStrategy,
-        activeDisplayId: null == opts ? void 0 : opts.activeDisplayId,
-        useLongDisplayIdForScreenshot: null == opts ? void 0 : opts.useLongDisplayIdForScreenshot
+        imeStrategy: null == opts ? void 0 : opts.imeStrategy
     });
     await page.connect();
     return new AndroidAgent(page, opts);

package/dist/lib/index.js

@@ -250,7 +250,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async execYadb(keyboardContent) {
         await this.ensureYadb();
         const adb = await this.getAdb();
-        await adb.shell(`app_process${this.getDisplayArg()} -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "${keyboardContent}"`);
+        await adb.shell(`app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "${keyboardContent}"`);
     }
     async getElementsInfo() {
         return [];
@@ -262,36 +262,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         };
     }
     async getScreenSize() {
-        var _this_options;
         const adb = await this.getAdb();
-        if ('number' == typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId)) try {
-            const longDisplayId = await this.getLongDisplayId();
-            if (longDisplayId) {
-                const stdout = await adb.shell('dumpsys display');
-                const lineRegex = new RegExp(`^.*uniqueId "local:${longDisplayId}".*$`, 'm');
-                const lineMatch = stdout.match(lineRegex);
-                if (lineMatch) {
-                    const targetLine = lineMatch[0];
-                    const realMatch = targetLine.match(/real (\d+) x (\d+)/);
-                    const rotationMatch = targetLine.match(/rotation (\d+)/);
-                    if (realMatch && rotationMatch) {
-                        const width = Number(realMatch[1]);
-                        const height = Number(realMatch[2]);
-                        const rotation = Number(rotationMatch[1]);
-                        const sizeStr = `${width}x${height}`;
-                        debugPage(`Using display info for long ID ${longDisplayId}: ${sizeStr}, rotation: ${rotation}`);
-                        return {
-                            override: sizeStr,
-                            physical: sizeStr,
-                            orientation: rotation
-                        };
-                    }
-                }
-            }
-            debugPage(`Could not find display info for activeDisplayId ${this.options.activeDisplayId}`);
-        } catch (e) {
-            debugPage(`Failed to get size from display info for display ${this.options.activeDisplayId}: ${e}`);
-        }
         const stdout = await adb.shell([
             'wm',
             'size'
@@ -310,43 +281,9 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             debugPage(`Using Physical size: ${physicalSize[1].trim()}`);
             size.physical = physicalSize[1].trim();
         }
-        const orientation = await this.getDisplayOrientation();
-        if (size.override || size.physical) return {
-            ...size,
-            orientation
-        };
-        throw new Error(`Failed to get screen size, output: ${stdout}`);
-    }
-    async getDisplayDensity() {
-        var _this_options;
-        const adb = await this.getAdb();
-        if ('number' == typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId)) try {
-            const longDisplayId = await this.getLongDisplayId();
-            if (longDisplayId) {
-                const stdout = await adb.shell('dumpsys display');
-                const lineRegex = new RegExp(`^.*uniqueId "local:${longDisplayId}".*$`, 'm');
-                const lineMatch = stdout.match(lineRegex);
-                if (lineMatch) {
-                    const targetLine = lineMatch[0];
-                    const densityMatch = targetLine.match(/density (\d+)/);
-                    if (densityMatch) {
-                        const density = Number(densityMatch[1]);
-                        debugPage(`Using display density for long ID ${longDisplayId}: ${density}`);
-                        return density;
-                    }
-                }
-            }
-        } catch (e) {
-            debugPage(`Failed to get density from display info: ${e}`);
-        }
-        const density = await adb.getScreenDensity();
-        return density ?? 160;
-    }
-    async getDisplayOrientation() {
-        const adb = await this.getAdb();
         let orientation = 0;
         try {
-            const orientationStdout = await adb.shell(`dumpsys${this.getDisplayArg()} input | grep SurfaceOrientation`);
+            const orientationStdout = await adb.shell('dumpsys input | grep SurfaceOrientation');
             const orientationMatch = orientationStdout.match(/SurfaceOrientation:\s*(\d)/);
             if (!orientationMatch) throw new Error('Failed to get orientation from input');
             orientation = Number(orientationMatch[1]);
@@ -354,7 +291,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         } catch (e) {
             debugPage('Failed to get orientation from input, try display');
             try {
-                const orientationStdout = await adb.shell(`dumpsys${this.getDisplayArg()} display | grep mCurrentOrientation`);
+                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]);
@@ -364,17 +301,21 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 debugPage('Failed to get orientation from display, default to 0');
             }
         }
-        return orientation;
+        if (size.override || size.physical) return {
+            ...size,
+            orientation
+        };
+        throw new Error(`Failed to get screen size, output: ${stdout}`);
     }
     async size() {
-        await this.getAdb();
+        const adb = await this.getAdb();
         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();
+        const densityNum = await adb.getScreenDensity();
         this.devicePixelRatio = Number(densityNum) / 160;
         const { x: logicalWidth, y: logicalHeight } = this.reverseAdjustCoordinates(width, height);
         return {
@@ -398,18 +339,12 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         };
     }
     async screenshotBase64() {
-        var _this_options;
         debugPage('screenshotBase64 begin');
         const { width, height } = await this.size();
         const adb = await this.getAdb();
         let screenshotBuffer;
         const androidScreenshotPath = `/data/local/tmp/midscene_screenshot_${(0, external_node_crypto_namespaceObject.randomUUID)()}.png`;
-        const useShellScreencap = 'number' == typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId);
         try {
-            if (useShellScreencap) {
-                var _this_options1;
-                throw new Error(`Display ${null == (_this_options1 = this.options) ? void 0 : _this_options1.activeDisplayId} requires shell screencap`);
-            }
             debugPage('Taking screenshot via adb.takeScreenshot');
             screenshotBuffer = await adb.takeScreenshot(null);
             debugPage('adb.takeScreenshot completed');
@@ -419,17 +354,13 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 throw new Error('Screenshot buffer has invalid format: could not find valid image signature');
             }
         } catch (error) {
-            debugPage(`Taking screenshot via adb.takeScreenshot failed or was skipped: ${error}`);
             const screenshotPath = (0, utils_namespaceObject.getTmpFile)('png');
             try {
-                var _this_options2, _this_options3;
                 debugPage('Fallback: taking screenshot via shell screencap');
-                const displayId = (null == (_this_options2 = this.options) ? void 0 : _this_options2.useLongDisplayIdForScreenshot) ? await this.getLongDisplayId() : null == (_this_options3 = this.options) ? void 0 : _this_options3.activeDisplayId;
-                const displayArg = displayId ? `-d ${displayId}` : '';
                 try {
-                    await adb.shell(`screencap -p ${displayArg} ${androidScreenshotPath}`.trim());
+                    await adb.shell(`screencap -p ${androidScreenshotPath}`);
                     debugPage('adb.shell screencap completed');
-                } catch (screencapError) {
+                } catch (error) {
                     debugPage('screencap failed, using forceScreenshot');
                     await this.forceScreenshot(androidScreenshotPath);
                     debugPage('forceScreenshot completed');
@@ -472,7 +403,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         await this.ensureYadb();
         const adb = await this.getAdb();
         await this.mouse.click(element.center[0], element.center[1]);
-        await adb.shell(`app_process${this.getDisplayArg()} -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "~CLEAR~"`);
+        await adb.shell('app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "~CLEAR~"');
         if (await adb.isSoftKeyboardPresent()) return;
         await this.mouse.click(element.center[0], element.center[1]);
     }
@@ -674,7 +605,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async mouseClick(x, y) {
         const adb = await this.getAdb();
         const { x: adjustedX, y: adjustedY } = this.adjustCoordinates(x, y);
-        await adb.shell(`input${this.getDisplayArg()} swipe ${adjustedX} ${adjustedY} ${adjustedX} ${adjustedY} 150`);
+        await adb.shell(`input swipe ${adjustedX} ${adjustedY} ${adjustedX} ${adjustedY} 150`);
     }
     async mouseMove(x, y) {
         return Promise.resolve();
@@ -684,7 +615,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         const { x: fromX, y: fromY } = this.adjustCoordinates(from.x, from.y);
         const { x: toX, y: toY } = this.adjustCoordinates(to.x, to.y);
         const swipeDuration = duration ?? 300;
-        await adb.shell(`input${this.getDisplayArg()} swipe ${fromX} ${fromY} ${toX} ${toY} ${swipeDuration}`);
+        await adb.shell(`input swipe ${fromX} ${fromY} ${toX} ${toY} ${swipeDuration}`);
     }
     async mouseWheel(deltaX, deltaY, duration) {
         const { width, height } = await this.size();
@@ -703,7 +634,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         const { x: adjustedEndX, y: adjustedEndY } = this.adjustCoordinates(endX, endY);
         const adb = await this.getAdb();
         const swipeDuration = duration ?? defaultNormalScrollDuration;
-        await adb.shell(`input${this.getDisplayArg()} swipe ${adjustedStartX} ${adjustedStartY} ${adjustedEndX} ${adjustedEndY} ${swipeDuration}`);
+        await adb.shell(`input swipe ${adjustedStartX} ${adjustedStartY} ${adjustedEndX} ${adjustedEndY} ${swipeDuration}`);
     }
     async destroy() {
         if (this.destroyed) return;
@@ -718,20 +649,20 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async back() {
         const adb = await this.getAdb();
-        await adb.shell(`input${this.getDisplayArg()} keyevent 4`);
+        await adb.shell('input keyevent 4');
     }
     async home() {
         const adb = await this.getAdb();
-        await adb.shell(`input${this.getDisplayArg()} keyevent 3`);
+        await adb.shell('input keyevent 3');
     }
     async recentApps() {
         const adb = await this.getAdb();
-        await adb.shell(`input${this.getDisplayArg()} keyevent 187`);
+        await adb.shell('input keyevent 187');
     }
     async longPress(x, y, duration = 1000) {
         const adb = await this.getAdb();
         const { x: adjustedX, y: adjustedY } = this.adjustCoordinates(x, y);
-        await adb.shell(`input${this.getDisplayArg()} swipe ${adjustedX} ${adjustedY} ${adjustedX} ${adjustedY} ${duration}`);
+        await adb.shell(`input swipe ${adjustedX} ${adjustedY} ${adjustedX} ${adjustedY} ${duration}`);
     }
     async pullDown(startPoint, distance, duration = 800) {
         const { width, height } = await this.size();
@@ -754,7 +685,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         const adb = await this.getAdb();
         const { x: fromX, y: fromY } = this.adjustCoordinates(from.x, from.y);
         const { x: toX, y: toY } = this.adjustCoordinates(to.x, to.y);
-        await adb.shell(`input${this.getDisplayArg()} swipe ${fromX} ${fromY} ${toX} ${toY} ${duration}`);
+        await adb.shell(`input swipe ${fromX} ${fromY} ${toX} ${toY} ${duration}`);
     }
     async pullUp(startPoint, distance, duration = 600) {
         const { width, height } = await this.size();
@@ -782,29 +713,6 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async getElementInfoByXpath(xpath) {
         throw new Error('Not implemented');
     }
-    getDisplayArg() {
-        var _this_options;
-        return 'number' == typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId) ? ` -d ${this.options.activeDisplayId}` : '';
-    }
-    async getLongDisplayId() {
-        var _this_options;
-        if ('number' != typeof (null == (_this_options = this.options) ? void 0 : _this_options.activeDisplayId)) return null;
-        const adb = await this.getAdb();
-        try {
-            const stdout = await adb.shell(`dumpsys SurfaceFlinger --display-id ${this.options.activeDisplayId}`);
-            const regex = new RegExp(`Display (\\d+) \\(HWC display ${this.options.activeDisplayId}\\):`);
-            const displayMatch = stdout.match(regex);
-            if (null == displayMatch ? void 0 : displayMatch[1]) {
-                debugPage(`Found long display ID: ${displayMatch[1]} for short ID: ${this.options.activeDisplayId}`);
-                return displayMatch[1];
-            }
-            debugPage(`Could not find long display ID for short ID: ${this.options.activeDisplayId}`);
-            return null;
-        } catch (error) {
-            debugPage(`Error getting long display ID: ${error}`);
-            return null;
-        }
-    }
     async hideKeyboard(options, timeoutMs = 1000) {
         var _this_options;
         const adb = await this.getAdb();
@@ -896,9 +804,7 @@ async function agentFromAdbDevice(deviceId, opts) {
         androidAdbPath: null == opts ? void 0 : opts.androidAdbPath,
         remoteAdbHost: null == opts ? void 0 : opts.remoteAdbHost,
         remoteAdbPort: null == opts ? void 0 : opts.remoteAdbPort,
-        imeStrategy: null == opts ? void 0 : opts.imeStrategy,
-        activeDisplayId: null == opts ? void 0 : opts.activeDisplayId,
-        useLongDisplayIdForScreenshot: null == opts ? void 0 : opts.useLongDisplayIdForScreenshot
+        imeStrategy: null == opts ? void 0 : opts.imeStrategy
     });
     await page.connect();
     return new AndroidAgent(page, opts);

package/dist/types/index.d.ts

@@ -41,8 +41,6 @@ export declare class AndroidDevice implements AndroidDevicePage {
     getElementsInfo(): Promise<ElementInfo[]>;
     getElementsNodeTree(): Promise<any>;
     private getScreenSize;
-    private getDisplayDensity;
-    private getDisplayOrientation;
     size(): Promise<Size>;
     private adjustCoordinates;
     private reverseAdjustCoordinates;
@@ -99,8 +97,6 @@ export declare class AndroidDevice implements AndroidDevicePage {
     getXpathsById(id: string): Promise<string[]>;
     getXpathsByPoint(point: Point, isOrderSensitive: boolean): Promise<string[]>;
     getElementInfoByXpath(xpath: string): Promise<ElementInfo>;
-    private getDisplayArg;
-    private getLongDisplayId;
     hideKeyboard(options?: AndroidDeviceInputOpt, timeoutMs?: number): Promise<boolean>;
 }
 
@@ -109,8 +105,6 @@ declare type AndroidDeviceOpt = {
     remoteAdbHost?: string;
     remoteAdbPort?: number;
     imeStrategy?: 'always-yadb' | 'yadb-for-non-ascii';
-    activeDisplayId?: number;
-    useLongDisplayIdForScreenshot?: boolean;
 } & AndroidDeviceInputOpt;
 
 export declare function getConnectedDevices(): Promise<Device[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "0.26.7-beta-20250821134240.0",
+  "version": "0.27.0",
   "description": "Android automation library for Midscene",
   "keywords": [
     "Android UI automation",
@@ -27,9 +27,9 @@
   },
   "dependencies": {
     "appium-adb": "12.12.1",
-    "@midscene/core": "0.26.7-beta-20250821134240.0",
-    "@midscene/shared": "0.26.7-beta-20250821134240.0",
-    "@midscene/web": "0.26.7-beta-20250821134240.0"
+    "@midscene/core": "0.27.0",
+    "@midscene/web": "0.27.0",
+    "@midscene/shared": "0.27.0"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.10",