@midscene/android 0.14.3 → 0.14.4-beta-20250415065130.0

package/dist/es/index.d.ts

@@ -15,6 +15,7 @@ declare class AndroidDevice implements AndroidDevicePage {
     constructor(deviceId: string);
     connect(): Promise<ADB>;
     getAdb(): Promise<ADB>;
+    private createAdbProxy;
     launch(uri: string): Promise<AndroidDevice>;
     private execYadb;
     getElementsInfo(): Promise<ElementInfo[]>;

package/dist/es/index.js

@@ -24,10 +24,10 @@ var AndroidDevice = class {
   }
   async getAdb() {
     if (this.adb) {
-      return this.adb;
+      return this.createAdbProxy(this.adb);
     }
     if (this.connectingAdb) {
-      return this.connectingAdb;
+      return this.connectingAdb.then((adb) => this.createAdbProxy(adb));
     }
     this.connectingAdb = (async () => {
       let error = null;
@@ -60,26 +60,56 @@ ${Object.keys(size).filter((key) => size[key]).map(
     })();
     return this.connectingAdb;
   }
+  createAdbProxy(adb) {
+    return new Proxy(adb, {
+      get: (target, prop) => {
+        const originalMethod = target[prop];
+        if (typeof originalMethod !== "function") {
+          return originalMethod;
+        }
+        return async (...args) => {
+          try {
+            return await originalMethod.apply(target, args);
+          } catch (error) {
+            const methodName = String(prop);
+            const deviceId = this.deviceId;
+            debugPage(
+              `ADB error with device ${deviceId} when calling ${methodName}: ${error}`
+            );
+            throw new Error(
+              `ADB error with device ${deviceId} when calling ${methodName}, please check https://midscenejs.com/integrate-with-android.html#faq : ${error.message}`,
+              {
+                cause: error
+              }
+            );
+          }
+        };
+      }
+    });
+  }
   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("/")) {
+      } else {
         const [appPackage, appActivity] = uri.split("/");
+        if (!appPackage || !appActivity) {
+          throw new Error(
+            `Invalid URI format: ${uri}, expected format: com.android/settings.Settings`
+          );
+        }
         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 });
+      throw new Error(`Failed to launch ${uri}: ${error.message}`, {
+        cause: error
+      });
     }
     return this;
   }
@@ -434,7 +464,12 @@ async function getConnectedDevices() {
     return devices;
   } catch (error) {
     console.error("Failed to get device list:", error);
-    throw new Error("Unable to get connected Android device list");
+    throw new Error(
+      `Unable to get connected Android device list, please check https://midscenejs.com/integrate-with-android.html#faq : ${error.message}`,
+      {
+        cause: error
+      }
+    );
   }
 }
 
