@mcesystems/adb-kit 1.0.96 → 1.0.97

package/dist/index.js

@@ -31493,13 +31493,14 @@ var AdbDeviceKit = class {
       client.removeListener("error", errorHandler);
       this.client = this.connect();
       this.device = this.client.getDevice(this.deviceId);
+      client.off("error", errorHandler);
     };
     client.on("error", errorHandler);
     return client;
   }
   async listDevices() {
-    const devices = await this.client.listDevices().filter((device) => device.type === "device");
-    return devices;
+    const allDevices = await this.client.listDevices();
+    return allDevices.filter((device) => device.type === "device");
   }
   async getProperty(adbDevice, property) {
     try {
@@ -31558,6 +31559,38 @@ var AdbDeviceKit = class {
   matchesDeviceId(device) {
     return device.id === this.deviceId || device.id.endsWith(this.deviceId);
   }
+  /**
+   * Waits for USB debugging to be authorized (e.g. user enables and allows on device).
+   * Returns a promise that resolves when the device is ready, or false on timeout.
+   * Subscribe to events for progress (off, needs always allow, authorized).
+   */
+  waitForUsbDebugging(timeoutMs = 12e4, _numberOfAllowedAttempts) {
+    const events = new UsbDebuggingEventEmitter();
+    let cleanupRef = null;
+    const promise = new Promise((resolve, reject) => {
+      let settled = false;
+      const done = (value) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timeout2);
+        cleanupRef?.();
+        cleanupRef = null;
+        resolve(value);
+      };
+      const timeout2 = setTimeout(() => done(false), timeoutMs);
+      events.once(USB_DEBUGGING_EVENT_AUTHORIZED, () => done(true));
+      this.trackUsbDebuggingStatus(events).then((c) => {
+        cleanupRef = c;
+      }).catch((err) => {
+        if (!settled) {
+          settled = true;
+          clearTimeout(timeout2);
+          reject(err);
+        }
+      });
+    });
+    return { promise, events };
+  }
   async trackUsbDebuggingStatus(eventEmitter) {
     const device = (await this.client.listDevices()).find(
       (device2) => device2.id === this.deviceId
@@ -31582,7 +31615,7 @@ var AdbDeviceKit = class {
       logError("Device removed from tracker");
       eventEmitter.emit(USB_DEBUGGING_EVENT_OFF, { deviceId: this.deviceId });
     });
-    tracker.on("change", (device2) => {
+    const handleDeviceChange = (device2) => {
       if (!this.matchesDeviceId(device2)) return;
       if (device2.type === "unauthorized") {
         logDetail("Device needs 'Always allow' authorization");
@@ -31596,7 +31629,9 @@ var AdbDeviceKit = class {
         logDetail("Device removed from tracker");
         eventEmitter.emit(USB_DEBUGGING_EVENT_OFF, { deviceId: this.deviceId });
       }
-    });
+    };
+    tracker.on("add", handleDeviceChange);
+    tracker.on("change", handleDeviceChange);
     return () => tracker.end();
   }
   async startPortForward(serviceName) {