@mcesystems/apple-kit 1.0.54 → 1.0.56

package/dist/index.js

@@ -32425,6 +32425,131 @@ async function getActivationState(udid) {
   }
 }
 
+// src/logic/actions/pair.ts
+async function isPaired(udid) {
+  logTask(`Checking pairing status for ${udid}`);
+  try {
+    const result = await runIDeviceTool("idevicepair", ["-u", udid, "validate"]);
+    if (!result) {
+      return false;
+    }
+    return result.stdout.toLowerCase().includes("success");
+  } catch {
+    return false;
+  }
+}
+async function trustDevice(udid, timeout2 = 6e4, onWaitingForTrust) {
+  logTask(`Trusting device ${udid}`);
+  if (await isPaired(udid)) {
+    logInfo(`Device ${udid} is already trusted`);
+    return true;
+  }
+  logInfo(`Initiating pairing for device ${udid}`);
+  try {
+    const pairResult = await pair(udid);
+    if (pairResult) {
+      logInfo(`Device ${udid} paired successfully`);
+      return true;
+    }
+  } catch (error) {
+    logError(`Pairing failed with ${udid}: ${error}`);
+  }
+  logInfo("Please accept the trust dialog on the device...");
+  onWaitingForTrust?.();
+  try {
+    await waitForPairing(udid, timeout2, 1e3);
+    logInfo(`Device ${udid} is now trusted`);
+    return true;
+  } catch {
+    logInfo(`Timeout waiting for trust acceptance on device ${udid}`);
+    return false;
+  }
+}
+async function waitForPairing(udid, timeout2 = 12e4, pollInterval = 1e3) {
+  logTask(`Waiting for pairing on device ${udid}`);
+  const startTime = Date.now();
+  while (Date.now() - startTime < timeout2) {
+    if (await isPaired(udid)) {
+      logInfo(`Device ${udid} is now paired`);
+      return true;
+    }
+    await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
+  }
+  throw new Error(`Timeout waiting for device pairing after ${timeout2}ms`);
+}
+async function pair(udid) {
+  logTask(`Initiating pairing for device ${udid}`);
+  try {
+    const result = await runIDeviceTool("idevicepair", ["-u", udid, "pair"]);
+    if (!result) {
+      return false;
+    }
+    return result.stdout.toLowerCase().includes("success");
+  } catch (error) {
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    if (errorMsg.includes("Please accept the trust dialog")) {
+      return false;
+    }
+    throw error;
+  }
+}
+async function unpair(udid) {
+  logTask(`Un-pairing device ${udid}`);
+  try {
+    const result = await runIDeviceTool("idevicepair", ["-u", udid, "unpair"]);
+    if (!result) {
+      return false;
+    }
+    return result.stdout.toLowerCase().includes("success");
+  } catch {
+    return false;
+  }
+}
+
+// src/logic/actions/appState.ts
+var FRONTMOST_KEYS = [
+  "FrontmostApplicationBundleID",
+  "FrontmostApplicationBundleId",
+  "FrontmostAppBundleIdentifier",
+  "ForegroundApplicationBundleID",
+  "ForegroundApplicationBundleId",
+  "ForegroundAppBundleId",
+  "ApplicationBundleIdentifier",
+  "BundleIdentifier",
+  "bundleIdentifier",
+  "bundleId"
+];
+async function isAppOpened(bundleId, udid) {
+  logTask(`Checking if app ${bundleId} is opened on device ${udid}`);
+  if (!await isPaired(udid)) {
+    await waitForPairing(udid, 1e4);
+  }
+  try {
+    for (const key of FRONTMOST_KEYS) {
+      const result = await runIDeviceTool("ideviceinfo", ["-u", udid, "-k", key]);
+      const output = result?.stdout?.trim() ?? "";
+      if (!output) {
+        continue;
+      }
+      if (isBundleIdMatch(output, bundleId)) {
+        return true;
+      }
+    }
+  } catch (error) {
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    logInfo(`isAppOpened failed: ${errorMsg}`);
+  }
+  return false;
+}
+function isBundleIdMatch(value, bundleId) {
+  if (value === bundleId) {
+    return true;
+  }
+  const escaped = bundleId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const matcher = new RegExp(`(^|[^A-Za-z0-9_.-])${escaped}($|[^A-Za-z0-9_.-])`);
+  return matcher.test(value);
+}
+
 // src/logic/actions/device.ts
 var import_node_fs2 = require("node:fs");
 var import_node_path3 = require("node:path");
@@ -33287,100 +33412,46 @@ function resolveCredentialsPath(options) {
   return process.env.MDM_CRED_PATH ?? process.env.APP_CRED_PATH;
 }
 
