@gamecrate/cli 2.2.1 → 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";
@@ -7585,7 +7590,7 @@ function published2(value) {
 }
 
 // src/index.ts
-var VERSION = "2.2.1";
+var VERSION = "2.3.0";
 async function main(argv) {
   const supervised = supervisedDir(argv);
   try {

package/package.json

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