@mcesystems/apple-kit 1.0.24 → 1.0.25

package/dist/index.js

@@ -986,7 +986,15 @@ function parseAppList(output) {
 }
 
 // src/logic/actions/device.ts
+var import_meta = {};
 var execAsync = (0, import_node_util.promisify)(import_node_child_process.exec);
+function getModuleDir() {
+  if (typeof import_meta !== "undefined" && import_meta.url) {
+    const { fileURLToPath } = require("node:url");
+    return (0, import_node_path.dirname)(fileURLToPath(import_meta.url));
+  }
+  return __dirname;
+}
 async function getDeviceInfo(udid) {
   logTask(`Getting device info for ${udid}`);
   const result = await runIDeviceTool("ideviceinfo", ["-u", udid]);
@@ -1015,12 +1023,17 @@ async function getDeviceInfo(udid) {
   };
 }
 async function runIDeviceTool(toolName, args = [], options = {}) {
-  const command = `"${toolName}${process.platform === "win32" ? ".exe" : ""}" ${args.map((a) => `"${a}"`).join(" ")}`;
+  const binPath = getIDeviceBinPath();
+  const ext = process.platform === "win32" ? ".exe" : "";
+  const toolPath = binPath ? (0, import_node_path.join)(binPath, `${toolName}${ext}`) : `${toolName}${ext}`;
+  const command = `"${toolPath}" ${args.map((a) => `"${a}"`).join(" ")}`;
   return execIDevice(command, options);
 }
 async function execIDevice(command, options = {}) {
   const binPath = getIDeviceBinPath();
-  options.cwd = binPath;
+  if (binPath) {
+    options.cwd = binPath;
+  }
   const result = await execAsync(command, {
     ...options,
     env: process.env,
@@ -1032,12 +1045,66 @@ async function execIDevice(command, options = {}) {
     stderr: result.stderr.toString()
   };
 }
+function getPlatformDir() {
+  const platform = process.platform;
+  if (platform === "win32") {
+    return "windows";
+  }
+  if (platform === "darwin") {
+    return "darwin";
+  }
+  if (platform === "linux") {
+    return "linux";
+  }
+  return platform;
+}
+function getBundledResourcesPath() {
+  const moduleDir = getModuleDir();
+  let packageRoot;
+  if (moduleDir.includes("dist")) {
+    packageRoot = (0, import_node_path.join)(moduleDir, "..", "..");
+  } else {
+    packageRoot = (0, import_node_path.join)(moduleDir, "..", "..", "..", "..");
+  }
+  const platformDir = getPlatformDir();
+  const distPath = (0, import_node_path.join)(packageRoot, "dist", "resources", "bin", platformDir);
+  if ((0, import_node_fs.existsSync)((0, import_node_path.join)(distPath, "idevice_id")) || (0, import_node_fs.existsSync)((0, import_node_path.join)(distPath, "idevice_id.exe"))) {
+    return distPath;
+  }
+  const devPath = (0, import_node_path.join)(packageRoot, "resources", "bin", platformDir);
+  if ((0, import_node_fs.existsSync)((0, import_node_path.join)(devPath, "idevice_id")) || (0, import_node_fs.existsSync)((0, import_node_path.join)(devPath, "idevice_id.exe"))) {
+    return devPath;
+  }
+  return null;
+}
 function getResourcesBinPath() {
-  const binPath = process.env.IDeviceBinPath;
-  if (!binPath) {
-    throw new Error("IDeviceBinPath is not set");
+  const envBinPath = process.env.IDeviceBinPath;
+  if (envBinPath) {
+    return envBinPath;
+  }
+  const bundledPath = getBundledResourcesPath();
+  if (bundledPath) {
+    return bundledPath;
+  }
+  if (process.platform === "darwin") {
+    const homebrewArmPath = "/opt/homebrew/bin";
+    if ((0, import_node_fs.existsSync)((0, import_node_path.join)(homebrewArmPath, "idevice_id"))) {
+      return homebrewArmPath;
+    }
+    const homebrewIntelPath = "/usr/local/bin";
+    if ((0, import_node_fs.existsSync)((0, import_node_path.join)(homebrewIntelPath, "idevice_id"))) {
+      return homebrewIntelPath;
+    }
   }
-  return binPath;
+  if (process.platform === "linux") {
+    const linuxPaths = ["/usr/bin", "/usr/local/bin"];
+    for (const linuxPath of linuxPaths) {
+      if ((0, import_node_fs.existsSync)((0, import_node_path.join)(linuxPath, "idevice_id"))) {
+        return linuxPath;
+      }
+    }
+  }
+  return "";
 }
 function getIDeviceBinPath() {
   return getResourcesBinPath();
@@ -1346,27 +1413,94 @@ async function launchAppWithPymobiledevice3(bundleId, args, udid) {
 
 // src/logic/actions/proxy.ts
 var import_node_child_process2 = require("node:child_process");
+var import_node_fs2 = require("node:fs");
 var import_node_path2 = require("node:path");
+var import_meta2 = {};
+function getModuleDir2() {
+  if (typeof import_meta2 !== "undefined" && import_meta2.url) {
+    const { fileURLToPath } = require("node:url");
+    return (0, import_node_path2.dirname)(fileURLToPath(import_meta2.url));
+  }
+  return __dirname;
+}
+function getPlatformDir2() {
+  const platform = process.platform;
+  if (platform === "win32") {
+    return "windows";
+  }
+  if (platform === "darwin") {
+    return "darwin";
+  }
+  if (platform === "linux") {
+    return "linux";
+  }
+  return platform;
+}
+function getBundledResourcesPath2() {
+  const moduleDir = getModuleDir2();
+  let packageRoot;
+  if (moduleDir.includes("dist")) {
+    packageRoot = (0, import_node_path2.join)(moduleDir, "..", "..");
+  } else {
+    packageRoot = (0, import_node_path2.join)(moduleDir, "..", "..", "..", "..");
+  }
+  const platformDir = getPlatformDir2();
+  const distPath = (0, import_node_path2.join)(packageRoot, "dist", "resources", "bin", platformDir);
+  if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(distPath, "iproxy")) || (0, import_node_fs2.existsSync)((0, import_node_path2.join)(distPath, "iproxy.exe"))) {
+    return distPath;
+  }
+  const devPath = (0, import_node_path2.join)(packageRoot, "resources", "bin", platformDir);
+  if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(devPath, "iproxy")) || (0, import_node_fs2.existsSync)((0, import_node_path2.join)(devPath, "iproxy.exe"))) {
+    return devPath;
+  }
+  return null;
+}
 function getResourcesBinPath2() {
-  const binPath = process.env.IDeviceBinPath;
-  if (!binPath) {
-    throw new Error("IDeviceBinPath is not set");
+  const envBinPath = process.env.IDeviceBinPath;
+  if (envBinPath) {
+    return envBinPath;
+  }
+  const bundledPath = getBundledResourcesPath2();
+  if (bundledPath) {
+    return bundledPath;
+  }
+  if (process.platform === "darwin") {
+    const homebrewArmPath = "/opt/homebrew/bin";
+    if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(homebrewArmPath, "iproxy"))) {
+      return homebrewArmPath;
+    }
+    const homebrewIntelPath = "/usr/local/bin";
+    if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(homebrewIntelPath, "iproxy"))) {
+      return homebrewIntelPath;
+    }
   }