-// src/logic/actions/pair.ts
-async function isPaired(udid) {
-  logTask(`Checking pairing status for ${udid}`);
-  try {
-    const result = await runIDeviceTool("idevicepair", ["-u", udid, "validate"]);
-    if (!result) {
-      return false;
-    }
-    return result.stdout.toLowerCase().includes("success");
-  } catch {
-    return false;
-  }
+// src/logic/actions/install.ts
+async function installLocalApp(ipaPath, udid) {
+  logTask(`Installing app ${ipaPath} on device ${udid}`);
+  await runIDeviceTool("ideviceinstaller", ["-u", udid, "install", ipaPath]);
 }
-async function trustDevice(udid, timeout2 = 6e4, onWaitingForTrust) {
-  logTask(`Trusting device ${udid}`);
-  if (await isPaired(udid)) {
-    logInfo(`Device ${udid} is already trusted`);
-    return true;
-  }
-  logInfo(`Initiating pairing for device ${udid}`);
-  try {
-    const pairResult = await pair(udid);
-    if (pairResult) {
-      logInfo(`Device ${udid} paired successfully`);
-      return true;
-    }
-  } catch (error) {
-    logError(`Pairing failed with ${udid}: ${error}`);
-  }
-  logInfo("Please accept the trust dialog on the device...");
-  onWaitingForTrust?.();
-  try {
-    await waitForPairing(udid, timeout2, 1e3);
-    logInfo(`Device ${udid} is now trusted`);
-    return true;
-  } catch {
-    logInfo(`Timeout waiting for trust acceptance on device ${udid}`);
-    return false;
+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
+  };
 }
-async function waitForPairing(udid, timeout2 = 12e4, pollInterval = 1e3) {
-  logTask(`Waiting for pairing on device ${udid}`);
-  const startTime = Date.now();
-  while (Date.now() - startTime < timeout2) {
-    if (await isPaired(udid)) {
-      logInfo(`Device ${udid} is now paired`);
-      return true;
-    }
-    await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
+function parseBooleanEnv(value) {
+  if (!value) {
+    return void 0;
   }
-  throw new Error(`Timeout waiting for device pairing after ${timeout2}ms`);
-}
-async function pair(udid) {
-  logTask(`Initiating pairing for device ${udid}`);
-  try {
-    const result = await runIDeviceTool("idevicepair", ["-u", udid, "pair"]);
-    if (!result) {
-      return false;
-    }
-    return result.stdout.toLowerCase().includes("success");
-  } catch (error) {
-    const errorMsg = error instanceof Error ? error.message : String(error);
-    if (errorMsg.includes("Please accept the trust dialog")) {
-      return false;
-    }
-    throw error;
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "true" || normalized === "1" || normalized === "yes") {
+    return true;
   }
-}
-async function unpair(udid) {
-  logTask(`Un-pairing device ${udid}`);
-  try {
-    const result = await runIDeviceTool("idevicepair", ["-u", udid, "unpair"]);
-    if (!result) {
-      return false;
-    }
-    return result.stdout.toLowerCase().includes("success");
-  } catch {
+  if (normalized === "false" || normalized === "0" || normalized === "no") {
     return false;
   }
+  return void 0;
 }
-
-// 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);
-  }
+async function installManagedApp(ipaPath, udid, timeBetweenInstalls) {
   await installLocalApp(ipaPath, udid);
-}
-async function installLocalApp(ipaPath, udid) {
-  logTask(`Installing app ${ipaPath} on device ${udid}`);
-  await runIDeviceTool("ideviceinstaller", ["-u", udid, "install", ipaPath]);
+  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}`);
@@ -33466,33 +33537,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 +33713,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");
@@ -33937,6 +33980,99 @@ function safeParseJson(line) {
     return void 0;
   }
 }
+function isRecord(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function getStringField(record, key) {
+  const value = record[key];
+  return typeof value === "string" ? value : void 0;
+}
+function getBooleanField(record, key) {
+  const value = record[key];
+  return typeof value === "boolean" ? value : void 0;
+}
+function getNumberField(record, key) {
+  const value = record[key];
+  return typeof value === "number" ? value : void 0;
+}
+function getRecordField(record, key) {
+  const value = record[key];
+  return isRecord(value) ? value : void 0;
+}
+function toProfileManifest(record) {
+  if (!record) {
+    return void 0;
+  }
+  const description = getStringField(record, "Description");
+  const isActive = getBooleanField(record, "IsActive");
+  if (description === void 0 && isActive === void 0) {
+    return void 0;
+  }
+  return {
+    Description: description,
+    IsActive: isActive
+  };
+}
+function toProfileMetadata(record) {
+  if (!record) {
+    return void 0;
+  }
+  const payloadDescription = getStringField(record, "PayloadDescription");
+  const payloadDisplayName = getStringField(record, "PayloadDisplayName");
+  const payloadRemovalDisallowed = getBooleanField(record, "PayloadRemovalDisallowed");
+  const payloadUuid = getStringField(record, "PayloadUUID");
+  const payloadVersion = getNumberField(record, "PayloadVersion");
+  if (payloadDescription === void 0 && payloadDisplayName === void 0 && payloadRemovalDisallowed === void 0 && payloadUuid === void 0 && payloadVersion === void 0) {
+    return void 0;
+  }
+  return {
+    PayloadDescription: payloadDescription,
+    PayloadDisplayName: payloadDisplayName,
+    PayloadRemovalDisallowed: payloadRemovalDisallowed,
+    PayloadUUID: payloadUuid,
+    PayloadVersion: payloadVersion
+  };
+}
+function toProfileListEntry(item) {
+  const identifier = getStringField(item, "Identifier");
+  const manifest = toProfileManifest(getRecordField(item, "Manifest"));
+  const metadata = toProfileMetadata(getRecordField(item, "Metadata"));
+  const status = getStringField(item, "Status");
+  if (!identifier && !manifest && !metadata && !status) {
+    return void 0;
+  }
+  return {
+    Identifier: identifier,
+    Manifest: manifest,
+    Metadata: metadata,
+    Status: status
+  };
+}
+function parseProfileListOutput(output) {
+  const profiles = [];
+  for (const item of output) {
+    if (Array.isArray(item)) {
+      for (const entry2 of item) {
+        if (!isRecord(entry2)) {
+          continue;
+        }
+        const profileEntry = toProfileListEntry(entry2);
+        if (profileEntry) {
+          profiles.push(profileEntry);
+        }
+      }
+      continue;
+    }
+    if (!isRecord(item)) {
+      continue;
+    }
+    const entry = toProfileListEntry(item);
+    if (entry) {
+      profiles.push(entry);
+    }
+  }
+  return profiles;
+}
 function createIosCli(iosBinaryPath) {
   return {
     async listDevices() {
@@ -33975,6 +34111,13 @@ function createIosCli(iosBinaryPath) {
     },
     async info(deviceId) {
       return runIosCommand(iosBinaryPath, ["info", "--udid", deviceId]);
+    },
+    async listProfiles(deviceId) {
+      const raw = await runIosCommand(iosBinaryPath, ["profile", "list", "--udid", deviceId]);
+      return {
+        profiles: parseProfileListOutput(raw.output),
+        raw
+      };
     }
   };
 }
@@ -33983,16 +34126,10 @@ 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 MCE_MDM_PROFILE_PREFIX = "com.mce.mdm";
 var ActivationFlow = class {
   iosCli;
   mdmClientPromise;
-  // private readonly organizationName?: string;
-  resourcesDir;
   constructor(config) {
     const iosBinaryPath = resolveIosBinaryPath(config);
     if (!iosBinaryPath) {
@@ -34000,25 +34137,40 @@ 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}`);
     const activationState = await this.getActivationState(udid);
-    if (activationState && activationState !== "Activated") {
+    if (activationState === "Activated") {
+      const isEnrolled = await this.isEnrolledToMceMdm(udid);
+      if (isEnrolled) {
+        logInfo("Device already activated and enrolled to MCE MDM. Skipping activation flow.");
+        return async () => {
+        };
+      }
+    } else if (activationState) {
       logInfo(`Activation state is ${activationState}, activating device`);
       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 isEnrolledToMceMdm(udid) {
+    const profiles = await this.listProfiles(udid);
+    return profiles.some((profile) => isMceMdmProfile(profile));
+  }
+  async listProfiles(udid) {
+    const result = await this.retry(
+      "list profiles",
+      () => this.iosCli.listProfiles(udid),
+      (response) => response.raw.exitCode === 0
+    );
+    return result.profiles;
   }
   async installWifiProfile(udid) {
     const wifiProfile = await generateWifiProfileFromEnv();
@@ -34060,39 +34212,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 +34267,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 = [];
@@ -34244,6 +34329,19 @@ function isActivationSuccess(result) {
   const hasFatal = result.logMessages.some((log) => log.level === "error");
   return !hasFatal;
 }
+function isMceMdmProfile(profile) {
+  const identifier = profile.Identifier;
+  if (!identifier) {
+    return false;
+  }
+  if (!identifier.startsWith(MCE_MDM_PROFILE_PREFIX)) {
+    return false;
+  }
+  if (profile.Manifest?.IsActive === false) {
+    return false;
+  }
+  return true;
+}
 
 // src/logic/appleDeviceKit.ts
 var AppleDeviceKit = class {
@@ -34328,9 +34426,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)
@@ -34350,6 +34448,15 @@ var AppleDeviceKit = class {
     this.ensureNotDisposed();
     return isAppInstalled(bundleId, this.deviceId);
   }
+  /**
+   * Check if an app is currently opened on the device
+   *
+   * @param bundleId Application bundle identifier
+   */
+  async isAppOpened(bundleId) {
+    this.ensureNotDisposed();
+    return isAppOpened(bundleId, this.deviceId);
+  }
   /**
    * List all installed user applications
    */