@mcesystems/adb-kit 1.0.68 → 1.0.69

package/dist/index.mjs

@@ -29851,7 +29851,7 @@ var require_adb = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     var client_1 = __importDefault(require_client2());
     var util_1 = __importDefault(require_util3());
-    var Adb = class {
+    var Adb2 = class {
       static createClient(options = {}) {
         const opts = {
           bin: options.bin,
@@ -29868,8 +29868,8 @@ var require_adb = __commonJS({
         return new client_1.default(opts);
       }
     };
-    Adb.util = util_1.default;
-    exports2.default = Adb;
+    Adb2.util = util_1.default;
+    exports2.default = Adb2;
   }
 });
 
@@ -31281,6 +31281,23 @@ function ensureAdbPathFromResources() {
     logInfo(`Using ADB from resources: ${adbPath}`);
   }
 }
+function isConnectionErrorMessage(err) {
+  const msg = err.message ?? "";
+  const code = err.code ?? "";
+  const name = err.name ?? "";
+  return msg.includes("ECONNRESET") || msg.includes("EPIPE") || msg.includes("Premature end of stream") || code === "ECONNRESET" || code === "EPIPE" || name === "PrematureEOFError";
+}
+var connectionErrorHandlerInstalled = false;
+function installConnectionErrorHandler() {
+  if (connectionErrorHandlerInstalled) return;
+  connectionErrorHandlerInstalled = true;
+  process.on("unhandledRejection", (reason) => {
+    if (reason instanceof Error && isConnectionErrorMessage(reason)) {
+      logDetail(`Suppressed expected ADB connection error: ${reason.message}`);
+      return;
+    }
+  });
+}
 var deviceProps = {
   Manufacturer: "ro.product.manufacturer",
   Name: "ro.product.name",
@@ -31315,9 +31332,8 @@ var AdbDeviceKit = class {
     setLogLevel(process.env.LOG_LEVEL ?? "none");
     logNamespace(`adb:${deviceId}`);
     ensureAdbPathFromResources();
-    this.client = adbkit.default.createClient({
-      bin: process.env.ADB_PATH ?? getAdbBinaryPath() ?? "."
-    });
+    installConnectionErrorHandler();
+    this.client = this.connect();
     this.deviceId = deviceId.split("\\").pop() ?? deviceId;
     logInfo(`Device ID: ${this.deviceId}`);
     this.device = this.client.getDevice(this.deviceId);
@@ -31326,6 +31342,18 @@ var AdbDeviceKit = class {
   device;
   deviceId;
   devicePort = null;
+  connect() {
+    const adbBin = process.env.ADB_PATH ?? getAdbBinaryPath() ?? "adb";
+    const client = adbkit.default.createClient({ bin: adbBin });
+    const errorHandler = (err) => {
+      logError(`ADB client connection error (e.g. device disconnected): ${err.message}`);
+      client.removeListener("error", errorHandler);
+      this.client = this.connect();
+      this.device = this.client.getDevice(this.deviceId);
+    };
+    client.on("error", errorHandler);
+    return client;
+  }
   async listDevices() {
     const devices = await this.client.listDevices();
     return devices;
@@ -31378,39 +31406,84 @@ var AdbDeviceKit = class {
     const devices = await this.listDevices();
     return !!devices.find((device) => device.id === this.deviceId);
   }
-  async waitForUsbDebugging(timeout2 = 12e4, numberOfAllowedAttempts = 5) {
+  /**
+   * Creates an isolated ADB client for tracking operations.
+   * This client is separate from the main client so connection errors
+   * during tracking don't affect other operations.
+   */
+  createTrackingClient() {
+    const adbBin = process.env.ADB_PATH ?? getAdbBinaryPath() ?? "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;
     }
-    let count = numberOfAllowedAttempts;
-    const tracker = await this.client.trackDevices();
+    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");
-        reject(new Error("Timeout waiting for USB debugging"));
+        settle({ type: "reject", err: new Error("Timeout waiting for USB debugging") });
       }, timeout2);
-      tracker.on("remove", (_) => {
+      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);
+        }
+      };
+      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}`);
+          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");
-          clearTimeout(timeoutId);
-          resolve(true);
+          settle({ type: "resolve", value: true });
         }
       });
       tracker.on("change", (device) => {
-        count--;
-        if (device.type === "device" && count > 0) {
-          clearTimeout(timeoutId);
+        if (device.type === "device") {
           logDetail("Device changed in tracker");
-          resolve(true);
-        } else if (count === 0) {
-          logDetail("No device found in tracker");
-          this.client.kill();
-          resolve(false);
+          settle({ type: "resolve", value: true });
         }
       });
     });
@@ -31436,7 +31509,12 @@ var AdbDeviceKit = class {
     return this.device;
   }
 };
+
+// src/index.ts
+var import_adbkit = __toESM(require_dist());
+var readAll = import_adbkit.default.util.readAll;
 export {
-  AdbDeviceKit
+  AdbDeviceKit,
+  readAll
 };
 //# sourceMappingURL=index.mjs.map