@mcesystems/apple-kit 1.0.85 → 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,
@@ -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");
     }
@@ -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,
@@ -38000,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;
@@ -38008,14 +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 = 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"));
-      }, 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({
@@ -38626,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;
@@ -38753,7 +38765,7 @@ 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() {
@@ -38786,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: {
@@ -39039,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;
   }
   /**