@serverkgg/bridge 0.0.20 → 0.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@serverkgg/bridge",
-	"version": "0.0.20",
+	"version": "0.0.21",
 	"description": "Serverk game bridge and driver runtime, wire protocol, manifest schema, and maintainer CLI",
 	"homepage": "https://serverk.gg",
 	"license": "SEE LICENSE IN LICENSE.md",

package/src/modules/bridgeModule.ts

@@ -23,6 +23,7 @@ export interface BridgeInstallModule {
 export interface BridgeLifecycleModule {
 	kind: BridgeKind.Lifecycle;
 	ready?: RegExp;
+	failed?: RegExp;
 	stopTimeoutSeconds?: number;
 	command(context: BridgeContext): Promise<string[]>;
 	stop?(context: BridgeContext): Promise<void>;

package/src/runtime/bridgeSupervisor.test.ts

@@ -32,6 +32,14 @@ const TIGHT_LAST_LINE_CRASH = `sleep 0.2; echo "${LAST_LINE}"; exit 3`;
 
 const INSTANT_EXIT = "false";
 
+const FAILED_BOOT_LINE = "[main/FATAL] [minecraft/Main]: Failed to start the minecraft server";
+
+const FAILED_BOOT = /Failed to start the minecraft server/;
+
+const FAILED_BOOT_WRAPPER = `sleep 300 & echo child=$!; echo "${FAILED_BOOT_LINE}"; wait`;
+
+const LATE_FAILED_LINE_WRAPPER = `echo ready; sleep 0.6; echo "${FAILED_BOOT_LINE}"; sleep 300`;
+
 const silent: BridgeLeveledLogger = Object.assign(() => {}, {
 	warn: () => {},
 	error: () => {},
@@ -519,4 +527,85 @@ describe("createSupervisor", () => {
 
 		expect(await waitGone(pids.at(0) ?? 0, 5000)).toBe(true);
 	}, 30_000);
+
+	test("stops a game that reports a failed boot instead of waiting for a ready line that never comes", async () => {
+		const records: BridgeCrashRecord[] = [];
+		const pids: number[] = [];
+
+		const supervisor = createSupervisor({
+			cwd: tmpdir(),
+			uid: process.getuid?.() ?? 0,
+			gid: process.getgid?.() ?? 0,
+			stopTimeoutSeconds: 1,
+			ready: READY,
+			failed: FAILED_BOOT,
+			onLog: silent,
+			resolveCommand: async () => {
+				return [
+					"bash",
+					"-c",
+					FAILED_BOOT_WRAPPER,
+				];
+			},
+			onExit(record) {
+				records.push(record);
+			},
+		});
+
+		supervisor.subscribe((entry) => {
+			const match = CHILD_PATTERN.exec(entry.line);
+
+			if (match?.groups?.pid) {
+				pids.push(Number(match.groups.pid));
+			}
+		});
+
+		await supervisor.start();
+
+		expect(await waitFor(() => records.length > 0, 10_000)).toBe(true);
+
+		const record = records.at(0);
+
+		expect(record?.phase).toBe(BridgeCrashPhase.Booting);
+		expect(record?.outOfMemory).toBe(false);
+		expect(record?.restarting).toBe(false);
+		expect(record?.lastLine).toBe(FAILED_BOOT_LINE);
+		expect(supervisor.running).toBe(false);
+		expect(supervisor.runtime).toBe(BridgeRuntime.Crashed);
+		expect(await waitGone(pids.at(0) ?? 0, 5000)).toBe(true);
+	}, 30_000);
+
+	test("ignores the failed pattern once the game has been running long enough to count as stable", async () => {
+		const records: BridgeCrashRecord[] = [];
+
+		const supervisor = createSupervisor({
+			cwd: tmpdir(),
+			uid: process.getuid?.() ?? 0,
+			gid: process.getgid?.() ?? 0,
+			stopTimeoutSeconds: 1,
+			ready: READY,
+			failed: FAILED_BOOT,
+			stableAfterMs: 200,
+			onLog: silent,
+			resolveCommand: async () => {
+				return [
+					"bash",
+					"-c",
+					LATE_FAILED_LINE_WRAPPER,
+				];
+			},
+			onExit(record) {
+				records.push(record);
+			},
+		});
+
+		await supervisor.start();
+
+		await Bun.sleep(1500);
+
+		expect(records).toHaveLength(0);
+		expect(supervisor.running).toBe(true);
+
+		await supervisor.stop();
+	}, 30_000);
 });

package/src/runtime/bridgeSupervisor.ts

@@ -36,6 +36,7 @@ export interface SupervisorOptions {
 	gid: number;
 	stopTimeoutSeconds: number;
 	ready?: RegExp;
+	failed?: RegExp;
 	resolveCommand: () => Promise<string[]>;
 	gracefulStop?: () => Promise<void>;
 	stableAfterMs?: number;
@@ -166,6 +167,7 @@ export const createSupervisor = (options: SupervisorOptions) => {
 	let launchedAt = performance.now();
 	let stable = false;
 	let stableTimer: ReturnType<typeof setTimeout> | null = null;
+	let bootFailure: string | null = null;
 
 	const serialize = chain();
 	const transition = chain();
@@ -298,6 +300,7 @@ export const createSupervisor = (options: SupervisorOptions) => {
 
 		launchedAt = performance.now();
 		stable = false;
+		bootFailure = null;
 
 		if (stableTimer) {
 			clearTimeout(stableTimer);
@@ -396,6 +399,31 @@ export const createSupervisor = (options: SupervisorOptions) => {
 			return;
 		}
 
+		if (options.failed) {
+			void watch(options.failed, options.stopTimeoutSeconds * 1000 * 10).then((match) => {
+				if (!match || launchStamp !== launchedAt || child === null || stable) {
+					return;
+				}
+
+				bootFailure = (match.input ?? match[0]).trim().slice(0, BRIDGE_CRASH_LINE_LIMIT);
+
+				options.onLog.error("the game reported a failed boot, stopping it", {
+					line: bootFailure,
+				});
+
+				const failing = child;
+				const failingGroup = childGroup;
+
+				terminate(failing, failingGroup, "SIGTERM");
+
+				void Bun.sleep(KILL_GRACE_MS).then(() => {
+					if (child === failing) {
+						terminate(failing, failingGroup, "SIGKILL");
+					}
+				});
+			});
+		}
+
 		if (!options.ready) {
 			runtime = BridgeRuntime.Running;
 
@@ -489,7 +517,7 @@ export const createSupervisor = (options: SupervisorOptions) => {
 		const uptimeMs = performance.now() - launchedAt;
 		const phase = stable ? BridgeCrashPhase.Running : BridgeCrashPhase.Booting;
 
-		outOfMemory = code === SIGKILL_EXIT_CODE;
+		outOfMemory = code === SIGKILL_EXIT_CODE && bootFailure === null;
 
 		if (outOfMemory) {
 			options.onLog.error("the game was killed for running out of memory", {
@@ -512,7 +540,7 @@ export const createSupervisor = (options: SupervisorOptions) => {
 
 			options.onExit?.({
 				...settled,
-				lastLine: lastLine(),
+				lastLine: bootFailure ?? lastLine(),
 			});
 		};
 

package/src/runtime/serve.ts

@@ -83,6 +83,7 @@ export const serve = async (driver: BridgeDriver) => {
 		gid: config.gameGid,
 		stopTimeoutSeconds: driver.lifecycle.stopTimeoutSeconds ?? DEFAULT_STOP_TIMEOUT_SECONDS,
 		ready: driver.lifecycle.ready,
+		failed: driver.lifecycle.failed,
 		onLog: log,
 		async resolveCommand() {
 			return await driver.lifecycle.command(context);