echo-cli-agent 0.1.7 → 0.1.9

package/scripts/service.mjs

@@ -8,6 +8,7 @@ import { spawnSync } from 'node:child_process'
 
 const SERVICE_NAME = 'echo-cli-agent'
 const LAUNCHD_LABEL = 'top.stormapex.echo-cli-agent'
+const LEGACY_LAUNCHD_LABEL = 'top.stormapex.api-ocra-agent'
 const root = resolve(dirname(fileURLToPath(import.meta.url)), '..')
 const agentEntry = join(root, 'dist', 'src', 'index.js')
 const action = process.argv[2]
@@ -39,15 +40,19 @@ function defaultConfigPath() {
 
 async function manageLaunchd(mode) {
   const target = join(homedir(), 'Library', 'LaunchAgents', `${LAUNCHD_LABEL}.plist`)
+  const legacyTarget = join(homedir(), 'Library', 'LaunchAgents', `${LEGACY_LAUNCHD_LABEL}.plist`)
   const domain = `gui/${process.getuid()}`
   if (mode === 'uninstall') {
     command('launchctl', ['bootout', domain, target], true)
+    command('launchctl', ['bootout', domain, `${domain}/${LEGACY_LAUNCHD_LABEL}`], true)
     await unlink(target).catch(ignoreMissing)
+    await unlink(legacyTarget).catch(ignoreMissing)
     process.stdout.write(`Removed ${target}\n`)
     return
   }
 
   const logDir = join(defaultDataDir(), 'logs')
+  const path = servicePath()
   await mkdir(dirname(target), { recursive: true })
   await mkdir(logDir, { recursive: true, mode: 0o700 })
   const plist = `<?xml version="1.0" encoding="UTF-8"?>
@@ -59,12 +64,20 @@ async function manageLaunchd(mode) {
   </array>
   <key>EnvironmentVariables</key><dict>
     <key>ECHO_AGENT_CONFIG</key><string>${xml(configPath)}</string>
+    <key>HOME</key><string>${xml(homedir())}</string>
+    <key>SHELL</key><string>${xml(process.env.SHELL ?? '/bin/zsh')}</string>
+    <key>PATH</key><string>${xml(path)}</string>
   </dict>
   <key>RunAtLoad</key><true/><key>KeepAlive</key><true/>
   <key>StandardOutPath</key><string>${xml(join(logDir, 'service.stdout.log'))}</string>
   <key>StandardErrorPath</key><string>${xml(join(logDir, 'service.stderr.log'))}</string>
 </dict></plist>
 `
+  // api_ocra was renamed to echo-cli-agent. Remove the old launchd job before
+  // bootstrapping the replacement, otherwise both jobs compete for port 17329.
+  command('launchctl', ['bootout', domain, legacyTarget], true)
+  command('launchctl', ['bootout', domain, `${domain}/${LEGACY_LAUNCHD_LABEL}`], true)
+  await unlink(legacyTarget).catch(ignoreMissing)
   await writeFile(target, plist, { mode: 0o600 })
   command('launchctl', ['bootout', domain, target], true)
   command('launchctl', ['bootstrap', domain, target])
@@ -92,6 +105,7 @@ Wants=network-online.target
 [Service]
 Type=simple
 Environment=ECHO_AGENT_CONFIG=${systemdQuote(configPath)}
+Environment=PATH=${systemdQuote(servicePath())}
 ExecStart=${systemdQuote(process.execPath)} ${systemdQuote(agentEntry)} run
 Restart=always
 RestartSec=3
@@ -135,6 +149,17 @@ function xml(value) {
   return value.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;').replaceAll('"', '&quot;')
 }
 
+function servicePath() {
+  const entries = [
+    dirname(process.execPath),
+    join(homedir(), '.local', 'bin'),
+    '/opt/homebrew/bin',
+    '/usr/local/bin',
+    process.env.PATH ?? ''
+  ]
+  return [...new Set(entries.flatMap((entry) => entry.split(':')).filter(Boolean))].join(':')
+}
+
 function systemdQuote(value) {
   return `"${value.replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('%', '%%')}"`
 }