@mcesystems/apple-kit 1.0.60 → 1.0.61

package/dist/index.js

@@ -33399,6 +33399,17 @@ function parseWifiEapType(value) {
 // src/logic/iosCli.ts
 var import_node_child_process2 = require("node:child_process");
 var import_node_path5 = require("node:path");
+var ios;
+function iosCli() {
+  const iosBinaryPath = resolveIosBinaryPath();
+  if (!iosBinaryPath) {
+    throw new Error("iosBinaryPath is required. Provide iosBinaryPath or resourcesDir.");
+  }
+  return createIosCli(iosBinaryPath);
+}
+if (!ios) {
+  ios = iosCli();
+}
 function runIosCommand(iosBinaryPath, args) {
   return new Promise((resolve2, reject) => {
     const child = (0, import_node_child_process2.spawn)(iosBinaryPath, args, {
@@ -33593,11 +33604,11 @@ function createIosCli(iosBinaryPath) {
     }
   };
 }
+var iosCli_default = ios;
 
 // src/logic/activationFlow.ts
 var DEFAULT_RETRIES = 150;
 var DEFAULT_RETRY_DELAY_MS = 1e3;
-var MCE_MDM_PROFILE_PREFIX = "com.mce.mdm";
 var ActivationFlow = class {
   iosCli;
   mdmClientPromise;
@@ -33611,38 +33622,12 @@ var ActivationFlow = class {
   }
   async run(udid) {
     logTask(`Starting activation flow for device ${udid}`);
-    const activationState = await this.getActivationState(udid);
-    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 void 0;
-    }
+    await this.retryActivateCommand("activate device", () => this.iosCli.activate(udid));
     const wifiProfileIdentifier = await this.installWifiProfile(udid);
     await this.installMdmProfile(udid);
     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) {
@@ -33657,14 +33642,6 @@ var ActivationFlow = class {
     await removeTempFile(wifiProfilePath, "wifi profile");
     return wifiProfileIdentifier;
   }
-  async getActivationState(udid) {
-    const infoResult = await this.retryIosCommand("device info", () => this.iosCli.info(udid));
-    const activationState = getActivationState2(infoResult.output);
-    if (!activationState) {
-      logInfo("Activation state not found");
-    }
-    return activationState;
-  }
   async installMdmProfile(udid) {
     const client = await this.requireMdmClient();
     logTask("Installing MDM enrollment profile");
@@ -33706,7 +33683,7 @@ var ActivationFlow = class {
   async retryActivateCommand(label, command) {
     return this.retry(label, command, (result) => isActivationSuccess(result));
   }
-  async retry(label, command, isSuccess, retries = DEFAULT_RETRIES, retryDelayMs = DEFAULT_RETRY_DELAY_MS) {
+  async retry(label, command, isSuccess, retries = +(process.env.DEFAULT_RETRIES ?? DEFAULT_RETRIES), retryDelayMs = +(process.env.DEFAULT_RETRY_DELAY_MS ?? DEFAULT_RETRY_DELAY_MS)) {
     for (let attempt = 0; attempt < retries; attempt += 1) {
       try {
         const result = await command();
@@ -33756,25 +33733,6 @@ function resolveIosBinaryPath() {
   const binaryName = platform === "win32" ? "ios.exe" : "ios";
   return (0, import_node_path6.join)(getResourcesBinPath(), binaryName);
 }
-function getActivationState2(output) {
-  if (!Array.isArray(output) || output.length === 0) {
-    return void 0;
-  }
-  for (const item of output) {
-    if (!item || typeof item !== "object") {
-      continue;
-    }
-    if ("ActivationState" in item) {
-      const value = item.ActivationState;
-      return typeof value === "string" ? value : void 0;
-    }
-    if ("activationState" in item) {
-      const value = item.activationState;
-      return typeof value === "string" ? value : void 0;
-    }
-  }
-  return void 0;
-}
 function isActivationSuccess(result) {
   if (result.exitCode !== 0) {
     return false;
@@ -33785,19 +33743,6 @@ 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/dataParser.ts
 function parsePlistOutput(output) {
@@ -33864,13 +33809,34 @@ async function info(udid) {
   if (!iosBinaryPath) {
     throw new Error("iosBinaryPath is required. Provide iosBinaryPath or resourcesDir.");
   }
-  const iosCli = createIosCli(iosBinaryPath);
-  const result = await iosCli.info(udid);
+  const iosCli2 = createIosCli(iosBinaryPath);
+  const result = await iosCli2.info(udid);
   if (!result) {
     throw new Error("Failed to get device info");
   }
   return result.output[0];
 }
+async function wipeDevice(udid) {
+  if (!iosCli_default) {
+    throw new Error("ios is not initialized");
+  }
+  logTask(`Wiping device ${udid}`);
+  await iosCli_default.wipe(udid);
+}
+async function removeProfile(profileIdentifier, udid) {
+  if (!iosCli_default) {
+    throw new Error("ios is not initialized");
+  }
+  logTask(`Removing profile ${profileIdentifier} from device ${udid}`);
+  await iosCli_default.removeProfile(udid, profileIdentifier);
+}
+async function listProfiles(udid) {
+  if (!iosCli_default) {
+    throw new Error("ios is not initialized");
+  }
+  logTask(`Listing profiles for device ${udid}`);
+  return iosCli_default.listProfiles(udid);
+}
 
 // src/logic/actions/pair.ts
 async function isPaired(udid) {
@@ -33994,160 +33960,8 @@ async function isAppInstalled(bundleId, udid) {
   const apps = await listApps(udid);
   return apps.some((app) => app.bundleId === bundleId);
 }
-async function wakeDevice(udid) {
-  try {
-    logInfo("Attempting to wake device screen...");
-    await runIDeviceTool("ideviceinfo", ["-u", udid, "-k", "DeviceName"]);
-    try {
-      await runIDeviceTool("ideviceinfo", ["-u", udid, "-k", "ActivationState"]);
-    } catch {
-    }
-    try {
-      await runIDeviceTool("idevicepair", ["-u", udid, "validate"]);
-    } catch {
-    }
-    await new Promise((resolve2) => setTimeout(resolve2, 1e3));
-    logInfo("Device wake attempt completed");
-  } catch (error) {
-    logInfo(
-      `Device wake attempt failed (non-critical): ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-}
-async function launchApp(bundleId, args, udid) {
+async function launchApp(bundleId, _args, udid) {
   logTask(`Launching app ${bundleId} on device ${udid}`);
-  if (!await isPaired(udid)) {
-    await waitForPairing(udid, 1e4);
-  }
-  const installed = await isAppInstalled(bundleId, udid);
-  if (!installed) {
-    throw new Error(
-      `App "${bundleId}" is not installed on the device. Install the app first or verify the bundle identifier is correct.`
-    );
-  }
-  await wakeDevice(udid);
-  try {
-    logInfo(`Attempting to launch ${bundleId} using idevicedebug...`);
-    const result = await runIDeviceTool("idevicedebug", ["-u", udid, "run", bundleId, ...args]);
-    const output = (result?.stdout ?? "") + (result?.stderr ?? "");
-    if (output.trim()) {
-      logInfo(`idevicedebug output: ${output.substring(0, 200)}`);
-    }
-    if (output.toLowerCase().includes("could not start") && output.toLowerCase().includes("debugserver")) {
-      logInfo("idevicedebug requires debugserver, falling back to pymobiledevice3...");
-      throw new Error("debugserver_not_available");
-    }
-    logInfo(`App ${bundleId} launched successfully using idevicedebug`);
-    await new Promise((resolve2) => setTimeout(resolve2, 1e3));
-    return;
-  } catch (error) {
-    const errorMsg = error instanceof Error ? error.message : String(error);
-    if (errorMsg.includes("debugserver_not_available") || errorMsg.toLowerCase().includes("could not start") || errorMsg.toLowerCase().includes("debugserver")) {
-      logInfo("idevicedebug failed, trying pymobiledevice3 for iOS 17+...");
-      await launchAppWithPymobiledevice3(bundleId, args, udid);
-      return;
-    }
-    throw error;
-  }
-}
-async function launchAppWithPymobiledevice3(bundleId, args, udid) {
-  logTask(`Launching app ${bundleId} using pymobiledevice3`);
-  const { exec } = await import("node:child_process");
-  const { promisify: promisify3 } = await import("node:util");
-  const execAsync2 = promisify3(exec);
-  try {
-    let cmdArgs = [
-      "-m",
-      "pymobiledevice3",
-      "developer",
-      "dvt",
-      "launch",
-      "--udid",
-      udid,
-      "--kill-existing",
-      // Kill existing instance to bring app to foreground
-      bundleId,
-      ...args
-    ];
-    let command = `python ${cmdArgs.map((a) => `"${a}"`).join(" ")}`;
-    logInfo(`Executing: ${command}`);
-    const result = await execAsync2(command, {
-      windowsHide: true,
-      encoding: "utf8",
-      timeout: 3e4
-      // 30 second timeout
-    });
-    const output = result.stdout.toString() + result.stderr.toString();
-    if (output.trim()) {
-      logInfo(`pymobiledevice3 output: ${output.substring(0, 200)}`);
-    }
-    if (output.toLowerCase().includes("developer mode") && output.toLowerCase().includes("not enabled")) {
-      throw new Error(
-        "Developer Mode is not enabled on the device.\nPlease enable it: Settings \u2192 Privacy & Security \u2192 Developer Mode \u2192 Enable"
-      );
-    }
-    if (output.toLowerCase().includes("tunneld") && (output.toLowerCase().includes("unable to connect") || output.toLowerCase().includes("invalidserviceerror"))) {
-      logInfo("Tunnel required, retrying with tunnel option...");
-      cmdArgs = [
-        "-m",
-        "pymobiledevice3",
-        "developer",
-        "dvt",
-        "launch",
-        "--udid",
-        udid,
-        "--tunnel",
-        udid,
-        // Use UDID for tunnel
-        "--kill-existing",
-        bundleId,
-        ...args
-      ];
-      command = `python ${cmdArgs.map((a) => `"${a}"`).join(" ")}`;
-      logInfo(`Retrying with tunnel: ${command}`);
-      try {
-        const retryResult = await execAsync2(command, {
-          windowsHide: true,
-          encoding: "utf8",
-          timeout: 3e4
-        });
-        const retryOutput = retryResult.stdout.toString() + retryResult.stderr.toString();
-        if (retryOutput.trim()) {
-          logInfo(`pymobiledevice3 retry output: ${retryOutput.substring(0, 200)}`);
-        }
-        if (retryOutput.toLowerCase().includes("tunneld") && retryOutput.toLowerCase().includes("unable to connect")) {
-          throw new Error(
-            "Tunnel connection failed. For iOS 17+, you may need to start tunneld:\n  python -m pymobiledevice3 remote tunneld\nOr ensure Developer Mode is enabled and device is unlocked."
-          );
-        }
-        logInfo(`App ${bundleId} launched successfully using pymobiledevice3 with tunnel`);
-        await new Promise((resolve2) => setTimeout(resolve2, 500));
-        return;
-      } catch {
-        throw new Error(
-          "Tunnel connection failed. For iOS 17+, you may need to start tunneld:\n  python -m pymobiledevice3 remote tunneld\nOr ensure Developer Mode is enabled and device is unlocked."
-        );
-      }
-    }
-    if (output.toLowerCase().includes("not found") || output.toLowerCase().includes("command not found") || output.toLowerCase().includes("cannot find")) {
-      throw new Error(
-        "pymobiledevice3 is not installed.\nInstall it with: python -m pip install --user pymobiledevice3"
-      );
-    }
-    if (output.toLowerCase().includes("error") && !output.toLowerCase().includes("warning")) {
-      logInfo(`Warning: pymobiledevice3 reported errors: ${output.substring(0, 300)}`);
-    }
-    logInfo(`App ${bundleId} launched successfully using pymobiledevice3`);
-    await new Promise((resolve2) => setTimeout(resolve2, 1e3));
-  } catch (error) {
-    const errorMsg = error instanceof Error ? error.message : String(error);
-    if (errorMsg.includes("not found") || errorMsg.includes("command not found") || errorMsg.includes("cannot find") || errorMsg.includes("No module named")) {
-      throw new Error(
-        "pymobiledevice3 is not installed or Python is not available.\nInstall it with: python -m pip install --user pymobiledevice3\nFor iOS 17+, Developer Mode must also be enabled on the device."
-      );
-    }
-    throw error;
-  }
 }
 
 // src/logic/actions/proxy.ts
@@ -34406,6 +34220,18 @@ var AppleDeviceKit = class {
     this.ensureNotDisposed();
     return getActivationState(this.deviceId);
   }
+  /**
+   * Wipe the device
+   */
+  async wipe() {
+    return wipeDevice(this.deviceId);
+  }
+  removeProfile(profileIdentifier) {
+    return removeProfile(profileIdentifier, this.deviceId);
+  }
+  listProfiles() {
+    return listProfiles(this.deviceId);
+  }
   /**
    * Activate the device using the activation flow.
    *