@mcesystems/apple-kit 1.0.86 → 1.0.87

package/dist/index.js

@@ -873,14 +873,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 logError3 = (0, import_debug.default)(`${namespace}:error`);
-  const logDetail2 = (0, import_debug.default)(`${namespace}:detail`);
+  const logDetail3 = (0, import_debug.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug.default)(`${namespace}:debug`);
   const logWarning3 = (0, import_debug.default)(`${namespace}:warning`);
   const logColor = (0, import_debug.default)(`${namespace}:color`);
   logInfo8.color = "19";
   logTask5.color = "25";
   logError3.color = "1";
-  logDetail2.color = "199";
+  logDetail3.color = "199";
   logWarning3.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
@@ -888,7 +888,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
     logInfo8.namespace = `${namespace2}:info`;
     logTask5.namespace = `${namespace2}:task`;
     logError3.namespace = `${namespace2}:error`;
-    logDetail2.namespace = `${namespace2}:detail`;
+    logDetail3.namespace = `${namespace2}:detail`;
     logWarning3.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
@@ -899,7 +899,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = true;
         logError3.enabled = true;
         logWarning3.enabled = true;
-        logDetail2.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
@@ -907,7 +907,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = true;
         logError3.enabled = true;
         logWarning3.enabled = true;
-        logDetail2.enabled = true;
+        logDetail3.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
@@ -915,7 +915,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = false;
         logError3.enabled = false;
         logWarning3.enabled = false;
-        logDetail2.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
     }
@@ -933,7 +933,7 @@ function createLoggers(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logError3.color = color;
         break;
       case "detail":
-        logDetail2.color = color;
+        logDetail3.color = color;
         break;
       case "warning":
         logWarning3.color = color;
@@ -1000,7 +1000,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
       const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
       callerDetails = `${functionName}`;
     }
-    logDetail2(`${header(`*${title}* ${callerDetails}`)}
+    logDetail3(`${header(`*${title}* ${callerDetails}`)}
 ${args.reduce((acc, arg) => `${acc}
 ${logDataDetail(arg)}`, "")}
 	
@@ -1023,7 +1023,7 @@ ${"=".repeat(80)}`);
     logInfo: logInfo8,
     logTask: logTask5,
     logError: logError3,
-    logDetail: logDetail2,
+    logDetail: logDetail3,
     logDebug,
     logWarning: logWarning3,
     logColor,
@@ -36610,14 +36610,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 logDetail2 = (0, import_debug2.default)(`${namespace}:detail`);
+  const logDetail3 = (0, import_debug2.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug2.default)(`${namespace}:debug`);
   const logWarning22 = (0, import_debug2.default)(`${namespace}:warning`);
   const logColor = (0, import_debug2.default)(`${namespace}:color`);
   logInfo222.color = "19";
   logTask5.color = "25";
   logError22.color = "1";
-  logDetail2.color = "199";
+  logDetail3.color = "199";
   logWarning22.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
@@ -36625,7 +36625,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
     logInfo222.namespace = `${namespace2}:info`;
     logTask5.namespace = `${namespace2}:task`;
     logError22.namespace = `${namespace2}:error`;
-    logDetail2.namespace = `${namespace2}:detail`;
+    logDetail3.namespace = `${namespace2}:detail`;
     logWarning22.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
@@ -36636,7 +36636,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = true;
         logError22.enabled = true;
         logWarning22.enabled = true;
-        logDetail2.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
@@ -36644,7 +36644,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = true;
         logError22.enabled = true;
         logWarning22.enabled = true;
-        logDetail2.enabled = true;
+        logDetail3.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
@@ -36652,7 +36652,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logTask5.enabled = false;
         logError22.enabled = false;
         logWarning22.enabled = false;
-        logDetail2.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
     }
@@ -36670,7 +36670,7 @@ function createLoggers2(namespace, logLevel = process.env.LOG_LEVEL ?? "none") {
         logError22.color = color;
         break;
       case "detail":
-        logDetail2.color = color;
+        logDetail3.color = color;
         break;
       case "warning":
         logWarning22.color = color;
@@ -36737,7 +36737,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
       const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
       callerDetails = `${functionName}`;
     }
-    logDetail2(`${header(`*${title}* ${callerDetails}`)}
+    logDetail3(`${header(`*${title}* ${callerDetails}`)}
 ${args.reduce((acc, arg) => `${acc}
 ${logDataDetail(arg)}`, "")}
 	
@@ -36760,7 +36760,7 @@ ${"=".repeat(80)}`);
     logInfo: logInfo222,
     logTask: logTask5,
     logError: logError22,
-    logDetail: logDetail2,
+    logDetail: logDetail3,
     logDebug,
     logWarning: logWarning22,
     logColor,
@@ -37707,14 +37707,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 logDetail2 = (0, import_debug22.default)(`${namespace}:detail`);
+  const logDetail3 = (0, import_debug22.default)(`${namespace}:detail`);
   const logDebug = (0, import_debug22.default)(`${namespace}:debug`);
   const logWarning22 = (0, import_debug22.default)(`${namespace}:warning`);
   const logColor = (0, import_debug22.default)(`${namespace}:color`);
   logInfo32.color = "19";
   logTask5.color = "25";
   logError22.color = "1";
-  logDetail2.color = "199";
+  logDetail3.color = "199";
   logWarning22.color = "186";
   logDebug.color = "211";
   logColor.enabled = true;
@@ -37722,7 +37722,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
     logInfo32.namespace = `${namespace2}:info`;
     logTask5.namespace = `${namespace2}:task`;
     logError22.namespace = `${namespace2}:error`;
-    logDetail2.namespace = `${namespace2}:detail`;
+    logDetail3.namespace = `${namespace2}:detail`;
     logWarning22.namespace = `${namespace2}:warning`;
     logDebug.namespace = `${namespace2}:debug`;
   }
