mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-13 20:56:40 +00:00
refactor(signal): extract daemon lifecycle and typed exit handling
This commit is contained in:
@@ -16,10 +16,20 @@ export type SignalDaemonOpts = {
|
||||
export type SignalDaemonHandle = {
|
||||
pid?: number;
|
||||
stop: () => void;
|
||||
exited: Promise<{ code: number | null; signal: NodeJS.Signals | null }>;
|
||||
exited: Promise<SignalDaemonExitEvent>;
|
||||
isExited: () => boolean;
|
||||
};
|
||||
|
||||
export type SignalDaemonExitEvent = {
|
||||
source: "process" | "spawn-error";
|
||||
code: number | null;
|
||||
signal: NodeJS.Signals | null;
|
||||
};
|
||||
|
||||
export function formatSignalDaemonExit(exit: SignalDaemonExitEvent): string {
|
||||
return `signal daemon exited (source=${exit.source} code=${String(exit.code ?? "null")} signal=${String(exit.signal ?? "null")})`;
|
||||
}
|
||||
|
||||
export function classifySignalCliLogLine(line: string): "log" | "error" | null {
|
||||
const trimmed = line.trim();
|
||||
if (!trimmed) {
|
||||
@@ -87,13 +97,11 @@ export function spawnSignalDaemon(opts: SignalDaemonOpts): SignalDaemonHandle {
|
||||
const error = opts.runtime?.error ?? (() => {});
|
||||
let exited = false;
|
||||
let settledExit = false;
|
||||
let resolveExit!: (value: { code: number | null; signal: NodeJS.Signals | null }) => void;
|
||||
const exitedPromise = new Promise<{ code: number | null; signal: NodeJS.Signals | null }>(
|
||||
(resolve) => {
|
||||
resolveExit = resolve;
|
||||
},
|
||||
);
|
||||
const settleExit = (value: { code: number | null; signal: NodeJS.Signals | null }) => {
|
||||
let resolveExit!: (value: SignalDaemonExitEvent) => void;
|
||||
const exitedPromise = new Promise<SignalDaemonExitEvent>((resolve) => {
|
||||
resolveExit = resolve;
|
||||
});
|
||||
const settleExit = (value: SignalDaemonExitEvent) => {
|
||||
if (settledExit) {
|
||||
return;
|
||||
}
|
||||
@@ -106,22 +114,24 @@ export function spawnSignalDaemon(opts: SignalDaemonOpts): SignalDaemonHandle {
|
||||
bindSignalCliOutput({ stream: child.stderr, log, error });
|
||||
child.once("exit", (code, signal) => {
|
||||
settleExit({
|
||||
source: "process",
|
||||
code: typeof code === "number" ? code : null,
|
||||
signal: signal ?? null,
|
||||
});
|
||||
error(
|
||||
`signal-cli daemon exited (code=${String(code ?? "null")} signal=${String(signal ?? "null")})`,
|
||||
formatSignalDaemonExit({ source: "process", code: code ?? null, signal: signal ?? null }),
|
||||
);
|
||||
});
|
||||
child.once("close", (code, signal) => {
|
||||
settleExit({
|
||||
source: "process",
|
||||
code: typeof code === "number" ? code : null,
|
||||
signal: signal ?? null,
|
||||
});
|
||||
});
|
||||
child.on("error", (err) => {
|
||||
error(`signal-cli spawn error: ${String(err)}`);
|
||||
settleExit({ code: null, signal: null });
|
||||
settleExit({ source: "spawn-error", code: null, signal: null });
|
||||
});
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user