@mcesystems/apple-kit 1.0.94 → 1.0.96

package/dist/index.js

@@ -390,7 +390,6 @@ module.exports = __toCommonJS(index_exports);
 // src/logic/appleDeviceKit.ts
 var import_node_fs5 = require("node:fs");
 var import_promises3 = require("node:fs/promises");
-var import_promises4 = require("node:fs/promises");
 var import_node_path5 = require("node:path");
 
 // ../tool-debug/dist/index.mjs
@@ -1226,14 +1225,14 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
   const logInfo8 = (0, import_debug.default)(`${namespace}:info`);
   const logTask5 = (0, import_debug.default)(`${namespace}:task`);
   const logError4 = (0, import_debug.default)(`${namespace}:error`);
-  const logDetail4 = (0, import_debug.default)(`${namespace}:detail`);
+  const logDetail3 = (0, import_debug.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug.default)(`${namespace}:debug`);
   const logWarning2 = (0, import_debug.default)(`${namespace}:warning`);
   const logColor = (0, import_debug.default)(`${namespace}:color`);
   logInfo8.color = "19";
   logTask5.color = "25";
   logError4.color = "1";
-  logDetail4.color = "199";
+  logDetail3.color = "199";
   logWarning2.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
@@ -1241,7 +1240,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
     logInfo8.namespace = `${namespace2}:info`;
     logTask5.namespace = `${namespace2}:task`;
     logError4.namespace = `${namespace2}:error`;
-    logDetail4.namespace = `${namespace2}:detail`;
+    logDetail3.namespace = `${namespace2}:detail`;
     logWarning2.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
@@ -1252,7 +1251,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = true;
         logError4.enabled = true;
         logWarning2.enabled = true;
-        logDetail4.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
@@ -1260,7 +1259,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = true;
         logError4.enabled = true;
         logWarning2.enabled = true;
-        logDetail4.enabled = true;
+        logDetail3.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
@@ -1268,7 +1267,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = false;
         logError4.enabled = false;
         logWarning2.enabled = false;
-        logDetail4.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
     }
@@ -1286,7 +1285,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logError4.color = color;
         break;
       case "detail":
-        logDetail4.color = color;
+        logDetail3.color = color;
         break;
       case "warning":
         logWarning2.color = color;
@@ -1344,7 +1343,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
   function logHeader(title) {
     logInfo8(`${header(title, 2)}`);
   }
-  function logDataObject2(title, ...args) {
+  function logDataObject3(title, ...args) {
     const stack = new Error().stack?.split("\n")[2] || "";
     const stackMatch = stack.match(/\((.*):(\d+):(\d+)\)$/) || stack.match(/at (.*):(\d+):(\d+)$/);
     let callerDetails = "";
@@ -1353,7 +1352,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
       const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
       callerDetails = `${functionName}`;
     }
-    logDetail4(`${header(`*${title}* ${callerDetails}`)}
+    logDetail3(`${header(`*${title}* ${callerDetails}`)}
 ${args.reduce((acc, arg) => `${acc}
 ${logDataDetail(arg)}`, "")}
 	
@@ -1376,14 +1375,14 @@ ${"=".repeat(80)}`);
     logInfo: logInfo8,
     logTask: logTask5,
     logError: logError4,
-    logDetail: logDetail4,
+    logDetail: logDetail3,
     logDebug,
     logWarning: logWarning2,
     logColor,
     setColors,
     printColors,
     logHeader,
-    logDataObject: logDataObject2,
+    logDataObject: logDataObject3,
     logErrorObject,
     setLogLevel,
     setNamespace: setNamespace7
@@ -1699,6 +1698,9 @@ ${out.stderr}`;
     (0, import_node_fs2.rmSync)(lockdownFile, { force: true });
     return true;
   }
+  getLockdownPath() {
+    return getLockdownPath();
+  }
 };
 
 // ../mdm-client/dist/index.mjs
@@ -37019,14 +37021,14 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
   const logInfo222 = (0, import_debug2.default)(`${namespace}:info`);
   const logTask5 = (0, import_debug2.default)(`${namespace}:task`);
   const logError22 = (0, import_debug2.default)(`${namespace}:error`);
-  const logDetail4 = (0, import_debug2.default)(`${namespace}:detail`);
+  const logDetail3 = (0, import_debug2.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug2.default)(`${namespace}:debug`);
   const logWarning2 = (0, import_debug2.default)(`${namespace}:warning`);
   const logColor = (0, import_debug2.default)(`${namespace}:color`);
   logInfo222.color = "19";
   logTask5.color = "25";
   logError22.color = "1";
-  logDetail4.color = "199";
+  logDetail3.color = "199";
   logWarning2.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
