Merge pull request #209 from cachix/socket-fallback

sandydoo · web-flow · commit 74ef2c6e523a · 2026-01-23T17:39:40.000+01:00
daemon: fall back to os.tmpdir if the socket path is too long
diff --git a/dist/index.js b/dist/index.js
@@ -28978,13 +28978,28 @@ async function setup() {
     const tmpdir = process.env["RUNNER_TEMP"] ?? os.tmpdir();
     switch (pushMode) {
         case PushMode.Daemon: {
-            const daemonDir = await fs.mkdtemp(path.join(tmpdir, "cachix-daemon-"));
+            const daemonDirPrefix = "cachix";
+            const socketName = "daemon.sock";
+            let daemonDir = await fs.mkdtemp(path.join(tmpdir, daemonDirPrefix));
+            let socketPath = path.join(daemonDir, socketName);
+            // Unix socket paths are limited to:
+            //   108 characters on Linux
+            //   104 characters on BSD/macOS
+            // If the path is too long, recreate in os.tmpdir() instead.
+            const maxSocketPathLen = os.platform() === "linux" ? 108 : 104;
+            if (socketPath.length > maxSocketPathLen) {
+                const oldSocketPath = socketPath;
+                await fs.rm(daemonDir, { recursive: true });
+                daemonDir = await fs.mkdtemp(path.join(os.tmpdir(), daemonDirPrefix));
+                socketPath = path.join(daemonDir, socketName);
+                core.warning(`Socket path too long (${oldSocketPath.length} > ${maxSocketPathLen} chars), using shorter path: ${oldSocketPath} -> ${socketPath}`);
+            }
             const daemonLog = (0, node_fs_1.openSync)(`${daemonDir}/daemon.log`, "a");
             const daemon = (0, node_child_process_1.spawn)(cachixBin, [
                 "daemon",
                 "run",
                 "--socket",
-                `${daemonDir}/daemon.sock`,
+                socketPath,
                 name,
                 ...splitArgs(cachixArgs),
             ], {
@@ -29080,6 +29095,7 @@ async function upload() {
                 // Wait a bit for the logs to flush through
                 await waitFor(1000);
                 daemonLog.unwatch();
+                await fs.rm(daemonDir, { recursive: true });
             }
             break;
         }
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -145,7 +145,26 @@ async function setup() {
 
   switch (pushMode) {
     case PushMode.Daemon: {
-      const daemonDir = await fs.mkdtemp(path.join(tmpdir, "cachix-daemon-"));
+      const daemonDirPrefix = "cachix";
+      const socketName = "daemon.sock";
+      let daemonDir = await fs.mkdtemp(path.join(tmpdir, daemonDirPrefix));
+      let socketPath = path.join(daemonDir, socketName);
+
+      // Unix socket paths are limited to:
+      //   108 characters on Linux
+      //   104 characters on BSD/macOS
+      // If the path is too long, recreate in os.tmpdir() instead.
+      const maxSocketPathLen = os.platform() === "linux" ? 108 : 104;
+      if (socketPath.length > maxSocketPathLen) {
+        const oldSocketPath = socketPath;
+        await fs.rm(daemonDir, { recursive: true });
+        daemonDir = await fs.mkdtemp(path.join(os.tmpdir(), daemonDirPrefix));
+        socketPath = path.join(daemonDir, socketName);
+        core.warning(
+          `Socket path too long (${oldSocketPath.length} > ${maxSocketPathLen} chars), using shorter path: ${oldSocketPath} -> ${socketPath}`,
+        );
+      }
+
       const daemonLog = openSync(`${daemonDir}/daemon.log`, "a");
 
       const daemon = spawn(
@@ -154,7 +173,7 @@ async function setup() {
           "daemon",
           "run",
           "--socket",
-          `${daemonDir}/daemon.sock`,
+          socketPath,
           name,
           ...splitArgs(cachixArgs),
         ],
@@ -276,6 +295,7 @@ async function upload() {
         // Wait a bit for the logs to flush through
         await waitFor(1000);
         daemonLog.unwatch();
+        await fs.rm(daemonDir, { recursive: true });
       }
 
       break;
