@mcesystems/adb-kit 1.0.41 → 1.0.45

package/dist/index.mjs

@@ -30173,7 +30173,7 @@ var require_dist = __commonJS({
 });
 
 // ../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/common.js
-var require_common2 = __commonJS({
+var require_common3 = __commonJS({
   "../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/common.js"(exports2, module2) {
     function setup(env2) {
       createDebug.debug = createDebug;
@@ -30350,7 +30350,7 @@ var require_common2 = __commonJS({
 });
 
 // ../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/browser.js
-var require_browser2 = __commonJS({
+var require_browser3 = __commonJS({
   "../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/browser.js"(exports2, module2) {
     exports2.formatArgs = formatArgs;
     exports2.save = save;
@@ -30507,7 +30507,7 @@ var require_browser2 = __commonJS({
       } catch (error) {
       }
     }
-    module2.exports = require_common2()(exports2);
+    module2.exports = require_common3()(exports2);
     var { formatters } = module2.exports;
     formatters.j = function(v) {
       try {
@@ -30520,7 +30520,7 @@ var require_browser2 = __commonJS({
 });
 
 // ../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/node.js
-var require_node2 = __commonJS({
+var require_node3 = __commonJS({
   "../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/node.js"(exports2, module2) {
     var tty = __require("tty");
     var util = __require("util");
@@ -30680,7 +30680,7 @@ var require_node2 = __commonJS({
         debug2.inspectOpts[keys[i]] = exports2.inspectOpts[keys[i]];
       }
     }
-    module2.exports = require_common2()(exports2);
+    module2.exports = require_common3()(exports2);
     var { formatters } = module2.exports;
     formatters.o = function(v) {
       this.inspectOpts.colors = this.useColors;
@@ -30694,12 +30694,12 @@ var require_node2 = __commonJS({
 });
 
 // ../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/index.js
-var require_src2 = __commonJS({
+var require_src3 = __commonJS({
   "../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/index.js"(exports2, module2) {
     if (typeof process === "undefined" || process.type === "renderer" || process.browser === true || process.__nwjs) {
-      module2.exports = require_browser2();
+      module2.exports = require_browser3();
     } else {
-      module2.exports = require_node2();
+      module2.exports = require_node3();
     }
   }
 });
@@ -30707,193 +30707,6 @@ var require_src2 = __commonJS({
 // src/logic/adbDeviceKit.ts
 var adbkit = __toESM(require_dist());
 
-// ../../node_modules/.pnpm/get-port@7.1.0/node_modules/get-port/index.js
-import net from "node:net";
-import os from "node:os";
-var Locked = class extends Error {
-  constructor(port) {
-    super(`${port} is locked`);
-  }
-};
-var lockedPorts = {
-  old: /* @__PURE__ */ new Set(),
-  young: /* @__PURE__ */ new Set()
-};
-var releaseOldLockedPortsIntervalMs = 1e3 * 15;
-var minPort = 1024;
-var maxPort = 65535;
-var timeout;
-var getLocalHosts = () => {
-  const interfaces = os.networkInterfaces();
-  const results = /* @__PURE__ */ new Set([void 0, "0.0.0.0"]);
-  for (const _interface of Object.values(interfaces)) {
-    for (const config of _interface) {
-      results.add(config.address);
-    }
-  }
-  return results;
-};
-var checkAvailablePort = (options) => new Promise((resolve, reject) => {
-  const server = net.createServer();
-  server.unref();
-  server.on("error", reject);
-  server.listen(options, () => {
-    const { port } = server.address();
-    server.close(() => {
-      resolve(port);
-    });
-  });
-});
-var getAvailablePort = async (options, hosts) => {
-  if (options.host || options.port === 0) {
-    return checkAvailablePort(options);
-  }
-  for (const host of hosts) {
-    try {
-      await checkAvailablePort({ port: options.port, host });
-    } catch (error) {
-      if (!["EADDRNOTAVAIL", "EINVAL"].includes(error.code)) {
-        throw error;
-      }
-    }
-  }
-  return options.port;
-};
-var portCheckSequence = function* (ports) {
-  if (ports) {
-    yield* ports;
-  }
-  yield 0;
-};
-async function getPorts(options) {
-  let ports;
-  let exclude = /* @__PURE__ */ new Set();
-  if (options) {
-    if (options.port) {
-      ports = typeof options.port === "number" ? [options.port] : options.port;
-    }
-    if (options.exclude) {
-      const excludeIterable = options.exclude;
-      if (typeof excludeIterable[Symbol.iterator] !== "function") {
-        throw new TypeError("The `exclude` option must be an iterable.");
-      }
-      for (const element of excludeIterable) {
-        if (typeof element !== "number") {
-          throw new TypeError("Each item in the `exclude` option must be a number corresponding to the port you want excluded.");
-        }
-        if (!Number.isSafeInteger(element)) {
-          throw new TypeError(`Number ${element} in the exclude option is not a safe integer and can't be used`);
-        }
-      }
-      exclude = new Set(excludeIterable);
-    }
-  }
-  if (timeout === void 0) {
-    timeout = setTimeout(() => {
-      timeout = void 0;
-      lockedPorts.old = lockedPorts.young;
-      lockedPorts.young = /* @__PURE__ */ new Set();
-    }, releaseOldLockedPortsIntervalMs);
-    if (timeout.unref) {
-      timeout.unref();
-    }
-  }
-  const hosts = getLocalHosts();
-  for (const port of portCheckSequence(ports)) {
-    try {
-      if (exclude.has(port)) {
-        continue;
-      }
-      let availablePort = await getAvailablePort({ ...options, port }, hosts);
-      while (lockedPorts.old.has(availablePort) || lockedPorts.young.has(availablePort)) {
-        if (port !== 0) {
-          throw new Locked(port);
-        }
-        availablePort = await getAvailablePort({ ...options, port }, hosts);
-      }
-      lockedPorts.young.add(availablePort);
-      return availablePort;
-    } catch (error) {
-      if (!["EADDRINUSE", "EACCES"].includes(error.code) && !(error instanceof Locked)) {
-        throw error;
-      }
-    }
-  }
-  throw new Error("No available ports found");
-}
-function portNumbers(from, to) {
-  if (!Number.isInteger(from) || !Number.isInteger(to)) {
-    throw new TypeError("`from` and `to` must be integer numbers");
-  }
-  if (from < minPort || from > maxPort) {
-    throw new RangeError(`'from' must be between ${minPort} and ${maxPort}`);
-  }
-  if (to < minPort || to > maxPort) {
-    throw new RangeError(`'to' must be between ${minPort} and ${maxPort}`);
-  }
-  if (from > to) {
-    throw new RangeError("`to` must be greater than or equal to `from`");
-  }
-  const generator = function* (from2, to2) {
-    for (let port = from2; port <= to2; port++) {
-      yield port;
-    }
-  };
-  return generator(from, to);
-}
-
-// src/utils/adbPath.ts
-import { existsSync } from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-var __filename = fileURLToPath(import.meta.url);
-var __dirname = path.dirname(__filename);
-function getPlatformDir() {
-  const platform = process.platform;
-  if (platform === "win32") {
-    return "windows";
-  }
-  if (platform === "darwin") {
-    return "darwin";
-  }
-  if (platform === "linux") {
-    return "linux";
-  }
-  throw new Error(`Unsupported platform: ${platform}`);
-}
-function getAdbBinaryName() {
-  if (process.platform === "win32") {
-    return "adb.exe";
-  }
-  return "adb";
-}
-function getAdbBinaryPath() {
-  let packageRoot;
-  if (__dirname.includes("dist")) {
-    packageRoot = path.resolve(__dirname, "..", "..");
-  } else {
-    packageRoot = path.resolve(__dirname, "..", "..");
-  }
-  const platformDir = getPlatformDir();
-  const binaryName = getAdbBinaryName();
-  const distPath = path.join(packageRoot, "dist", "resources", "bin", platformDir, binaryName);
-  if (existsSync(distPath)) {
-    return distPath;
-  }
-  return null;
-}
-
-// src/utils/debug.ts
-var import_debug = __toESM(require_src2());
-var logTask = (0, import_debug.default)("adb-kit:task");
-var logInfo = (0, import_debug.default)("adb-kit:info");
-var logWarning = (0, import_debug.default)("adb-kit:warning");
-var logError = (0, import_debug.default)("adb-kit:error");
-logTask.color = "40";
-logInfo.color = "45";
-logWarning.color = "214";
-logError.color = "160";
-
 // ../tool-debug/dist/index.mjs
 var __create2 = Object.create;
 var __defProp2 = Object.defineProperty;
@@ -31040,7 +30853,7 @@ var require_ms2 = __commonJS2({
     }
   }
 });
-var require_common3 = __commonJS2({
+var require_common2 = __commonJS2({
   "../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/common.js"(exports2, module2) {
     function setup(env2) {
       createDebug2.debug = createDebug2;
@@ -31215,7 +31028,7 @@ var require_common3 = __commonJS2({
     module2.exports = setup;
   }
 });
-var require_browser3 = __commonJS2({
+var require_browser2 = __commonJS2({
   "../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/browser.js"(exports2, module2) {
     exports2.formatArgs = formatArgs;
     exports2.save = save;
@@ -31372,7 +31185,7 @@ var require_browser3 = __commonJS2({
       } catch (error) {
       }
     }
-    module2.exports = require_common3()(exports2);
+    module2.exports = require_common2()(exports2);
     var { formatters } = module2.exports;
     formatters.j = function(v) {
       try {
@@ -31494,7 +31307,7 @@ var require_supports_color2 = __commonJS2({
     };
   }
 });
-var require_node3 = __commonJS2({
+var require_node2 = __commonJS2({
   "../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/node.js"(exports2, module2) {
     var tty = __require2("tty");
     var util = __require2("util");
@@ -31654,7 +31467,7 @@ var require_node3 = __commonJS2({
         debug2.inspectOpts[keys[i]] = exports2.inspectOpts[keys[i]];
       }
     }
-    module2.exports = require_common3()(exports2);
+    module2.exports = require_common2()(exports2);
     var { formatters } = module2.exports;
     formatters.o = function(v) {
       this.inspectOpts.colors = this.useColors;
@@ -31666,37 +31479,224 @@ var require_node3 = __commonJS2({
     };
   }
 });
-var require_src3 = __commonJS2({
+var require_src2 = __commonJS2({
   "../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/index.js"(exports2, module2) {
     if (typeof process === "undefined" || process.type === "renderer" || process.browser === true || process.__nwjs) {
-      module2.exports = require_browser3();
+      module2.exports = require_browser2();
     } else {
-      module2.exports = require_node3();
+      module2.exports = require_node2();
     }
   }
 });
-var import_debug2 = __toESM2(require_src3());
-var logInfo2 = (0, import_debug2.default)("info");
-var logTask2 = (0, import_debug2.default)("task");
-var logError2 = (0, import_debug2.default)("error");
-var logDetail = (0, import_debug2.default)("detail");
+var import_debug = __toESM2(require_src2());
+var logInfo = (0, import_debug.default)("info");
+var logTask = (0, import_debug.default)("task");
+var logError = (0, import_debug.default)("error");
+var logDetail = (0, import_debug.default)("detail");
 function logNamespace(namespace) {
-  logInfo2.namespace = `INFO:${namespace}`;
-  logTask2.namespace = `TASK:${namespace}`;
-  logError2.namespace = `ERROR:${namespace}`;
-  logDetail.namespace = `DETAIL:${namespace}`;
-  logInfo2.color = "45";
-  logTask2.color = "40";
-  logError2.color = "160";
+  logInfo.namespace = `${namespace}:INFO`;
+  logTask.namespace = `${namespace}:TASK`;
+  logError.namespace = `${namespace}:ERROR`;
+  logDetail.namespace = `${namespace}:DETAIL`;
+  logInfo.color = "45";
+  logTask.color = "40";
+  logError.color = "160";
   logDetail.color = "240";
 }
 
+// ../../node_modules/.pnpm/get-port@7.1.0/node_modules/get-port/index.js
+import net from "node:net";
+import os from "node:os";
+var Locked = class extends Error {
+  constructor(port) {
+    super(`${port} is locked`);
+  }
+};
+var lockedPorts = {
+  old: /* @__PURE__ */ new Set(),
+  young: /* @__PURE__ */ new Set()
+};
+var releaseOldLockedPortsIntervalMs = 1e3 * 15;
+var minPort = 1024;
+var maxPort = 65535;
+var timeout;
+var getLocalHosts = () => {
+  const interfaces = os.networkInterfaces();
+  const results = /* @__PURE__ */ new Set([void 0, "0.0.0.0"]);
+  for (const _interface of Object.values(interfaces)) {
+    for (const config of _interface) {
+      results.add(config.address);
+    }
+  }
+  return results;
+};
+var checkAvailablePort = (options) => new Promise((resolve, reject) => {
+  const server = net.createServer();
+  server.unref();
+  server.on("error", reject);
+  server.listen(options, () => {
+    const { port } = server.address();
+    server.close(() => {
+      resolve(port);
+    });
+  });
+});
+var getAvailablePort = async (options, hosts) => {
+  if (options.host || options.port === 0) {
+    return checkAvailablePort(options);
+  }
+  for (const host of hosts) {
+    try {
+      await checkAvailablePort({ port: options.port, host });
+    } catch (error) {
+      if (!["EADDRNOTAVAIL", "EINVAL"].includes(error.code)) {
+        throw error;
+      }
+    }
+  }
+  return options.port;
+};
+var portCheckSequence = function* (ports) {
+  if (ports) {
+    yield* ports;
+  }
+  yield 0;
+};
+async function getPorts(options) {
+  let ports;
+  let exclude = /* @__PURE__ */ new Set();
+  if (options) {
+    if (options.port) {
+      ports = typeof options.port === "number" ? [options.port] : options.port;
+    }
+    if (options.exclude) {
+      const excludeIterable = options.exclude;
+      if (typeof excludeIterable[Symbol.iterator] !== "function") {
+        throw new TypeError("The `exclude` option must be an iterable.");
+      }
+      for (const element of excludeIterable) {
+        if (typeof element !== "number") {
+          throw new TypeError("Each item in the `exclude` option must be a number corresponding to the port you want excluded.");
+        }
+        if (!Number.isSafeInteger(element)) {
+          throw new TypeError(`Number ${element} in the exclude option is not a safe integer and can't be used`);
+        }
+      }
+      exclude = new Set(excludeIterable);
+    }
+  }
+  if (timeout === void 0) {
+    timeout = setTimeout(() => {
+      timeout = void 0;
+      lockedPorts.old = lockedPorts.young;
+      lockedPorts.young = /* @__PURE__ */ new Set();
+    }, releaseOldLockedPortsIntervalMs);
+    if (timeout.unref) {
+      timeout.unref();
+    }
+  }
+  const hosts = getLocalHosts();
+  for (const port of portCheckSequence(ports)) {
+    try {
+      if (exclude.has(port)) {
+        continue;
+      }
+      let availablePort = await getAvailablePort({ ...options, port }, hosts);
+      while (lockedPorts.old.has(availablePort) || lockedPorts.young.has(availablePort)) {
+        if (port !== 0) {
+          throw new Locked(port);
+        }
+        availablePort = await getAvailablePort({ ...options, port }, hosts);
+      }
+      lockedPorts.young.add(availablePort);
+      return availablePort;
+    } catch (error) {
+      if (!["EADDRINUSE", "EACCES"].includes(error.code) && !(error instanceof Locked)) {
+        throw error;
+      }
+    }
+  }
+  throw new Error("No available ports found");
+}
+function portNumbers(from, to) {
+  if (!Number.isInteger(from) || !Number.isInteger(to)) {
+    throw new TypeError("`from` and `to` must be integer numbers");
+  }
+  if (from < minPort || from > maxPort) {
+    throw new RangeError(`'from' must be between ${minPort} and ${maxPort}`);
+  }
+  if (to < minPort || to > maxPort) {
+    throw new RangeError(`'to' must be between ${minPort} and ${maxPort}`);
+  }
+  if (from > to) {
+    throw new RangeError("`to` must be greater than or equal to `from`");
+  }
+  const generator = function* (from2, to2) {
+    for (let port = from2; port <= to2; port++) {
+      yield port;
+    }
+  };
+  return generator(from, to);
+}
+
+// src/utils/adbPath.ts
+import { existsSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+var __filename = fileURLToPath(import.meta.url);
+var __dirname = path.dirname(__filename);
+function getPlatformDir() {
+  const platform = process.platform;
+  if (platform === "win32") {
+    return "windows";
+  }
+  if (platform === "darwin") {
+    return "darwin";
+  }
+  if (platform === "linux") {
+    return "linux";
+  }
+  throw new Error(`Unsupported platform: ${platform}`);
+}
+function getAdbBinaryName() {
+  if (process.platform === "win32") {
+    return "adb.exe";
+  }
+  return "adb";
+}
+function getAdbBinaryPath() {
+  let packageRoot;
+  if (__dirname.includes("dist")) {
+    packageRoot = path.resolve(__dirname, "..", "..");
+  } else {
+    packageRoot = path.resolve(__dirname, "..", "..");
+  }
+  const platformDir = getPlatformDir();
+  const binaryName = getAdbBinaryName();
+  const distPath = path.join(packageRoot, "dist", "resources", "bin", platformDir, binaryName);
+  if (existsSync(distPath)) {
+    return distPath;
+  }
+  return null;
+}
+
+// src/utils/debug.ts
+var import_debug2 = __toESM(require_src3());
+var logTask2 = (0, import_debug2.default)("adb-kit:task");
+var logInfo2 = (0, import_debug2.default)("adb-kit:info");
+var logWarning = (0, import_debug2.default)("adb-kit:warning");
+var logError2 = (0, import_debug2.default)("adb-kit:error");
+logTask2.color = "40";
+logInfo2.color = "45";
+logWarning.color = "214";
+logError2.color = "160";
+
 // src/logic/adbDeviceKit.ts
 function ensureAdbPathFromResources() {
   const adbPath = getAdbBinaryPath();
   if (adbPath && !process.env.ADB_PATH) {
     process.env.ADB_PATH = adbPath;
-    logInfo(`Using ADB from resources: ${adbPath}`);
+    logInfo2(`Using ADB from resources: ${adbPath}`);
   }
 }
 var deviceProps = {
@@ -31735,7 +31735,7 @@ var AdbDeviceKit = class {
       bin: process.env.ADB_PATH ?? getAdbBinaryPath() ?? "."
     });
     this.deviceId = deviceId.split("\\").pop() ?? deviceId;
-    logInfo(`Device ID: ${this.deviceId}`);
+    logInfo2(`Device ID: ${this.deviceId}`);
     this.device = this.client.getDevice(this.deviceId);
   }
   client;
@@ -31748,16 +31748,16 @@ var AdbDeviceKit = class {
   }
   async getProperty(adbDevice, property) {
     try {
-      logTask(`Getting property ${property} for device ${this.deviceId}`);
+      logTask2(`Getting property ${property} for device ${this.deviceId}`);
       const stream = await adbDevice.shell(`getprop ${deviceProps[property]}`);
-      logTask(`Stream: ${stream}`);
+      logTask2(`Stream: ${stream}`);
       const chunks = [];
       for await (const chunk of stream) {
         chunks.push(chunk);
       }
       return Buffer.concat(chunks).toString().trim();
     } catch (error) {
-      logError(`Error getting property ${property} for device ${this.deviceId}: ${error}`);
+      logError2(`Error getting property ${property} for device ${this.deviceId}: ${error}`);
       return "";
     }
   }
@@ -31765,22 +31765,22 @@ var AdbDeviceKit = class {
     return this.device.getProperties();
   }
   async getDeviceProperties(properties) {
-    logTask(`Getting properties ${properties.join(", ")} for device ${this.deviceId}`);
+    logTask2(`Getting properties ${properties.join(", ")} for device ${this.deviceId}`);
     const propertiesValues = await Promise.all(
       properties.map((property) => this.getProperty(this.device, property))
     );
     return propertiesValues;
   }
   async installApp(appPath) {
-    logTask(`Installing app ${appPath} on device ${this.deviceId}`);
+    logTask2(`Installing app ${appPath} on device ${this.deviceId}`);
     await this.device.install(appPath);
   }
   async uninstallApp(packageName) {
-    logTask(`Uninstalling app ${packageName} on device ${this.deviceId}`);
+    logTask2(`Uninstalling app ${packageName} on device ${this.deviceId}`);
     await this.device.uninstall(packageName);
   }
   async isAppInstalled(packageName) {
-    logTask(`Checking if app ${packageName} is installed on device ${this.deviceId}`);
+    logTask2(`Checking if app ${packageName} is installed on device ${this.deviceId}`);
     return await this.device.isInstalled(packageName);
   }
   /**
@@ -31803,12 +31803,12 @@ var AdbDeviceKit = class {
     const tracker = await this.client.trackDevices();
     return new Promise((resolve, reject) => {
       const timeoutId = setTimeout(() => {
-        logError("Timeout waiting for USB debugging");
+        logError2("Timeout waiting for USB debugging");
         reject(new Error("Timeout waiting for USB debugging"));
       }, timeout2);
       tracker.on("remove", (_) => {
         clearTimeout(timeoutId);
-        logError("Device removed from tracker");
+        logError2("Device removed from tracker");
       });
       tracker.on("add", (device) => {
         if (device.type === "device") {