diff --git a/packages/cli/tests/22-daemon-stop-supervisor.test.ts b/packages/cli/tests/22-daemon-stop-supervisor.test.ts index b98bcf05f..d45d1e91c 100644 --- a/packages/cli/tests/22-daemon-stop-supervisor.test.ts +++ b/packages/cli/tests/22-daemon-stop-supervisor.test.ts @@ -69,7 +69,7 @@ function readProcessCommand(pid: number): string | null { } type DaemonStatus = { - status: string | null; + localDaemon: string | null; pid: number | null; }; @@ -77,19 +77,19 @@ async function readDaemonStatus(paseoHome: string): Promise { const result = await $`PASEO_HOME=${paseoHome} PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD=${testEnv.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD} PASEO_DICTATION_ENABLED=${testEnv.PASEO_DICTATION_ENABLED} PASEO_VOICE_MODE_ENABLED=${testEnv.PASEO_VOICE_MODE_ENABLED} npx paseo daemon status --home ${paseoHome} --json`.nothrow(); if (result.exitCode !== 0) { - return { status: null, pid: null }; + return { localDaemon: null, pid: null }; } try { - const parsed = JSON.parse(result.stdout) as { status?: unknown; pid?: unknown }; - const status = typeof parsed.status === "string" ? parsed.status : null; + const parsed = JSON.parse(result.stdout) as { localDaemon?: unknown; pid?: unknown }; + const localDaemon = typeof parsed.localDaemon === "string" ? parsed.localDaemon : null; const pid = typeof parsed.pid === "number" && Number.isInteger(parsed.pid) && parsed.pid > 0 ? parsed.pid : null; - return { status, pid }; + return { localDaemon, pid }; } catch { - return { status: null, pid: null }; + return { localDaemon: null, pid: null }; } } @@ -145,7 +145,11 @@ try { await waitFor( async () => { const status = await readDaemonStatus(paseoHome); - return status.status === "running" && status.pid !== null && isProcessRunning(status.pid); + return ( + status.localDaemon === "running" && + status.pid !== null && + isProcessRunning(status.pid) + ); }, 120000, "daemon did not become running in time", @@ -153,7 +157,11 @@ try { const statusBeforeStop = await readDaemonStatus(paseoHome); const daemonPid = statusBeforeStop.pid; - assert.strictEqual(statusBeforeStop.status, "running", "daemon should be running before stop"); + assert.strictEqual( + statusBeforeStop.localDaemon, + "running", + "daemon should be running before stop", + ); assert(daemonPid !== null, "daemon pid should exist once daemon starts"); assert(isProcessRunning(daemonPid), "daemon process should be running"); const pidLockBeforeStop = await readPidLockState(paseoHome); @@ -176,7 +184,7 @@ try { await waitFor( async () => { const status = await readDaemonStatus(paseoHome); - return status.status === "stopped"; + return status.localDaemon === "stopped"; }, 15000, "daemon status did not transition to stopped after stop", @@ -202,7 +210,7 @@ try { const statusAfterStop = await readDaemonStatus(paseoHome); assert.strictEqual( - statusAfterStop.status, + statusAfterStop.localDaemon, "stopped", "daemon should remain stopped after stop command", ); diff --git a/packages/cli/tests/23-daemon-sigint-supervisor.test.ts b/packages/cli/tests/23-daemon-sigint-supervisor.test.ts index 44866f395..1c8df652b 100644 --- a/packages/cli/tests/23-daemon-sigint-supervisor.test.ts +++ b/packages/cli/tests/23-daemon-sigint-supervisor.test.ts @@ -62,7 +62,7 @@ function signalProcessGroup(pid: number, signal: NodeJS.Signals): boolean { } type DaemonStatus = { - status: string | null; + localDaemon: string | null; pid: number | null; }; @@ -70,19 +70,19 @@ async function readDaemonStatus(paseoHome: string): Promise { const result = await $`PASEO_HOME=${paseoHome} PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD=${testEnv.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD} PASEO_DICTATION_ENABLED=${testEnv.PASEO_DICTATION_ENABLED} PASEO_VOICE_MODE_ENABLED=${testEnv.PASEO_VOICE_MODE_ENABLED} npx paseo daemon status --home ${paseoHome} --json`.nothrow(); if (result.exitCode !== 0) { - return { status: null, pid: null }; + return { localDaemon: null, pid: null }; } try { - const parsed = JSON.parse(result.stdout) as { status?: unknown; pid?: unknown }; - const status = typeof parsed.status === "string" ? parsed.status : null; + const parsed = JSON.parse(result.stdout) as { localDaemon?: unknown; pid?: unknown }; + const localDaemon = typeof parsed.localDaemon === "string" ? parsed.localDaemon : null; const pid = typeof parsed.pid === "number" && Number.isInteger(parsed.pid) && parsed.pid > 0 ? parsed.pid : null; - return { status, pid }; + return { localDaemon, pid }; } catch { - return { status: null, pid: null }; + return { localDaemon: null, pid: null }; } } @@ -157,7 +157,11 @@ try { await waitFor( async () => { const status = await readDaemonStatus(paseoHome); - return status.status === "running" && status.pid !== null && isProcessRunning(status.pid); + return ( + status.localDaemon === "running" && + status.pid !== null && + isProcessRunning(status.pid) + ); }, 120000, "daemon did not become running in time", @@ -183,7 +187,7 @@ try { await waitFor( async () => { const status = await readDaemonStatus(paseoHome); - return status.status === "stopped"; + return status.localDaemon === "stopped"; }, 15000, "daemon status did not transition to stopped after SIGINT", diff --git a/packages/cli/tests/25-daemon-restart-supervisor.test.ts b/packages/cli/tests/25-daemon-restart-supervisor.test.ts index e5a5f4ff2..b1a8462ef 100644 --- a/packages/cli/tests/25-daemon-restart-supervisor.test.ts +++ b/packages/cli/tests/25-daemon-restart-supervisor.test.ts @@ -70,7 +70,7 @@ function readWorkerPid(supervisorPid: number): number | null { } type DaemonStatus = { - status: string | null; + localDaemon: string | null; pid: number | null; }; @@ -78,19 +78,19 @@ async function readDaemonStatus(paseoHome: string): Promise { const result = await $`PASEO_HOME=${paseoHome} PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD=${testEnv.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD} PASEO_DICTATION_ENABLED=${testEnv.PASEO_DICTATION_ENABLED} PASEO_VOICE_MODE_ENABLED=${testEnv.PASEO_VOICE_MODE_ENABLED} npx paseo daemon status --home ${paseoHome} --json`.nothrow(); if (result.exitCode !== 0) { - return { status: null, pid: null }; + return { localDaemon: null, pid: null }; } try { - const parsed = JSON.parse(result.stdout) as { status?: unknown; pid?: unknown }; - const status = typeof parsed.status === "string" ? parsed.status : null; + const parsed = JSON.parse(result.stdout) as { localDaemon?: unknown; pid?: unknown }; + const localDaemon = typeof parsed.localDaemon === "string" ? parsed.localDaemon : null; const pid = typeof parsed.pid === "number" && Number.isInteger(parsed.pid) && parsed.pid > 0 ? parsed.pid : null; - return { status, pid }; + return { localDaemon, pid }; } catch { - return { status: null, pid: null }; + return { localDaemon: null, pid: null }; } } @@ -147,7 +147,11 @@ try { await waitFor( async () => { const status = await readDaemonStatus(paseoHome); - return status.status === "running" && status.pid !== null && isProcessRunning(status.pid); + return ( + status.localDaemon === "running" && + status.pid !== null && + isProcessRunning(status.pid) + ); }, 120000, "daemon did not become running in time", @@ -156,7 +160,7 @@ try { const statusBeforeRestart = await readDaemonStatus(paseoHome); const supervisorPid = statusBeforeRestart.pid; assert.strictEqual( - statusBeforeRestart.status, + statusBeforeRestart.localDaemon, "running", "daemon should be running before restart", ); @@ -207,7 +211,7 @@ try { const statusAfterRestart = await readDaemonStatus(paseoHome); assert.strictEqual( - statusAfterRestart.status, + statusAfterRestart.localDaemon, "running", "daemon should stay running after restart", ); diff --git a/packages/cli/tests/26-daemon-restart-unsupervised.test.ts b/packages/cli/tests/26-daemon-restart-unsupervised.test.ts index 172f1f752..2d554e585 100644 --- a/packages/cli/tests/26-daemon-restart-unsupervised.test.ts +++ b/packages/cli/tests/26-daemon-restart-unsupervised.test.ts @@ -41,7 +41,7 @@ function isProcessRunning(pid: number): boolean { } type DaemonStatus = { - status: string | null; + localDaemon: string | null; pid: number | null; }; @@ -49,19 +49,19 @@ async function readDaemonStatus(paseoHome: string): Promise { const result = await $`PASEO_HOME=${paseoHome} PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD=${testEnv.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD} PASEO_DICTATION_ENABLED=${testEnv.PASEO_DICTATION_ENABLED} PASEO_VOICE_MODE_ENABLED=${testEnv.PASEO_VOICE_MODE_ENABLED} npx paseo daemon status --home ${paseoHome} --json`.nothrow(); if (result.exitCode !== 0) { - return { status: null, pid: null }; + return { localDaemon: null, pid: null }; } try { - const parsed = JSON.parse(result.stdout) as { status?: unknown; pid?: unknown }; - const status = typeof parsed.status === "string" ? parsed.status : null; + const parsed = JSON.parse(result.stdout) as { localDaemon?: unknown; pid?: unknown }; + const localDaemon = typeof parsed.localDaemon === "string" ? parsed.localDaemon : null; const pid = typeof parsed.pid === "number" && Number.isInteger(parsed.pid) && parsed.pid > 0 ? parsed.pid : null; - return { status, pid }; + return { localDaemon, pid }; } catch { - return { status: null, pid: null }; + return { localDaemon: null, pid: null }; } } @@ -146,7 +146,11 @@ try { await waitFor( async () => { const status = await readDaemonStatus(paseoHome); - return status.status === "running" && status.pid !== null && isProcessRunning(status.pid); + return ( + status.localDaemon === "running" && + status.pid !== null && + isProcessRunning(status.pid) + ); }, 120000, "daemon did not become running in time", @@ -154,7 +158,7 @@ try { const statusBeforeRestart = await readDaemonStatus(paseoHome); assert.strictEqual( - statusBeforeRestart.status, + statusBeforeRestart.localDaemon, "running", "daemon should be running before restart", ); @@ -191,7 +195,7 @@ try { await waitFor( async () => { const status = await readDaemonStatus(paseoHome); - return status.status === "stopped"; + return status.localDaemon === "stopped"; }, 15000, "daemon status did not transition to stopped after unsupervised restart request",