@mcesystems/apple-kit 1.0.54 → 1.0.55

package/dist/index.js

@@ -33369,19 +33369,46 @@ async function unpair(udid) {
 }
 
 // src/logic/actions/install.ts
-async function installApp(ipaPath, udid, options) {
-  if (options?.installViaMdm) {
-    logTask(`Installing app on device ${udid} via MDM`);
-    const mdmClient = await resolveMdmClient(options.mdm);
-    const mdmInstallOptions = getMdmInstallOptions(options.mdm);
-    await mdmClient.installApp(udid, mdmInstallOptions);
-  }
-  await installLocalApp(ipaPath, udid);
-}
 async function installLocalApp(ipaPath, udid) {
   logTask(`Installing app ${ipaPath} on device ${udid}`);
   await runIDeviceTool("ideviceinstaller", ["-u", udid, "install", ipaPath]);
 }
+function getMdmInstallOptionsFromEnv() {
+  const appId = process.env.MDM_APP_ID;
+  const url = process.env.MDM_APP_URL;
+  const waitForInstalled = parseBooleanEnv(process.env.MDM_APP_WAIT_FOR_INSTALLED);
+  if (!appId && !url) {
+    throw new Error("MDM install requires MDM_APP_ID or MDM_APP_URL.");
+  }
+  return {
+    appId,
+    url,
+    waitForInstalled
+  };
+}
+function parseBooleanEnv(value) {
+  if (!value) {
+    return void 0;
+  }
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "true" || normalized === "1" || normalized === "yes") {
+    return true;
+  }
+  if (normalized === "false" || normalized === "0" || normalized === "no") {
+    return false;
+  }
+  return void 0;
+}
+async function installManagedApp(ipaPath, udid, timeBetweenInstalls) {
+  await installLocalApp(ipaPath, udid);
+  const mdmInstallOptions = getMdmInstallOptionsFromEnv();
+  const client = await createMdmClientFromEnv();
+  logTask("Installing app via MDM for management takeover");
+  await new Promise((resolve5) => setTimeout(resolve5, timeBetweenInstalls));
+  if (client) {
+    client.installApp(udid, mdmInstallOptions);
+  }
+}
 async function uninstallApp(bundleId, udid) {
   logTask(`Uninstalling app ${bundleId} from device ${udid}`);
   if (!await isPaired(udid)) {
@@ -33466,33 +33493,6 @@ async function launchApp(bundleId, args, udid) {
     throw error;
   }
 }
-async function resolveMdmClient(options) {
-  if (options?.client) {
-    return options.client;
-  }
-  if (options?.clientConfig) {
-    return createMdmClient(options.clientConfig);
-  }
-  const envClient = await createMdmClientFromEnv();
-  if (!envClient) {
-    throw new Error(
-      "MDM client not configured. Set MDM_ENDPOINT and MDM_CRED_PATH or pass mdm.client."
-    );
-  }
-  return envClient;
-}
-function getMdmInstallOptions(options) {
-  const appId = options?.appId;
-  const url = options?.url;
-  if (!appId && !url) {
-    throw new Error("MDM install requires an appId or url.");
-  }
-  return {
-    appId,
-    url,
-    waitForInstalled: options?.waitForInstalled
-  };
-}
 async function launchAppWithPymobiledevice3(bundleId, args, udid) {
   logTask(`Launching app ${bundleId} using pymobiledevice3`);
   const { exec } = await import("node:child_process");
@@ -33669,7 +33669,6 @@ function killPortForwardProcess(process2) {
 }
 
 // src/logic/activationFlow.ts
-var import_node_fs4 = require("node:fs");
 var import_promises2 = require("node:fs/promises");
 var import_node_os2 = require("node:os");
 var import_node_path7 = require("node:path");
@@ -33983,16 +33982,9 @@ function createIosCli(iosBinaryPath) {
 var import_meta3 = {};
 var DEFAULT_RETRIES = 150;
 var DEFAULT_RETRY_DELAY_MS = 1e3;
-var TIME_BETWEEN_INSTALLS = 1e4;
-var TIME_TO_WAIT_FOR_MANAGED_APP_INSTALL = 1e4;
-function sleep(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
-}
 var ActivationFlow = class {
   iosCli;
   mdmClientPromise;
-  // private readonly organizationName?: string;
-  resourcesDir;
   constructor(config) {
     const iosBinaryPath = resolveIosBinaryPath(config);
     if (!iosBinaryPath) {
@@ -34000,7 +33992,6 @@ var ActivationFlow = class {
     }
     this.iosCli = createIosCli(iosBinaryPath);
     this.mdmClientPromise = createMdmClientFromEnv({ resourcesDir: config.resourcesDir });
-    this.resourcesDir = config.resourcesDir;
   }
   async run(udid) {
     logTask(`Starting activation flow for device ${udid}`);
@@ -34010,15 +34001,12 @@ var ActivationFlow = class {
       await this.retryActivateCommand("activate device", () => this.iosCli.activate(udid));
     } else {
       await this.retryIosCommand("wipe", () => this.iosCli.wipe(udid));
-      return "wiped";
+      return void 0;
     }
     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";
+    return () => this.removeWifiProfile(udid, wifiProfileIdentifier);
   }
   async installWifiProfile(udid) {
     const wifiProfile = await generateWifiProfileFromEnv();
@@ -34060,39 +34048,6 @@ var ActivationFlow = class {
     );
     await removeTempFile(profilePath, "mdm profile");
   }
-  // private async installTrustProfile(udid: string): Promise<void> {
-  // 	const resourcesProfilePath = getResourcesTrustProfilePath(this.resourcesDir);
-  // 	if (existsSync(resourcesProfilePath)) {
-  // 		logTask("Installing trust profile from resources");
-  // 		await this.retryIosCommand("install trust profile", () =>
-  // 			this.iosCli.installProfile(udid, resourcesProfilePath)
-  // 		);
-  // 		return;
-  // 	}
-  // 	if (!this.organizationName) {
-  // 		logError("ORGANIZATION_NAME is required to generate trust profile");
-  // 		throw new Error("ORGANIZATION_NAME is required for trust profile generation");
-  // 	}
-  // 	const trustProfile = await generateTrustProfileFromEnv(this.organizationName);
-  // 	if (!trustProfile) {
-  // 		return;
-  // 	}
-  // 	logTask("Generating trust profile and saving to resources");
-  // 	await ensureResourcesDirExists(this.resourcesDir);
-  // 	await writeFile(resourcesProfilePath, trustProfile, "utf-8");
-  // 	await this.retryIosCommand("install trust profile", () =>
-  // 		this.iosCli.installProfile(udid, resourcesProfilePath)
-  // 	);
-  // }
-  async installManagedApp(udid) {
-    const ipaPath = resolveManagedAppPath(this.resourcesDir);
-    await installLocalApp(ipaPath, udid);
-    const mdmInstallOptions = getMdmInstallOptionsFromEnv();
-    const client = await this.requireMdmClient();
-    logTask("Installing app via MDM for management takeover");
-    await sleep(TIME_BETWEEN_INSTALLS);
-    client.installApp(udid, mdmInstallOptions);
-  }
   async removeWifiProfile(udid, profileIdentifier) {
     if (!profileIdentifier) {
       return;
@@ -34148,40 +34103,6 @@ async function removeTempFile(filePath, label) {
     logError(`Failed to remove ${label} temp file: ${errorMsg}`);
   }
 }
-function resolveManagedAppPath(resourcesDir) {
-  const resolvedResourcesDir = resolveResourcesDir(resourcesDir);
-  const ipaPath = (0, import_node_path7.join)(resolvedResourcesDir, "deviceagent.ipa");
-  if (!(0, import_node_fs4.existsSync)(ipaPath)) {
-    throw new Error(`Managed app IPA not found at ${ipaPath}`);
-  }
-  return ipaPath;
-}
-function getMdmInstallOptionsFromEnv() {
-  const appId = process.env.MDM_APP_ID;
-  const url = process.env.MDM_APP_URL;
-  const waitForInstalled = parseBooleanEnv(process.env.MDM_APP_WAIT_FOR_INSTALLED);
-  if (!appId && !url) {
-    throw new Error("MDM install requires MDM_APP_ID or MDM_APP_URL.");
-  }
-  return {
-    appId,
-    url,
-    waitForInstalled
-  };
-}
-function parseBooleanEnv(value) {
-  if (!value) {
-    return void 0;
-  }
-  const normalized = value.trim().toLowerCase();
-  if (normalized === "true" || normalized === "1" || normalized === "yes") {
-    return true;
-  }
-  if (normalized === "false" || normalized === "0" || normalized === "no") {
-    return false;
-  }
-  return void 0;
-}
 function getProfileIdentifierFromProfile(profile) {
   const pattern = /<key>PayloadIdentifier<\/key>\s*<string>([^<]+)<\/string>/g;
   const matches = [];
@@ -34328,9 +34249,9 @@ var AppleDeviceKit = class {
    *
    * @param ipaPath Path to the IPA file
    */
-  async installApp(ipaPath, options) {
+  async installApp(ipaPath, timeBetweenInstalls = 1e4) {
     this.ensureNotDisposed();
-    installApp(ipaPath, this.deviceId, options);
+    return installManagedApp(ipaPath, this.deviceId, timeBetweenInstalls);
   }
   /**
    * Uninstall an app by bundle ID (uninstall agent)