@serverkgg/bridge 0.0.12 → 0.0.13

package/src/wine/winePrefix.ts

@@ -0,0 +1,88 @@
+import type { BridgeContext } from "../context";
+import { readStamp, writeStamp } from "../install";
+import { execDetail } from "../utils";
+import { protonCommand } from "./protonCommand";
+import { wineCommand } from "./wineCommand";
+
+export const WINE_PREFIX_STAMP = ".serverk-wine.json";
+
+const PREFIX_TIMEOUT_MS = 600_000;
+
+const BOOT_EXE = "wineboot";
+
+const BOOT_ARGS = [
+	"-i",
+];
+
+export interface WinePrefixStamp {
+	ready: boolean;
+	proton: boolean;
+}
+
+export interface PrepareWinePrefixOptions {
+	proton?: boolean;
+	appId?: string;
+	protonDir?: string;
+	compatDir?: string;
+	steamDir?: string;
+	prefix?: string;
+	home?: string;
+	xvfb?: boolean;
+	environment?: Record<string, string>;
+}
+
+const prefixArgv = async (context: BridgeContext, options: PrepareWinePrefixOptions) => {
+	if (options.proton !== true) {
+		return await wineCommand(context, {
+			exe: BOOT_EXE,
+			args: BOOT_ARGS,
+			xvfb: options.xvfb,
+			prefix: options.prefix,
+			home: options.home,
+			environment: options.environment,
+		});
+	}
+
+	if (!options.appId) {
+		throw new Error("a proton prefix needs the steam app id it belongs to");
+	}
+
+	return await protonCommand(context, {
+		appId: options.appId,
+		exe: BOOT_EXE,
+		args: BOOT_ARGS,
+		protonDir: options.protonDir,
+		compatDir: options.compatDir,
+		steamDir: options.steamDir,
+		home: options.home,
+		environment: options.environment,
+	});
+};
+
+export const prepareWinePrefix = async (context: BridgeContext, options: PrepareWinePrefixOptions = {}) => {
+	const proton = options.proton === true;
+	const stamp = await readStamp<WinePrefixStamp>(context, WINE_PREFIX_STAMP);
+
+	if (stamp?.ready === true && stamp.proton === proton) {
+		return;
+	}
+
+	context.log(proton ? "creating the proton prefix" : "creating the wine prefix");
+
+	const result = await context.exec(await prefixArgv(context, options), {
+		timeoutMs: PREFIX_TIMEOUT_MS,
+	});
+
+	if (result.code !== 0) {
+		throw new Error(`the wine prefix could not be created — ${execDetail(result)}`);
+	}
+
+	await writeStamp<WinePrefixStamp>(
+		context,
+		{
+			ready: true,
+			proton,
+		},
+		WINE_PREFIX_STAMP,
+	);
+};

package/src/runtime/bridgeSecrets.test.ts

@@ -1,121 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import type { BridgeConfig } from "../protocol";
-import { createBridgeSecrets } from "./bridgeSecrets";
-
-const configWith = (secrets: Record<string, string>): BridgeConfig => ({
-	code: "wsvv8fakxm",
-	token: "token",
-	cwd: "/data",
-	run: "/run/bridge",
-	ports: {
-		game: 25_565,
-	},
-	memoryMb: 2048,
-	cpuPercent: 100,
-	gameUid: 1000,
-	gameGid: 1000,
-	variables: {
-		VERSION: "1.21",
-	},
-	secrets,
-});
-
-let directory: string;
-
-let path: string;
-
-const write = async (config: BridgeConfig) => {
-	await writeFile(path, `${JSON.stringify(config, null, 2)}\n`);
-};
-
-beforeEach(async () => {
-	directory = await mkdtemp(join(tmpdir(), "bridge-secrets-"));
-	path = join(directory, "config.json");
-});
-
-afterEach(async () => {
-	await rm(directory, {
-		force: true,
-		recursive: true,
-	});
-});
-
-describe("the bridge secrets reader", () => {
-	test("answers from the boot snapshot", async () => {
-		const config = configWith({
-			CURSEFORGE_API_KEY: "boot",
-		});
-
-		await write(config);
-
-		const secrets = createBridgeSecrets(path, config, 0);
-
-		expect(secrets.read("CURSEFORGE_API_KEY")).toBe("boot");
-		expect(secrets.read("MODRINTH_API_KEY")).toBeNull();
-	});
-
-	test("sees a value the agent rewrote into the config", async () => {
-		const config = configWith({
-			CURSEFORGE_API_KEY: "boot",
-		});
-
-		await write(config);
-
-		const secrets = createBridgeSecrets(path, config, 0);
-
-		expect(secrets.read("CURSEFORGE_API_KEY")).toBe("boot");
-
-		await write(
-			configWith({
-				CURSEFORGE_API_KEY: "rotated",
-				MODRINTH_API_KEY: "added",
-			}),
-		);
-
-		expect(secrets.read("CURSEFORGE_API_KEY")).toBe("rotated");
-		expect(secrets.read("MODRINTH_API_KEY")).toBe("added");
-	});
-
-	test("keeps the last good values while the config is mid-write", async () => {
-		const config = configWith({
-			CURSEFORGE_API_KEY: "boot",
-		});
-
-		await write(config);
-
-		const secrets = createBridgeSecrets(path, config, 0);
-
-		expect(secrets.read("CURSEFORGE_API_KEY")).toBe("boot");
-
-		await writeFile(path, '{"code": "wsvv8fak');
-
-		expect(secrets.read("CURSEFORGE_API_KEY")).toBe("boot");
-
-		await rm(path);
-
-		expect(secrets.read("CURSEFORGE_API_KEY")).toBe("boot");
-	});
-
-	test("re-reads the file at most once per refresh window", async () => {
-		const config = configWith({
-			CURSEFORGE_API_KEY: "boot",
-		});
-
-		await write(config);
-
-		const secrets = createBridgeSecrets(path, config, 60_000);
-
-		expect(secrets.read("CURSEFORGE_API_KEY")).toBe("boot");
-
-		await write(
-			configWith({
-				CURSEFORGE_API_KEY: "rotated",
-			}),
-		);
-
-		expect(secrets.read("CURSEFORGE_API_KEY")).toBe("boot");
-	});
-});

package/src/runtime/bridgeSecrets.ts

@@ -1,43 +0,0 @@
-import { readFileSync } from "node:fs";
-import type { BridgeConfig } from "../protocol";
-import { parseConfig } from "./bridgeConfigReader";
-
-export const BRIDGE_SECRET_REFRESH_MS = 2000;
-
-export interface BridgeSecrets {
-	read: (key: string) => string | null;
-}
-
-export const createBridgeSecrets = (
-	path: string,
-	config: BridgeConfig,
-	refreshMs: number = BRIDGE_SECRET_REFRESH_MS,
-): BridgeSecrets => {
-	let values = config.secrets;
-
-	let checkedAt: number | null = null;
-
-	const refresh = () => {
-		const stamp = performance.now();
-
-		if (checkedAt !== null && stamp - checkedAt < refreshMs) {
-			return;
-		}
-
-		checkedAt = stamp;
-
-		try {
-			values = parseConfig(readFileSync(path, "utf8")).secrets;
-		} catch {
-			return;
-		}
-	};
-
-	return {
-		read(key) {
-			refresh();
-
-			return values[key] ?? null;
-		},
-	};
-};