@mcesystems/apple-kit 1.0.78 → 1.0.80

package/dist/index.mjs

@@ -836,24 +836,24 @@ var require_src = __commonJS({
 var import_debug = __toESM(require_src());
 function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
   const logInfo8 = (0, import_debug.default)(`${namespace}:info`);
-  const logTask4 = (0, import_debug.default)(`${namespace}:task`);
-  const logError4 = (0, import_debug.default)(`${namespace}:error`);
-  const logDetail3 = (0, import_debug.default)(`${namespace}:detail`);
+  const logTask5 = (0, import_debug.default)(`${namespace}:task`);
+  const logError3 = (0, import_debug.default)(`${namespace}:error`);
+  const logDetail2 = (0, import_debug.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug.default)(`${namespace}:debug`);
   const logWarning2 = (0, import_debug.default)(`${namespace}:warning`);
   const logColor = (0, import_debug.default)(`${namespace}:color`);
   logInfo8.color = "19";
-  logTask4.color = "25";
-  logError4.color = "1";
-  logDetail3.color = "199";
+  logTask5.color = "25";
+  logError3.color = "1";
+  logDetail2.color = "199";
   logWarning2.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
   function setNamespace7(namespace2) {
     logInfo8.namespace = `${namespace2}:info`;
-    logTask4.namespace = `${namespace2}:task`;
-    logError4.namespace = `${namespace2}:error`;
-    logDetail3.namespace = `${namespace2}:detail`;
+    logTask5.namespace = `${namespace2}:task`;
+    logError3.namespace = `${namespace2}:error`;
+    logDetail2.namespace = `${namespace2}:detail`;
     logWarning2.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
@@ -861,26 +861,26 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
     switch (level) {
       case "info":
         logInfo8.enabled = true;
-        logTask4.enabled = true;
-        logError4.enabled = true;
+        logTask5.enabled = true;
+        logError3.enabled = true;
         logWarning2.enabled = true;
-        logDetail3.enabled = false;
+        logDetail2.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
         logInfo8.enabled = true;
-        logTask4.enabled = true;
-        logError4.enabled = true;
+        logTask5.enabled = true;
+        logError3.enabled = true;
         logWarning2.enabled = true;
-        logDetail3.enabled = true;
+        logDetail2.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
         logInfo8.enabled = false;
-        logTask4.enabled = false;
-        logError4.enabled = false;
+        logTask5.enabled = false;
+        logError3.enabled = false;
         logWarning2.enabled = false;
-        logDetail3.enabled = false;
+        logDetail2.enabled = false;
         logDebug.enabled = false;
         break;
     }
@@ -892,13 +892,13 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logInfo8.color = color;
         break;
       case "task":
-        logTask4.color = color;
+        logTask5.color = color;
         break;
       case "error":
-        logError4.color = color;
+        logError3.color = color;
         break;
       case "detail":
-        logDetail3.color = color;
+        logDetail2.color = color;
         break;
       case "warning":
         logWarning2.color = color;
@@ -965,7 +965,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
       const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
       callerDetails = `${functionName}`;
     }
-    logDetail3(`${header(`*${title}* ${callerDetails}`)}
+    logDetail2(`${header(`*${title}* ${callerDetails}`)}
 ${args.reduce((acc, arg) => `${acc}
 ${logDataDetail(arg)}`, "")}
 	
@@ -973,22 +973,22 @@ ${"=".repeat(80)}`);
   }
   function logErrorObject(error, extraDetails) {
     if (error instanceof Error) {
-      logError4(`${extraDetails ? header(extraDetails, 1) : header(error.message, 1)}
+      logError3(`${extraDetails ? header(extraDetails, 1) : header(error.message, 1)}
 		Error Message:
 		${error.message}
 		Error Stack:
 		${error.stack}
 		${"=".repeat(80)}`);
     } else {
-      logError4(`${extraDetails ? header(extraDetails, 1) : header(String(error), 1)}
+      logError3(`${extraDetails ? header(extraDetails, 1) : header(String(error), 1)}
 		${"=".repeat(80)}`);
     }
   }
   return {
     logInfo: logInfo8,
-    logTask: logTask4,
-    logError: logError4,
-    logDetail: logDetail3,
+    logTask: logTask5,
+    logError: logError3,
+    logDetail: logDetail2,
     logDebug,
     logWarning: logWarning2,
     logColor,
@@ -1141,7 +1141,12 @@ function portNumbers(from, to) {
 import { existsSync } from "node:fs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
-var { logTask, logInfo, logDetail, setNamespace, logDataObject } = createLoggers("apple-kit:device");
+function throwIfAborted(signal) {
+  if (signal?.aborted) {
+    throw new DOMException("Device action was cancelled", "AbortError");
+  }
+}
+var { logTask, logInfo, setNamespace } = createLoggers("apple-kit:device");
 function getAppleLockdownPath() {
   if (process.platform === "win32") {
     return join(process.env.ProgramData ?? "C:\\ProgramData", "Apple", "Lockdown");
@@ -1163,7 +1168,7 @@ var DeviceActions = class {
   async info() {
     logInfo(`Getting device info for ${this.udid}`);
     const result = await this.iosClient.info();
-    if (!result) {
+    if (result.exitCode !== 0) {
       throw new Error("Failed to get device info");
     }
     return result.output[0];
@@ -1190,55 +1195,49 @@ var DeviceActions = class {
     if (!result) {
       return false;
     }
-    logDataObject("IOS pair results", { result });
     return result.raw.stderr.includes("Successfully paired");
   }
-  async isPaired() {
-    logInfo(`Checking if device ${this.udid} is paired`);
-    try {
-      const deviceInfo = await this.info();
-      const trusted = deviceInfo.TrustedHostAttached === true;
-      logDetail(`Device ${this.udid} TrustedHostAttached: ${trusted}`);
-      return trusted;
-    } catch (error) {
-      logDetail(`Device ${this.udid} info failed (not paired or unreachable): ${error}`);
-      return false;
-    }
-  }
   async trustDevice({
     timeout: timeout2 = 6e4,
-    onWaitingForTrust
+    pollInterval = 1e3,
+    onWaitingForTrust,
+    signal
   }) {
-    logInfo(`Trusting device ${this.udid}`);
-    if (await this.isPaired()) {
-      logInfo(`Device ${this.udid} is already trusted (lockdown file exists)`);
+    try {
+      const info = await this.info();
+      if (info?.ActivationState !== void 0) {
+        return true;
+      }
+    } catch {
+      logInfo(`Trusting device ${this.udid}`);
+    }
+    if (await this.pair()) {
       return true;
     }
-    logInfo("Initiating pairing to show trust dialog on device...");
-    await this.pair();
     logInfo("Please accept the trust dialog on the device...");
     onWaitingForTrust?.();
     try {
-      await this.waitForPairing({ timeout: timeout2, pollInterval: 1e3 });
+      await this.waitForPairing({ timeout: timeout2, pollInterval, signal });
       logInfo(`Device ${this.udid} is now trusted`);
       return true;
     } catch {
       logInfo(`Timeout waiting for trust acceptance on device ${this.udid}`);
-      return false;
+      throw new Error(`Timeout waiting for trust acceptance on device ${this.udid}`);
     }
   }
   async waitForPairing({
     timeout: timeout2 = 12e4,
-    pollInterval = 1e3
+    pollInterval = 1e3,
+    signal
   }) {
     logTask(`Waiting for pairing on device ${this.udid}`);
     const startTime = Date.now();
     while (Date.now() - startTime < timeout2) {
-      if (await this.isPaired()) {
-        logInfo(`Device ${this.udid} is now paired`);
+      throwIfAborted(signal);
+      await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
+      if (await this.pair()) {
         return true;
       }
-      await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
     }
     throw new Error(`Timeout waiting for device pairing after ${timeout2}ms`);
   }
@@ -36574,24 +36573,24 @@ var require_src2 = __commonJS22({
 var import_debug2 = __toESM22(require_src2());
 function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
   const logInfo222 = (0, import_debug2.default)(`${namespace}:info`);
-  const logTask4 = (0, import_debug2.default)(`${namespace}:task`);
+  const logTask5 = (0, import_debug2.default)(`${namespace}:task`);
   const logError22 = (0, import_debug2.default)(`${namespace}:error`);
-  const logDetail3 = (0, import_debug2.default)(`${namespace}:detail`);
+  const logDetail2 = (0, import_debug2.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug2.default)(`${namespace}:debug`);
   const logWarning2 = (0, import_debug2.default)(`${namespace}:warning`);
   const logColor = (0, import_debug2.default)(`${namespace}:color`);
   logInfo222.color = "19";
-  logTask4.color = "25";
+  logTask5.color = "25";
   logError22.color = "1";
-  logDetail3.color = "199";
+  logDetail2.color = "199";
   logWarning2.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
   function setNamespace7(namespace2) {
     logInfo222.namespace = `${namespace2}:info`;
-    logTask4.namespace = `${namespace2}:task`;
+    logTask5.namespace = `${namespace2}:task`;
     logError22.namespace = `${namespace2}:error`;
-    logDetail3.namespace = `${namespace2}:detail`;
+    logDetail2.namespace = `${namespace2}:detail`;
     logWarning2.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
@@ -36599,26 +36598,26 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
     switch (level) {
       case "info":
         logInfo222.enabled = true;
-        logTask4.enabled = true;
+        logTask5.enabled = true;
         logError22.enabled = true;
         logWarning2.enabled = true;
-        logDetail3.enabled = false;
+        logDetail2.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
         logInfo222.enabled = true;
-        logTask4.enabled = true;
+        logTask5.enabled = true;
         logError22.enabled = true;
         logWarning2.enabled = true;
-        logDetail3.enabled = true;
+        logDetail2.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
         logInfo222.enabled = false;
-        logTask4.enabled = false;
+        logTask5.enabled = false;
         logError22.enabled = false;
         logWarning2.enabled = false;
-        logDetail3.enabled = false;
+        logDetail2.enabled = false;
         logDebug.enabled = false;
         break;
     }
@@ -36630,13 +36629,13 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logInfo222.color = color;
         break;
       case "task":
-        logTask4.color = color;
+        logTask5.color = color;
         break;
       case "error":
         logError22.color = color;
         break;
       case "detail":
-        logDetail3.color = color;
+        logDetail2.color = color;
         break;
       case "warning":
         logWarning2.color = color;
@@ -36703,7 +36702,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
       const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
       callerDetails = `${functionName}`;
     }
-    logDetail3(`${header(`*${title}* ${callerDetails}`)}
+    logDetail2(`${header(`*${title}* ${callerDetails}`)}
 ${args.reduce((acc, arg) => `${acc}
 ${logDataDetail(arg)}`, "")}
 	
@@ -36724,9 +36723,9 @@ ${"=".repeat(80)}`);
   }
   return {
     logInfo: logInfo222,
-    logTask: logTask4,
+    logTask: logTask5,
     logError: logError22,
-    logDetail: logDetail3,
+    logDetail: logDetail2,
     logDebug,
     logWarning: logWarning2,
     logColor,
@@ -37671,24 +37670,24 @@ var require_src22 = __commonJS3({
 var import_debug22 = __toESM3(require_src22());
 function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
   const logInfo32 = (0, import_debug22.default)(`${namespace}:info`);
-  const logTask4 = (0, import_debug22.default)(`${namespace}:task`);
+  const logTask5 = (0, import_debug22.default)(`${namespace}:task`);
   const logError22 = (0, import_debug22.default)(`${namespace}:error`);
-  const logDetail3 = (0, import_debug22.default)(`${namespace}:detail`);
+  const logDetail2 = (0, import_debug22.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug22.default)(`${namespace}:debug`);
   const logWarning2 = (0, import_debug22.default)(`${namespace}:warning`);
   const logColor = (0, import_debug22.default)(`${namespace}:color`);
   logInfo32.color = "19";
-  logTask4.color = "25";
+  logTask5.color = "25";
   logError22.color = "1";
-  logDetail3.color = "199";
+  logDetail2.color = "199";
   logWarning2.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
   function setNamespace7(namespace2) {
     logInfo32.namespace = `${namespace2}:info`;
-    logTask4.namespace = `${namespace2}:task`;
+    logTask5.namespace = `${namespace2}:task`;
     logError22.namespace = `${namespace2}:error`;
-    logDetail3.namespace = `${namespace2}:detail`;
+    logDetail2.namespace = `${namespace2}:detail`;
     logWarning2.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
@@ -37696,26 +37695,26 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
     switch (level) {
       case "info":
         logInfo32.enabled = true;
-        logTask4.enabled = true;
+        logTask5.enabled = true;
         logError22.enabled = true;
         logWarning2.enabled = true;
-        logDetail3.enabled = false;
+        logDetail2.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
         logInfo32.enabled = true;
-        logTask4.enabled = true;
+        logTask5.enabled = true;
         logError22.enabled = true;
         logWarning2.enabled = true;
-        logDetail3.enabled = true;
+        logDetail2.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
         logInfo32.enabled = false;
-        logTask4.enabled = false;
+        logTask5.enabled = false;
         logError22.enabled = false;
         logWarning2.enabled = false;
-        logDetail3.enabled = false;
+        logDetail2.enabled = false;
         logDebug.enabled = false;
         break;
     }
@@ -37727,13 +37726,13 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logInfo32.color = color;
         break;
       case "task":
-        logTask4.color = color;
+        logTask5.color = color;
         break;
       case "error":
         logError22.color = color;
         break;
       case "detail":
-        logDetail3.color = color;
+        logDetail2.color = color;
         break;
       case "warning":
         logWarning2.color = color;
@@ -37800,7 +37799,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
       const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
       callerDetails = `${functionName}`;
     }
-    logDetail3(`${header(`*${title}* ${callerDetails}`)}
+    logDetail2(`${header(`*${title}* ${callerDetails}`)}
 ${args.reduce((acc, arg) => `${acc}
 ${logDataDetail(arg)}`, "")}
 	
@@ -37821,9 +37820,9 @@ ${"=".repeat(80)}`);
   }
   return {
     logInfo: logInfo32,
-    logTask: logTask4,
+    logTask: logTask5,
     logError: logError22,
-    logDetail: logDetail3,
+    logDetail: logDetail2,
     logDebug,
     logWarning: logWarning2,
     logColor,
@@ -37836,11 +37835,11 @@ ${"=".repeat(80)}`);
     setNamespace: setNamespace7
   };
 }
-var { logInfo: logInfo22, logError, logWarning, logDataObject: logDataObject2 } = createLoggers22("mdm-client");
+var { logInfo: logInfo22, logError, logWarning, logDataObject } = createLoggers22("mdm-client");
 var MdmClient = class {
   constructor(config) {
     this.config = config;
-    logDataObject2("MDM Client Config", { config });
+    logDataObject("MDM Client Config", { config });
     if (!config.endpoint) {
       throw new Error("MDM endpoint is required");
     }
@@ -37908,7 +37907,7 @@ async function createMDMClient() {
   const credPath = process.env.CREDENTIALS_PATH;
   if (!endpoint || !credPath) {
     logWarning("MDM endpoint or credentials path is not set");
-    logDataObject2("Environment variables", { endpoint, credPath });
+    logDataObject("Environment variables", { endpoint, credPath });
     return void 0;
   }
   const credentials = await readCredentialsFromFile(credPath);
@@ -38007,10 +38006,17 @@ var ProxyActions = class {
 };
 
 // src/logic/activationFlow.ts
+import { EventEmitter } from "node:events";
 import { unlink, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join as join4 } from "node:path";
 
+// src/types/activation.ts
+var ACTIVATION_FLOW_EVENT_ACTIVATION_DONE = "activationDone";
+var ACTIVATION_FLOW_EVENT_WIFI_INSTALLED = "wifiInstalled";
+var ACTIVATION_FLOW_EVENT_MDM_PROFILE_INSTALLED = "mdmProfileInstalled";
+var ACTIVATION_FLOW_EVENT_STEPS_SKIPPED = "stepsSkipped";
+
 // src/utils/wifiProfile.ts
 import { randomUUID } from "node:crypto";
 
@@ -38287,6 +38293,22 @@ function parseWifiEapType(value) {
 var DEFAULT_RETRIES = 150;
 var DEFAULT_RETRY_DELAY_MS = 1e3;
 var { logTask: logTask3, logInfo: logInfo6, logError: logError2, setNamespace: setNamespace4 } = createLoggers("apple-kit:activation");
+function throwIfAborted2(signal) {
+  if (signal?.aborted) {
+    throw new DOMException("Activation flow was cancelled", "AbortError");
+  }
+}
+function sleep(ms, signal) {
+  return new Promise((resolve2, reject) => {
+    throwIfAborted2(signal);
+    const id = setTimeout(resolve2, ms);
+    const onAbort = () => {
+      clearTimeout(id);
+      reject(new DOMException("Activation flow was cancelled", "AbortError"));
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
 var ActivationFlow = class {
   constructor(udid, iosClient) {
     this.udid = udid;
@@ -38294,32 +38316,62 @@ var ActivationFlow = class {
     setNamespace4(`${udid}`);
   }
   mdmClient;
-  async run(steps) {
+  run(steps, signal) {
+    const events = new EventEmitter();
+    const promise = this.runInternal(steps, events, signal);
+    return { promise, events };
+  }
+  async runInternal(steps, events, signal) {
+    throwIfAborted2(signal);
     this.mdmClient = await createMDMClient();
     logTask3(`Starting activation flow for device ${this.udid}`);
-    await this.retryActivateCommand("activate device", () => this.iosClient.activate());
-    const wifiProfileIdentifier = await this.installWifiProfile();
-    await this.installMdmProfile();
-    await this.retryIosCommand("skip steps", () => this.iosClient.skipSteps(steps));
+    throwIfAborted2(signal);
+    const infoResult = await this.iosClient.info();
+    if (infoResult.exitCode !== 0) {
+      const pairResult = await this.iosClient.pair();
+      if (pairResult.exitCode !== 0) {
+        if (!(await this.iosClient.listDevices()).udids.includes(this.udid)) {
+          throw new Error("Usbmuxd is not running or incorrectly configured");
+        }
+        throw new Error("Failed to pair device");
+      }
+    }
+    const { attempt } = await this.retryActivateCommand(
+      "activate device",
+      () => this.iosClient.activate(),
+      signal
+    );
+    events.emit(ACTIVATION_FLOW_EVENT_ACTIVATION_DONE, { attempt: attempt + 1 });
+    throwIfAborted2(signal);
+    const wifiProfileIdentifier = await this.installWifiProfile(events, signal);
+    throwIfAborted2(signal);
+    await this.installMdmProfile(events, signal);
+    throwIfAborted2(signal);
+    await this.retryIosCommand("skip steps", () => this.iosClient.skipSteps(steps), signal);
+    events.emit(ACTIVATION_FLOW_EVENT_STEPS_SKIPPED, { steps: steps ?? [] });
     return () => this.removeWifiProfile(wifiProfileIdentifier);
   }
-  async installWifiProfile() {
+  async installWifiProfile(events, signal) {
+    throwIfAborted2(signal);
     const wifiProfile = await generateWifiProfileFromEnv();
     if (!wifiProfile) {
       return void 0;
     }
     const wifiProfilePath = await saveWifiProfileToTemp(wifiProfile);
     const wifiProfileIdentifier = getProfileIdentifierFromProfile(wifiProfile);
-    await this.retryIosCommand(
+    const { attempt } = await this.retryIosCommand(
       "install wifi profile",
-      () => this.iosClient.installProfile(wifiProfilePath)
+      () => this.iosClient.installProfile(wifiProfilePath),
+      signal
     );
+    events.emit(ACTIVATION_FLOW_EVENT_WIFI_INSTALLED, { retries: attempt });
     await removeTempFile(wifiProfilePath, "wifi profile");
     return wifiProfileIdentifier;
   }
-  async installMdmProfile() {
+  async installMdmProfile(events, signal) {
+    throwIfAborted2(signal);
     logTask3("Installing MDM enrollment profile");
-    const enrollmentProfile = await this.retry(
+    const { result: enrollmentProfile } = await this.retry(
       "generate mdm enrollment profile",
       () => {
         if (!this.mdmClient) {
@@ -38327,16 +38379,21 @@ var ActivationFlow = class {
         }
         return this.mdmClient.generateEnrollmentProfile(this.udid);
       },
-      (result) => result.status === "OK" && Boolean(result.profile)
+      (result) => result.status === "OK" && Boolean(result.profile),
+      void 0,
+      void 0,
+      signal
     );
     if (!enrollmentProfile.profile) {
       throw new Error("MDM enrollment profile missing from response");
     }
     const profilePath = await saveProfileToTemp(enrollmentProfile.profile, "mdm_profile");
-    await this.retryIosCommand(
+    const { attempt } = await this.retryIosCommand(
       "install mdm profile",
-      () => this.iosClient.installProfile(profilePath)
+      () => this.iosClient.installProfile(profilePath),
+      signal
     );
+    events.emit(ACTIVATION_FLOW_EVENT_MDM_PROFILE_INSTALLED, { retries: attempt });
     await removeTempFile(profilePath, "mdm profile");
   }
   async removeWifiProfile(profileIdentifier) {
@@ -38349,25 +38406,41 @@ var ActivationFlow = class {
       () => this.iosClient.removeProfile(profileIdentifier)
     );
   }
-  async retryIosCommand(label, command) {
-    return this.retry(label, command, (result) => result.exitCode === 0);
+  async retryIosCommand(label, command, signal) {
+    return this.retry(
+      label,
+      command,
+      (result) => result.exitCode === 0,
+      void 0,
+      void 0,
+      signal
+    );
   }
-  async retryActivateCommand(label, command) {
-    return this.retry(label, command, (result) => isActivationSuccess(result));
+  async retryActivateCommand(label, command, signal) {
+    return this.retry(
+      label,
+      command,
+      (result) => isActivationSuccess(result),
+      void 0,
+      void 0,
+      signal
+    );
   }
-  async retry(label, command, isSuccess, retries = +(process.env.DEFAULT_RETRIES ?? DEFAULT_RETRIES), retryDelayMs = +(process.env.DEFAULT_RETRY_DELAY_MS ?? DEFAULT_RETRY_DELAY_MS)) {
+  async retry(label, command, isSuccess, retries = +(process.env.DEFAULT_RETRIES ?? DEFAULT_RETRIES), retryDelayMs = +(process.env.DEFAULT_RETRY_DELAY_MS ?? DEFAULT_RETRY_DELAY_MS), signal) {
     for (let attempt = 0; attempt < retries; attempt += 1) {
+      throwIfAborted2(signal);
       try {
         const result = await command();
         if (isSuccess(result)) {
-          return result;
+          return { result, attempt };
         }
       } catch (error) {
         const errorMsg = error instanceof Error ? error.message : String(error);
         logError2(`${label} failed: ${errorMsg}`);
       }
+      throwIfAborted2(signal);
       logInfo6(`Retrying ${label}... ${attempt + 1} of ${retries}`);
-      await new Promise((resolve2) => setTimeout(resolve2, retryDelayMs));
+      await sleep(retryDelayMs, signal);
     }
     throw new Error(`Failed to ${label} after ${retries} attempts`);
   }
@@ -38517,14 +38590,17 @@ var ProfileParser = class {
 };
 
 // src/logic/iosClient.ts
-var { logDetail: logDetail2, setNamespace: setNamespace5 } = createLoggers("");
+var { logDetail, setNamespace: setNamespace5, logTask: logTask4 } = createLoggers("");
 var IosClient = class {
-  constructor(iosPath, udid, usbmuxdAddress) {
+  constructor(iosPath, udid, _usbmuxdAddress) {
     this.iosPath = iosPath;
     this.udid = udid;
-    this.usbmuxdAddress = usbmuxdAddress;
+    this._usbmuxdAddress = _usbmuxdAddress;
     setNamespace5(`apple-${this.udid}`);
   }
+  get usbmuxdAddress() {
+    return this._usbmuxdAddress;
+  }
   safeParseJson(line) {
     try {
       const parsed = JSON.parse(line);
@@ -38540,8 +38616,7 @@ var IosClient = class {
     return output.split("\n").map((line) => line.trim()).filter((line) => line.length > 0).map((line) => this.safeParseJson(line)).filter((item) => Boolean(item));
   }
   spawnIosCommand(args) {
-    logDetail2(`Running command: ${this.iosPath} ${args.join(" ")}`);
-    logDetail2(`USBMUXD_SOCKET_ADDRESS: ${this.usbmuxdAddress}`);
+    logTask4(`Running command: ${this.iosPath} ${args.join(" ")}`);
     const child = spawn(this.iosPath, args, {
       windowsHide: true,
       stdio: ["ignore", "pipe", "pipe"],
@@ -38561,32 +38636,31 @@ var IosClient = class {
         stdout += data.toString();
       });
       child.stderr?.on("data", (data) => {
-        logDetail2(`Command data: ${data.toString()}`);
         stderr += data.toString();
       });
       child.on("error", (error) => {
-        logDetail2(`Command error: ${error.message}`);
         reject(error);
       });
       child.on("close", (code) => {
-        logDetail2(`Command closed: ${code}`);
         const output = this.parseIosOutput(stdout);
         const logMessages = this.parseIosOutput(stderr).map((item) => ({
           level: item.level,
           msg: item.msg,
-          timestamp: item.timestamp
+          time: item.time,
+          err: item.err
         }));
-        resolve2({
+        const result = {
           command: this.iosPath,
           args,
-          output,
           logMessages,
+          output,
           exitCode: code ?? 0,
           raw: {
             stdout,
             stderr
           }
-        });
+        };
+        resolve2(result);
       });
     });
   }
@@ -38676,7 +38750,7 @@ var IosClient = class {
   }
   async tunnelStart(userspace = false) {
     const args = ["tunnel", "start", "--udid", this.udid, ...userspace ? ["--userspace"] : []];
-    logDetail2(`Spawning tunnel: ${this.iosPath} ${args.join(" ")}`);
+    logDetail(`Spawning tunnel: ${this.iosPath} ${args.join(" ")}`);
     const child = spawn(this.iosPath, args, {
       windowsHide: true,
       env: {
@@ -38771,10 +38845,30 @@ var IosClient = class {
 };
 
 // src/logic/appleDeviceKit.ts
-var { logInfo: logInfo7, logError: logError3, setNamespace: setNamespace6 } = createLoggers("apple-kit");
+var { logInfo: logInfo7, setNamespace: setNamespace6, logDataObject: logDataObject2 } = 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)) {
+      logDataObject2("Required environment variables are not set", requiredEnvVars);
+      throw new Error("Required environment variables are not set");
+    }
     this.deviceId = udid;
     setNamespace6(`apple-${udid}`);
     logInfo7(
@@ -38789,11 +38883,6 @@ var AppleDeviceKit = class {
     this.installActions = new InstallActions(this.deviceId, this.iosClient);
     this.activationFlow = new ActivationFlow(this.deviceId, this.iosClient);
     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;
@@ -38824,13 +38913,6 @@ var AppleDeviceKit = class {
     this.ensureNotDisposed();
     return this.deviceActions.listDevices();
   }
-  /**
-   * Check if device is paired/trusted with this computer
-   */
-  async isPaired() {
-    this.ensureNotDisposed();
-    return this.deviceActions.isPaired();
-  }
   /**
    * Wait for device to be paired
    * Polls the pairing status until successful or timeout
@@ -38838,9 +38920,9 @@ var AppleDeviceKit = class {
    * @param timeout Timeout in milliseconds (default: 120000)
    * @param pollInterval Poll interval in milliseconds (default: 1000)
    */
-  async waitForPairing(timeout2 = 12e4, pollInterval = 1e3) {
+  async waitForPairing(timeout2 = 12e4, pollInterval = 1e3, signal) {
     this.ensureNotDisposed();
-    return this.deviceActions.waitForPairing({ timeout: timeout2, pollInterval });
+    return this.deviceActions.waitForPairing({ timeout: timeout2, pollInterval, signal });
   }
   /**
    * Attempt to pair/trust the device
@@ -38863,8 +38945,8 @@ var AppleDeviceKit = class {
    * @param onWaitingForTrust Callback when waiting for user to accept trust dialog
    * @returns true if device is now trusted
    */
-  async trustDevice(timeout2 = 6e4, onWaitingForTrust) {
-    return this.deviceActions.trustDevice({ timeout: timeout2, onWaitingForTrust });
+  async trustDevice(timeout2 = 6e4, pollInterval = 1e3, onWaitingForTrust, signal) {
+    return this.deviceActions.trustDevice({ timeout: timeout2, pollInterval, onWaitingForTrust, signal });
   }
   /**
    * Unpair/untrust the device
@@ -38962,14 +39044,16 @@ var AppleDeviceKit = class {
    * Activate the device using the activation flow.
    *
    * This flow can install WiFi/MDM/trust profiles and skip setup steps.
+   * Returns { promise, events } so callers can attach listeners before the flow completes.
+   * Pass an AbortSignal to cancel the flow (on each retry or between steps).
    *
    * Note: This requires a valid activation record or Apple server access.
    *
    * Precondition: the device must be paired and trusted.
    */
-  async activate() {
+  activate(signal) {
     this.ensureNotDisposed();
-    return this.activationFlow.run();
+    return this.activationFlow.run(void 0, signal);
   }
   /**
    * Get the device UDID
@@ -39025,6 +39109,10 @@ var AppleDeviceKit = class {
   }
 };
 export {
+  ACTIVATION_FLOW_EVENT_ACTIVATION_DONE,
+  ACTIVATION_FLOW_EVENT_MDM_PROFILE_INSTALLED,
+  ACTIVATION_FLOW_EVENT_STEPS_SKIPPED,
+  ACTIVATION_FLOW_EVENT_WIFI_INSTALLED,
   ActivationFlow,
   AppleDeviceKit,
   IosClient