@@ -37733,7 +37733,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logTask5.enabled = true;
         logError22.enabled = true;
         logWarning22.enabled = true;
-        logDetail2.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
       case "debug":
@@ -37741,7 +37741,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logTask5.enabled = true;
         logError22.enabled = true;
         logWarning22.enabled = true;
-        logDetail2.enabled = true;
+        logDetail3.enabled = true;
         logDebug.enabled = true;
         break;
       case "none":
@@ -37749,7 +37749,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logTask5.enabled = false;
         logError22.enabled = false;
         logWarning22.enabled = false;
-        logDetail2.enabled = false;
+        logDetail3.enabled = false;
         logDebug.enabled = false;
         break;
     }
@@ -37767,7 +37767,7 @@ function createLoggers22(namespace, logLevel = process.env.LOG_LEVEL ?? "none")
         logError22.color = color;
         break;
       case "detail":
-        logDetail2.color = color;
+        logDetail3.color = color;
         break;
       case "warning":
         logWarning22.color = color;
@@ -37834,7 +37834,7 @@ ${" ".repeat(padding)}${"=".repeat(80)}`;
       const functionName = functionMatch ? functionMatch[1] : "<anonymous>";
       callerDetails = `${functionName}`;
     }
-    logDetail2(`${header(`*${title}* ${callerDetails}`)}
+    logDetail3(`${header(`*${title}* ${callerDetails}`)}
 ${args.reduce((acc, arg) => `${acc}
 ${logDataDetail(arg)}`, "")}
 	
@@ -37857,7 +37857,7 @@ ${"=".repeat(80)}`);
     logInfo: logInfo32,
     logTask: logTask5,
     logError: logError22,
-    logDetail: logDetail2,
+    logDetail: logDetail3,
     logDebug,
     logWarning: logWarning22,
     logColor,
