@gamecrate/cli 2.4.0 → 2.5.0

package/dist/gamecrate.js

@@ -2,7 +2,7 @@
 
 // src/index.ts
 import { existsSync as existsSync16 } from "node:fs";
-import { chown, cp, mkdir as mkdir7, readdir as readdir12, readFile as readFile13, rm as rm6, rmdir, stat as stat6, writeFile as writeFile7 } from "node:fs/promises";
+import { chown, cp, mkdir as mkdir7, readdir as readdir12, readFile as readFile14, rm as rm6, rmdir, stat as stat6, writeFile as writeFile7 } from "node:fs/promises";
 import { homedir as homedir7 } from "node:os";
 import { basename as basename11, dirname as dirname14, join as join28 } from "node:path";
 import { setTimeout as sleep8 } from "node:timers/promises";
@@ -1038,7 +1038,7 @@ function requireGame(args, config) {
 
 // src/image/refs.ts
 import { existsSync as existsSync8, readlinkSync } from "node:fs";
-import { mkdir as mkdir3, readdir as readdir7, rename, rm as rm3, symlink, unlink as unlink3 } from "node:fs/promises";
+import { mkdir as mkdir3, readFile as readFile6, readdir as readdir7, rename, rm as rm3, symlink, unlink as unlink3 } from "node:fs/promises";
 import { dirname as dirname6, join as join11 } from "node:path";
 
 // src/cli/output.ts
@@ -4558,8 +4558,24 @@ function byPath(index, raw, game) {
 function refsRoot() {
   return join11(cacheDir(), "refs");
 }
-function refsLink(game) {
-  return join11(refsRoot(), "current", game);
+function refsLink(game, version) {
+  if (version === undefined)
+    return join11(refsRoot(), "current", game);
+  return join11(refsRoot(), "version", game, version);
+}
+async function readVersion(dir) {
+  const text = await readFile6(join11(dir, "Version.txt"), "utf8").catch(() => {
+    return;
+  });
+  const hit = text === undefined ? null : /^(\d+\.\d+)/.exec(text.trim());
+  return hit === null ? undefined : hit[1];
+}
+async function pointBoth(game, dir) {
+  const version = await readVersion(dir);
+  const link = await point(refsLink(game), dir);
+  if (version !== undefined)
+    await point(refsLink(game, version), dir);
+  return { link, version };
 }
 function currentRefs(game) {
   try {
@@ -4581,6 +4597,7 @@ function extractScript(candidates, container) {
     '  [ -f "$1" ] || continue',
     `  echo "${MARK2}$d"`,
     '  cp "$@" /out/',
+    `  cp '${join11(container, "Version.txt")}' /out/ 2>/dev/null || true`,
     "  exit 0",
     "done",
     "exit 3"
@@ -4598,9 +4615,8 @@ async function extractRefs(game, config) {
     throw new GamecrateError(`${ref} is not present, so ${game} has no assemblies to extract`, Exit.Environment, `gamecrate steam build ${game}, or docker pull ${ref}`);
   }
   const dir = join11(refsRoot(), digest.replace(/[^A-Za-z0-9]/g, "-"));
-  const link = refsLink(game);
   if (existsSync8(dir)) {
-    return { dir, link: await point(link, dir), digest, source: "(cached)", count: await dllCount(dir) };
+    return { dir, ...await pointBoth(game, dir), digest, source: "(cached)", count: await dllCount(dir) };
   }
   const partial = `${dir}.partial`;
   await rm3(partial, { recursive: true, force: true });
@@ -4632,7 +4648,7 @@ async function extractRefs(game, config) {
     throw new GamecrateError(`${ref} reported assemblies at ${source} but none arrived`, Exit.Environment, "the copy ran inside the image; check /out was writable by the calling uid");
   }
   await rename(partial, dir);
-  return { dir, link: await point(link, dir), digest, source, count };
+  return { dir, ...await pointBoth(game, dir), digest, source, count };
 }
 async function dllCount(dir) {
   const entries = await readdir7(dir).catch(() => []);
@@ -4720,11 +4736,11 @@ function profileRows(profile, spec, width, notes) {
 
 // src/cli/mods.ts
 import { existsSync as existsSync9 } from "node:fs";
-import { mkdir as mkdir4, readFile as readFile8, readdir as readdir8, writeFile as writeFile4 } from "node:fs/promises";
+import { mkdir as mkdir4, readFile as readFile9, readdir as readdir8, writeFile as writeFile4 } from "node:fs/promises";
 import { dirname as dirname9, join as join14, relative as relative3, resolve as resolve6 } from "node:path";
 
 // src/config/write.ts
-import { chmod, readFile as readFile6, realpath, rename as rename2, stat as stat3, writeFile as writeFile3 } from "node:fs/promises";
+import { chmod, readFile as readFile7, realpath, rename as rename2, stat as stat3, writeFile as writeFile3 } from "node:fs/promises";
 import { dirname as dirname7, extname as extname2, join as join12 } from "node:path";
 import { applyEdits, modify } from "jsonc-parser";
 import { isMap as isMap2, parseDocument as parseDocument2 } from "yaml";
@@ -4747,7 +4763,7 @@ async function writeConfig(file, edits) {
     return;
   const yaml = isYaml2(file);
   const target = await realpath(file);
-  const before = await readFile6(target, "utf8");
+  const before = await readFile7(target, "utf8");
   const after = yaml ? editYaml(before, edits) : editJson(before, edits);
   const mode = (await stat3(target)).mode & 511;
   const temp = join12(dirname7(target), `.gamecrate-write-${process.pid}.tmp`);
@@ -4789,7 +4805,7 @@ function editYaml(text, edits) {
 }
 
 // src/mods/workshopapi.ts
-import { readFile as readFile7, stat as stat4 } from "node:fs/promises";
+import { readFile as readFile8, stat as stat4 } from "node:fs/promises";
 import { basename as basename5, dirname as dirname8, join as join13 } from "node:path";
 var ENDPOINT = "https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1/";
 var CHUNK = 100;
@@ -4903,7 +4919,7 @@ async function exists(dir) {
 }
 async function readText(path) {
   try {
-    return await readFile7(path, "utf8");
+    return await readFile8(path, "utf8");
   } catch {
     return "";
   }
@@ -5200,7 +5216,7 @@ async function walk2(root, manifestFile, plugin) {
   return out;
 }
 async function readId(dir, manifestFile, plugin) {
-  const text = await readFile8(join14(dir, manifestFile), "utf8").catch(() => {
+  const text = await readFile9(join14(dir, manifestFile), "utf8").catch(() => {
     return;
   });
   if (text === undefined)
@@ -5235,7 +5251,7 @@ import { createInterface } from "node:readline/promises";
 
 // src/image/build.ts
 import { mkdirSync as mkdirSync4, mkdtempSync, rmSync as rmSync3, writeFileSync as writeFileSync2 } from "node:fs";
-import { readFile as readFile9 } from "node:fs/promises";
+import { readFile as readFile10 } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join as join17 } from "node:path";
 
@@ -5673,7 +5689,7 @@ async function cell(input, opts, ctx) {
   }
   try {
     const dir = await download(input, opts, ctx, say);
-    const raw = await readFile9(join17(dir, input.versionFile), "utf8");
+    const raw = await readFile10(join17(dir, input.versionFile), "utf8");
     const version = sanitizeVersion(raw, ctx.published ?? "unknown");
     const tags = tagsFor({ ...tagInput, version });
     const layers = join17(steamHome(opts.config.dataRoot), "layers");
@@ -6720,7 +6736,7 @@ function parseAtoms(stdout) {
 }
 
 // src/launch/generate.ts
-import { mkdir as mkdir5, readdir as readdir9, readFile as readFile10, writeFile as writeFile5 } from "node:fs/promises";
+import { mkdir as mkdir5, readdir as readdir9, readFile as readFile11, writeFile as writeFile5 } from "node:fs/promises";
 import { dirname as dirname12, join as join20 } from "node:path";
 async function readInstallVersion(game, plugin) {
   const raw = await installVersionText(game);
@@ -6737,7 +6753,7 @@ async function installVersionText(game) {
   if (host === undefined)
     return null;
   try {
-    return await readFile10(join20(expandHome(host), game.version.file), "utf8");
+    return await readFile11(join20(expandHome(host), game.version.file), "utf8");
   } catch {
     return null;
   }
@@ -6762,7 +6778,7 @@ async function readKnownExpansions(game, plugin, warnings) {
       continue;
     let id = null;
     try {
-      id = plugin.parseManifest(await readFile10(join20(dataDir, entry.name, game.manifest.file), "utf8"))?.packageId ?? null;
+      id = plugin.parseManifest(await readFile11(join20(dataDir, entry.name, game.manifest.file), "utf8"))?.packageId ?? null;
     } catch {
       continue;
     }
@@ -6833,7 +6849,7 @@ async function mergePrefs(plan) {
   await mkdir5(dirname12(target), { recursive: true });
   let existing = null;
   try {
-    existing = await readFile10(target, "utf8");
+    existing = await readFile11(target, "utf8");
   } catch (error) {
     if (error.code !== "ENOENT")
       throw error;
@@ -6922,7 +6938,7 @@ async function offerRebuild(input) {
 
 // src/launch/supervisor.ts
 import { existsSync as existsSync14 } from "node:fs";
-import { readFile as readFile11, readlink, rm as rm4, writeFile as writeFile6 } from "node:fs/promises";
+import { readFile as readFile12, readlink, rm as rm4, writeFile as writeFile6 } from "node:fs/promises";
 import { basename as basename8, join as join22 } from "node:path";
 import { setTimeout as sleep7 } from "node:timers/promises";
 async function forkSupervisor(plan, argv) {
@@ -6989,7 +7005,7 @@ async function writeExit(instanceDir, record) {
 `);
 }
 async function lastExit(instanceDir) {
-  const text = await readFile11(join22(instanceDir, ".gamecrate", "last-exit.json"), "utf8").catch(() => {
+  const text = await readFile12(join22(instanceDir, ".gamecrate", "last-exit.json"), "utf8").catch(() => {
     return;
   });
   if (text === undefined)
@@ -7650,7 +7666,7 @@ async function detectForeignOwnership(dir, uid, limit = 100) {
 
 // src/mods/workshop.ts
 import { existsSync as existsSync15 } from "node:fs";
-import { readFile as readFile12 } from "node:fs/promises";
+import { readFile as readFile13 } from "node:fs/promises";
 import { join as join27, resolve as resolvePath2 } from "node:path";
 var ROUNDS = 5;
 async function prepareWorkshop(game, profileName, args, config, allowFetch, plugin, sources) {
@@ -7713,7 +7729,7 @@ async function manifestAt(dir, game, plugin, problems) {
   if (!existsSync15(file))
     return null;
   try {
-    return plugin.parseManifest(await readFile12(file, "utf8"));
+    return plugin.parseManifest(await readFile13(file, "utf8"));
   } catch (error) {
     problems.push({ where: file, message: error instanceof Error ? error.message : String(error) });
     return null;
@@ -7785,7 +7801,7 @@ function published2(value) {
 }
 
 // src/index.ts
-var VERSION = "2.4.0";
+var VERSION = "2.5.0";
 async function main(argv) {
   const supervised = supervisedDir(argv);
   try {
@@ -8365,7 +8381,7 @@ async function logs(args, config, defaults) {
   }
   status(runDir);
   for (const name of files) {
-    const text = await readFile13(join28(runDir, name), "utf8").catch(() => "");
+    const text = await readFile14(join28(runDir, name), "utf8").catch(() => "");
     for (const line of text.split(`
 `)) {
       if (line.length > 0)

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

@@ -8,9 +8,13 @@ export interface ManagedRefs {
     digest: string;
     /** Container path they were found at. */
     source: string;
+    /** `1.6` from the game's own Version.txt, absent when the image does not ship one. */
+    version?: string;
     count: number;
 }
-export declare function refsLink(game: string): string;
+export declare function refsLink(game: string, version?: string): string;
+/** `1.6.4633 rev1254` in the file, `1.6` as the folder a mod builds into. */
+export declare function readVersion(dir: string): Promise<string | undefined>;
 /** What `current` points at, for a failure message. A build that broke on the wrong game
  * generation says nothing about refs on its own. */
 export declare function currentRefs(game: string): string | undefined;

package/package.json

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