@gamecrate/cli 2.2.0 → 2.3.0

package/dist/gamecrate.js

@@ -1056,6 +1056,7 @@ import { basename, join } from "node:path";
 var CONTAINER_RUNTIME_DIR = "/tmp/xdg";
 var CONTAINER_LOG_DIR = "/logs";
 var X11_SOCKET_DIR = "/tmp/.X11-unix";
+var HOST_X11_DIR = "/run/host-x11";
 var CONTAINER_XAUTHORITY = "/tmp/xauth";
 var CONTAINER_XDG_DIR = "/xdg";
 var RUNTIME_DIR_SIZE = "64m";
@@ -1080,12 +1081,14 @@ function buildRunSpec(plan, modMounts, identity, image) {
   const proton = image?.launcher === "proton";
   const executable = image?.executable ?? game.executable;
   refuseProtonHeaded(plan.game, plan.mode, image);
-  const command = proton ? ["run-headless-windows", winPath(join(game.gameFiles.container, basename(executable)))] : headed ? [executable] : [
+  const command = proton ? ["run-headless-windows", winPath(join(game.gameFiles.container, basename(executable)))] : headed ? ["run-headed", executable] : [
     "xvfb-run",
     "-a",
     `--server-args=-screen 0 ${settings.width}x${settings.height}x24`,
     executable
   ];
+  if (headed)
+    env.SCREEN = `${settings.width}x${settings.height}x24`;
   if (proton) {
     Object.assign(env, {
       SCREEN: `${settings.width}x${settings.height}x24`,
@@ -1106,7 +1109,7 @@ function buildRunSpec(plan, modMounts, identity, image) {
   }
   addScratch(mounts, env, plan, identity);
   if (headed)
-    addSession(mounts, env, plan);
+    addSession(mounts, env, plan, identity);
   const deviceCgroupRules = [];
   if (settings.input) {
     mounts.push({ type: "bind", source: "/dev/input", target: "/dev/input", readonly: true });
@@ -1174,10 +1177,10 @@ function addScratch(mounts, env, plan, identity) {
   env.XDG_CACHE_HOME = `${CONTAINER_XDG_DIR}/cache`;
   env.XDG_DATA_HOME ??= `${CONTAINER_XDG_DIR}/data`;
 }
-function addSession(mounts, env, plan) {
+function addSession(mounts, env, plan, identity) {
   const { settings } = plan;
   if (settings.display === "x11")
-    addX11(mounts, env);
+    addX11(mounts, env, identity);
   else
     addWayland(mounts, env);
   if (!settings.audio)
@@ -1187,11 +1190,13 @@ function addSession(mounts, env, plan) {
   }
   env.PULSE_SERVER = `unix:${CONTAINER_RUNTIME_DIR}/pulse/native`;
 }
-function addX11(mounts, env) {
+function addX11(mounts, env, identity) {
   const x11 = x11Session();
   if (!x11)
     return;
-  mounts.push({ type: "bind", source: X11_SOCKET_DIR, target: X11_SOCKET_DIR });
+  mounts.push({ type: "tmpfs", target: X11_SOCKET_DIR, uid: identity.uid, gid: identity.gid, mode: "1777" });
+  mounts.push({ type: "bind", source: X11_SOCKET_DIR, target: HOST_X11_DIR, readonly: true });
+  env.HOST_X11_DIR = HOST_X11_DIR;
   env.DISPLAY = x11.display;
   env.XDG_SESSION_TYPE = "x11";
   env.SDL_VIDEODRIVER = "x11";
@@ -5318,6 +5323,11 @@ async function runOnce(argv, what) {
 ${stderr}`.trim());
 }
 var HEARTBEAT_MS = 1000;
+function spawnFailure(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  const code = error?.code;
+  return code === undefined || message.includes(code) ? message : `${message} (${code})`;
+}
 async function live(argv, what) {
   const since = Date.now();
   let lastNotice = 0;
@@ -5330,10 +5340,7 @@ async function live(argv, what) {
     status(`${what} (${notice})`);
   }, HEARTBEAT_MS);
   try {
-    return await captureLive(argv).catch((error) => ({
-      code: 127,
-      text: error instanceof Error ? error.message : String(error)
-    }));
+    return await captureLive(argv).catch((error) => ({ code: 127, text: spawnFailure(error) }));
   } finally {
     clearInterval(timer);
   }
@@ -7583,7 +7590,7 @@ function published2(value) {
 }
 
 // src/index.ts
-var VERSION = "2.2.0";
+var VERSION = "2.3.0";
 async function main(argv) {
   const supervised = supervisedDir(argv);
   try {
@@ -8048,7 +8055,8 @@ function steamcmdSource(runner, config) {
 }
 function gameForImage(args, config, defaults, game) {
   const base = config.games[game];
-  return withImageOverride(base, imageFor(base, launchProfile(args, defaults, base), args.image));
+  const ref = args.image ?? imageFor(base, launchProfile(args, defaults, base));
+  return withImageOverride(base, ref);
 }
 async function refs(args, config, defaults) {
   const game = requireGame(args, config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamecrate/cli",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Run a modded game in a container, with mods resolved from your local checkouts.",
   "license": "MIT",
   "type": "module",
@@ -34,7 +34,7 @@
   ],
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "test": "vitest run",
+    "test": "bun test --parallel",
     "build": "npm run build:node && npm run build:types && npm run build:binary",
     "build:node": "bun build ./src/index.ts --target=node --packages=external --define __VERSION__='\"'${npm_package_version:-0.0.0-dev}'\"' --outfile dist/gamecrate.js && bun build ./src/lib.ts --target=node --packages=external --outfile dist/lib.js",
     "build:types": "tsc -p tsconfig.build.json",
@@ -43,6 +43,7 @@
     "prepack": "npm run build:node && npm run build:types"
   },
   "devDependencies": {
+    "@types/bun": "^1.3.0",
     "@types/node": "^22.10.0",
     "@types/picomatch": "^4.0.0",
     "typescript": "^5.7.0"