@mcesystems/apple-kit 1.0.90 → 1.0.91

package/dist/index.js

@@ -1219,24 +1219,24 @@ var import_debug = __toESM2(require_src());
 function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
   const logInfo8 = (0, import_debug.default)(`${namespace}:info`);
   const logTask5 = (0, import_debug.default)(`${namespace}:task`);
-  const logError3 = (0, import_debug.default)(`${namespace}:error`);
+  const logError4 = (0, import_debug.default)(`${namespace}:error`);
   const logDetail3 = (0, import_debug.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug.default)(`${namespace}:debug`);
-  const logWarning3 = (0, import_debug.default)(`${namespace}:warning`);
+  const logWarning2 = (0, import_debug.default)(`${namespace}:warning`);
   const logColor = (0, import_debug.default)(`${namespace}:color`);
   logInfo8.color = "19";
   logTask5.color = "25";
-  logError3.color = "1";
+  logError4.color = "1";
   logDetail3.color = "199";
-  logWarning3.color = "186";
+  logWarning2.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
   function setNamespace7(namespace2) {
     logInfo8.namespace = `${namespace2}:info`;
     logTask5.namespace = `${namespace2}:task`;
-    logError3.namespace = `${namespace2}:error`;
+    logError4.namespace = `${namespace2}:error`;
     logDetail3.namespace = `${namespace2}:detail`;
-    logWarning3.namespace = `${namespace2}:warning`;
+    logWarning2.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
   function setLogLevel(level) {
@@ -1244,24 +1244,24 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
       case "info":
         logInfo8.enabled = true;
         logTask5.enabled = true;
-        logError3.enabled = true;
-        logWarning3.enabled = true;
+        logError4.enabled = true;
+        logWarning2.enabled = true;
         logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
         logInfo8.enabled = true;
         logTask5.enabled = true;
-        logError3.enabled = true;
-        logWarning3.enabled = true;
+        logError4.enabled = true;
+        logWarning2.enabled = true;
         logDetail3.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
         logInfo8.enabled = false;
         logTask5.enabled = false;
-        logError3.enabled = false;
-        logWarning3.enabled = false;
+        logError4.enabled = false;
+        logWarning2.enabled = false;
         logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
@@ -1277,13 +1277,13 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.color = color;
         break;
       case "error":
-        logError3.color = color;
+        logError4.color = color;
         break;
       case "detail":
         logDetail3.color = color;
         break;
       case "warning":
-        logWarning3.color = color;
+        logWarning2.color = color;
         break;
       case "debug":
         logDebug.color = color;
@@ -1338,7 +1338,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
   function logHeader(title) {
     logInfo8(`${header(title, 2)}`);
   }
-  function logDataObject3(title, ...args) {
+  function logDataObject2(title, ...args) {
     const stack = new Error().stack?.split("\n")[2] || "";
     const stackMatch = stack.match(/\((.*):(\d+):(\d+)\)$/) || stack.match(/at (.*):(\d+):(\d+)$/);
     let callerDetails = "";
@@ -1355,29 +1355,29 @@ ${"=".repeat(80)}`);
   }
   function logErrorObject(error, extraDetails) {
     if (error instanceof Error) {
-      logError3(`${extraDetails ? header(extraDetails, 1) : header(error.message, 1)}
+      logError4(`${extraDetails ? header(extraDetails, 1) : header(error.message, 1)}
 		Error Message:
 		${error.message}
 		Error Stack:
 		${error.stack}
 		${"=".repeat(80)}`);
     } else {
-      logError3(`${extraDetails ? header(extraDetails, 1) : header(String(error), 1)}
+      logError4(`${extraDetails ? header(extraDetails, 1) : header(String(error), 1)}
 		${"=".repeat(80)}`);
     }
   }
   return {
     logInfo: logInfo8,
     logTask: logTask5,
-    logError: logError3,
+    logError: logError4,
     logDetail: logDetail3,
     logDebug,
-    logWarning: logWarning3,
+    logWarning: logWarning2,
     logColor,
     setColors,
     printColors,
     logHeader,
-    logDataObject: logDataObject3,
+    logDataObject: logDataObject2,
     logErrorObject,
     setLogLevel,
     setNamespace: setNamespace7
@@ -1646,13 +1646,29 @@ var DeviceActions = class {
     const startTime = Date.now();
     while (Date.now() - startTime < timeout2) {
       throwIfAborted(signal);
-      await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
-      if (await this.pair()) {
+      if (await this.isPairedViaInfo()) {
         return true;
       }
+      await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
     }
     throw new Error(`Timeout waiting for device pairing after ${timeout2}ms`);
   }
+  /**
+   * Returns true if device is paired and trusted.
+   * Uses info() which only succeeds when full pairing is established (user has accepted Trust).
+   * Prefer this over lockdown file check since file location/timing can vary by platform.
+   */
+  async isPairedViaInfo() {
+    try {
+      const result = await this.iosClient.info();
+      if (result.exitCode === 0 && result.output[0]) {
+        const info = result.output[0];
+        return info?.ActivationState !== void 0;
+      }
+    } catch {
+    }
+    return false;
+  }
   async isWifiConnected(timeoutMs = 5e3) {
     logInfo(`Checking WiFi connection for device ${this.udid}`);
     const combined = (out) => `${out.stdout}
@@ -36999,13 +37015,13 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
   const logError22 = (0, import_debug2.default)(`${namespace}:error`);
   const logDetail3 = (0, import_debug2.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug2.default)(`${namespace}:debug`);
-  const logWarning22 = (0, import_debug2.default)(`${namespace}:warning`);
+  const logWarning2 = (0, import_debug2.default)(`${namespace}:warning`);
   const logColor = (0, import_debug2.default)(`${namespace}:color`);
   logInfo222.color = "19";
   logTask5.color = "25";
   logError22.color = "1";
   logDetail3.color = "199";
-  logWarning22.color = "186";
+  logWarning2.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
   function setNamespace7(namespace2) {
@@ -37013,7 +37029,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
     logTask5.namespace = `${namespace2}:task`;
     logError22.namespace = `${namespace2}:error`;
     logDetail3.namespace = `${namespace2}:detail`;
-    logWarning22.namespace = `${namespace2}:warning`;
+    logWarning2.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
   function setLogLevel(level) {
@@ -37022,7 +37038,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logInfo222.enabled = true;
         logTask5.enabled = true;
         logError22.enabled = true;
-        logWarning22.enabled = true;
+        logWarning2.enabled = true;
         logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
@@ -37030,7 +37046,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logInfo222.enabled = true;
         logTask5.enabled = true;
         logError22.enabled = true;
-        logWarning22.enabled = true;
+        logWarning2.enabled = true;
         logDetail3.enabled = true;
         logDebug.enabled = true;
         break;
@@ -37038,7 +37054,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logInfo222.enabled = false;
         logTask5.enabled = false;
         logError22.enabled = false;
-        logWarning22.enabled = false;
+        logWarning2.enabled = false;
         logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
@@ -37060,7 +37076,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logDetail3.color = color;
         break;
       case "warning":
-        logWarning22.color = color;
+        logWarning2.color = color;
         break;
       case "debug":
         logDebug.color = color;
@@ -37115,7 +37131,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
   function logHeader(title) {
     logInfo222(`${header(title, 2)}`);
   }
-  function logDataObject22(title, ...args) {
+  function logDataObject2(title, ...args) {
     const stack = new Error().stack?.split("\n")[2] || "";
     const stackMatch = stack.match(/\((.*):(\d+):(\d+)\)$/) || stack.match(/at (.*):(\d+):(\d+)$/);
     let callerDetails = "";
@@ -37149,12 +37165,12 @@ ${"=".repeat(80)}`);
     logError: logError22,
     logDetail: logDetail3,
     logDebug,
-    logWarning: logWarning22,
+    logWarning: logWarning2,
     logColor,
     setColors,
     printColors,
     logHeader,
-    logDataObject: logDataObject22,
+    logDataObject: logDataObject2,
     logErrorObject,
     setLogLevel,
     setNamespace: setNamespace7
@@ -38096,13 +38112,13 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
   const logError22 = (0, import_debug22.default)(`${namespace}:error`);
   const logDetail3 = (0, import_debug22.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug22.default)(`${namespace}:debug`);
-  const logWarning22 = (0, import_debug22.default)(`${namespace}:warning`);
+  const logWarning2 = (0, import_debug22.default)(`${namespace}:warning`);
   const logColor = (0, import_debug22.default)(`${namespace}:color`);
   logInfo32.color = "19";
   logTask5.color = "25";
   logError22.color = "1";
   logDetail3.color = "199";
-  logWarning22.color = "186";
+  logWarning2.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
   function setNamespace7(namespace2) {
@@ -38110,7 +38126,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
     logTask5.namespace = `${namespace2}:task`;
     logError22.namespace = `${namespace2}:error`;
     logDetail3.namespace = `${namespace2}:detail`;
-    logWarning22.namespace = `${namespace2}:warning`;
+    logWarning2.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
   function setLogLevel(level) {
@@ -38119,7 +38135,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logInfo32.enabled = true;
         logTask5.enabled = true;
         logError22.enabled = true;
-        logWarning22.enabled = true;
+        logWarning2.enabled = true;
         logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
@@ -38127,7 +38143,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logInfo32.enabled = true;
         logTask5.enabled = true;
         logError22.enabled = true;
-        logWarning22.enabled = true;
+        logWarning2.enabled = true;
         logDetail3.enabled = true;
         logDebug.enabled = true;
         break;
@@ -38135,7 +38151,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logInfo32.enabled = false;
         logTask5.enabled = false;
         logError22.enabled = false;
-        logWarning22.enabled = false;
+        logWarning2.enabled = false;
         logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
@@ -38157,7 +38173,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logDetail3.color = color;
         break;
       case "warning":
-        logWarning22.color = color;
+        logWarning2.color = color;
         break;
       case "debug":
         logDebug.color = color;
@@ -38212,7 +38228,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
   function logHeader(title) {
     logInfo32(`${header(title, 2)}`);
   }
-  function logDataObject22(title, ...args) {
+  function logDataObject2(title, ...args) {
     const stack = new Error().stack?.split("\n")[2] || "";
     const stackMatch = stack.match(/\((.*):(\d+):(\d+)\)$/) || stack.match(/at (.*):(\d+):(\d+)$/);
     let callerDetails = "";
@@ -38246,12 +38262,12 @@ ${"=".repeat(80)}`);
     logError: logError22,
     logDetail: logDetail3,
     logDebug,
-    logWarning: logWarning22,
+    logWarning: logWarning2,
     logColor,
     setColors,
     printColors,
     logHeader,
-    logDataObject: logDataObject22,
+    logDataObject: logDataObject2,
     logErrorObject,
     setLogLevel,
     setNamespace: setNamespace7
@@ -38740,7 +38756,7 @@ var ActivationFlow = class {
       }
     }
     await this.retryActivateCommand("activate device", () => this.iosClient.activate(), signal);
-    events.emit(ACTIVATION_FLOW_EVENT_ACTIVATION_DONE, { attempt: 1 });
+    events.emit(ACTIVATION_FLOW_EVENT_ACTIVATION_DONE);
     throwIfAborted2(signal);
     let wifiProfileIdentifier;
     if (config?.withMdm) {
@@ -38754,7 +38770,9 @@ var ActivationFlow = class {
       const expectedSsid = config.wifiProfileConfig?.ssid;
       if (expectedSsid) {
         if (await this.deviceActions.isWifiConnected(15e3) !== expectedSsid) {
-          throw new Error("WiFi profile not installed correctly");
+          throw new Error(
+            `WiFi profile not installed correctly, expected ${expectedSsid} but got ${await this.deviceActions.isWifiConnected(15e3)}`
+          );
         }
       }
       await this.installMdmProfile(events, signal);
@@ -38803,7 +38821,7 @@ var ActivationFlow = class {
       () => this.iosClient.installProfile(profilePath),
       signal
     );
-    events.emit(ACTIVATION_FLOW_EVENT_MDM_PROFILE_INSTALLED, { retries: 0 });
+    events.emit(ACTIVATION_FLOW_EVENT_MDM_PROFILE_INSTALLED);
     await removeTempFile(profilePath, "mdm profile");
   }
   async retryMdmEnrollmentProfile(signal) {
@@ -39304,30 +39322,10 @@ var IosClient = class {
 };
 
 // src/logic/appleDeviceKit.ts
-var { logInfo: logInfo7, setNamespace: setNamespace6, logDataObject: logDataObject2, logWarning: logWarning2 } = createLoggers("apple-kit");
+var { logInfo: logInfo7, setNamespace: setNamespace6, logError: logError3 } = createLoggers("apple-kit");
 var AppleDeviceKit = class {
   constructor(udid, logicalPort, usbmuxdAddress) {
     this.logicalPort = logicalPort;
-    const requiredEnvVars = {
-      USBIPD_PATH: process.env.USBIPD_PATH,
-      LOCKDOWN_WINDOWS_PATH: process.env.LOCKDOWN_WINDOWS_PATH,
-      MDM_ENDPOINT: process.env.MDM_ENDPOINT,
-      AUTH_API_URL: process.env.AUTH_API_URL,
-      CREDENTIALS_PATH: process.env.CREDENTIALS_PATH,
-      RESOURCES_PATH: process.env.RESOURCES_PATH,
-      WIFI_SSID: process.env.WIFI_SSID,
-      WIFI_PASSWORD: process.env.WIFI_PASSWORD,
-      WIFI_ENCRYPTION: process.env.WIFI_ENCRYPTION,
-      WIFI_HIDDEN: process.env.WIFI_HIDDEN,
-      WIFI_ENTERPRISE: process.env.WIFI_ENTERPRISE,
-      WIFI_EAP_TYPE: process.env.WIFI_EAP_TYPE,
-      CERT_FILE: process.env.CERT_FILE,
-      ORGANIZATION_NAME: process.env.ORGANIZATION_NAME
-    };
-    if (Object.values(requiredEnvVars).some((value) => !value)) {
-      logWarning2("Required environment variables are not set");
-      logDataObject2("Required Env Variables", requiredEnvVars);
-    }
     this.deviceId = udid;
     setNamespace6(`apple-${udid}`);
     logInfo7(
@@ -39342,6 +39340,11 @@ var AppleDeviceKit = class {
     this.installActions = new InstallActions(this.deviceId, this.iosClient);
     this.activationFlow = new ActivationFlow(this.deviceId, this.iosClient, this.deviceActions);
     this.proxyActions = new ProxyActions(this.deviceId, this.iosClient);
+    this.iosClient.tunnelStart(true).then((process3) => {
+      this.tunnelProcess = process3;
+    }).catch((error) => {
+      logError3(`Failed to start tunnel: ${error.message}`);
+    });
   }
   deviceId;
   proxyProcess = null;
@@ -39381,7 +39384,11 @@ var AppleDeviceKit = class {
    */
   async waitForPairing(timeout2 = 12e4, pollInterval = 1e3, signal) {
     this.ensureNotDisposed();
-    return this.deviceActions.waitForPairing({ timeout: timeout2, pollInterval, signal });
+    return this.deviceActions.waitForPairing({
+      timeout: timeout2,
+      pollInterval,
+      signal
+    });
   }
   /**
    * Attempt to pair/trust the device