@@ -457,6 +492,10 @@ async function agentFromAdbDevice(deviceId, opts) {
   if (!deviceId) {
     const devices = await getConnectedDevices();
     deviceId = devices[0].udid;
+    debugPage(
+      "deviceId not specified, will use the first device (id = %s)",
+      deviceId
+    );
   }
   const page = new AndroidDevice(deviceId);
   await page.connect();

package/dist/lib/index.d.ts

@@ -15,6 +15,7 @@ declare class AndroidDevice implements AndroidDevicePage {
     constructor(deviceId: string);
     connect(): Promise<ADB>;
     getAdb(): Promise<ADB>;
+    private createAdbProxy;
     launch(uri: string): Promise<AndroidDevice>;
     private execYadb;
     getElementsInfo(): Promise<ElementInfo[]>;

package/dist/lib/index.js

@@ -63,10 +63,10 @@ var AndroidDevice = class {
   }
   async getAdb() {
     if (this.adb) {
-      return this.adb;
+      return this.createAdbProxy(this.adb);
     }
     if (this.connectingAdb) {
-      return this.connectingAdb;
+      return this.connectingAdb.then((adb) => this.createAdbProxy(adb));
     }
     this.connectingAdb = (async () => {
       let error = null;
@@ -99,26 +99,56 @@ ${Object.keys(size).filter((key) => size[key]).map(
     })();
     return this.connectingAdb;
   }
+  createAdbProxy(adb) {
+    return new Proxy(adb, {
+      get: (target, prop) => {
+        const originalMethod = target[prop];
+        if (typeof originalMethod !== "function") {
+          return originalMethod;
+        }
+        return async (...args) => {
+          try {
+            return await originalMethod.apply(target, args);
+          } catch (error) {
+            const methodName = String(prop);
+            const deviceId = this.deviceId;
+            debugPage(
+              `ADB error with device ${deviceId} when calling ${methodName}: ${error}`
+            );
+            throw new Error(
+              `ADB error with device ${deviceId} when calling ${methodName}, please check https://midscenejs.com/integrate-with-android.html#faq : ${error.message}`,
+              {
+                cause: error
+              }
+            );
+          }
+        };
+      }
+    });
+  }
   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("/")) {
+      } else {
         const [appPackage, appActivity] = uri.split("/");
+        if (!appPackage || !appActivity) {
+          throw new Error(
+            `Invalid URI format: ${uri}, expected format: com.android/settings.Settings`
+          );
+        }
         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 });
+      throw new Error(`Failed to launch ${uri}: ${error.message}`, {
+        cause: error
+      });
     }
     return this;
   }
@@ -473,7 +503,12 @@ async function getConnectedDevices() {
     return devices;
   } catch (error) {
     console.error("Failed to get device list:", error);
-    throw new Error("Unable to get connected Android device list");
+    throw new Error(
+      `Unable to get connected Android device list, please check https://midscenejs.com/integrate-with-android.html#faq : ${error.message}`,
+      {
+        cause: error
+      }
+    );
   }
 }
 
@@ -496,6 +531,10 @@ async function agentFromAdbDevice(deviceId, opts) {
   if (!deviceId) {
     const devices = await getConnectedDevices();
     deviceId = devices[0].udid;
+    debugPage(
+      "deviceId not specified, will use the first device (id = %s)",
+      deviceId
+    );
   }
   const page = new AndroidDevice(deviceId);
   await page.connect();

package/dist/types/index.d.ts

@@ -15,6 +15,7 @@ declare class AndroidDevice implements AndroidDevicePage {
     constructor(deviceId: string);
     connect(): Promise<ADB>;
     getAdb(): Promise<ADB>;
+    private createAdbProxy;
     launch(uri: string): Promise<AndroidDevice>;
     private execYadb;
     getElementsInfo(): Promise<ElementInfo[]>;

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@midscene/android",
-  "version": "0.14.3",
+  "version": "0.14.4-beta-20250415065130.0",
   "description": "Android automation library for Midscene",
   "main": "./dist/lib/index.js",
   "types": "./dist/types/index.d.ts",
   "files": [
     "dist",
-    "bin",
     "README.md"
   ],
   "exports": {
@@ -17,9 +16,9 @@
   },
   "dependencies": {
     "appium-adb": "12.12.1",
-    "@midscene/web": "0.14.3",
-    "@midscene/core": "0.14.3",
-    "@midscene/shared": "0.14.3"
+    "@midscene/shared": "0.14.4-beta-20250415065130.0",
+    "@midscene/web": "0.14.4-beta-20250415065130.0",
+    "@midscene/core": "0.14.4-beta-20250415065130.0"
   },
   "devDependencies": {
     "@modern-js/module-tools": "2.60.6",
@@ -30,7 +29,9 @@
   },
   "license": "MIT",
   "scripts": {
+    "dev": "modern dev",
     "build": "modern build -c ./modern.config.ts",
+    "build:watch": "modern build -w -c ./modern.config.ts",
     "test": "vitest --run",
     "test:u": "vitest --run -u",
     "test:ai": "MIDSCENE_CACHE=true npm run test"