@@ -37034,7 +37036,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
     logInfo222.namespace = `${namespace2}:info`;
     logTask5.namespace = `${namespace2}:task`;
     logError22.namespace = `${namespace2}:error`;
-    logDetail4.namespace = `${namespace2}:detail`;
+    logDetail3.namespace = `${namespace2}:detail`;
     logWarning2.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
@@ -37045,7 +37047,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = true;
         logError22.enabled = true;
         logWarning2.enabled = true;
-        logDetail4.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
@@ -37053,7 +37055,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = true;
         logError22.enabled = true;
         logWarning2.enabled = true;
-        logDetail4.enabled = true;
+        logDetail3.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
@@ -37061,7 +37063,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = false;
         logError22.enabled = false;
         logWarning2.enabled = false;
-        logDetail4.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
     }
@@ -37079,7 +37081,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logError22.color = color;
         break;
       case "detail":
-        logDetail4.color = color;
+        logDetail3.color = color;
         break;
       case "warning":
         logWarning2.color = color;
@@ -37137,7 +37139,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
   function logHeader(title) {
     logInfo222(`${header(title, 2)}`);
   }
-  function logDataObject2(title, ...args) {
+  function logDataObject22(title, ...args) {
     const stack = new Error().stack?.split("\n")[2] || "";
     const stackMatch = stack.match(/\((.*):(\d+):(\d+)\)$/) || stack.match(/at (.*):(\d+):(\d+)$/);
     let callerDetails = "";
@@ -37146,7 +37148,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
       const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
       callerDetails = `${functionName}`;
     }
-    logDetail4(`${header(`*${title}* ${callerDetails}`)}
+    logDetail3(`${header(`*${title}* ${callerDetails}`)}
 ${args.reduce((acc, arg) => `${acc}
 ${logDataDetail(arg)}`, "")}
 	
@@ -37169,14 +37171,14 @@ ${"=".repeat(80)}`);
     logInfo: logInfo222,
     logTask: logTask5,
     logError: logError22,
-    logDetail: logDetail4,
+    logDetail: logDetail3,
     logDebug,
     logWarning: logWarning2,
     logColor,
     setColors,
     printColors,
     logHeader,
-    logDataObject: logDataObject2,
+    logDataObject: logDataObject22,
     logErrorObject,
     setLogLevel,
     setNamespace: setNamespace7
@@ -38116,14 +38118,14 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
   const logInfo32 = (0, import_debug22.default)(`${namespace}:info`);
   const logTask5 = (0, import_debug22.default)(`${namespace}:task`);
   const logError22 = (0, import_debug22.default)(`${namespace}:error`);
-  const logDetail4 = (0, import_debug22.default)(`${namespace}:detail`);
+  const logDetail3 = (0, import_debug22.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug22.default)(`${namespace}:debug`);
   const logWarning2 = (0, import_debug22.default)(`${namespace}:warning`);
   const logColor = (0, import_debug22.default)(`${namespace}:color`);
   logInfo32.color = "19";
   logTask5.color = "25";
   logError22.color = "1";
-  logDetail4.color = "199";
+  logDetail3.color = "199";
   logWarning2.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
@@ -38131,7 +38133,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
     logInfo32.namespace = `${namespace2}:info`;
     logTask5.namespace = `${namespace2}:task`;
     logError22.namespace = `${namespace2}:error`;
-    logDetail4.namespace = `${namespace2}:detail`;
+    logDetail3.namespace = `${namespace2}:detail`;
     logWarning2.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
@@ -38142,7 +38144,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logTask5.enabled = true;
         logError22.enabled = true;
         logWarning2.enabled = true;
-        logDetail4.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
@@ -38150,7 +38152,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logTask5.enabled = true;
         logError22.enabled = true;
         logWarning2.enabled = true;
-        logDetail4.enabled = true;
+        logDetail3.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
@@ -38158,7 +38160,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logTask5.enabled = false;
         logError22.enabled = false;
         logWarning2.enabled = false;
-        logDetail4.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
     }
@@ -38176,7 +38178,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logError22.color = color;
         break;
       case "detail":
-        logDetail4.color = color;
+        logDetail3.color = color;
         break;
       case "warning":
         logWarning2.color = color;
@@ -38234,7 +38236,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
   function logHeader(title) {
     logInfo32(`${header(title, 2)}`);
   }
-  function logDataObject2(title, ...args) {
+  function logDataObject22(title, ...args) {
     const stack = new Error().stack?.split("\n")[2] || "";
     const stackMatch = stack.match(/\((.*):(\d+):(\d+)\)$/) || stack.match(/at (.*):(\d+):(\d+)$/);
     let callerDetails = "";
@@ -38243,7 +38245,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
       const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
       callerDetails = `${functionName}`;
     }
-    logDetail4(`${header(`*${title}* ${callerDetails}`)}
+    logDetail3(`${header(`*${title}* ${callerDetails}`)}
 ${args.reduce((acc, arg) => `${acc}
 ${logDataDetail(arg)}`, "")}
 	
@@ -38266,14 +38268,14 @@ ${"=".repeat(80)}`);
     logInfo: logInfo32,
     logTask: logTask5,
     logError: logError22,
-    logDetail: logDetail4,
+    logDetail: logDetail3,
     logDebug,
     logWarning: logWarning2,
     logColor,
     setColors,
     printColors,
     logHeader,
-    logDataObject: logDataObject2,
+    logDataObject: logDataObject22,
     logErrorObject,
     setLogLevel,
     setNamespace: setNamespace7
@@ -38364,7 +38366,7 @@ async function createMDMClient(options) {
 }
 
 // src/logic/actions/install.ts
-var { logInfo: logInfo3, setNamespace: setNamespace2 } = createLoggers("apple-kit:install");
+var { logInfo: logInfo3, setNamespace: setNamespace2, logDataObject: logDataObject2 } = createLoggers("apple-kit:install");
 var InstallActions = class {
   constructor(udid, iosClient) {
     this.udid = udid;
@@ -38377,12 +38379,16 @@ var InstallActions = class {
   }
   async installManagedApp(ipaPath, options) {
     const result = await this.iosClient.installApp(ipaPath);
+    logDataObject2("Installing app result", { result });
+    return await this.installManagedAppFromMDM(options);
+  }
+  async installManagedAppFromMDM(options) {
     logInfo3("Installing app via MDM for management takeover");
     const mdmClient = await createMDMClient(options.clientConfig);
     if (!mdmClient) {
       throw new Error("Failed to create MDM client");
     }
-    await mdmClient.installApp(this.udid, options);
+    const result = await mdmClient.installApp(this.udid, options);
     return result;
   }
   async uninstallApp(bundleId) {
@@ -38409,7 +38415,7 @@ var InstallActions = class {
 };
 
 // src/logic/actions/proxy.ts
-var { logTask: logTask2, logInfo: logInfo4, setNamespace: setNamespace3, logDetail } = createLoggers("");
+var { logTask: logTask2, logInfo: logInfo4, setNamespace: setNamespace3 } = createLoggers("");
 var ProxyActions = class {
   constructor(udid, iosClient) {
     this.udid = udid;
@@ -38426,7 +38432,6 @@ var ProxyActions = class {
         reject(new Error("Port forwarding timed out"));
       }, timeoutMs);
       result.stderr?.on("data", (data) => {
-        logDetail("port forward stderr", data.toString());
         if (data.toString().includes("Started")) {
           clearTimeout(timeout2);
           resolve2({
@@ -39030,7 +39035,7 @@ var ProfileParser = class {
 };
 
 // src/logic/iosClient.ts
-var { logDetail: logDetail2, setNamespace: setNamespace5, logTask: logTask4 } = createLoggers("");
+var { logDetail, setNamespace: setNamespace5, logTask: logTask4 } = createLoggers("");
 var IosClient = class {
   constructor(iosPath, udid, _usbmuxdAddress) {
     this.iosPath = iosPath;
@@ -39183,9 +39188,9 @@ var IosClient = class {
   async devMode() {
     return this.runIosCommand(["devmode", "enable", "--udid", this.udid]);
   }
-  async tunnelStart(userspace = false) {
-    const args = ["tunnel", "start", "--udid", this.udid, ...userspace ? ["--userspace"] : []];
-    logDetail2(`Spawning tunnel: ${this.iosPath} ${args.join(" ")}`);
+  async tunnelStart(userspace = false, pairRecordPath) {
+    const args = ["tunnel", "start", `--pair-record-path=${pairRecordPath ?? "default"}`, "--udid", this.udid, ...userspace ? ["--userspace"] : []];
+    logDetail(`Spawning tunnel: ${this.iosPath} ${args.join(" ")}`);
     const child = (0, import_node_child_process.spawn)(this.iosPath, args, {
       windowsHide: true,
       env: {
@@ -39328,7 +39333,7 @@ var IosClient = class {
 };
 
 // src/logic/appleDeviceKit.ts
-var { logInfo: logInfo7, setNamespace: setNamespace6, logError: logError3, logDetail: logDetail3 } = createLoggers("apple-kit");
+var { logInfo: logInfo7, setNamespace: setNamespace6, logError: logError3, logDetail: logDetail2 } = createLoggers("apple-kit");
 var AppleDeviceKit = class _AppleDeviceKit {
   constructor(udid, logicalPort, usbmuxdAddress) {
     this.logicalPort = logicalPort;
@@ -39346,11 +39351,7 @@ var AppleDeviceKit = class _AppleDeviceKit {
     this.installActions = new InstallActions(this.deviceId, this.iosClient);
     this.activationFlow = new ActivationFlow(this.deviceId, this.iosClient, this.deviceActions);
     this.proxyActions = new ProxyActions(this.deviceId, this.iosClient);
-    this.iosClient.tunnelStart(true).then((process3) => {
-      this.tunnelProcess = process3;
-    }).catch((error) => {
-      logError3(`Failed to start tunnel: ${error.message}`);
-    });
+    this.ensureTunnel();
   }
   deviceId;
   proxyProcess = null;
@@ -39385,17 +39386,19 @@ var AppleDeviceKit = class _AppleDeviceKit {
   async ensureTunnel() {
     const requiresTunnel = await this.requiresTunneling();
     if (!requiresTunnel) {
-      logDetail3(`Device ${this.deviceId} does not require tunneling (iOS < 17)`);
+      logDetail2(`Device ${this.deviceId} does not require tunneling (iOS < 17)`);
       return;
     }
     const existingTunnel = this.tunnelProcess;
     if (existingTunnel && !existingTunnel.killed) {
-      logDetail3(`Tunnel already running for device ${this.deviceId}`);
+      logDetail2(`Tunnel already running for device ${this.deviceId}`);
       return;
     }
     logInfo7(`Starting tunnel for device ${this.deviceId} (iOS 17+)`);
     try {
-      const tunnelProcess = await this.iosClient.tunnelStart(true);
+      const pairRecordPath = (0, import_node_path5.join)(this.deviceActions.getLockdownPath() ?? "", "RemotePairing", `${this.deviceId}`);
+      await (0, import_promises3.mkdir)(pairRecordPath, { recursive: true });
+      const tunnelProcess = await this.iosClient.tunnelStart(true, pairRecordPath);
       this.tunnelProcess = tunnelProcess;
       tunnelProcess.on("exit", (code) => {
         logError3(`Tunnel process for device ${this.deviceId} exited with code ${code}`);
@@ -39499,6 +39502,10 @@ var AppleDeviceKit = class _AppleDeviceKit {
     this.ensureNotDisposed();
     return this.installActions.installManagedApp(ipaPath, options);
   }
+  async installAppFromMDM(options) {
+    this.ensureNotDisposed();
+    return this.installActions.installManagedAppFromMDM(options);
+  }
   /**
    * Uninstall an app by bundle ID (uninstall agent)
    *
@@ -39617,9 +39624,9 @@ var AppleDeviceKit = class _AppleDeviceKit {
     const tmpFilePath = (0, import_node_path5.join)(tmpDir, fileName);
     try {
       await (0, import_promises3.mkdir)(tmpDir, { recursive: true });
-      await (0, import_promises4.writeFile)(tmpFilePath, fileData);
+      await (0, import_promises3.writeFile)(tmpFilePath, fileData);
       const stats = await (0, import_promises3.stat)(tmpFilePath);
-      logDetail3(`Temp file written: ${tmpFilePath}, size: ${stats.size} bytes`);
+      logDetail2(`Temp file written: ${tmpFilePath}, size: ${stats.size} bytes`);
       if (stats.size !== fileData.length) {
         throw new Error(
           `File size mismatch: expected ${fileData.length} bytes, got ${stats.size} bytes`
@@ -39631,7 +39638,7 @@ var AppleDeviceKit = class _AppleDeviceKit {
         srcPath: tmpFilePath,
         dstPath: devicePath
       });
-      logDetail3(`Push: ${JSON.stringify(pushResult)}`);
+      logDetail2(`Push: ${JSON.stringify(pushResult)}`);
       if (pushResult.exitCode !== 0) {
         const errorMessages = pushResult.logMessages.filter((msg) => msg.level === "error").map((msg) => msg.msg).join("; ");
         const allMessages = pushResult.logMessages.map((msg) => `${msg.level}: ${msg.msg}`).join("; ");
@@ -39668,7 +39675,7 @@ var AppleDeviceKit = class _AppleDeviceKit {
         srcPath: devicePath,
         dstPath: tmpDir
       });
-      logDetail3(`Pull: ${JSON.stringify(pullResult)}`);
+      logDetail2(`Pull: ${JSON.stringify(pullResult)}`);
       if (pullResult.exitCode !== 0) {
         const errorMessages = pullResult.logMessages.filter((msg) => msg.level === "error").map((msg) => msg.msg).join("; ");
         const allMessages = pullResult.logMessages.map((msg) => `${msg.level}: ${msg.msg}`).join("; ");