-  return binPath;
+  if (process.platform === "linux") {
+    const linuxPaths = ["/usr/bin", "/usr/local/bin"];
+    for (const linuxPath of linuxPaths) {
+      if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(linuxPath, "iproxy"))) {
+        return linuxPath;
+      }
+    }
+  }
+  return "";
 }
 function startPortForward(localPort, devicePort, udid, startupTimeout = 500) {
   return new Promise((resolve, reject) => {
     logTask(`Starting port forward ${localPort} -> ${devicePort} for device ${udid}`);
     const binPath = getResourcesBinPath2();
-    const toolPath = (0, import_node_path2.join)(binPath, `iproxy${process.platform === "win32" ? ".exe" : ""}`);
+    const ext = process.platform === "win32" ? ".exe" : "";
+    const toolPath = binPath ? (0, import_node_path2.join)(binPath, `iproxy${ext}`) : `iproxy${ext}`;
+    const spawnOptions = {
+      windowsHide: true,
+      stdio: ["ignore", "pipe", "pipe"]
+    };
+    if (binPath) {
+      spawnOptions.cwd = binPath;
+    }
     const child = (0, import_node_child_process2.spawn)(
       toolPath,
       [localPort.toString(), devicePort.toString(), "-u", udid],
-      {
-        cwd: binPath,
-        windowsHide: true,
-        stdio: ["ignore", "pipe", "pipe"]
-      }
+      spawnOptions
     );
     let hasResolved = false;
     let stderrOutput = "";
@@ -1426,7 +1560,7 @@ var AppleDeviceKit = class {
   }
   deviceId;
   proxyProcess = null;
-  devicePort = null;
+  localDevicePort = null;
   isDisposed = false;
   /**
    * Throws if the kit has been disposed
@@ -1554,9 +1688,9 @@ var AppleDeviceKit = class {
   async startPortForwardAsync(devicePort, startupTimeout = 500) {
     this.ensureNotDisposed();
     this.killProxyProcess();
-    this.devicePort = await getPorts({ port: portNumbers(3e4, 31e3) });
+    this.localDevicePort = await getPorts({ port: portNumbers(3e4, 31e3) });
     const { result, process: process2 } = await startPortForward(
-      this.devicePort,
+      this.localDevicePort,
       devicePort,
       this.deviceId,
       startupTimeout
@@ -1578,8 +1712,8 @@ var AppleDeviceKit = class {
    */
   closePortForward() {
     this.killProxyProcess();
-    if (this.devicePort) {
-      this.devicePort = null;
+    if (this.localDevicePort) {
+      this.localDevicePort = null;
     }
   }
   /**
@@ -1620,7 +1754,7 @@ var AppleDeviceKit = class {
    * Returns undefined if no port forward is active
    */
   getDevicePort() {
-    return this.devicePort;
+    return this.localDevicePort;
   }
   /**
    * Check if this kit has been disposed