refactor: normalize runCommandWithOutput result type to handle spawn errors

Author: CKodidela

src/cli/commands/info.ts

@@ -56,13 +56,8 @@ const getEventCount = async (): Promise<number | null> => {
 }
 
 const getRelayUptimeSeconds = async (): Promise<number | null> => {
-  let idResult: { code: number; stdout: string; stderr: string }
-  try {
-    idResult = await runCommandWithOutput('docker', ['compose', 'ps', '-q', 'nostream'], { timeoutMs: 1000 })
-  } catch {
-    return null
-  }
-  if (idResult.code !== 0) {
+  const idResult = await runCommandWithOutput('docker', ['compose', 'ps', '-q', 'nostream'], { timeoutMs: 1000 })
+  if (!idResult.ok || idResult.code !== 0) {
     return null
   }
 
@@ -74,7 +69,7 @@ const getRelayUptimeSeconds = async (): Promise<number | null> => {
   const startedAtResult = await runCommandWithOutput('docker', ['inspect', '--format', '{{.State.StartedAt}}', containerId], {
     timeoutMs: 1000,
   })
-  if (startedAtResult.code !== 0) {
+  if (!startedAtResult.ok || startedAtResult.code !== 0) {
     return null
   }
 

src/cli/commands/update.ts

@@ -18,6 +18,10 @@ export const runUpdate = async (passthrough: string[]): Promise<number> => {
   }
 
   const stashResult = await runCommandWithOutput('git', ['stash', 'push', '-u', '-m', 'nostream-cli-update'])
+  if (!stashResult.ok) {
+    spinner.fail(stashResult.ok === false && stashResult.reason === 'not-found' ? 'Update failed: git is not installed' : 'Update failed while stashing local changes')
+    return 1
+  }
   if (stashResult.code !== 0) {
     spinner.fail('Update failed while stashing local changes')
     return stashResult.code

src/cli/utils/process.ts

@@ -7,6 +7,10 @@ export type RunOptions = {
   timeoutMs?: number
 }
 
+export type CommandResult =
+  | { ok: true; code: number; stdout: string; stderr: string }
+  | { ok: false; reason: 'not-found' | 'permission-denied' | 'spawn-error' | 'timeout' | 'signal'; stdout: string; stderr: string }
+
 export const runCommand = (command: string, args: string[], options: RunOptions = {}): Promise<number> => {
   return new Promise((resolve, reject) => {
     const child = spawn(command, args, {
@@ -38,10 +42,19 @@ export const runCommandWithOutput = (
   command: string,
   args: string[],
   options: RunOptions = {},
-): Promise<{ code: number; stdout: string; stderr: string }> => {
-  return new Promise((resolve, reject) => {
+): Promise<CommandResult> => {
+  return new Promise((resolve) => {
     let stdout = ''
     let stderr = ''
+    let timedOut = false
+    let settled = false
+
+    const settle = (result: CommandResult) => {
+      if (!settled) {
+        settled = true
+        resolve(result)
+      }
+    }
 
     const child = spawn(command, args, {
       cwd: options.cwd,
@@ -53,6 +66,7 @@ export const runCommandWithOutput = (
     const timer =
       typeof options.timeoutMs === 'number'
         ? setTimeout(() => {
+            timedOut = true
             child.kill('SIGTERM')
           }, options.timeoutMs)
         : undefined
@@ -65,17 +79,31 @@ export const runCommandWithOutput = (
       stderr += chunk.toString()
     })
 
-    child.on('error', reject)
-    child.on('close', (code) => {
-      if (timer) {
-        clearTimeout(timer)
+    child.on('error', (err: NodeJS.ErrnoException) => {
+      if (timer) clearTimeout(timer)
+      if (err.code === 'ENOENT') {
+        settle({ ok: false, reason: 'not-found', stdout, stderr })
+      } else if (err.code === 'EACCES') {
+        settle({ ok: false, reason: 'permission-denied', stdout, stderr })
+      } else {
+        settle({ ok: false, reason: 'spawn-error', stdout, stderr })
+      }
+    })
+
+    child.on('close', (code, signal) => {
+      if (timer) clearTimeout(timer)
+
+      if (timedOut) {
+        settle({ ok: false, reason: 'timeout', stdout, stderr })
+        return
+      }
+
+      if (signal !== null && code === null) {
+        settle({ ok: false, reason: 'signal', stdout, stderr })
+        return
       }
 
-      resolve({
-        code: code ?? 1,
-        stdout,
-        stderr,
-      })
+      settle({ ok: true, code: code ?? 1, stdout, stderr })
     })
   })
 }

test/unit/cli/info.spec.ts

@@ -31,14 +31,27 @@ describe('runInfo', () => {
     sinon.restore()
   })
 
+  it('outputs valid JSON when docker is not installed (ENOENT)', async () => {
+    sinon.stub(fs, 'existsSync').returns(false)
+    sinon.stub(processUtils, 'runCommandWithOutput').resolves({ ok: false, reason: 'not-found', stdout: '', stderr: '' })
+
+    const code = await infoCommand.runInfo({ json: true })
+
+    expect(code).to.equal(0)
+    const parsed = JSON.parse(stdout)
+    expect(parsed).to.have.nested.property('runtime.uptimeSeconds', null)
+    expect(stderr).to.equal('')
+  })
+
   it('prints detected I2P hostnames as JSON', async () => {
     sinon.stub(fs, 'existsSync').callsFake((target) => String(target).endsWith('nostream.dat'))
     sinon
       .stub(processUtils, 'runCommandWithOutput')
       .onFirstCall()
-      .resolves({ code: 1, stdout: '', stderr: '' })
+      .resolves({ ok: true, code: 1, stdout: '', stderr: '' })
       .onSecondCall()
       .resolves({
+        ok: true,
         code: 0,
         stdout: 'alphaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.b32.i2p\n',
         stderr: 'betabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.b32.i2p\n',
@@ -58,7 +71,7 @@ describe('runInfo', () => {
 
   it('prints a JSON error when I2P keys are missing', async () => {
     sinon.stub(fs, 'existsSync').returns(false)
-    sinon.stub(processUtils, 'runCommandWithOutput').resolves({ code: 1, stdout: '', stderr: '' })
+    sinon.stub(processUtils, 'runCommandWithOutput').resolves({ ok: true, code: 1, stdout: '', stderr: '' })
 
     const code = await infoCommand.runInfo({ i2pHostname: true, json: true })
 
@@ -77,9 +90,9 @@ describe('runInfo', () => {
     sinon
       .stub(processUtils, 'runCommandWithOutput')
       .onFirstCall()
-      .resolves({ code: 1, stdout: '', stderr: '' })
+      .resolves({ ok: true, code: 1, stdout: '', stderr: '' })
       .onSecondCall()
-      .resolves({ code: 0, stdout: '', stderr: '' })
+      .resolves({ ok: true, code: 0, stdout: '', stderr: '' })
 
     const code = await infoCommand.runInfo({ i2pHostname: true, json: true })
 
@@ -101,9 +114,9 @@ describe('runInfo', () => {
     sinon
       .stub(processUtils, 'runCommandWithOutput')
       .onFirstCall()
-      .resolves({ code: 1, stdout: '', stderr: '' })
+      .resolves({ ok: true, code: 1, stdout: '', stderr: '' })
       .onSecondCall()
-      .resolves({ code: 0, stdout: '', stderr: '' })
+      .resolves({ ok: true, code: 0, stdout: '', stderr: '' })
 
     const code = await infoCommand.runInfo({ i2pHostname: true })
 

test/unit/cli/update.spec.ts

@@ -15,6 +15,7 @@ describe('runUpdate', () => {
     sinon.stub(stopCommand, 'runStop').resolves(0)
     const runStartStub = sinon.stub(startCommand, 'runStart').resolves(0)
     sinon.stub(processUtils, 'runCommandWithOutput').resolves({
+      ok: true,
       code: 0,
       stdout: 'Saved working directory and index state WIP on main: abc123',
       stderr: '',
@@ -38,6 +39,7 @@ describe('runUpdate', () => {
     sinon.stub(stopCommand, 'runStop').resolves(0)
     const runStartStub = sinon.stub(startCommand, 'runStart').resolves(0)
     sinon.stub(processUtils, 'runCommandWithOutput').resolves({
+      ok: true,
       code: 0,
       stdout: 'Saved working directory and index state WIP on main: abc123',
       stderr: '',