Cleanup final

src/main/nodecg/platform-process-killer.ts

@@ -1,12 +1,16 @@
-import { ChildProcess, SpawnOptions } from "node:child_process";
+import { SpawnOptions } from "node:child_process";
 
 export type PlatformProcessKillerDeps = {
   platform: NodeJS.Platform;
-  spawnProcess: (command: string, args: string[], options: SpawnOptions) => ChildProcess;
+  spawnProcess: (command: string, args: string[], options: SpawnOptions) => SpawnedKillerProcess;
   killProcess: (pid: number, signal: NodeJS.Signals) => void;
   log: (...args: unknown[]) => void;
 };
 
+type SpawnedKillerProcess = {
+  on: (event: "error", listener: (error: Error) => void) => unknown;
+};
+
 export function killProcessTree(pid: number, signal: NodeJS.Signals, deps: PlatformProcessKillerDeps): boolean {
   if (!Number.isSafeInteger(pid) || pid <= 0) {
     deps.log(`Invalid pid for process tree termination: ${pid}`);

src/main/nodecg/process-manager.ts

@@ -1,4 +1,4 @@
-import { ChildProcess, spawn, SpawnOptions } from "node:child_process";
+import { spawn, SpawnOptions } from "node:child_process";
 import fs from "node:fs";
 import net from "node:net";
 import path from "node:path";
@@ -17,7 +17,7 @@ type NodecgProcessManagerConfig = {
 };
 
 type NodecgProcessManagerDeps = {
-  spawnProcess: (command: string, args: string[], options: SpawnOptions) => ChildProcess;
+  spawnProcess: (command: string, args: string[], options: SpawnOptions) => NodecgChildProcess;
   pathExists: (candidatePath: string) => boolean;
   fetchUrl: typeof fetch;
   platform: NodeJS.Platform;
@@ -31,6 +31,22 @@ type NodecgProcessManagerDeps = {
   hasReadWriteAccess: (candidatePath: string) => boolean;
 };
 
+type NodecgChildProcess = {
+  pid?: number;
+  killed: boolean;
+  exitCode: number | null;
+  signalCode: NodeJS.Signals | null;
+  stdout?: ProcessOutputStream | null;
+  stderr?: ProcessOutputStream | null;
+  on(event: "exit", listener: (code: number | null, signal: NodeJS.Signals | null) => void): unknown;
+  on(event: "error", listener: (error: Error) => void): unknown;
+  once(event: "exit", listener: () => void): unknown;
+};
+
+type ProcessOutputStream = {
+  on(event: "data", listener: (chunk: unknown) => void): unknown;
+};
+
 export type NodecgProcessManager = {
   startNodecgProcess: () => Promise<void>;
   waitForNodecgReady: (startTime: number) => Promise<void>;
@@ -50,7 +66,7 @@ export function createNodecgProcessManager({
 }: NodecgProcessManagerConfig): NodecgProcessManager {
   const resolvedDeps = resolveDeps(deps);
 
-  let nodecgProcess: ChildProcess | null = null;
+  let nodecgProcess: NodecgChildProcess | null = null;
   let nodecgState: NodecgProcessState = "idle";
   let startNodecgPromise: Promise<void> | null = null;
   let stopNodecgPromise: Promise<void> | null = null;