@nickname4th/pura-cli 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nickname4th/pura-cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "LAN Android device mirroring hub and developer CLI for distributed teams.",
   "license": "MIT",
   "type": "module",

package/server/dist/adb.js

@@ -1,7 +1,10 @@
 import { execFile } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 import { promisify } from "node:util";
 const execFileAsync = promisify(execFile);
-const ADB = process.env.ADB_PATH ?? "adb";
+const ADB = resolveAdbCommand();
 const INCLUDE_TCP_DEVICES = process.env.INCLUDE_TCP_DEVICES === "true";
 export function adbCommand(args) {
     return {
@@ -151,6 +154,18 @@ export async function getDisplaySize(serial) {
 function clamp(value, min, max) {
     return Math.max(min, Math.min(max, value));
 }
+function resolveAdbCommand() {
+    if (process.env.ADB_PATH)
+        return process.env.ADB_PATH;
+    const sdkRoot = process.env.ANDROID_HOME ?? process.env.ANDROID_SDK_ROOT;
+    const candidates = [
+        sdkRoot ? path.join(sdkRoot, "platform-tools", "adb") : "",
+        path.join(os.homedir(), "Library", "Android", "sdk", "platform-tools", "adb"),
+        "/opt/homebrew/bin/adb",
+        "/usr/local/bin/adb"
+    ].filter(Boolean);
+    return candidates.find((candidate) => fs.existsSync(candidate)) ?? "adb";
+}
 const keyEvents = {
     back: "KEYCODE_BACK",
     home: "KEYCODE_HOME",

package/server/dist/cli.js

@@ -204,6 +204,16 @@ function printLaunchAgentStatus() {
     }
 }
 function makeLaunchAgentPlist(nodePath, cliPath) {
+    const environment = {
+        PATH: process.env.PATH,
+        ANDROID_HOME: process.env.ANDROID_HOME,
+        ANDROID_SDK_ROOT: process.env.ANDROID_SDK_ROOT,
+        ADB_PATH: findExecutable("adb")
+    };
+    const environmentEntries = Object.entries(environment)
+        .filter((entry) => Boolean(entry[1]))
+        .map(([key, value]) => `    <key>${escapeXml(key)}</key>\n    <string>${escapeXml(value)}</string>`)
+        .join("\n");
     return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -220,6 +230,10 @@ function makeLaunchAgentPlist(nodePath, cliPath) {
   <true/>
   <key>KeepAlive</key>
   <true/>
+  <key>EnvironmentVariables</key>
+  <dict>
+${environmentEntries}
+  </dict>
   <key>StandardOutPath</key>
   <string>${escapeXml(path.join(os.homedir(), "Library", "Logs", "pura-agent.log"))}</string>
   <key>StandardErrorPath</key>
@@ -256,6 +270,16 @@ function resolveAgentDataDir(value) {
         return path.join(os.homedir(), ".pura", "agent-data");
     return path.isAbsolute(value) ? value : path.resolve(value);
 }
+function findExecutable(name) {
+    for (const directory of (process.env.PATH ?? "").split(path.delimiter)) {
+        if (!directory)
+            continue;
+        const candidate = path.join(directory, name);
+        if (fs.existsSync(candidate))
+            return candidate;
+    }
+    return undefined;
+}
 function startServer(env) {
     const child = spawn(process.execPath, [new URL("./index.js", import.meta.url).pathname], {
         stdio: "inherit",