@mcesystems/apple-kit 1.0.41 → 1.0.44

package/dist/index.js

@@ -951,46 +951,15 @@ function logError(message) {
   debugError(message);
 }
 
-// src/logic/actions/device.ts
+// src/logic/actions/tool.ts
 var import_node_child_process = require("node:child_process");
-var import_node_fs = require("node:fs");
-var import_node_path = require("node:path");
+var import_node_path2 = require("node:path");
 var import_node_util = require("node:util");
 
-// src/logic/dataParser.ts
-function parsePlistOutput(output) {
-  const result = {};
-  const lines = output.split("\n");
-  for (const line of lines) {
-    const colonIndex = line.indexOf(":");
-    if (colonIndex > 0) {
-      const key = line.substring(0, colonIndex).trim();
-      const value = line.substring(colonIndex + 1).trim();
-      result[key] = value;
-    }
-  }
-  return result;
-}
-function parseAppList(output) {
-  const apps = [];
-  const lines = output.trim().split("\n");
-  for (const line of lines) {
-    const match = line.match(/^([^,]+),\s*([^,]+),\s*"?([^"]+)"?/);
-    if (match) {
-      apps.push({
-        bundleId: match[1].trim(),
-        version: match[2].trim(),
-        displayName: match[3].trim(),
-        bundleVersion: ""
-      });
-    }
-  }
-  return apps;
-}
-
-// src/logic/actions/device.ts
+// src/logic/utils/resolvePath.ts
+var import_node_fs = require("node:fs");
+var import_node_path = require("node:path");
 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");
@@ -998,56 +967,6 @@ function getModuleDir() {
   }
   return __dirname;
 }
