@mcesystems/adb-kit 1.0.70 → 1.0.72

package/README.md

@@ -77,6 +77,17 @@ const client = await device.getClient();
 const deviceClient = await device.getDeviceClient();
 ```
 
+**First connected Android properties**
+
+One-shot example that discovers the first connected Android device and prints a curated set of its properties (manufacturer, model, brand, Android version, etc.).
+
+```bash
+# From packages/adb-kit
+pnpm example:first-android-properties
+```
+
+See [src/examples/first-connected-android-properties.ts](./src/examples/first-connected-android-properties.ts) for the script.
+
 **USB debugging robustness example**
 
 Interactive example that runs the same flow 5 times to verify `waitForUsbDebugging` handling: start without USB debugging (device not found), short 5s timeout (user lets it pass), then wait up to 30s while the user enables USB debugging, show device recognized, then user disables USB debugging and repeats.

package/dist/index.js

@@ -31050,55 +31050,172 @@ var require_src2 = __commonJS2({
   }
 });
 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");
-var logDebug = (0, import_debug.default)("debug");
-var logWarning = (0, import_debug.default)("warning");
-var logColor = (0, import_debug.default)("color");
-logInfo.color = "19";
-logTask.color = "25";
-logError.color = "1";
-logDetail.color = "199";
-logWarning.color = "186";
-logDebug.color = "211";
-logColor.enabled = true;
-function logNamespace(namespace) {
-  logInfo.namespace = `${namespace}:info`;
-  logTask.namespace = `${namespace}:task`;
-  logError.namespace = `${namespace}:error`;
-  logDetail.namespace = `${namespace}:detail`;
-  logWarning.namespace = `${namespace}:warning`;
-  logDebug.namespace = `${namespace}:debug`;
-}
-function setLogLevel(level) {
-  switch (level) {
-    case "info":
-      logInfo.enabled = true;
-      logTask.enabled = true;
-      logError.enabled = true;
-      logWarning.enabled = true;
-      logDetail.enabled = false;
-      logDebug.enabled = false;
-      break;
-    case "debug":
-      logInfo.enabled = true;
-      logTask.enabled = true;
-      logError.enabled = true;
-      logWarning.enabled = true;
-      logDetail.enabled = true;
-      logDebug.enabled = true;
-      break;
-    case "none":
-      logInfo.enabled = false;
-      logTask.enabled = false;
-      logError.enabled = false;
-      logWarning.enabled = false;
-      logDetail.enabled = false;
-      logDebug.enabled = false;
-      break;
+function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
+  const logInfo2 = (0, import_debug.default)(`${namespace}:info`);
+  const logTask2 = (0, import_debug.default)(`${namespace}:task`);
+  const logError2 = (0, import_debug.default)(`${namespace}:error`);
+  const logDetail2 = (0, import_debug.default)(`${namespace}:detail`);
+  const logDebug = (0, import_debug.default)(`${namespace}:debug`);
+  const logWarning = (0, import_debug.default)(`${namespace}:warning`);
+  const logColor = (0, import_debug.default)(`${namespace}:color`);
+  logInfo2.color = "19";
+  logTask2.color = "25";
+  logError2.color = "1";
+  logDetail2.color = "199";
+  logWarning.color = "186";
+  logDebug.color = "211";
+  logColor.enabled = true;
+  function setNamespace2(namespace2) {
+    logInfo2.namespace = `${namespace2}:info`;
+    logTask2.namespace = `${namespace2}:task`;
+    logError2.namespace = `${namespace2}:error`;
+    logDetail2.namespace = `${namespace2}:detail`;
+    logWarning.namespace = `${namespace2}:warning`;
+    logDebug.namespace = `${namespace2}:debug`;
+  }
+  function setLogLevel(level) {
+    switch (level) {
+      case "info":
+        logInfo2.enabled = true;
+        logTask2.enabled = true;
+        logError2.enabled = true;
+        logWarning.enabled = true;
+        logDetail2.enabled = false;
+        logDebug.enabled = false;
+        break;
+      case "debug":
+        logInfo2.enabled = true;
+        logTask2.enabled = true;
+        logError2.enabled = true;
+        logWarning.enabled = true;
+        logDetail2.enabled = true;
+        logDebug.enabled = true;
+        break;
+      case "none":
+        logInfo2.enabled = false;
+        logTask2.enabled = false;
+        logError2.enabled = false;
+        logWarning.enabled = false;
+        logDetail2.enabled = false;
+        logDebug.enabled = false;
+        break;
+    }
+  }
+  setLogLevel(logLevel);
+  function setColors(type, color) {
+    switch (type) {
+      case "info":
+        logInfo2.color = color;
+        break;
+      case "task":
+        logTask2.color = color;
+        break;
+      case "error":
+        logError2.color = color;
+        break;
+      case "detail":
+        logDetail2.color = color;
+        break;
+      case "warning":
+        logWarning.color = color;
+        break;
+      case "debug":
+        logDebug.color = color;
+        break;
+      default:
+        throw new Error(`Invalid log type: ${type}`);
+    }
+  }
+  function printColors() {
+    for (let i = 0; i < 256; i++) {
+      logColor.color = `${i}`;
+      logColor(`${i}: ${i}`);
+    }
+  }
+  function logDataDetail(data, prefix = "#  ") {
+    if (data === null || data === void 0) {
+      return `${prefix}<null or undefined>`;
+    }
+    if (typeof data !== "object") {
+      return `${prefix}${String(data)}`;
+    }
+    const keys = Object.keys(data);
+    let result = "";
+    for (const key of keys) {
+      result += `${prefix}${key}: `;
+      if (key in data) {
+        let dataKey = key;
+        if (key in data) {
+          dataKey = key;
+          const value = data[dataKey];
+          if (value === null || value === void 0) {
+            result += `<${value === null ? "null" : "undefined"}>
+`;
+          } else if (typeof value === "object") {
+            result += `
+					${logDataDetail(value, `${prefix}   `)}
+`;
+          } else {
+            result += `${value}
+`;
+          }
+        }
+      }
+    }
+    return result.trim();
+  }
+  function header(title, padding = 0) {
+    return `${" ".repeat(padding)}${"=".repeat(80)}
+${" ".repeat(40 - title.length / 2)}${title}
+${" ".repeat(padding)}${"=".repeat(80)}`;
+  }
+  function logHeader(title) {
+    logInfo2(`${header(title, 2)}`);
   }
+  function logDataObject(title, ...args) {
+    const stack = new Error().stack?.split("\n")[2] || "";
+    const stackMatch = stack.match(/\((.*):(\d+):(\d+)\)$/) || stack.match(/at (.*):(\d+):(\d+)$/);
+    let callerDetails = "";
+    if (stackMatch) {
+      const functionMatch = stack.match(/at (.+) \(/);
+      const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
+      callerDetails = `${functionName}`;
+    }
+    logDetail2(`${header(`*${title}* ${callerDetails}`)}
+${args.reduce((acc, arg) => `${acc}
+${logDataDetail(arg)}`, "")}
+	
+${"=".repeat(80)}`);
+  }
+  function logErrorObject(error, extraDetails) {
+    if (error instanceof Error) {
+      logError2(`${extraDetails ? header(extraDetails, 1) : header(error.message, 1)}
+		Error Message:
+		${error.message}
+		Error Stack:
+		${error.stack}
+		${"=".repeat(80)}`);
+    } else {
+      logError2(`${extraDetails ? header(extraDetails, 1) : header(String(error), 1)}
+		${"=".repeat(80)}`);
+    }
+  }
+  return {
+    logInfo: logInfo2,
+    logTask: logTask2,
+    logError: logError2,
+    logDetail: logDetail2,
+    logDebug,
+    logWarning,
+    logColor,
+    setColors,
+    printColors,
+    logHeader,
+    logDataObject,
+    logErrorObject,
+    setLogLevel,
+    setNamespace: setNamespace2
+  };
 }
 
 // ../../node_modules/.pnpm/get-port@7.1.0/node_modules/get-port/index.js
@@ -31278,6 +31395,7 @@ function getAdbBinaryPath() {
 }
 
 // src/logic/adbDeviceKit.ts
+var { logInfo, logError, logTask, logDetail, setNamespace } = createLoggers("adb-kit");
 function ensureAdbPathFromResources() {
   const adbPath = getAdbBinaryPath();
   if (adbPath && !process.env.ADB_PATH) {
@@ -31333,8 +31451,7 @@ var deviceProps = {
 var AdbDeviceKit = class {
   constructor(deviceId, port) {
     this.port = port;
-    setLogLevel(process.env.LOG_LEVEL ?? "none");
-    logNamespace(`adb:${deviceId}`);
+    setNamespace(`adb-kit:${deviceId}`);
     ensureAdbPathFromResources();
     installConnectionErrorHandler();
     this.client = this.connect();
@@ -31366,12 +31483,9 @@ var AdbDeviceKit = class {
     try {
       logTask(`Getting property ${property} for device ${this.deviceId}`);
       const stream = await adbDevice.shell(`getprop ${deviceProps[property]}`);
-      logTask(`Stream: ${stream}`);
-      const chunks = [];
-      for await (const chunk of stream) {
-        chunks.push(chunk);
-      }
-      return Buffer.concat(chunks).toString().trim();
+      logTask(`Reading getprop output for ${property}`);
+      const buffer = await adbkit.default.util.readAll(stream);
+      return buffer.toString().trim();
     } catch (error) {
       logError(`Error getting property ${property} for device ${this.deviceId}: ${error}`);
       return "";