@andersbakken/fisk 5.0.1 → 5.0.3

package/daemon/fisk-daemon.js

@@ -27,31 +27,36 @@ var os__default = /*#__PURE__*/_interopDefaultLegacy(os$1);
 var net__default = /*#__PURE__*/_interopDefaultLegacy(net);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+function __awaiter(thisArg, _arguments, P, generator) {
+  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+  return new (P || (P = Promise))(function (resolve, reject) {
+      function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+      function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+      function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+      step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
 }
 
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+  var e = new Error(message);
+  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
 const execFileAsync = require$$4.promisify(child_process.execFile);
 // Prefixes removed from a compiler's `-v` output before hashing / parsing.
 // Must match filter() in src/client/Client.cpp (lines 234-257).
@@ -3428,6 +3433,28 @@ var output = {
 
 var fs = libExports;
 
+// systemd socket activation: the first passed fd is at SD_LISTEN_FDS_START (3).
+// See sd_listen_fds(3). When LISTEN_PID matches our pid and LISTEN_FDS >= 1,
+// listen on the inherited fd instead of creating a new socket. This lets
+// systemd own the socket file, so its inode survives daemon restarts and any
+// bind-mount of the socket (e.g. docker -v /tmp/fisk.socket:/tmp/fisk.socket)
+// keeps working across upgrades.
+const SD_LISTEN_FDS_START = 3;
+function systemdListenFd() {
+    const pid = process.env.LISTEN_PID;
+    const fds = process.env.LISTEN_FDS;
+    if (!pid || !fds) {
+        return undefined;
+    }
+    if (parseInt(pid, 10) !== process.pid) {
+        return undefined;
+    }
+    const count = parseInt(fds, 10);
+    if (!count || count < 1) {
+        return undefined;
+    }
+    return SD_LISTEN_FDS_START;
+}
 class Server extends EventEmitter__default["default"] {
     constructor(option, common) {
         super();
@@ -3438,6 +3465,7 @@ class Server extends EventEmitter__default["default"] {
         this.option = option;
         this._connections = {};
         this._connectionId = 0;
+        this._activated = false;
     }
     close() {
         if (this.debug) {
@@ -3446,14 +3474,44 @@ class Server extends EventEmitter__default["default"] {
         if (this.server) {
             this.server.close();
         }
-        try {
-            fs.unlinkSync(this.file);
-        }
-        catch (err) {
-            /* */
+        // When socket-activated, systemd owns the socket file. Do not unlink
+        // it -- that would break the bind-mount contract for existing clients.
+        if (!this._activated) {
+            try {
+                fs.unlinkSync(this.file);
+            }
+            catch (err) {
+                /* */
+            }
         }
     }
     listen() {
+        const inheritedFd = systemdListenFd();
+        if (inheritedFd !== undefined) {
+            this._activated = true;
+            if (this.debug) {
+                console.log("Server::listen using systemd-activated fd", inheritedFd);
+            }
+            return new Promise((resolve) => {
+                let connected = false;
+                this.server = net__default["default"].createServer(this._onConnection.bind(this));
+                this.server.listen({ fd: inheritedFd }, () => {
+                    connected = true;
+                    resolve();
+                });
+                this.server.on("error", (err) => {
+                    if (!connected) {
+                        console.error("Got server error", err);
+                        setTimeout(this.listen.bind(this), 1000);
+                    }
+                });
+                this.server.on("close", () => {
+                    if (!connected) {
+                        setTimeout(this.listen.bind(this), 1000);
+                    }
+                });
+            });
+        }
         try {
             fs.unlinkSync(this.file); // this should be more
             // complicated with attempts to

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@andersbakken/fisk",
-    "version": "5.0.1",
+    "version": "5.0.3",
     "description": "Fisk, a distributed compile system",
     "scripts": {
         "lint": "eslint . --ext .ts",
@@ -33,7 +33,7 @@
     ],
     "dependencies": {
         "@andersbakken/blessed": "^0.1.82",
-        "@andersbakken/fisk-native": "^24.0.0",
+        "@andersbakken/fisk-native": "^25.0.0",
         "@jhanssen/options": "^10.0.0",
         "axios": "^0.21.1",
         "bufferutil": "^4.0.7",