-async function getDeviceInfo(udid) {
-  logTask(`Getting device info for ${udid}`);
-  const result = await runIDeviceTool("ideviceinfo", ["-u", udid]);
-  if (!result) {
-    throw new Error("Failed to get device info");
-  }
-  const props = parsePlistOutput(result.stdout);
-  return {
-    deviceName: props.DeviceName || "",
-    productType: props.ProductType || "",
-    productVersion: props.ProductVersion || "",
-    buildVersion: props.BuildVersion || "",
-    serialNumber: props.SerialNumber || "",
-    udid: props.UniqueDeviceID || udid,
-    wifiAddress: props.WiFiAddress || "",
-    bluetoothAddress: props.BluetoothAddress || "",
-    phoneNumber: props.PhoneNumber || "",
-    cpuArchitecture: props.CPUArchitecture || "",
-    hardwareModel: props.HardwareModel || "",
-    modelNumber: props.ModelNumber || "",
-    regionInfo: props.RegionInfo || "",
-    timeZone: props.TimeZone || "",
-    uniqueChipID: props.UniqueChipID || "",
-    isPaired: true
-    // If we can get info, device is paired
-  };
-}
-async function runIDeviceTool(toolName, args = [], options = {}) {
-  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();
-  if (binPath) {
-    options.cwd = binPath;
-  }
-  const result = await execAsync(command, {
-    ...options,
-    env: process.env,
-    windowsHide: true,
-    encoding: "utf8"
-  });
-  return {
-    stdout: result.stdout.toString(),
-    stderr: result.stderr.toString()
-  };
-}
 function getPlatformDir() {
   const platform = process.platform;
   if (platform === "win32") {
@@ -1061,29 +980,19 @@ function getPlatformDir() {
   }
   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 envBinPath = process.env.IDeviceBinPath;
   if (envBinPath) {
-    return envBinPath;
+    if ((0, import_node_path.isAbsolute)(envBinPath)) {
+      return envBinPath;
+    }
+    const absolutePath = (0, import_node_path.join)(process.cwd(), envBinPath);
+    logInfo(`Using absolute path: ${absolutePath}`);
+    if ((0, import_node_fs.existsSync)(absolutePath)) {
+      return absolutePath;
+    }
+    logError(`Absolute path does not exist: ${absolutePath}`);
+    return "";
   }
   const bundledPath = getBundledResourcesPath();
   if (bundledPath) {
@@ -1109,8 +1018,50 @@ function getResourcesBinPath() {
   }
   return "";
 }
-function getIDeviceBinPath() {
-  return getResourcesBinPath();
+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;
+}
+
+// src/logic/actions/tool.ts
+var execAsync = (0, import_node_util.promisify)(import_node_child_process.exec);
+async function runIDeviceTool(toolName, args = [], options = {}) {
+  const binPath = getResourcesBinPath();
+  const ext = process.platform === "win32" ? ".exe" : "";
+  const toolPath = binPath ? (0, import_node_path2.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 = getResourcesBinPath();
+  if (binPath) {
+    options.cwd = binPath;
+  }
+  const result = await execAsync(command, {
+    ...options,
+    env: process.env,
+    windowsHide: true,
+    encoding: "utf8"
+  });
+  return {
+    stdout: result.stdout.toString(),
+    stderr: result.stderr.toString()
+  };
 }
 
 // src/logic/actions/activation.ts
@@ -1151,6 +1102,70 @@ async function activate(udid) {
   }
 }
 
+// src/logic/actions/device.ts
+var import_node_fs2 = require("node:fs");
+var import_node_path3 = require("node:path");
+
+// src/logic/dataParser.ts
+function parsePlistOutput(output) {
+  const result = {};
+  const lines = output.split("\n");
+  for (const line of lines) {
+    const colonIndex = line.indexOf(":");
+    if (colonIndex > 0) {
+      const key = line.substring(0, colonIndex).trim();
+      const value = line.substring(colonIndex + 1).trim();
+      result[key] = value;
+    }
+  }
+  return result;
+}
+function parseAppList(output) {
+  const apps = [];
+  const lines = output.trim().split("\n");
+  for (const line of lines) {
+    const match = line.match(/^([^,]+),\s*([^,]+),\s*"?([^"]+)"?/);
+    if (match) {
+      apps.push({
+        bundleId: match[1].trim(),
+        version: match[2].trim(),
+        displayName: match[3].trim(),
+        bundleVersion: ""
+      });
+    }
+  }
+  return apps;
+}
+
+// src/logic/actions/device.ts
+async function getDeviceInfo(udid) {
+  logTask(`Getting device info for ${udid}`);
+  const result = await runIDeviceTool("ideviceinfo", ["-u", udid]);
+  if (!result) {
+    throw new Error("Failed to get device info");
+  }
+  const props = parsePlistOutput(result.stdout);
+  return {
+    deviceName: props.DeviceName || "",
+    productType: props.ProductType || "",
+    productVersion: props.ProductVersion || "",
+    buildVersion: props.BuildVersion || "",
+    serialNumber: props.SerialNumber || "",
+    udid: props.UniqueDeviceID || udid,
+    wifiAddress: props.WiFiAddress || "",
+    bluetoothAddress: props.BluetoothAddress || "",
+    phoneNumber: props.PhoneNumber || "",
+    cpuArchitecture: props.CPUArchitecture || "",
+    hardwareModel: props.HardwareModel || "",
+    modelNumber: props.ModelNumber || "",
+    regionInfo: props.RegionInfo || "",
+    timeZone: props.TimeZone || "",
+    uniqueChipID: props.UniqueChipID || "",
+    isPaired: true
+    // If we can get info, device is paired
+  };
+}
+
 // src/logic/actions/pair.ts
 async function isPaired(udid) {
   logTask(`Checking pairing status for ${udid}`);
@@ -1426,83 +1441,13 @@ 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 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;
-    }
-  }
-  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 "";
-}
+var import_node_path4 = require("node:path");
 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 binPath = getResourcesBinPath();
     const ext = process.platform === "win32" ? ".exe" : "";
-    const toolPath = binPath ? (0, import_node_path2.join)(binPath, `iproxy${ext}`) : `iproxy${ext}`;
+    const toolPath = binPath ? (0, import_node_path4.join)(binPath, `iproxy${ext}`) : `iproxy${ext}`;
     const spawnOptions = {
       windowsHide: true,
       stdio: ["ignore", "pipe", "pipe"]
@@ -1510,6 +1455,9 @@ function startPortForward(localPort, devicePort, udid, startupTimeout = 500) {
     if (binPath) {
       spawnOptions.cwd = binPath;
     }
+    logInfo(`Spawning iproxy with path: ${toolPath}`);
+    logInfo(`Arguments: ${[localPort.toString(), devicePort.toString(), "-u", udid].join(" ")}`);
+    logInfo(`Options: ${JSON.stringify(spawnOptions)}`);
     const child = (0, import_node_child_process2.spawn)(
       toolPath,
       [localPort.toString(), devicePort.toString(), "-u", udid],
@@ -1517,7 +1465,11 @@ function startPortForward(localPort, devicePort, udid, startupTimeout = 500) {
     );
     let hasResolved = false;
     let stderrOutput = "";
+    child.stdout?.on("data", (data) => {
+      logTask(`${data.toString()}`);
+    });
     child.stderr?.on("data", (data) => {
+      logError(`${data.toString()}`);
       const msg = data.toString();
       stderrOutput += msg;
       if (msg.toLowerCase().includes("error") && !hasResolved) {