@midscene/android 0.16.8 → 0.16.9-beta-20250507095704.0

package/dist/es/index.js

@@ -2,7 +2,9 @@
 import assert from "assert";
 import fs from "fs";
 import path from "path";
+import { getAIConfig } from "@midscene/core";
 import { getTmpFile } from "@midscene/core/utils";
+import { MIDSCENE_ADB_PATH } from "@midscene/shared/env";
 import { isValidPNGImageBuffer, resizeImg } from "@midscene/shared/img";
 import { getDebug } from "@midscene/shared/logger";
 import { ADB } from "appium-adb";
@@ -33,9 +35,11 @@ var AndroidDevice = class {
       let error = null;
       debugPage(`Initializing ADB with device ID: ${this.deviceId}`);
       try {
+        const androidAdbPath = getAIConfig(MIDSCENE_ADB_PATH);
         this.adb = await ADB.createADB({
           udid: this.deviceId,
-          adbExecTimeout: 6e4
+          adbExecTimeout: 6e4,
+          executable: androidAdbPath ? { path: androidAdbPath, defaultArgs: [] } : void 0
         });
         const size = await this.getScreenSize();
         console.log(`

package/dist/lib/index.js

@@ -34,7 +34,7 @@ __export(src_exports, {
   AndroidDevice: () => AndroidDevice,
   agentFromAdbDevice: () => agentFromAdbDevice,
   getConnectedDevices: () => getConnectedDevices,
-  overrideAIConfig: () => import_env2.overrideAIConfig
+  overrideAIConfig: () => import_env3.overrideAIConfig
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -42,7 +42,9 @@ module.exports = __toCommonJS(src_exports);
 var import_node_assert = __toESM(require("assert"));
 var import_node_fs = __toESM(require("fs"));
 var import_node_path = __toESM(require("path"));
+var import_core = require("@midscene/core");
 var import_utils = require("@midscene/core/utils");
+var import_env = require("@midscene/shared/env");
 var import_img = require("@midscene/shared/img");
 var import_logger = require("@midscene/shared/logger");
 var import_appium_adb = require("appium-adb");
@@ -73,9 +75,11 @@ var AndroidDevice = class {
       let error = null;
       debugPage(`Initializing ADB with device ID: ${this.deviceId}`);
       try {
+        const androidAdbPath = (0, import_core.getAIConfig)(import_env.MIDSCENE_ADB_PATH);
         this.adb = await import_appium_adb.ADB.createADB({
           udid: this.deviceId,
-          adbExecTimeout: 6e4
+          adbExecTimeout: 6e4,
+          executable: androidAdbPath ? { path: androidAdbPath, defaultArgs: [] } : void 0
         });
         const size = await this.getScreenSize();
         console.log(`
@@ -515,7 +519,7 @@ ${Object.keys(size).filter((key) => size[key]).map(
 
 // src/agent/index.ts
 var import_agent = require("@midscene/web/agent");
-var import_env = require("@midscene/shared/env");
+var import_env2 = require("@midscene/shared/env");
 
 // src/utils/index.ts
 var import_appium_adb2 = require("appium-adb");
@@ -542,7 +546,7 @@ async function getConnectedDevices() {
 var AndroidAgent = class extends import_agent.PageAgent {
   constructor(page, opts) {
     super(page, opts);
-    if (!(0, import_env.vlLocateMode)()) {
+    if (!(0, import_env2.vlLocateMode)()) {
       throw new Error(
         "Android Agent only supports vl-model. https://midscenejs.com/choose-a-model.html"
       );
@@ -568,7 +572,7 @@ async function agentFromAdbDevice(deviceId, opts) {
 }
 
 // src/index.ts
-var import_env2 = require("@midscene/shared/env");
+var import_env3 = require("@midscene/shared/env");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AndroidAgent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "0.16.8",
+  "version": "0.16.9-beta-20250507095704.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/core": "0.16.8",
-    "@midscene/shared": "0.16.8",
-    "@midscene/web": "0.16.8"
+    "@midscene/shared": "0.16.9-beta-20250507095704.0",
+    "@midscene/web": "0.16.9-beta-20250507095704.0",
+    "@midscene/core": "0.16.9-beta-20250507095704.0"
   },
   "devDependencies": {
     "@modern-js/module-tools": "2.60.6",