@mcesystems/apple-kit 1.0.52 → 1.0.53

package/dist/index.mjs

@@ -33938,6 +33938,9 @@ function createIosCli(iosBinaryPath) {
     async installProfile(deviceId, profilePath) {
       return runIosCommand(iosBinaryPath, ["profile", "add", profilePath, "--udid", deviceId]);
     },
+    async removeProfile(deviceId, profileName) {
+      return runIosCommand(iosBinaryPath, ["profile", "remove", profileName, "--udid", deviceId]);
+    },
     async skipSteps(deviceId) {
       return runIosCommand(iosBinaryPath, ["prepare", "--skip-all", "--udid", deviceId]);
     },
@@ -33963,7 +33966,9 @@ function createIosCli(iosBinaryPath) {
 
 // src/logic/activationFlow.ts
 var DEFAULT_RETRIES = 150;
-var DEFAULT_RETRY_DELAY_MS = 2e3;
+var DEFAULT_RETRY_DELAY_MS = 1e3;
+var TIME_BETWEEN_INSTALLS = 5e3;
+var TIME_TO_WAIT_FOR_MANAGED_APP_INSTALL = 1e4;
 function sleep(ms) {
   return new Promise((resolve5) => setTimeout(resolve5, ms));
 }
@@ -33991,23 +33996,27 @@ var ActivationFlow = class {
       await this.retryIosCommand("wipe", () => this.iosCli.wipe(udid));
       return "wiped";
     }
-    await this.installWifiProfile(udid);
+    const wifiProfileIdentifier = await this.installWifiProfile(udid);
     await this.installMdmProfile(udid);
     await this.retryIosCommand("skip steps", () => this.iosCli.skipSteps(udid));
     await this.installManagedApp(udid);
+    await sleep(TIME_TO_WAIT_FOR_MANAGED_APP_INSTALL);
+    await this.removeWifiProfile(udid, wifiProfileIdentifier);
     return "activated";
   }
   async installWifiProfile(udid) {
     const wifiProfile = await generateWifiProfileFromEnv();
     if (!wifiProfile) {
-      return;
+      return void 0;
     }
     const wifiProfilePath = await saveWifiProfileToTemp(wifiProfile);
+    const wifiProfileIdentifier = getProfileIdentifierFromProfile(wifiProfile);
     await this.retryIosCommand(
       "install wifi profile",
       () => this.iosCli.installProfile(udid, wifiProfilePath)
     );
     await removeTempFile(wifiProfilePath, "wifi profile");
+    return wifiProfileIdentifier;
   }
   async getActivationState(udid) {
     const infoResult = await this.retryIosCommand("device info", () => this.iosCli.info(udid));
@@ -34065,9 +34074,19 @@ var ActivationFlow = class {
     const mdmInstallOptions = getMdmInstallOptionsFromEnv();
     const client = await this.requireMdmClient();
     logTask("Installing app via MDM for management takeover");
-    await sleep(1e4);
+    await sleep(TIME_BETWEEN_INSTALLS);
     client.installApp(udid, mdmInstallOptions);
   }
+  async removeWifiProfile(udid, profileIdentifier) {
+    if (!profileIdentifier) {
+      return;
+    }
+    logTask("Removing WiFi profile");
+    await this.retryIosCommand(
+      "remove wifi profile",
+      () => this.iosCli.removeProfile(udid, profileIdentifier)
+    );
+  }
   async requireMdmClient() {
     const client = await this.mdmClientPromise;
     if (!client) {
@@ -34147,6 +34166,19 @@ function parseBooleanEnv(value) {
   }
   return void 0;
 }
+function getProfileIdentifierFromProfile(profile) {
+  const pattern = /<key>PayloadIdentifier<\/key>\s*<string>([^<]+)<\/string>/g;
+  const matches = [];
+  let match = pattern.exec(profile);
+  while (match) {
+    matches.push(match[1].trim());
+    match = pattern.exec(profile);
+  }
+  if (matches.length === 0) {
+    return void 0;
+  }
+  return matches[matches.length - 1];
+}
 function resolveResourcesDir(resourcesDir) {
   if (resourcesDir) {
     return resolve4(resourcesDir);