@mcesystems/apple-kit 1.0.95 → 1.0.97

package/dist/index.mjs

@@ -376,8 +376,7 @@ var require_retry_promise = __commonJS({
 
 // src/logic/appleDeviceKit.ts
 import { readFileSync, unlinkSync } from "node:fs";
-import { mkdir, stat } from "node:fs/promises";
-import { writeFile as writeFile2 } from "node:fs/promises";
+import { mkdir, stat, writeFile as writeFile2 } from "node:fs/promises";
 import { join as join5 } from "node:path";
 
 // ../tool-debug/dist/index.mjs
@@ -1686,6 +1685,9 @@ ${out.stderr}`;
     rmSync(lockdownFile, { force: true });
     return true;
   }
+  getLockdownPath() {
+    return getLockdownPath();
+  }
 };
 
 // ../mdm-client/dist/index.mjs
@@ -38604,31 +38606,34 @@ function escapeXml(str) {
 var { logInfo: logInfo5 } = createLoggers("apple-kit:wifi-profile");
 async function generateWifiProfile(config, options) {
   const {
-    ssid,
     encryptionType,
     password,
     autoJoin = true,
     organizationName = "MCE Systems",
-    displayName = `WiFi - ${ssid}`,
     enterprise = false,
     username,
     acceptAnyCertificate = true
   } = config;
+  const resolvedSsid = config.ssid ?? process.env.WIFI_SSID ?? "";
+  if (!resolvedSsid) {
+    throw new Error("WiFi SSID is required. Set config.ssid or WIFI_SSID environment variable.");
+  }
   const profileUuid = randomUUID().toUpperCase();
   const payloadUuid = randomUUID().toUpperCase();
-  const profileId = `com.mce.wifi.${ssid.replace(/[^a-zA-Z0-9]/g, "")}.${Date.now()}`;
+  const profileId = `com.mce.wifi.${resolvedSsid.replace(/[^a-zA-Z0-9]/g, "")}.${Date.now()}`;
   const payloadId = `${profileId}.payload`;
-  logInfo5(`Generating WiFi profile for SSID: ${ssid}, encryption: ${encryptionType}`);
+  const displayNameToUse = config.displayName ?? `WiFi - ${resolvedSsid}`;
+  logInfo5(`Generating WiFi profile for SSID: ${resolvedSsid}, encryption: ${encryptionType}`);
   const templateName = enterprise ? "wifi-enterprise.xml" : "wifi-standard.xml";
   const template = await loadTemplate(templateName, options?.plistDir);
   const variables = {
-    ssid: config.ssid ?? process.env.WIFI_SSID,
+    ssid: resolvedSsid,
     password: config.password ?? process.env.WIFI_PASSWORD,
     encryptionType: parseWifiEncryptionType(config.encryptionType ?? process.env.WIFI_ENCRYPTION),
     autoJoin: autoJoin ? "true" : "false",
     hiddenNetwork: config.hiddenNetwork ?? process.env.WIFI_HIDDEN === "true",
     organizationName,
-    displayName,
+    displayName: displayNameToUse,
     profileId,
     profileUuid,
     payloadId,
@@ -38723,10 +38728,9 @@ function isAbortError(error) {
   return error instanceof DOMException && error.name === "AbortError";
 }
 var ActivationFlow = class {
-  constructor(udid, iosClient, deviceActions) {
+  constructor(udid, iosClient) {
     this.udid = udid;
     this.iosClient = iosClient;
-    this.deviceActions = deviceActions;
     setNamespace4(`${udid}`);
   }
   mdmClient;
@@ -38762,14 +38766,6 @@ var ActivationFlow = class {
         signal
       );
       throwIfAborted2(signal);
-      const expectedSsid = config.wifiProfileConfig?.ssid;
-      if (expectedSsid) {
-        if (await this.deviceActions.isWifiConnected(15e3) !== expectedSsid) {
-          throw new Error(
-            `WiFi profile not installed correctly, expected ${expectedSsid} but got ${await this.deviceActions.isWifiConnected(15e3)}`
-          );
-        }
-      }
       await this.installMdmProfile(events, signal);
       throwIfAborted2(signal);
     }
@@ -39172,46 +39168,60 @@ var IosClient = class {
   async devMode() {
     return this.runIosCommand(["devmode", "enable", "--udid", this.udid]);
   }
-  async tunnelStart(userspace = false) {
-    const args = ["tunnel", "start", "--udid", this.udid, ...userspace ? ["--userspace"] : []];
-    logDetail(`Spawning tunnel: ${this.iosPath} ${args.join(" ")}`);
-    const child = spawn(this.iosPath, args, {
-      windowsHide: true,
-      env: {
-        ...process.env,
-        USBMUXD_SOCKET_ADDRESS: this.usbmuxdAddress
-      },
-      stdio: ["ignore", "pipe", "pipe"]
+  async tunnelStart(userspace = false, pairRecordPath) {
+    return new Promise((resolve2, reject) => {
+      const args = [
+        "tunnel",
+        "start",
+        `--pair-record-path=${pairRecordPath ?? "default"}`,
+        "--udid",
+        this.udid,
+        ...userspace ? ["--userspace"] : []
+      ];
+      logDetail(`Spawning tunnel: ${this.iosPath} ${args.join(" ")}`);
+      const child = spawn(this.iosPath, args, {
+        windowsHide: true,
+        env: {
+          ...process.env,
+          USBMUXD_SOCKET_ADDRESS: this.usbmuxdAddress
+        },
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      let settled = false;
+      const cleanup = () => {
+        child.off("error", onError);
+        child.off("exit", onExit);
+        child.stdout?.off("data", onReadyCheck);
+        child.stderr?.off("data", onReadyCheck);
+        clearTimeout(readyTimeout);
+      };
+      const finish = (result) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        cleanup();
+        if (result.reject) {
+          reject(result.reject);
+          return;
+        }
+        if (result.resolve !== void 0) {
+          resolve2(result.resolve);
+        }
+      };
+      const onError = (err) => finish({ reject: err });
+      const onExit = (code) => finish({ reject: new Error(`Tunnel exited early (code=${code})`) });
+      const onReadyCheck = (data) => {
+        const line = data.toString();
+        const isReady = line.includes("Tunnel server started") || line.includes("tunnel") && (line.includes("listening") || line.includes("connected"));
+        if (isReady) finish({ resolve: child });
+      };
+      const readyTimeout = setTimeout(() => finish({ resolve: child }), 1e4);
+      child.once("error", onError);
+      child.once("exit", onExit);
+      child.stdout?.on("data", onReadyCheck);
+      child.stderr?.on("data", onReadyCheck);
     });
-    let settled = false;
-    const cleanup = () => {
-      child.off("error", onError);
-      child.off("exit", onExit);
-      child.stdout?.off("data", onReadyCheck);
-      child.stderr?.off("data", onReadyCheck);
-      clearTimeout(readyTimeout);
-    };
-    const finish = (result) => {
-      if (settled) return;
-      settled = true;
-      cleanup();
-      if (result.reject) throw result.reject;
-      if (result.resolve !== void 0) return result.resolve;
-      throw new Error("Tunnel process not found");
-    };
-    const onError = (err) => finish({ reject: err });
-    const onExit = (code) => finish({ reject: new Error(`Tunnel exited early (code=${code})`) });
-    const onReadyCheck = (data) => {
-      const line = data.toString();
-      const isReady = line.includes("Tunnel server started") || line.includes("tunnel") && (line.includes("listening") || line.includes("connected"));
-      if (isReady) finish({ resolve: child });
-    };
-    const readyTimeout = setTimeout(() => finish({ resolve: child }), 1e4);
-    child.once("error", onError);
-    child.once("exit", onExit);
-    child.stdout?.on("data", onReadyCheck);
-    child.stderr?.on("data", onReadyCheck);
-    return child;
   }
   async fsyncPull({
     app,
@@ -39333,9 +39343,9 @@ var AppleDeviceKit = class _AppleDeviceKit {
     this.iosClient = new IosClient(iosBinaryPath, udid, usbmuxdAddress);
     this.deviceActions = new DeviceActions(this.deviceId, this.iosClient);
     this.installActions = new InstallActions(this.deviceId, this.iosClient);
-    this.activationFlow = new ActivationFlow(this.deviceId, this.iosClient, this.deviceActions);
+    this.activationFlow = new ActivationFlow(this.deviceId, this.iosClient);
     this.proxyActions = new ProxyActions(this.deviceId, this.iosClient);
-    this.ensureTunnel();
+    this.getTunnelReady();
   }
   deviceId;
   proxyProcess = null;
@@ -39347,7 +39357,18 @@ var AppleDeviceKit = class _AppleDeviceKit {
   activationFlow;
   proxyActions;
   tunnelProcess = null;
+  tunnelReadyPromise = null;
   static IOS_17_VERSION = 17;
+  /**
+   * Returns a promise that resolves when the tunnel is ready (or immediately if not needed).
+   * Reuses the same in-flight promise so constructor and methods don't race.
+   */
+  getTunnelReady() {
+    if (!this.tunnelReadyPromise) {
+      this.tunnelReadyPromise = this.runEnsureTunnel();
+    }
+    return this.tunnelReadyPromise;
+  }
   /**
    * Check if iOS version requires tunneling (iOS 17+)
    */
@@ -39365,9 +39386,15 @@ var AppleDeviceKit = class _AppleDeviceKit {
     }
   }
   /**
-   * Ensure tunnel is started for iOS 17+ devices
+   * Ensure tunnel is started for iOS 17+ devices. Safe to call multiple times; reuses in-flight setup.
    */
   async ensureTunnel() {
+    await this.getTunnelReady();
+  }
+  /**
+   * Internal tunnel startup. Called once per tunnel lifecycle; getTunnelReady() caches this promise.
+   */
+  async runEnsureTunnel() {
     const requiresTunnel = await this.requiresTunneling();
     if (!requiresTunnel) {
       logDetail2(`Device ${this.deviceId} does not require tunneling (iOS < 17)`);
@@ -39380,19 +39407,28 @@ var AppleDeviceKit = class _AppleDeviceKit {
     }
     logInfo7(`Starting tunnel for device ${this.deviceId} (iOS 17+)`);
     try {
-      const tunnelProcess = await this.iosClient.tunnelStart(true);
+      const pairRecordPath = join5(
+        this.deviceActions.getLockdownPath() ?? "",
+        "RemotePairing",
+        `${this.deviceId}`
+      );
+      await mkdir(pairRecordPath, { recursive: true });
+      const tunnelProcess = await this.iosClient.tunnelStart(true, pairRecordPath);
       this.tunnelProcess = tunnelProcess;
       tunnelProcess.on("exit", (code) => {
         logError3(`Tunnel process for device ${this.deviceId} exited with code ${code}`);
         this.tunnelProcess = null;
+        this.tunnelReadyPromise = null;
       });
       tunnelProcess.on("error", (error) => {
         logError3(`Tunnel process error for device ${this.deviceId}: ${error.message}`);
         this.tunnelProcess = null;
+        this.tunnelReadyPromise = null;
       });
       await new Promise((resolve2) => setTimeout(resolve2, 1e3));
       logInfo7(`Tunnel started successfully for device ${this.deviceId}`);
     } catch (error) {
+      this.tunnelReadyPromise = null;
       logError3(
         `Failed to start tunnel for device ${this.deviceId}: ${error instanceof Error ? error.message : String(error)}`
       );
@@ -39630,9 +39666,6 @@ var AppleDeviceKit = class _AppleDeviceKit {
       }
       logInfo7(`File ${fileName} pushed to device ${this.deviceId}`);
     } finally {
-      if (requiresTunnel) {
-        this.stopTunnel();
-      }
       try {
         unlinkSync(tmpFilePath);
       } catch (_error) {
@@ -39669,9 +39702,6 @@ var AppleDeviceKit = class _AppleDeviceKit {
       logInfo7(`File ${fileName} pulled from device ${this.deviceId}`);
       return fileData;
     } finally {
-      if (requiresTunnel) {
-        this.stopTunnel();
-      }
       try {
         unlinkSync(tmpFilePath);
       } catch (_error) {