@aiscene/android 1.6.7 → 1.6.8

package/dist/types/mcp-server.d.ts

@@ -9,14 +9,11 @@ import { AndroidDeviceOpt } from '@midscene/core/device';
 import { BaseMCPServer } from '@midscene/shared/mcp';
 import { BaseMidsceneTools } from '@midscene/shared/mcp';
 import { DeviceAction } from '@midscene/core';
-import { ElementCacheFeature } from '@midscene/core';
 import type { ElementInfo } from '@midscene/shared/extractor';
-import { IModelConfig } from '@midscene/shared/env';
 import { InterfaceType } from '@midscene/core';
 import { LaunchMCPServerOptions } from '@midscene/shared/mcp';
 import { LaunchMCPServerResult } from '@midscene/shared/mcp';
 import { Point } from '@midscene/core';
-import { Rect } from '@midscene/core';
 import { Size } from '@midscene/core';
 import { Tool } from '@midscene/shared/mcp';
 import { ToolDefinition } from '@midscene/shared/mcp';
@@ -67,7 +64,6 @@ declare class AndroidDevice implements AbstractInterface {
     private yadbPushed;
     private devicePixelRatio;
     private devicePixelRatioInitialized;
-    private scalingRatio;
     private adb;
     private connectingAdb;
     private destroyed;
@@ -78,6 +74,9 @@ declare class AndroidDevice implements AbstractInterface {
     private cachedPhysicalDisplayId;
     private scrcpyAdapter;
     private appNameMapping;
+    private scalingRatio;
+    private takeScreenshotFailCount;
+    private static readonly TAKE_SCREENSHOT_FAIL_THRESHOLD;
     interfaceType: InterfaceType;
     uri: string | undefined;
     options?: AndroidDeviceOpt;
@@ -108,16 +107,6 @@ declare class AndroidDevice implements AbstractInterface {
     private resolvePackageName;
     launch(uri: string): Promise<AndroidDevice>;
     execYadb(keyboardContent: string): Promise<void>;
-    /**
-     * 通过剪贴板输入文本（备用方案，当YADB不可用时）
-     * 支持中文等非ASCII字符
-     */
-    private inputViaClipboard;
-    /**
-     * 逐字符输入文本（最后备用方案）
-     * 通过模拟按键输入，支持中文（如果有对应输入法）
-     */
-    private inputCharByChar;
     getElementsInfo(): Promise<ElementInfo[]>;
     getElementsNodeTree(): Promise<any>;
     getScreenSize(): Promise<{
@@ -129,22 +118,38 @@ declare class AndroidDevice implements AbstractInterface {
     private initializeDevicePixelRatio;
     getDisplayDensity(): Promise<number>;
     getDisplayOrientation(): Promise<number>;
-    size(): Promise<Size>;
     /**
-     * Generate cache feature for an element at given center point
-     * Cache is based on test case ID + device ID, so screen size is guaranteed to be consistent
-     * for same test case on same device. We store exact coordinates for maximum accuracy.
+     * Get physical screen dimensions adjusted for current orientation.
+     * Swaps width/height when the device is in landscape and the reported
+     * dimensions do not already reflect the current orientation.
      */
-    cacheFeatureForPoint(center: [number, number], options?: {
-        targetDescription?: string;
-        modelConfig?: IModelConfig;
-    }): Promise<ElementCacheFeature>;
+    private getOrientedPhysicalSize;
+    size(): Promise<Size>;
+    cacheFeatureForPoint(center: [number, number]): Promise<{
+        centerX: number;
+        centerY: number;
+        screenSize: {
+            width: number;
+            height: number;
+        };
+    }>;
+    rectMatchesCacheFeature(feature: {
+        centerX: number;
+        centerY: number;
+        screenSize: {
+            width: number;
+            height: number;
+        };
+    }): Promise<{
+        left: number;
+        top: number;
+        width: number;
+        height: number;
+    }>;
     /**
-     * Find element rect from cache feature
-     * Since cache is keyed by test case ID + device ID, screen size will be identical
-     * We return the exact cached coordinates for maximum accuracy.
+     * Convert logical coordinates (from AI) back to physical coordinates (for ADB).
+     * The ratio is derived from size(), so overriding size() alone is sufficient.
      */
-    rectMatchesCacheFeature(feature: ElementCacheFeature): Promise<Rect>;
     private adjustCoordinates;
     /**
      * Calculate the end point for scroll operations based on start point, scroll delta, and screen boundaries.
@@ -173,11 +178,15 @@ declare class AndroidDevice implements AbstractInterface {
     scrollRight(distance?: number, startPoint?: Point): Promise<void>;
     ensureYadb(): Promise<void>;
     /**
-     * Check if text contains characters that may cause issues with ADB inputText
-     * This includes:
-     * - Non-ASCII characters (Unicode characters like ö, é, ñ, Chinese, Japanese, etc.)
-     * - Format specifiers that may be interpreted by shell (%, $)
-     * - Special shell characters that need escaping
+     * Check if text contains characters that may cause issues with ADB inputText.
+     * appium-adb's inputText has known bugs with certain characters:
+     * - Backslash causes broken shell quoting
+     * - Backtick is not escaped at all
+     * - Text containing both " and ' throws an error
+     * - Dollar sign can cause variable expansion issues
+     *
+     * For these characters, we route through yadb which handles them correctly
+     * via escapeForShell + double-quoted shell context.
      */
     private shouldUseYadbForText;
     keyboardType(text: string, options?: AndroidDeviceInputOpt): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiscene/android",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "Android automation library for Midscene",
   "keywords": [
     "Android UI automation",
@@ -15,7 +15,11 @@
   "bin": {
     "midscene-android": "./bin/midscene-android"
   },
-  "files": ["bin", "dist", "README.md"],
+  "files": [
+    "bin",
+    "dist",
+    "README.md"
+  ],
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
@@ -29,34 +33,21 @@
     },
     "./package.json": "./package.json"
   },
-  "scripts": {
-    "dev": "npm run build:watch",
-    "prebuild": "node scripts/download-scrcpy-server.mjs && node scripts/download-yadb.mjs",
-    "build": "rslib build",
-    "build:watch": "rslib build --watch --no-clean",
-    "prepack": "node scripts/download-scrcpy-server.mjs && node scripts/download-yadb.mjs",
-    "playground": "DEBUG=midscene:* tsx demo/playground.ts",
-    "test": "vitest --run",
-    "test:u": "vitest --run -u",
-    "test:ai": "AI_TEST_TYPE=android npm run test",
-    "test:ai:cache": "MIDSCENE_CACHE=true AI_TEST_TYPE=android npm run test"
-  },
   "dependencies": {
-    "@midscene/core": "workspace:*",
-    "@midscene/shared": "workspace:*",
     "@yume-chan/adb": "2.5.1",
     "@yume-chan/adb-scrcpy": "2.3.2",
     "@yume-chan/adb-server-node-tcp": "2.5.2",
     "@yume-chan/scrcpy": "2.3.0",
     "@yume-chan/stream-extra": "2.1.0",
     "appium-adb": "12.12.1",
-    "sharp": "^0.34.3"
+    "sharp": "^0.34.3",
+    "@midscene/core": "1.6.0",
+    "@midscene/shared": "1.6.0"
   },
   "optionalDependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0"
   },
   "devDependencies": {
-    "@midscene/playground": "workspace:*",
     "@rslib/core": "^0.18.3",
     "@types/node": "^18.0.0",
     "dotenv": "^16.4.5",
@@ -64,7 +55,19 @@
     "typescript": "^5.8.3",
     "tsx": "^4.19.2",
     "vitest": "3.0.5",
-    "zod": "3.24.3"
+    "zod": "3.24.3",
+    "@midscene/playground": "1.6.0"
   },
-  "license": "MIT"
-}
+  "license": "MIT",
+  "scripts": {
+    "dev": "npm run build:watch",
+    "prebuild": "node scripts/download-scrcpy-server.mjs && node scripts/download-yadb.mjs",
+    "build": "rslib build",
+    "build:watch": "rslib build --watch --no-clean",
+    "playground": "DEBUG=midscene:* tsx demo/playground.ts",
+    "test": "vitest --run",
+    "test:u": "vitest --run -u",
+    "test:ai": "AI_TEST_TYPE=android npm run test",
+    "test:ai:cache": "MIDSCENE_CACHE=true AI_TEST_TYPE=android npm run test"
+  }
+}