127626a122
Two issues fixed: 1. process-cleanup.ts used fire-and-forget void Promise for shutdown handlers — now properly collects and awaits all cleanup promises via Promise.allSettled, with dedup guard to prevent double cleanup 2. TmuxSessionManager was never registered for process cleanup — now registered in create-managers.ts via registerManagerForCleanup Also fixed setTimeout().unref() which could let the process exit before cleanup completes.
94 lines
2.5 KiB
TypeScript
94 lines
2.5 KiB
TypeScript
import { log } from "../../shared"
|
|
|
|
type ProcessCleanupEvent = NodeJS.Signals | "beforeExit" | "exit"
|
|
|
|
function registerProcessSignal(
|
|
signal: ProcessCleanupEvent,
|
|
handler: () => void,
|
|
exitAfter: boolean
|
|
): () => void {
|
|
const listener = () => {
|
|
handler()
|
|
if (exitAfter) {
|
|
process.exitCode = 0
|
|
setTimeout(() => process.exit(), 6000)
|
|
}
|
|
}
|
|
process.on(signal, listener)
|
|
return listener
|
|
}
|
|
|
|
interface CleanupTarget {
|
|
shutdown(): void | Promise<void>
|
|
}
|
|
|
|
const cleanupManagers = new Set<CleanupTarget>()
|
|
let cleanupRegistered = false
|
|
const cleanupHandlers = new Map<ProcessCleanupEvent, () => void>()
|
|
|
|
export function registerManagerForCleanup(manager: CleanupTarget): void {
|
|
cleanupManagers.add(manager)
|
|
|
|
if (cleanupRegistered) return
|
|
cleanupRegistered = true
|
|
|
|
let cleanupPromise: Promise<void> | undefined
|
|
|
|
const cleanupAll = () => {
|
|
if (cleanupPromise) return
|
|
const promises: Promise<void>[] = []
|
|
for (const m of cleanupManagers) {
|
|
try {
|
|
promises.push(
|
|
Promise.resolve(m.shutdown()).catch((error) => {
|
|
log("[background-agent] Error during async shutdown cleanup:", error)
|
|
})
|
|
)
|
|
} catch (error) {
|
|
log("[background-agent] Error during shutdown cleanup:", error)
|
|
}
|
|
}
|
|
cleanupPromise = Promise.allSettled(promises).then(() => {})
|
|
cleanupPromise.then(() => {
|
|
log("[background-agent] All shutdown cleanup completed")
|
|
})
|
|
}
|
|
|
|
const registerSignal = (signal: ProcessCleanupEvent, exitAfter: boolean): void => {
|
|
const listener = registerProcessSignal(signal, cleanupAll, exitAfter)
|
|
cleanupHandlers.set(signal, listener)
|
|
}
|
|
|
|
registerSignal("SIGINT", true)
|
|
registerSignal("SIGTERM", true)
|
|
if (process.platform === "win32") {
|
|
registerSignal("SIGBREAK", true)
|
|
}
|
|
registerSignal("beforeExit", false)
|
|
registerSignal("exit", false)
|
|
}
|
|
|
|
export function unregisterManagerForCleanup(manager: CleanupTarget): void {
|
|
cleanupManagers.delete(manager)
|
|
|
|
if (cleanupManagers.size > 0) return
|
|
|
|
for (const [signal, listener] of cleanupHandlers.entries()) {
|
|
process.off(signal, listener)
|
|
}
|
|
cleanupHandlers.clear()
|
|
cleanupRegistered = false
|
|
}
|
|
|
|
/** @internal — test-only reset for module-level singleton state */
|
|
export function _resetForTesting(): void {
|
|
for (const manager of [...cleanupManagers]) {
|
|
cleanupManagers.delete(manager)
|
|
}
|
|
for (const [signal, listener] of cleanupHandlers.entries()) {
|
|
process.off(signal, listener)
|
|
}
|
|
cleanupHandlers.clear()
|
|
cleanupRegistered = false
|
|
}
|