refactor: rename daemon to runner throughout codebase

This commit is contained in:
weishu
2026-01-19 11:12:48 +08:00
parent ccdcb3d75d
commit 0228146b99
53 changed files with 812 additions and 714 deletions
+10 -10
View File
@@ -1,6 +1,6 @@
import axios from 'axios'
import type { AgentState, CreateMachineResponse, CreateSessionResponse, DaemonState, Machine, MachineMetadata, Metadata, Session } from '@/api/types'
import { AgentStateSchema, CreateMachineResponseSchema, CreateSessionResponseSchema, DaemonStateSchema, MachineMetadataSchema, MetadataSchema } from '@/api/types'
import type { AgentState, CreateMachineResponse, CreateSessionResponse, RunnerState, Machine, MachineMetadata, Metadata, Session } from '@/api/types'
import { AgentStateSchema, CreateMachineResponseSchema, CreateSessionResponseSchema, RunnerStateSchema, MachineMetadataSchema, MetadataSchema } from '@/api/types'
import { configuration } from '@/configuration'
import { getAuthToken } from '@/api/auth'
import { ApiMachineClient } from './apiMachine'
@@ -76,14 +76,14 @@ export class ApiClient {
async getOrCreateMachine(opts: {
machineId: string
metadata: MachineMetadata
daemonState?: DaemonState
runnerState?: RunnerState
}): Promise<Machine> {
const response = await axios.post<CreateMachineResponse>(
`${configuration.serverUrl}/cli/machines`,
{
id: opts.machineId,
metadata: opts.metadata,
daemonState: opts.daemonState ?? null
runnerState: opts.runnerState ?? null
},
{
headers: {
@@ -107,10 +107,10 @@ export class ApiClient {
return parsedMetadata.success ? parsedMetadata.data : null
})()
const daemonState = (() => {
if (raw.daemonState == null) return null
const parsedDaemonState = DaemonStateSchema.safeParse(raw.daemonState)
return parsedDaemonState.success ? parsedDaemonState.data : null
const runnerState = (() => {
if (raw.runnerState == null) return null
const parsedRunnerState = RunnerStateSchema.safeParse(raw.runnerState)
return parsedRunnerState.success ? parsedRunnerState.data : null
})()
return {
@@ -122,8 +122,8 @@ export class ApiClient {
activeAt: raw.activeAt,
metadata,
metadataVersion: raw.metadataVersion,
daemonState,
daemonStateVersion: raw.daemonStateVersion
runnerState,
runnerStateVersion: raw.runnerStateVersion
}
}
+31 -31
View File
@@ -1,26 +1,26 @@
/**
* WebSocket client for machine/daemon communication with hapi-server
* WebSocket client for machine/runner communication with hapi-server
*/
import { io, type Socket } from 'socket.io-client'
import { stat } from 'node:fs/promises'
import { logger } from '@/ui/logger'
import { configuration } from '@/configuration'
import type { DaemonState, Machine, MachineMetadata, Update, UpdateMachineBody } from './types'
import { DaemonStateSchema, MachineMetadataSchema } from './types'
import type { RunnerState, Machine, MachineMetadata, Update, UpdateMachineBody } from './types'
import { RunnerStateSchema, MachineMetadataSchema } from './types'
import { backoff } from '@/utils/time'
import { RpcHandlerManager } from './rpc/RpcHandlerManager'
import { registerCommonHandlers } from '../modules/common/registerCommonHandlers'
import type { SpawnSessionOptions, SpawnSessionResult } from '../modules/common/rpcTypes'
import { applyVersionedAck } from './versionedUpdate'
interface ServerToDaemonEvents {
interface ServerToRunnerEvents {
update: (data: Update) => void
'rpc-request': (data: { method: string; params: string }, callback: (response: string) => void) => void
error: (data: { message: string }) => void
}
interface DaemonToServerEvents {
interface RunnerToServerEvents {
'machine-alive': (data: { machineId: string; time: number }) => void
'machine-update-metadata': (data: { machineId: string; metadata: unknown; expectedVersion: number }, cb: (answer: {
result: 'error'
@@ -33,16 +33,16 @@ interface DaemonToServerEvents {
version: number
metadata: unknown | null
}) => void) => void
'machine-update-state': (data: { machineId: string; daemonState: unknown | null; expectedVersion: number }, cb: (answer: {
'machine-update-state': (data: { machineId: string; runnerState: unknown | null; expectedVersion: number }, cb: (answer: {
result: 'error'
} | {
result: 'version-mismatch'
version: number
daemonState: unknown | null
runnerState: unknown | null
} | {
result: 'success'
version: number
daemonState: unknown | null
runnerState: unknown | null
}) => void) => void
'rpc-register': (data: { method: string }) => void
'rpc-unregister': (data: { method: string }) => void
@@ -63,7 +63,7 @@ interface PathExistsResponse {
}
export class ApiMachineClient {
private socket!: Socket<ServerToDaemonEvents, DaemonToServerEvents>
private socket!: Socket<ServerToRunnerEvents, RunnerToServerEvents>
private keepAliveInterval: NodeJS.Timeout | null = null
private rpcHandlerManager: RpcHandlerManager
@@ -142,9 +142,9 @@ export class ApiMachineClient {
return { message: 'Session stopped' }
})
this.rpcHandlerManager.registerHandler('stop-daemon', () => {
this.rpcHandlerManager.registerHandler('stop-runner', () => {
setTimeout(() => requestShutdown(), 100)
return { message: 'Daemon stop request acknowledged' }
return { message: 'Runner stop request acknowledged' }
})
}
@@ -181,35 +181,35 @@ export class ApiMachineClient {
})
}
async updateDaemonState(handler: (state: DaemonState | null) => DaemonState): Promise<void> {
async updateRunnerState(handler: (state: RunnerState | null) => RunnerState): Promise<void> {
await backoff(async () => {
const updated = handler(this.machine.daemonState)
const updated = handler(this.machine.runnerState)
const answer = await this.socket.emitWithAck('machine-update-state', {
machineId: this.machine.id,
daemonState: updated,
expectedVersion: this.machine.daemonStateVersion
runnerState: updated,
expectedVersion: this.machine.runnerStateVersion
}) as unknown
applyVersionedAck(answer, {
valueKey: 'daemonState',
valueKey: 'runnerState',
parseValue: (value) => {
const parsed = DaemonStateSchema.safeParse(value)
const parsed = RunnerStateSchema.safeParse(value)
return parsed.success ? parsed.data : null
},
applyValue: (value) => {
this.machine.daemonState = value
this.machine.runnerState = value
},
applyVersion: (version) => {
this.machine.daemonStateVersion = version
this.machine.runnerStateVersion = version
},
logInvalidValue: (context, version) => {
const suffix = context === 'success' ? 'ack' : 'version-mismatch ack'
logger.debug(`[API MACHINE] Ignoring invalid daemonState value from ${suffix}`, { version })
logger.debug(`[API MACHINE] Ignoring invalid runnerState value from ${suffix}`, { version })
},
invalidResponseMessage: 'Invalid machine-update-state response',
errorMessage: 'Machine state update failed',
versionMismatchMessage: 'Daemon state version mismatch'
versionMismatchMessage: 'Runner state version mismatch'
})
})
}
@@ -231,14 +231,14 @@ export class ApiMachineClient {
this.socket.on('connect', () => {
logger.debug('[API MACHINE] Connected to bot')
this.rpcHandlerManager.onSocketConnect(this.socket)
this.updateDaemonState((state) => ({
this.updateRunnerState((state) => ({
...(state ?? {}),
status: 'running',
pid: process.pid,
httpPort: this.machine.daemonState?.httpPort,
httpPort: this.machine.runnerState?.httpPort,
startedAt: Date.now()
})).catch((error) => {
logger.debug('[API MACHINE] Failed to update daemon state on connect', error)
logger.debug('[API MACHINE] Failed to update runner state on connect', error)
})
this.startKeepAlive()
})
@@ -273,19 +273,19 @@ export class ApiMachineClient {
this.machine.metadataVersion = update.metadata.version
}
if (update.daemonState) {
const next = update.daemonState.value
if (update.runnerState) {
const next = update.runnerState.value
if (next == null) {
this.machine.daemonState = null
this.machine.runnerState = null
} else {
const parsed = DaemonStateSchema.safeParse(next)
const parsed = RunnerStateSchema.safeParse(next)
if (parsed.success) {
this.machine.daemonState = parsed.data
this.machine.runnerState = parsed.data
} else {
logger.debug('[API MACHINE] Ignoring invalid daemonState update', { version: update.daemonState.version })
logger.debug('[API MACHINE] Ignoring invalid runnerState update', { version: update.runnerState.version })
}
}
this.machine.daemonStateVersion = update.daemonState.version
this.machine.runnerStateVersion = update.runnerState.version
}
})
+10 -10
View File
@@ -32,7 +32,7 @@ export const MachineMetadataSchema = z.object({
export type MachineMetadata = z.infer<typeof MachineMetadataSchema>
export const DaemonStateSchema = z.object({
export const RunnerStateSchema = z.object({
status: z.union([z.enum(['running', 'shutting-down']), z.string()]),
pid: z.number().optional(),
httpPort: z.number().optional(),
@@ -41,7 +41,7 @@ export const DaemonStateSchema = z.object({
shutdownSource: z.union([z.enum(['mobile-app', 'cli', 'os-signal', 'unknown']), z.string()]).optional()
}).passthrough()
export type DaemonState = z.infer<typeof DaemonStateSchema>
export type RunnerState = z.infer<typeof RunnerStateSchema>
export type Machine = {
id: string
@@ -52,8 +52,8 @@ export type Machine = {
activeAt: number
metadata: MachineMetadata | null
metadataVersion: number
daemonState: DaemonState | null
daemonStateVersion: number
runnerState: RunnerState | null
runnerStateVersion: number
}
export const UpdateNewMessageBodySchema = z.object({
@@ -92,7 +92,7 @@ export const UpdateMachineBodySchema = z.object({
version: z.number(),
value: z.unknown()
}).nullable(),
daemonState: z.object({
runnerState: z.object({
version: z.number(),
value: z.unknown().nullable()
}).nullable()
@@ -154,8 +154,8 @@ export const CreateMachineResponseSchema = z.object({
activeAt: z.number(),
metadata: z.unknown().nullable(),
metadataVersion: z.number(),
daemonState: z.unknown().nullable(),
daemonStateVersion: z.number()
runnerState: z.unknown().nullable(),
runnerStateVersion: z.number()
})
})
@@ -271,17 +271,17 @@ export interface ClientToServerEvents {
version: number
metadata: unknown | null
}) => void) => void
'machine-update-state': (data: { machineId: string; expectedVersion: number; daemonState: unknown | null }, cb: (answer: {
'machine-update-state': (data: { machineId: string; expectedVersion: number; runnerState: unknown | null }, cb: (answer: {
result: 'error'
reason?: SocketErrorReason
} | {
result: 'version-mismatch'
version: number
daemonState: unknown | null
runnerState: unknown | null
} | {
result: 'success'
version: number
daemonState: unknown | null
runnerState: unknown | null
}) => void) => void
'rpc-register': (data: { method: string }) => void
'rpc-unregister': (data: { method: string }) => void