@@ -37967,10 +37967,7 @@ var InstallActions = class {
     return this.iosClient.installApp(ipaPath);
   }
   async installManagedApp(ipaPath, options) {
-    const fs9f4 = require("node:fs");
-    fs9f4.appendFileSync("debug-9f3919.log", JSON.stringify({ sessionId: "9f3919", location: "install.ts:installManagedApp:entry", message: "installManagedApp called", data: { ipaPath, udid: this.udid, options }, timestamp: Date.now(), hypothesisId: "C" }) + "\n");
     const result = await this.iosClient.installApp(ipaPath);
-    fs9f4.appendFileSync("debug-9f3919.log", JSON.stringify({ sessionId: "9f3919", location: "install.ts:installManagedApp:afterInstall", message: "iosClient.installApp returned", data: { exitCode: result.exitCode, stderr: result.raw.stderr.substring(0, 2e3), stdout: result.raw.stdout.substring(0, 2e3) }, timestamp: Date.now(), hypothesisId: "A" }) + "\n");
     logInfo3("Installing app via MDM for management takeover");
     const mdmClient = await createMDMClient();
     if (!mdmClient) {
@@ -38003,7 +38000,7 @@ var InstallActions = class {
 };
 
 // src/logic/actions/proxy.ts
-var { logTask: logTask2, logInfo: logInfo4, setNamespace: setNamespace3 } = createLoggers("");
+var { logTask: logTask2, logInfo: logInfo4, setNamespace: setNamespace3, logDetail } = createLoggers("");
 var ProxyActions = class {
   constructor(udid, iosClient) {
     this.udid = udid;
@@ -38011,15 +38008,26 @@ var ProxyActions = class {
     setNamespace3(`apple-${udid}`);
   }
   childProcess = /* @__PURE__ */ new Map();
-  async startPortForward(localPort, devicePort) {
+  async startPortForward(localPort, devicePort, timeoutMs = 1e4) {
     logInfo4(`Starting port forward ${localPort} -> ${devicePort} for device ${this.udid}`);
     const result = this.iosClient.forward({ fromPort: localPort, toPort: devicePort });
     this.childProcess.set(this.udid, result);
     return new Promise((resolve2, reject) => {
       const timeout2 = setTimeout(() => {
         reject(new Error("Port forwarding timed out"));
-      }, 1e4);
+      }, timeoutMs);
       result.stdout?.on("data", (data) => {
+        logDetail("port forward stdout", data.toString());
+        if (data.toString().includes("Started")) {
+          clearTimeout(timeout2);
+          resolve2({
+            localPort,
+            devicePort
+          });
+        }
+      });
+      result.stderr?.on("data", (data) => {
+        logDetail("port forward stderr", data.toString());
         if (data.toString().includes("Started")) {
           clearTimeout(timeout2);
           resolve2({
@@ -38630,7 +38638,7 @@ var ProfileParser = class {
 };
 
 // src/logic/iosClient.ts
-var { logDetail, setNamespace: setNamespace5, logTask: logTask4 } = createLoggers("");
+var { logDetail: logDetail2, setNamespace: setNamespace5, logTask: logTask4 } = createLoggers("");
 var IosClient = class {
   constructor(iosPath, udid, _usbmuxdAddress) {
     this.iosPath = iosPath;
@@ -38657,8 +38665,6 @@ var IosClient = class {
   }
   spawnIosCommand(args) {
     logTask4(`Running command: ${this.iosPath} ${args.join(" ")}`);
-    const fs9f3 = require("node:fs");
-    fs9f3.appendFileSync("debug-9f3919.log", JSON.stringify({ sessionId: "9f3919", location: "iosClient.ts:spawnIosCommand", message: "spawning ios command", data: { iosPath: this.iosPath, args, USBMUXD_SOCKET_ADDRESS: this.usbmuxdAddress, command: args[0] }, timestamp: Date.now(), hypothesisId: "D" }) + "\n");
     const child = (0, import_node_child_process.spawn)(this.iosPath, args, {
       windowsHide: true,
       stdio: ["ignore", "pipe", "pipe"],
@@ -38763,48 +38769,10 @@ var IosClient = class {
     return this.spawnIosCommand(["forward", `--port=${fromPort}:${toPort}`, "--udid", this.udid]);
   }
   async info() {
-    const fs9f2 = require("node:fs");
-    fs9f2.appendFileSync("debug-9f3919.log", JSON.stringify({ sessionId: "9f3919", location: "iosClient.ts:info:entry", message: "info called (working command for comparison)", data: { udid: this.udid, usbmuxdAddress: this._usbmuxdAddress }, timestamp: Date.now(), hypothesisId: "E" }) + "\n");
-    const result = await this.runIosCommand(["info", "--udid", this.udid]);
-    fs9f2.appendFileSync("debug-9f3919.log", JSON.stringify({ sessionId: "9f3919", location: "iosClient.ts:info:result", message: "info completed (working command for comparison)", data: { exitCode: result.exitCode, hasOutput: result.output.length > 0, stderr: result.raw.stderr.substring(0, 500) }, timestamp: Date.now(), hypothesisId: "E" }) + "\n");
-    return result;
+    return this.runIosCommand(["info", "--udid", this.udid]);
   }
   async installApp(ipaPath) {
-    const fs9f = require("node:fs");
-    const path9f = require("node:path");
-    const lockdownApple = path9f.join(process.env.ProgramData ?? "C:\\ProgramData", "Apple", "Lockdown");
-    const lockdownCustom = process.env.LOCKDOWN_WINDOWS_PATH || "";
-    const appleSysCfgPath = path9f.join(lockdownApple, "SystemConfiguration.plist");
-    const customSysCfgPath = lockdownCustom ? path9f.join(lockdownCustom, "SystemConfiguration.plist") : "";
-    const appleDevPath = path9f.join(lockdownApple, this.udid + ".plist");
-    const customDevPath = lockdownCustom ? path9f.join(lockdownCustom, this.udid + ".plist") : "";
-    const readPlistBuid = (p) => {
-      try {
-        const c = fs9f.readFileSync(p, "utf8");
-        const m = c.match(/SystemBUID<\/key>\s*<string>([^<]+)<\/string>/);
-        return m ? m[1] : "NOT_FOUND_IN_XML";
-      } catch (e) {
-        return "READ_ERROR:" + e.message;
-      }
-    };
-    const readPlistHostId = (p) => {
-      try {
-        const c = fs9f.readFileSync(p, "utf8");
-        const m = c.match(/HostID<\/key>\s*<string>([^<]+)<\/string>/);
-        return m ? m[1] : "NOT_FOUND_IN_XML";
-      } catch (e) {
-        return "READ_ERROR:" + e.message;
-      }
-    };
-    const appleBuid = readPlistBuid(appleSysCfgPath);
-    const customBuid = customSysCfgPath ? readPlistBuid(customSysCfgPath) : "N/A";
-    const appleHostId = readPlistHostId(appleDevPath);
-    const customHostId = customDevPath ? readPlistHostId(customDevPath) : "N/A";
-    const buidMatch = appleBuid === customBuid;
-    fs9f.appendFileSync(path9f.join(process.cwd(), "debug-9f3919.log"), JSON.stringify({ sessionId: "9f3919", location: "iosClient.ts:installApp:lockdown-buid-compare", message: "SystemBUID and HostID comparison", data: { appleBuid, customBuid, buidMatch, appleHostId, customHostId, hostIdMatch: appleHostId === customHostId, usbmuxdAddress: this._usbmuxdAddress }, timestamp: Date.now(), hypothesisId: "F" }) + "\n");
-    const result = await this.runIosCommand(["install", `--path=${ipaPath}`, "--udid", this.udid]);
-    fs9f.appendFileSync(path9f.join(process.cwd(), "debug-9f3919.log"), JSON.stringify({ sessionId: "9f3919", location: "iosClient.ts:installApp:result", message: "installApp completed", data: { exitCode: result.exitCode, stderr: result.raw.stderr.substring(0, 2e3), stdout: result.raw.stdout.substring(0, 2e3) }, timestamp: Date.now(), hypothesisId: "A" }) + "\n");
-    return result;
+    return this.runIosCommand(["install", `--path=${ipaPath}`, "--udid", this.udid]);
   }
   async uninstallApp(bundleId) {
     return this.runIosCommand(["uninstall", bundleId, "--udid", this.udid]);
@@ -38830,7 +38798,7 @@ var IosClient = class {
   }
   async tunnelStart(userspace = false) {
     const args = ["tunnel", "start", "--udid", this.udid, ...userspace ? ["--userspace"] : []];
-    logDetail(`Spawning tunnel: ${this.iosPath} ${args.join(" ")}`);
+    logDetail2(`Spawning tunnel: ${this.iosPath} ${args.join(" ")}`);
     const child = (0, import_node_child_process.spawn)(this.iosPath, args, {
       windowsHide: true,
       env: {
@@ -39083,11 +39051,11 @@ var AppleDeviceKit = class {
    * @param startupTimeout Time to wait for proxy to start (ms)
    * @returns The port forward result with the allocated local port
    */
-  async startPortForwardAsync(devicePort) {
+  async startPortForwardAsync(devicePort, timeoutMs = 1e4) {
     this.ensureNotDisposed();
     this.killProxyProcess();
     this.localDevicePort = await getPorts({ port: portNumbers(3e4, 31e3) });
-    const result = await this.proxyActions.startPortForward(this.localDevicePort, devicePort);
+    const result = await this.proxyActions.startPortForward(this.localDevicePort, devicePort, timeoutMs);
     return result;
   }
   /**