@mcesystems/apple-kit 1.0.55 → 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,87 +33412,6 @@ 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;
-  }
-}
-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/install.ts
 async function installLocalApp(ipaPath, udid) {
   logTask(`Installing app ${ipaPath} on device ${udid}`);
@@ -33936,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() {
@@ -33974,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
+      };
     }
   };
 }
@@ -33982,6 +34126,7 @@ function createIosCli(iosBinaryPath) {
 var import_meta3 = {};
 var DEFAULT_RETRIES = 150;
 var DEFAULT_RETRY_DELAY_MS = 1e3;
+var MCE_MDM_PROFILE_PREFIX = "com.mce.mdm";
 var ActivationFlow = class {
   iosCli;
   mdmClientPromise;
@@ -33996,7 +34141,14 @@ var ActivationFlow = class {
   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 {
@@ -34008,6 +34160,18 @@ var ActivationFlow = class {
     await this.retryIosCommand("skip steps", () => this.iosCli.skipSteps(udid));
     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();
     if (!wifiProfile) {
@@ -34165,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 {
@@ -34271,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
    */