@mcesystems/adb-kit 1.0.90 → 1.0.92

package/dist/index.js

@@ -25692,7 +25692,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];
         }
@@ -25704,7 +25704,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() {
@@ -25918,7 +25918,7 @@ var require_api = __commonJS({
           return this;
         };
         return Api2;
-      })(EventEmitter);
+      })(EventEmitter2);
       module2.exports = Api;
     }).call(exports2);
   }
@@ -26099,7 +26099,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];
         }
@@ -26111,7 +26111,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);
@@ -26159,7 +26159,7 @@ var require_parser2 = __commonJS({
           this.emit("error", new SyntaxError("Unparseable line '" + line + "'"));
         };
         return Parser2;
-      })(EventEmitter);
+      })(EventEmitter2);
       module2.exports = Parser;
     }).call(exports2);
   }
@@ -30214,11 +30214,15 @@ var require_dist = __commonJS({
 var index_exports = {};
 __export(index_exports, {
   AdbDeviceKit: () => AdbDeviceKit,
+  USB_DEBUGGING_EVENT_AUTHORIZED: () => USB_DEBUGGING_EVENT_AUTHORIZED,
+  USB_DEBUGGING_EVENT_NEEDS_ALWAYS_ALLOW: () => USB_DEBUGGING_EVENT_NEEDS_ALWAYS_ALLOW,
+  USB_DEBUGGING_EVENT_OFF: () => USB_DEBUGGING_EVENT_OFF,
   readAll: () => readAll
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/logic/adbDeviceKit.ts
+var import_node_events = require("node:events");
 var adbkit = __toESM(require_dist());
 
 // ../tool-debug/dist/index.mjs
@@ -31353,6 +31357,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
 var import_node_fs = require("node:fs");
 var import_node_path = __toESM(require("node:path"));
@@ -31477,7 +31486,7 @@ var AdbDeviceKit = class {
     return client;
   }
   async listDevices() {
-    const devices = await this.client.listDevices();
+    const devices = await this.client.listDevices().filter((device) => device.type === "device");
     return devices;
   }
   async getProperty(adbDevice, property) {
@@ -31534,78 +31543,99 @@ var AdbDeviceKit = class {
     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 import_node_events.EventEmitter();
+    const promise = (async () => {
+      const device = (await this.client.listDevices()).find((device2) => device2.id === this.deviceId);
+      logDetail(`Device: ${device?.id} (${device?.type})`);
+      if (device?.type === "device") {
+        logDetail("USB debugging is already enabled");
+        return true;
+      }
+      const trackingClient = this.createTrackingClient();
+      const tracker = await trackingClient.trackDevices();
+      if (device?.type === "unauthorized") {
+        logDetail("Device needs 'Always allow' authorization");
+        events.emit(USB_DEBUGGING_EVENT_NEEDS_ALWAYS_ALLOW);
+      } else {
+        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 = (device2) => {
+          if (!this.matchesDeviceId(device2)) return;
+          if (device2.type === "unauthorized") {
+            logDetail("Device needs 'Always allow' authorization");
+            events.emit(USB_DEBUGGING_EVENT_NEEDS_ALWAYS_ALLOW);
+            return;
+          }
+          if (device2.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) {
@@ -31635,6 +31665,9 @@ var readAll = import_adbkit.default.util.readAll;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AdbDeviceKit,
+  USB_DEBUGGING_EVENT_AUTHORIZED,
+  USB_DEBUGGING_EVENT_NEEDS_ALWAYS_ALLOW,
+  USB_DEBUGGING_EVENT_OFF,
   readAll
 });
 //# sourceMappingURL=index.js.map