@mcesystems/apple-kit 1.0.84 → 1.0.86

package/dist/index.js

@@ -1182,9 +1182,9 @@ function throwIfAborted(signal) {
   }
 }
 var { logTask, logInfo, setNamespace } = createLoggers("apple-kit:device");
-function getAppleLockdownPath() {
+function getLockdownPath() {
   if (process.platform === "win32") {
-    return (0, import_node_path.join)(process.env.ProgramData ?? "C:\\ProgramData", "Apple", "Lockdown");
+    return process.env.LOCKDOWN_WINDOWS_PATH || (0, import_node_path.join)(process.env.ProgramData ?? "C:\\ProgramData", "Apple", "Lockdown");
   }
   if (process.platform === "darwin") {
     return "/var/db/lockdown";
@@ -1278,7 +1278,7 @@ var DeviceActions = class {
   }
   async unpair() {
     logInfo(`Un-pairing device ${this.udid}`);
-    const lockdownDir = getAppleLockdownPath();
+    const lockdownDir = getLockdownPath();
     if (!lockdownDir) {
       throw new Error("Cannot determine lockdown directory for this platform");
     }
@@ -37967,7 +37967,10 @@ 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) {
@@ -38010,7 +38013,8 @@ var ProxyActions = class {
   childProcess = /* @__PURE__ */ new Map();
   async startPortForward(localPort, devicePort) {
     logInfo4(`Starting port forward ${localPort} -> ${devicePort} for device ${this.udid}`);
-    const result = await this.iosClient.forward({ fromPort: localPort, toPort: devicePort });
+    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"));
@@ -38653,6 +38657,8 @@ 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"],
@@ -38753,14 +38759,52 @@ var IosClient = class {
   async pair() {
     return this.runIosCommand(["pair", "--udid", this.udid]);
   }
-  async forward({ fromPort, toPort }) {
+  forward({ fromPort, toPort }) {
     return this.spawnIosCommand(["forward", `--port=${fromPort}:${toPort}`, "--udid", this.udid]);
   }
   async info() {
-    return this.runIosCommand(["info", "--udid", this.udid]);
+    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;
   }
   async installApp(ipaPath) {
-    return this.runIosCommand(["install", `--path=${ipaPath}`, "--udid", this.udid]);
+    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;
   }
   async uninstallApp(bundleId) {
     return this.runIosCommand(["uninstall", bundleId, "--udid", this.udid]);