@mcesystems/adb-kit 1.0.87 → 1.0.91

package/dist/index.mjs

@@ -25696,7 +25696,7 @@ var require_server = __commonJS({
 var require_api = __commonJS({
   "../../node_modules/.pnpm/@devicefarmer+adbkit-monkey@1.2.1/node_modules/@devicefarmer/adbkit-monkey/lib/monkey/api.js"(exports2, module2) {
     (function() {
-      var Api, EventEmitter, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) {
+      var Api, EventEmitter2, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) {
         for (var key in parent) {
           if (__hasProp.call(parent, key)) child[key] = parent[key];
         }
@@ -25708,7 +25708,7 @@ var require_api = __commonJS({
         child.__super__ = parent.prototype;
         return child;
       };
-      EventEmitter = __require("events").EventEmitter;
+      EventEmitter2 = __require("events").EventEmitter;
       Api = (function(_super) {
         __extends(Api2, _super);
         function Api2() {
@@ -25922,7 +25922,7 @@ var require_api = __commonJS({
           return this;
         };
         return Api2;
-      })(EventEmitter);
+      })(EventEmitter2);
       module2.exports = Api;
     }).call(exports2);
   }
@@ -26103,7 +26103,7 @@ var require_multi = __commonJS({
 var require_parser2 = __commonJS({
   "../../node_modules/.pnpm/@devicefarmer+adbkit-monkey@1.2.1/node_modules/@devicefarmer/adbkit-monkey/lib/monkey/parser.js"(exports2, module2) {
     (function() {
-      var EventEmitter, Parser, Reply, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) {
+      var EventEmitter2, Parser, Reply, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) {
         for (var key in parent) {
           if (__hasProp.call(parent, key)) child[key] = parent[key];
         }
@@ -26115,7 +26115,7 @@ var require_parser2 = __commonJS({
         child.__super__ = parent.prototype;
         return child;
       };
-      EventEmitter = __require("events").EventEmitter;
+      EventEmitter2 = __require("events").EventEmitter;
       Reply = require_reply();
       Parser = (function(_super) {
         __extends(Parser2, _super);
@@ -26163,7 +26163,7 @@ var require_parser2 = __commonJS({
           this.emit("error", new SyntaxError("Unparseable line '" + line + "'"));
         };
         return Parser2;
-      })(EventEmitter);
+      })(EventEmitter2);
       module2.exports = Parser;
     }).call(exports2);
   }
@@ -30216,6 +30216,7 @@ var require_dist = __commonJS({
 
 // src/logic/adbDeviceKit.ts
 var adbkit = __toESM(require_dist());
+import { EventEmitter } from "node:events";
 
 // ../tool-debug/dist/index.mjs
 import process22 from "node:process";
@@ -31349,6 +31350,11 @@ function portNumbers(from, to) {
   return generator(from, to);
 }
 
+// src/types/usbDebugging.ts
+var USB_DEBUGGING_EVENT_OFF = "usbDebuggingOff";
+var USB_DEBUGGING_EVENT_NEEDS_ALWAYS_ALLOW = "usbDebuggingNeedsAlwaysAllow";
+var USB_DEBUGGING_EVENT_AUTHORIZED = "usbDebuggingAuthorized";
+
 // src/utils/adbPath.ts
 import { existsSync } from "node:fs";
 import path from "node:path";
@@ -31445,8 +31451,9 @@ var deviceProps = {
   "Build User": "ro.build.user"
 };
 var AdbDeviceKit = class {
-  constructor(deviceId, port) {
+  constructor(deviceId, port, config) {
     this.port = port;
+    this.config = config;
     setNamespace(`adb-kit:${deviceId}`);
     ensureAdbPathFromResources();
     installConnectionErrorHandler();
@@ -31460,7 +31467,7 @@ var AdbDeviceKit = class {
   deviceId;
   devicePort = null;
   connect() {
-    const adbBin = process.env.ADB_PATH ?? getAdbBinaryPath() ?? "adb";
+    const adbBin = process.env.ADB_PATH ?? this.config?.binPath ?? "adb";
     const client = adbkit.default.createClient({ bin: adbBin });
     const errorHandler = (err) => {
       logError(`ADB client connection error (e.g. device disconnected): ${err.message}`);
@@ -31526,81 +31533,95 @@ var AdbDeviceKit = class {
    * during tracking don't affect other operations.
    */
   createTrackingClient() {
-    const adbBin = process.env.ADB_PATH ?? getAdbBinaryPath() ?? "adb";
+    const adbBin = process.env.ADB_PATH ?? this.config?.binPath ?? "adb";
     return adbkit.default.createClient({ bin: adbBin });
   }
-  async waitForUsbDebugging(timeout2 = 12e4, _numberOfAllowedAttempts = 5) {
-    if (await this.hasUsbDebugging()) {
-      logDetail("USB debugging is already enabled");
-      return true;
-    }
-    const trackingClient = this.createTrackingClient();
-    const tracker = await trackingClient.trackDevices();
-    let settled = false;
-    return new Promise((resolve, reject) => {
-      const timeoutId = setTimeout(() => {
-        logError("Timeout waiting for USB debugging");
-        settle({ type: "reject", err: new Error("Timeout waiting for USB debugging") });
-      }, timeout2);
-      const cleanupTrackingClient = () => {
-        try {
-          tracker.end();
-        } catch {
-        }
-        trackingClient.on("error", () => {
+  matchesDeviceId(device) {
+    return device.id === this.deviceId || device.id.endsWith(this.deviceId);
+  }
+  waitForUsbDebugging(timeout2 = 12e4, _numberOfAllowedAttempts = 5) {
+    const events = new EventEmitter();
+    const promise = (async () => {
+      if (await this.hasUsbDebugging()) {
+        logDetail("USB debugging is already enabled");
+        return true;
+      }
+      const trackingClient = this.createTrackingClient();
+      const tracker = await trackingClient.trackDevices();
+      events.emit(USB_DEBUGGING_EVENT_OFF);
+      let settled = false;
+      return new Promise((resolve, reject) => {
+        const timeoutId = setTimeout(() => {
+          logError("Timeout waiting for USB debugging");
+          settle({ type: "reject", err: new Error("Timeout waiting for USB debugging") });
+        }, timeout2);
+        const cleanupTrackingClient = () => {
+          try {
+            tracker.end();
+          } catch {
+          }
+          trackingClient.on("error", () => {
+          });
+        };
+        const settle = (result) => {
+          if (settled) return;
+          settled = true;
+          clearTimeout(timeoutId);
+          cleanupTrackingClient();
+          if (result.type === "resolve") {
+            resolve(result.value);
+          } else {
+            logError(result.err.message);
+            reject(result.err);
+          }
+        };
+        const handleAddOrChange = (device) => {
+          if (!this.matchesDeviceId(device)) return;
+          if (device.type === "unauthorized") {
+            logDetail("Device needs 'Always allow' authorization");
+            events.emit(USB_DEBUGGING_EVENT_NEEDS_ALWAYS_ALLOW);
+            return;
+          }
+          if (device.type === "device") {
+            logDetail("Device authorized");
+            events.emit(USB_DEBUGGING_EVENT_AUTHORIZED);
+            settle({ type: "resolve", value: true });
+          }
+        };
+        trackingClient.on("error", (err) => {
+          if (isConnectionErrorMessage(err)) {
+            logDetail(`Tracking client connection closed: ${err.message}`);
+            settle({ type: "resolve", value: false });
+          } else {
+            logError(`Tracking client error: ${err.message}`);
+            settle({ type: "reject", err });
+          }
         });
-      };
-      const settle = (result) => {
-        if (settled) return;
-        settled = true;
-        clearTimeout(timeoutId);
-        cleanupTrackingClient();
-        if (result.type === "resolve") {
-          resolve(result.value);
-        } else {
-          logError(result.err.message);
-          reject(result.err);
-        }
-      };
-      trackingClient.on("error", (err) => {
-        if (isConnectionErrorMessage(err)) {
-          logDetail(`Tracking client connection closed: ${err.message}`);
-          settle({ type: "resolve", value: false });
-        } else {
-          logError(`Tracking client error: ${err.message}`);
-          settle({ type: "reject", err });
-        }
-      });
-      tracker.on("error", (err) => {
-        if (isConnectionErrorMessage(err)) {
-          logDetail(`Tracker connection closed: ${err.message}`);
+        tracker.on("error", (err) => {
+          if (isConnectionErrorMessage(err)) {
+            logDetail(`Tracker connection closed: ${err.message}`);
+            settle({ type: "resolve", value: false });
+          } else {
+            logError(`Tracker error: ${err.message}`);
+            settle({ type: "reject", err });
+          }
+        });
+        tracker.on("end", () => {
+          logDetail("Device tracking ended");
           settle({ type: "resolve", value: false });
-        } else {
-          logError(`Tracker error: ${err.message}`);
-          settle({ type: "reject", err });
-        }
-      });
-      tracker.on("end", () => {
-        logDetail("Device tracking ended");
-        settle({ type: "resolve", value: false });
-      });
-      tracker.on("remove", (_) => {
-        logError("Device removed from tracker");
-        settle({ type: "reject", err: new Error("Device removed while waiting for USB debugging") });
-      });
-      tracker.on("add", (device) => {
-        if (device.type === "device") {
-          logDetail("Device added to tracker");
-          settle({ type: "resolve", value: true });
-        }
-      });
-      tracker.on("change", (device) => {
-        if (device.type === "device") {
-          logDetail("Device changed in tracker");
-          settle({ type: "resolve", value: true });
-        }
+        });
+        tracker.on("remove", (_) => {
+          logError("Device removed from tracker");
+          settle({
+            type: "reject",
+            err: new Error("Device removed while waiting for USB debugging")
+          });
+        });
+        tracker.on("add", handleAddOrChange);
+        tracker.on("change", handleAddOrChange);
       });
-    });
+    })();
+    return { promise, events };
   }
   async startPortForward(serviceName) {
     if (this.devicePort) {
@@ -31629,6 +31650,9 @@ var import_adbkit = __toESM(require_dist());
 var readAll = import_adbkit.default.util.readAll;
 export {
   AdbDeviceKit,
+  USB_DEBUGGING_EVENT_AUTHORIZED,
+  USB_DEBUGGING_EVENT_NEEDS_ALWAYS_ALLOW,
+  USB_DEBUGGING_EVENT_OFF,
   readAll
 };
 //# sourceMappingURL=index.mjs.map