@gamecrate/cli 2.3.0 → 2.3.1

package/dist/gamecrate.js

@@ -1056,7 +1056,6 @@ 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";
@@ -1081,14 +1080,12 @@ 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 ? ["run-headed", executable] : [
+  const command = proton ? ["run-headless-windows", winPath(join(game.gameFiles.container, basename(executable)))] : 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`,
@@ -1109,7 +1106,7 @@ function buildRunSpec(plan, modMounts, identity, image) {
   }
   addScratch(mounts, env, plan, identity);
   if (headed)
-    addSession(mounts, env, plan, identity);
+    addSession(mounts, env, plan);
   const deviceCgroupRules = [];
   if (settings.input) {
     mounts.push({ type: "bind", source: "/dev/input", target: "/dev/input", readonly: true });
@@ -1177,10 +1174,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, identity) {
+function addSession(mounts, env, plan) {
   const { settings } = plan;
   if (settings.display === "x11")
-    addX11(mounts, env, identity);
+    addX11(mounts, env);
   else
     addWayland(mounts, env);
   if (!settings.audio)
@@ -1190,13 +1187,11 @@ function addSession(mounts, env, plan, identity) {
   }
   env.PULSE_SERVER = `unix:${CONTAINER_RUNTIME_DIR}/pulse/native`;
 }
-function addX11(mounts, env, identity) {
+function addX11(mounts, env) {
   const x11 = x11Session();
   if (!x11)
     return;
-  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;
+  mounts.push({ type: "bind", source: X11_SOCKET_DIR, target: X11_SOCKET_DIR });
   env.DISPLAY = x11.display;
   env.XDG_SESSION_TYPE = "x11";
   env.SDL_VIDEODRIVER = "x11";
@@ -2454,7 +2449,10 @@ function repeats(entries, key) {
   });
   return found;
 }
-var TAG_COMPONENT = /^[A-Za-z0-9_][A-Za-z0-9._-]*$/;
+function describe(value) {
+  return typeof value === "string" ? value : JSON.stringify(value);
+}
+var TAG_COMPONENT = /^\w[\w.-]*$/;
 function steamBuildRules(ctx) {
   const push = (message, path, suggestion) => {
     ctx.issues.push({
@@ -2509,7 +2507,7 @@ function steamBuildRules(ctx) {
     const wants = depot === "windows" ? "proton" : "xvfb";
     if (base === wants)
       return;
-    push(`a ${String(depot)} depot cannot run on the "${base}" base`, ["variants", index, "base"], depot === "windows" ? 'set base to "proton"; it is the only base with wine' : 'set base to "xvfb", or set depot to "windows" if the image should run under wine');
+    push(`a ${describe(depot)} depot cannot run on the "${base}" base`, ["variants", index, "base"], depot === "windows" ? 'set base to "proton"; it is the only base with wine' : 'set base to "xvfb", or set depot to "windows" if the image should run under wine');
   });
 }
 var steamBuildSchema = obj({
@@ -4528,7 +4526,10 @@ function refsLink(game) {
 }
 var MARK2 = "@@gamecrate@@ ";
 function extractScript(candidates, container) {
-  const quoted = candidates.map((c) => `'${join11(container, c).replaceAll("'", String.raw`'\''`)}'`);
+  const quoted = candidates.map((c) => {
+    const escaped = join11(container, c).replaceAll("'", String.raw`'\''`);
+    return `'${escaped}'`;
+  });
   return [
     `for d in ${quoted.join(" ")}; do`,
     '  set -- "$d"/*.dll',
@@ -4880,7 +4881,7 @@ async function modsAdd(args, ctx) {
   const target = await resolveTarget(args, ctx, game);
   const pins = await discover(source, gameConfig, requirePlugin(ctx.plugins, game), ctx);
   if (pins.length === 0) {
-    throw new GamecrateError(`no mod manifest at ${describe(source)}`, Exit.Resolution, `looked for ${gameConfig.manifest.file}`);
+    throw new GamecrateError(`no mod manifest at ${describe2(source)}`, Exit.Resolution, `looked for ${gameConfig.manifest.file}`);
   }
   const where = new Map;
   for (const pin of pins) {
@@ -4893,7 +4894,7 @@ async function modsAdd(args, ctx) {
     const lines = [...where.entries()].filter(([, at]) => at.length > 1);
     const rows = lines.map(([id, at]) => `  ${id}: ${at.join(", ")}`).join(`
 `);
-    throw new GamecrateError(`${twice.length} mod id(s) are declared by more than one directory in ${describe(source)}`, Exit.Config, `${rows}
+    throw new GamecrateError(`${twice.length} mod id(s) are declared by more than one directory in ${describe2(source)}`, Exit.Config, `${rows}
 pin one of them with --subdir`);
   }
   const clashes = pins.filter((pin) => existingKey(target.existing, pin.id) !== undefined);
@@ -5023,7 +5024,7 @@ async function syncWorkshop(ctx, name, pins) {
 function gitPin(url, entry) {
   return { url, ...entry.subdir === undefined ? {} : { subdir: entry.subdir } };
 }
-function describe(source) {
+function describe2(source) {
   if (source.kind === "path")
     return source.value;
   if (source.kind === "workshop")
@@ -5302,7 +5303,8 @@ function dockerRun(mounts, script) {
   ];
 }
 function shq(value) {
-  return `'${value.replaceAll("'", `'\\''`)}'`;
+  const escaped = value.replaceAll("'", String.raw`'\''`);
+  return `'${escaped}'`;
 }
 function craneArgv(mounts, ref, lines) {
   const creds = ref === null ? null : registryCreds();
@@ -5353,7 +5355,7 @@ async function runLive(argv, what) {
 }
 function lastLine(text) {
   return text.split(`
-`).map((l) => l.trim()).filter((l) => l !== "").at(-1) ?? "no output";
+`).map((l) => l.trim()).findLast((l) => l !== "") ?? "no output";
 }
 async function craneAppend(opts) {
   for (const p of opts.include) {
@@ -5537,7 +5539,7 @@ function sanitizeVersion(raw, fallback) {
 }
 function versionPrefixes(version) {
   const parts = version.split(".");
-  if (parts.length < 2 || parts.some((p) => p === ""))
+  if (parts.length < 2 || parts.includes(""))
     return [];
   return parts.slice(0, -1).map((_, i) => parts.slice(0, i + 1).join("."));
 }
@@ -5683,6 +5685,10 @@ async function download(input, opts, ctx, say) {
   }
   return (await pending).dir;
 }
+function loadOutput(stdout, stderr) {
+  return `${stdout}
+${stderr}`.trim() || "(no output)";
+}
 async function resolvedBase(base, platform) {
   if (base.includes("@sha256:"))
     return base;
@@ -5708,7 +5714,7 @@ async function readGate(ref, opts) {
     reads.push(await craneLabels(ref));
   if (opts.load)
     reads.push(await inspectLabels(ref));
-  if (reads.some((labels) => labels === null))
+  if (reads.includes(null))
     return { present: false, buildid: null };
   const ids = reads.map((labels) => labels?.["steam.buildid"] ?? null);
   return { present: reads.length > 0, buildid: ids.every((id) => id === ids[0]) ? ids[0] ?? null : null };
@@ -5726,8 +5732,7 @@ async function inspectLabels(ref) {
 async function dockerLoad(tar, ref) {
   const { code, stdout, stderr } = await capture(["docker", "load", "-i", tar]);
   if (code !== 0 || !stdout.includes(`Loaded image: ${ref}`)) {
-    throw new GamecrateError(`docker load failed for ${tar}`, Exit.Environment, `expected "Loaded image: ${ref}", got: ${`${stdout}
-${stderr}`.trim() || "(no output)"}`);
+    throw new GamecrateError(`docker load failed for ${tar}`, Exit.Environment, `expected "Loaded image: ${ref}", got: ${loadOutput(stdout, stderr)}`);
   }
 }
 async function dockerLabel(ref, labels) {
@@ -6002,7 +6007,10 @@ ${cases}
 complete -F ${fn} ${NAME}
 `;
   }
-  const zshVerbs = SUBCOMMANDS.map((s) => `    '${s.name}:${s.summary.replaceAll("'", String.raw`'\''`)}'`).join(`
+  const zshVerbs = SUBCOMMANDS.map((s) => {
+    const summary = s.summary.replaceAll("'", String.raw`'\''`);
+    return `    '${s.name}:${summary}'`;
+  }).join(`
 `);
   const zshFlags = options.map((f) => {
     const desc = f.description.replaceAll("'", String.raw`'\''`).replaceAll(/[[\]:]/g, "");
@@ -7590,7 +7598,7 @@ function published2(value) {
 }
 
 // src/index.ts
-var VERSION = "2.3.0";
+var VERSION = "2.3.1";
 async function main(argv) {
   const supervised = supervisedDir(argv);
   try {
@@ -7871,8 +7879,10 @@ async function rebuiltForUpdate(plan, config, args) {
     cwd: process.cwd(),
     configFile: await globalConfigPath(),
     ask: async (question) => {
-      if (args.yes)
-        return rebuilt = true;
+      if (args.yes) {
+        rebuilt = true;
+        return true;
+      }
       if (process.stdin.isTTY !== true || args.json) {
         warn("no terminal to ask, so the launch keeps the current image");
         return false;
@@ -8016,7 +8026,7 @@ async function copyOutLogs(plan) {
   try {
     await cp(source, target, { recursive: true, force: true });
   } catch (error) {
-    warn(`could not copy ${source}: ${describe2(error)}`);
+    warn(`could not copy ${source}: ${describe3(error)}`);
   }
 }
 async function mods(args, config, plugins, defaults) {
@@ -8491,7 +8501,7 @@ async function spawnStatus(argv, interactive = false) {
   const proc = spawnArgv(argv, [interactive ? "inherit" : "ignore", "inherit", "inherit"]);
   return exited(proc);
 }
-function describe2(error) {
+function describe3(error) {
   return error instanceof Error ? error.message : String(error);
 }
 function reportFatal(error) {
@@ -8503,7 +8513,7 @@ function reportFatal(error) {
 `);
     return error.code;
   }
-  process.stderr.write(`gamecrate: ${describe2(error)}
+  process.stderr.write(`gamecrate: ${describe3(error)}
 `);
   return Exit.GameFailed;
 }

package/dist/lib.js

@@ -242,7 +242,10 @@ function repeats(entries, key) {
   });
   return found;
 }
-var TAG_COMPONENT = /^[A-Za-z0-9_][A-Za-z0-9._-]*$/;
+function describe(value) {
+  return typeof value === "string" ? value : JSON.stringify(value);
+}
+var TAG_COMPONENT = /^\w[\w.-]*$/;
 function steamBuildRules(ctx) {
   const push = (message, path, suggestion) => {
     ctx.issues.push({
@@ -297,7 +300,7 @@ function steamBuildRules(ctx) {
     const wants = depot === "windows" ? "proton" : "xvfb";
     if (base === wants)
       return;
-    push(`a ${String(depot)} depot cannot run on the "${base}" base`, ["variants", index, "base"], depot === "windows" ? 'set base to "proton"; it is the only base with wine' : 'set base to "xvfb", or set depot to "windows" if the image should run under wine');
+    push(`a ${describe(depot)} depot cannot run on the "${base}" base`, ["variants", index, "base"], depot === "windows" ? 'set base to "proton"; it is the only base with wine' : 'set base to "xvfb", or set depot to "windows" if the image should run under wine');
   });
 }
 var steamBuildSchema = obj({

package/dist/types/launch/image.d.ts

@@ -1,6 +1,5 @@
 import type { ImageLaunch } from '../docker/spec';
-import type { ModeName, Problem } from '../types';
-import type { GameConfig } from '../types';
+import type { GameConfig, ModeName, Problem } from '../types';
 /** What an image says about itself. Every field is null for an image gamecrate did not build. */
 export interface ImageFacts {
     present: boolean;

package/dist/types/launch/updates.d.ts

@@ -1,6 +1,5 @@
 import type { ImageFacts } from './image';
-import type { ParsedArgs, RootConfig } from '../types';
-import type { UpdateCheckSpec } from '../types';
+import type { ParsedArgs, RootConfig, UpdateCheckSpec } from '../types';
 export interface CheckInput {
     facts: ImageFacts;
     spec: UpdateCheckSpec | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamecrate/cli",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Run a modded game in a container, with mods resolved from your local checkouts.",
   "license": "MIT",
   "type": "module",