@midscene/android 0.13.2-beta-20250403020006.0 → 0.14.0

package/dist/es/index.d.ts

@@ -1,21 +1,21 @@
-import { AbstractPage } from '@midscene/web';
-export { PageAgent as AndroidAgent } from '@midscene/web';
 import { Size, Point } from '@midscene/core';
 import { ElementInfo } from '@midscene/shared/extractor';
-import { ADB } from 'appium-adb';
+import { AndroidDevicePage } from '@midscene/web';
+import { ADB, Device } from 'appium-adb';
+import { PageAgent, PageAgentOpt } from '@midscene/web/agent';
 
-declare class AndroidDevice implements AbstractPage {
+declare class AndroidDevice implements AndroidDevicePage {
     private deviceId;
     private screenSize;
     private yadbPushed;
     private deviceRatio;
-    private adbInitPromise;
+    private adb;
+    private connectingAdb;
     pageType: string;
-    constructor({ deviceId }: {
-        deviceId: string;
-    });
-    private initAdb;
+    constructor(deviceId: string);
+    connect(): Promise<ADB>;
     getAdb(): Promise<ADB>;
+    launch(uri: string): Promise<AndroidDevice>;
     private execYadb;
     getElementsInfo(): Promise<ElementInfo[]>;
     getElementsNodeTree(): Promise<any>;
@@ -79,4 +79,11 @@ declare class AndroidDevice implements AbstractPage {
     destroy(): Promise<void>;
 }
 
-export { AndroidDevice };
+declare class AndroidAgent extends PageAgent<AndroidDevice> {
+    launch(uri: string): Promise<void>;
+}
+declare function agentFromAdbDevice(deviceId?: string, opts?: PageAgentOpt): Promise<AndroidAgent>;
+
+declare function getConnectedDevices(): Promise<Device[]>;
+
+export { AndroidAgent, AndroidDevice, agentFromAdbDevice, getConnectedDevices };

package/dist/es/index.js

@@ -1,35 +1,79 @@
-// src/index.ts
-import { PageAgent } from "@midscene/web";
-
 // src/page/index.ts
+import assert from "assert";
 import fs from "fs";
 import path from "path";
 import { getTmpFile } from "@midscene/core/utils";
 import { resizeImg } from "@midscene/shared/img";
 import { getDebug } from "@midscene/shared/logger";
 import { ADB } from "appium-adb";
-var debugPage = getDebug("android:adb");
 var androidScreenshotPath = "/data/local/tmp/midscene_screenshot.png";
+var debugPage = getDebug("android");
 var AndroidDevice = class {
-  constructor({ deviceId }) {
+  constructor(deviceId) {
     this.screenSize = null;
     this.yadbPushed = false;
     this.deviceRatio = 1;
+    this.adb = null;
+    this.connectingAdb = null;
     this.pageType = "android";
+    assert(deviceId, "deviceId is required for AndroidDevice");
     this.deviceId = deviceId;
-    this.adbInitPromise = this.initAdb();
   }
-  async initAdb() {
-    debugPage(`Initializing ADB with device ID: ${this.deviceId}`);
-    const adb = await ADB.createADB({
-      udid: this.deviceId,
-      adbExecTimeout: 6e4
-    });
-    debugPage("ADB initialized successfully");
-    return adb;
+  async connect() {
+    return this.getAdb();
   }
   async getAdb() {
-    return this.adbInitPromise;
+    if (this.adb) {
+      return this.adb;
+    }
+    if (this.connectingAdb) {
+      return this.connectingAdb;
+    }
+    this.connectingAdb = (async () => {
+      let error = null;
+      debugPage(`Initializing ADB with device ID: ${this.deviceId}`);
+      try {
+        this.adb = await ADB.createADB({
+          udid: this.deviceId,
+          adbExecTimeout: 6e4
+        });
+        debugPage("ADB initialized successfully");
+        return this.adb;
+      } catch (e) {
+        debugPage(`Failed to initialize ADB: ${e}`);
+        error = new Error(`Unable to connect to device ${this.deviceId}: ${e}`);
+      } finally {
+        this.connectingAdb = null;
+      }
+      if (error) {
+        throw error;
+      }
+      throw new Error("ADB initialization failed unexpectedly");
+    })();
+    return this.connectingAdb;
+  }
+  async launch(uri) {
+    const adb = await this.getAdb();
+    try {
+      if (uri.startsWith("http://") || uri.startsWith("https://") || uri.includes("://")) {
+        await adb.startUri(uri);
+      } else if (uri.includes("/")) {
+        const [appPackage, appActivity] = uri.split("/");
+        await adb.startApp({
+          pkg: appPackage,
+          activity: appActivity
+        });
+      } else {
+        await adb.startApp({
+          pkg: uri
+        });
+      }
+      debugPage(`Successfully launched: ${uri}`);
+    } catch (error) {
+      debugPage(`Error launching ${uri}: ${error}`);
+      throw new Error(`Failed to launch ${uri}: ${error}`, { cause: error });
+    }
+    return this;
   }
   async execYadb(keyboardContent) {
     await this.ensureYadb();
@@ -158,9 +202,11 @@ var AndroidDevice = class {
     }
     await this.ensureYadb();
     const adb = await this.getAdb();
+    await this.mouse.click(element.center[0], element.center[1]);
     await adb.shell(
       'app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "~CLEAR~"'
     );
+    await this.mouse.click(element.center[0], element.center[1]);
   }
   async forceScreenshot(path2) {
     await this.ensureYadb();
@@ -363,7 +409,45 @@ var AndroidDevice = class {
     }
   }
 };
+
+// src/agent/index.ts
+import { PageAgent } from "@midscene/web/agent";
+
+// src/utils/index.ts
+import { ADB as ADB2 } from "appium-adb";
+async function getConnectedDevices() {
+  try {
+    const adb = await ADB2.createADB({
+      adbExecTimeout: 6e4
+    });
+    const devices = await adb.getConnectedDevices();
+    debugPage(`Found ${devices.length} connected devices: `, devices);
+    return devices;
+  } catch (error) {
+    console.error("Failed to get device list:", error);
+    throw new Error("Unable to get connected Android device list");
+  }
+}
+
+// src/agent/index.ts
+var AndroidAgent = class extends PageAgent {
+  async launch(uri) {
+    const device = this.page;
+    await device.launch(uri);
+  }
+};
+async function agentFromAdbDevice(deviceId, opts) {
+  if (!deviceId) {
+    const devices = await getConnectedDevices();
+    deviceId = devices[0].udid;
+  }
+  const page = new AndroidDevice(deviceId);
+  await page.connect();
+  return new AndroidAgent(page, opts);
+}
 export {
-  PageAgent as AndroidAgent,
-  AndroidDevice
+  AndroidAgent,
+  AndroidDevice,
+  agentFromAdbDevice,
+  getConnectedDevices
 };

package/dist/lib/index.d.ts

@@ -1,21 +1,21 @@
-import { AbstractPage } from '@midscene/web';
-export { PageAgent as AndroidAgent } from '@midscene/web';
 import { Size, Point } from '@midscene/core';
 import { ElementInfo } from '@midscene/shared/extractor';
-import { ADB } from 'appium-adb';
+import { AndroidDevicePage } from '@midscene/web';
+import { ADB, Device } from 'appium-adb';
+import { PageAgent, PageAgentOpt } from '@midscene/web/agent';
 
-declare class AndroidDevice implements AbstractPage {
+declare class AndroidDevice implements AndroidDevicePage {
     private deviceId;
     private screenSize;
     private yadbPushed;
     private deviceRatio;
-    private adbInitPromise;
+    private adb;
+    private connectingAdb;
     pageType: string;
-    constructor({ deviceId }: {
-        deviceId: string;
-    });
-    private initAdb;
+    constructor(deviceId: string);
+    connect(): Promise<ADB>;
     getAdb(): Promise<ADB>;
+    launch(uri: string): Promise<AndroidDevice>;
     private execYadb;
     getElementsInfo(): Promise<ElementInfo[]>;
     getElementsNodeTree(): Promise<any>;
@@ -79,4 +79,11 @@ declare class AndroidDevice implements AbstractPage {
     destroy(): Promise<void>;
 }
 
-export { AndroidDevice };
+declare class AndroidAgent extends PageAgent<AndroidDevice> {
+    launch(uri: string): Promise<void>;
+}
+declare function agentFromAdbDevice(deviceId?: string, opts?: PageAgentOpt): Promise<AndroidAgent>;
+
+declare function getConnectedDevices(): Promise<Device[]>;
+
+export { AndroidAgent, AndroidDevice, agentFromAdbDevice, getConnectedDevices };

package/dist/lib/index.js

@@ -30,41 +30,89 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  AndroidAgent: () => import_web.PageAgent,
-  AndroidDevice: () => AndroidDevice
+  AndroidAgent: () => AndroidAgent,
+  AndroidDevice: () => AndroidDevice,
+  agentFromAdbDevice: () => agentFromAdbDevice,
+  getConnectedDevices: () => getConnectedDevices
 });
 module.exports = __toCommonJS(src_exports);
-var import_web = require("@midscene/web");
 
 // src/page/index.ts
+var import_node_assert = __toESM(require("assert"));
 var import_node_fs = __toESM(require("fs"));
 var import_node_path = __toESM(require("path"));
 var import_utils = require("@midscene/core/utils");
 var import_img = require("@midscene/shared/img");
 var import_logger = require("@midscene/shared/logger");
 var import_appium_adb = require("appium-adb");
-var debugPage = (0, import_logger.getDebug)("android:adb");
 var androidScreenshotPath = "/data/local/tmp/midscene_screenshot.png";
+var debugPage = (0, import_logger.getDebug)("android");
 var AndroidDevice = class {
-  constructor({ deviceId }) {
+  constructor(deviceId) {
     this.screenSize = null;
     this.yadbPushed = false;
     this.deviceRatio = 1;
+    this.adb = null;
+    this.connectingAdb = null;
     this.pageType = "android";
+    (0, import_node_assert.default)(deviceId, "deviceId is required for AndroidDevice");
     this.deviceId = deviceId;
-    this.adbInitPromise = this.initAdb();
   }
-  async initAdb() {
-    debugPage(`Initializing ADB with device ID: ${this.deviceId}`);
-    const adb = await import_appium_adb.ADB.createADB({
-      udid: this.deviceId,
-      adbExecTimeout: 6e4
-    });
-    debugPage("ADB initialized successfully");
-    return adb;
+  async connect() {
+    return this.getAdb();
   }
   async getAdb() {
-    return this.adbInitPromise;
+    if (this.adb) {
+      return this.adb;
+    }
+    if (this.connectingAdb) {
+      return this.connectingAdb;
+    }
+    this.connectingAdb = (async () => {
+      let error = null;
+      debugPage(`Initializing ADB with device ID: ${this.deviceId}`);
+      try {
+        this.adb = await import_appium_adb.ADB.createADB({
+          udid: this.deviceId,
+          adbExecTimeout: 6e4
+        });
+        debugPage("ADB initialized successfully");
+        return this.adb;
+      } catch (e) {
+        debugPage(`Failed to initialize ADB: ${e}`);
+        error = new Error(`Unable to connect to device ${this.deviceId}: ${e}`);
+      } finally {
+        this.connectingAdb = null;
+      }
+      if (error) {
+        throw error;
+      }
+      throw new Error("ADB initialization failed unexpectedly");
+    })();
+    return this.connectingAdb;
+  }
+  async launch(uri) {
+    const adb = await this.getAdb();
+    try {
+      if (uri.startsWith("http://") || uri.startsWith("https://") || uri.includes("://")) {
+        await adb.startUri(uri);
+      } else if (uri.includes("/")) {
+        const [appPackage, appActivity] = uri.split("/");
+        await adb.startApp({
+          pkg: appPackage,
+          activity: appActivity
+        });
+      } else {
+        await adb.startApp({
+          pkg: uri
+        });
+      }
+      debugPage(`Successfully launched: ${uri}`);
+    } catch (error) {
+      debugPage(`Error launching ${uri}: ${error}`);
+      throw new Error(`Failed to launch ${uri}: ${error}`, { cause: error });
+    }
+    return this;
   }
   async execYadb(keyboardContent) {
     await this.ensureYadb();
@@ -193,9 +241,11 @@ var AndroidDevice = class {
     }
     await this.ensureYadb();
     const adb = await this.getAdb();
+    await this.mouse.click(element.center[0], element.center[1]);
     await adb.shell(
       'app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard "~CLEAR~"'
     );
+    await this.mouse.click(element.center[0], element.center[1]);
   }
   async forceScreenshot(path2) {
     await this.ensureYadb();
@@ -398,8 +448,46 @@ var AndroidDevice = class {
     }
   }
 };
+
+// src/agent/index.ts
+var import_agent = require("@midscene/web/agent");
+
+// src/utils/index.ts
+var import_appium_adb2 = require("appium-adb");
+async function getConnectedDevices() {
+  try {
+    const adb = await import_appium_adb2.ADB.createADB({
+      adbExecTimeout: 6e4
+    });
+    const devices = await adb.getConnectedDevices();
+    debugPage(`Found ${devices.length} connected devices: `, devices);
+    return devices;
+  } catch (error) {
+    console.error("Failed to get device list:", error);
+    throw new Error("Unable to get connected Android device list");
+  }
+}
+
+// src/agent/index.ts
+var AndroidAgent = class extends import_agent.PageAgent {
+  async launch(uri) {
+    const device = this.page;
+    await device.launch(uri);
+  }
+};
+async function agentFromAdbDevice(deviceId, opts) {
+  if (!deviceId) {
+    const devices = await getConnectedDevices();
+    deviceId = devices[0].udid;
+  }
+  const page = new AndroidDevice(deviceId);
+  await page.connect();
+  return new AndroidAgent(page, opts);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AndroidAgent,
-  AndroidDevice
+  AndroidDevice,
+  agentFromAdbDevice,
+  getConnectedDevices
 });

package/dist/types/index.d.ts

@@ -1,21 +1,21 @@
-import { AbstractPage } from '@midscene/web';
-export { PageAgent as AndroidAgent } from '@midscene/web';
 import { Size, Point } from '@midscene/core';
 import { ElementInfo } from '@midscene/shared/extractor';
-import { ADB } from 'appium-adb';
+import { AndroidDevicePage } from '@midscene/web';
+import { ADB, Device } from 'appium-adb';
+import { PageAgent, PageAgentOpt } from '@midscene/web/agent';
 
-declare class AndroidDevice implements AbstractPage {
+declare class AndroidDevice implements AndroidDevicePage {
     private deviceId;
     private screenSize;
     private yadbPushed;
     private deviceRatio;
-    private adbInitPromise;
+    private adb;
+    private connectingAdb;
     pageType: string;
-    constructor({ deviceId }: {
-        deviceId: string;
-    });
-    private initAdb;
+    constructor(deviceId: string);
+    connect(): Promise<ADB>;
     getAdb(): Promise<ADB>;
+    launch(uri: string): Promise<AndroidDevice>;
     private execYadb;
     getElementsInfo(): Promise<ElementInfo[]>;
     getElementsNodeTree(): Promise<any>;
@@ -79,4 +79,11 @@ declare class AndroidDevice implements AbstractPage {
     destroy(): Promise<void>;
 }
 
-export { AndroidDevice };
+declare class AndroidAgent extends PageAgent<AndroidDevice> {
+    launch(uri: string): Promise<void>;
+}
+declare function agentFromAdbDevice(deviceId?: string, opts?: PageAgentOpt): Promise<AndroidAgent>;
+
+declare function getConnectedDevices(): Promise<Device[]>;
+
+export { AndroidAgent, AndroidDevice, agentFromAdbDevice, getConnectedDevices };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "0.13.2-beta-20250403020006.0",
+  "version": "0.14.0",
   "description": "Android automation library for Midscene",
   "main": "./dist/lib/index.js",
   "types": "./dist/types/index.d.ts",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "appium-adb": "12.12.1",
-    "@midscene/web": "0.13.2-beta-20250403020006.0",
-    "@midscene/core": "0.13.2-beta-20250403020006.0",
-    "@midscene/shared": "0.13.2-beta-20250403020006.0"
+    "@midscene/web": "0.14.0",
+    "@midscene/core": "0.14.0",
+    "@midscene/shared": "0.14.0"
   },
   "devDependencies": {
     "@modern-js/module-tools": "2.60.6",