@opentag/cli 0.3.2 → 0.3.4

package/dist/index.js

@@ -2667,6 +2667,15 @@ var serviceHardeningEnvKeys = [
   "OPENTAG_RATE_LIMIT_MAX_REQUESTS",
   "OPENTAG_RATE_LIMIT_DISABLED"
 ];
+var launchAgentCliPath = [
+  "/opt/homebrew/bin",
+  "/opt/homebrew/sbin",
+  "/usr/local/bin",
+  "/usr/bin",
+  "/bin",
+  "/usr/sbin",
+  "/sbin"
+].join(":");
 function loggerFrom(dependencies) {
   return dependencies.logger ?? console;
 }
@@ -2769,11 +2778,38 @@ function assertMacOS(dependencies) {
 function runLaunchctlOrThrow(dependencies, args, action) {
   const result = launchctlRunner(dependencies)(args);
   if (result.status !== 0) {
-    const detail = [result.stderr.trim(), result.stdout.trim()].filter(Boolean).join("\n");
+    const detail = launchctlDetail(result);
     throw new Error(`${action} failed${detail ? `: ${detail}` : "."}`);
   }
   return result;
 }
+function launchctlDetail(result) {
+  return [result.stderr.trim(), result.stdout.trim()].filter(Boolean).join("\n");
+}
+function printLaunchdService(dependencies) {
+  return launchctlRunner(dependencies)(["print", launchdServiceTarget(dependencies)]);
+}
+function sleepFrom(dependencies) {
+  return dependencies.sleep ?? ((ms) => new Promise((resolve2) => setTimeout(resolve2, ms)));
+}
+async function waitForLaunchdLoaded(dependencies, input = {}) {
+  const intervalMs = input.intervalMs ?? 100;
+  const deadline = Date.now() + (input.timeoutMs ?? 1500);
+  while (true) {
+    if (printLaunchdService(dependencies).status === 0) return true;
+    if (Date.now() >= deadline) return false;
+    await sleepFrom(dependencies)(intervalMs);
+  }
+}
+async function waitForLaunchdUnloaded(dependencies, input = {}) {
+  const intervalMs = input.intervalMs ?? 100;
+  const deadline = Date.now() + (input.timeoutMs ?? 1500);
+  while (true) {
+    if (printLaunchdService(dependencies).status !== 0) return true;
+    if (Date.now() >= deadline) return false;
+    await sleepFrom(dependencies)(intervalMs);
+  }
+}
 function serviceWorkingDirectory(configPath) {
   const config = readCliConfig(configPath);
   return config.daemon.repositories[0]?.checkoutPath ?? dirname2(configPath);
@@ -2850,6 +2886,7 @@ function formatConnectorReadiness(config) {
 function launchAgentEnvironment(options, paths) {
   return {
     OPENTAG_CONFIG_PATH: paths.configPath,
+    PATH: launchAgentCliPath,
     ...serviceHardeningEnvironment(options)
   };
 }
@@ -2889,13 +2926,17 @@ function startService(options = {}, dependencies = {}) {
   const launchctl = launchctlRunner(dependencies);
   const bootstrap = launchctl(["bootstrap", launchdDomain(dependencies), paths.plistPath]);
   if (bootstrap.status !== 0) {
-    const print = launchctl(["print", launchdServiceTarget(dependencies)]);
+    const print = printLaunchdService(dependencies);
     if (print.status !== 0) {
-      const detail = [bootstrap.stderr.trim(), bootstrap.stdout.trim()].filter(Boolean).join("\n");
+      const detail = launchctlDetail(bootstrap);
       throw new Error(`launchctl bootstrap failed${detail ? `: ${detail}` : "."}`);
     }
   }
-  runLaunchctlOrThrow(dependencies, ["kickstart", "-k", launchdServiceTarget(dependencies)], "launchctl kickstart");
+  const kickstart = launchctl(["kickstart", "-k", launchdServiceTarget(dependencies)]);
+  if (kickstart.status !== 0 && printLaunchdService(dependencies).status !== 0) {
+    const detail = launchctlDetail(kickstart);
+    throw new Error(`launchctl kickstart failed${detail ? `: ${detail}` : "."}`);
+  }
   return paths;
 }
 function stopService(options = {}, dependencies = {}) {
@@ -2904,10 +2945,11 @@ function stopService(options = {}, dependencies = {}) {
   if (!installed(paths)) return paths;
   const launchctl = launchctlRunner(dependencies);
   const first = launchctl(["bootout", launchdServiceTarget(dependencies)]);
-  if (first.status !== 0 && !isNotLoaded(first)) {
+  if (first.status !== 0) {
     const second = launchctl(["bootout", launchdDomain(dependencies), paths.plistPath]);
     if (second.status !== 0 && !isNotLoaded(second)) {
-      const detail = [second.stderr.trim(), first.stderr.trim(), second.stdout.trim(), first.stdout.trim()].filter(Boolean).join("\n");
+      const firstDetail = isNotLoaded(first) ? "" : launchctlDetail(first);
+      const detail = [launchctlDetail(second), firstDetail].filter(Boolean).join("\n");
       throw new Error(`launchctl bootout failed${detail ? `: ${detail}` : "."}`);
     }
   }
@@ -3166,6 +3208,9 @@ async function runServiceInstallCommand(options, dependencies = {}) {
 }
 async function runServiceStartCommand(options, dependencies = {}) {
   const paths = startService(options, dependencies);
+  if (!await waitForLaunchdLoaded(dependencies)) {
+    throw new Error("OpenTag service start did not leave launchd loaded. Run `opentag service status` and `opentag service logs` for details.");
+  }
   loggerFrom(dependencies).log(`OpenTag service started: ${paths.label}`);
 }
 async function runServiceStopCommand(options, dependencies = {}) {
@@ -3174,7 +3219,16 @@ async function runServiceStopCommand(options, dependencies = {}) {
 }
 async function runServiceRestartCommand(options, dependencies = {}) {
   stopService(options, dependencies);
-  const paths = startService(options, dependencies);
+  await waitForLaunchdUnloaded(dependencies, { timeoutMs: 1e3 });
+  let paths = startService(options, dependencies);
+  let loaded = await waitForLaunchdLoaded(dependencies, { timeoutMs: 500 });
+  if (!loaded) {
+    paths = startService(options, dependencies);
+    loaded = await waitForLaunchdLoaded(dependencies);
+  }
+  if (!loaded) {
+    throw new Error("OpenTag service restart did not leave launchd loaded. Run `opentag service status` and `opentag service logs` for details.");
+  }
   loggerFrom(dependencies).log(`OpenTag service restarted: ${paths.label}`);
 }
 async function runServiceUninstallCommand(options, dependencies = {}) {