@andersbakken/fisk 4.0.23 → 4.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@andersbakken/fisk",
-    "version": "4.0.23",
+    "version": "4.0.25",
     "description": "Fisk, a distributed compile system",
     "scripts": {
         "lint": "eslint . --ext .ts",

package/scheduler/fisk-scheduler.js

@@ -54243,6 +54243,7 @@ server.on("listen", (app) => {
         setTimeout(() => process.exit(), 100);
     });
     app.post("/builder-command", (req, res) => {
+        console.log("Got builder command", req.body);
         if (!req.body || !req.body.builder || !req.body.command) {
             res.sendStatus(404);
             return;
@@ -54259,21 +54260,26 @@ server.on("listen", (app) => {
             }
         }
         if (!found) {
+            console.log("Didn't find builder", req.body);
             res.sendStatus(404);
             return;
         }
         let timedOut = false;
         const id = ++nextCommandId;
-        found.send({ type: "command", command: req.body.command, id });
+        const cmd = { type: "command", command: req.body.command, id };
+        console.log("Sending command to builder", found.ip, found.name, cmd);
+        found.send(cmd);
         const onCommand = (message) => {
-            if (timedOut || !found) {
+            assert__default["default"](found);
+            if (timedOut) {
+                console.log("Timed out already");
                 return;
             }
             console.log("Got message from builder", found.ip, found.name, "\n", message);
             if (message && typeof message === "object") {
                 const msg = message;
                 if (msg.id === id) {
-                    found.off("command", onCommand);
+                    found.removeListener("command", onCommand);
                     clearTimeout(timeOut);
                     if (req.body.json) {
                         res.send(JSON.stringify(message, null, 4));
@@ -54287,11 +54293,11 @@ ${msg.stdout ? "stdout:\n" + msg.stdout + "\n" : ""}${msg.stderr ? "stderr:\n" +
                 }
             }
         };
-        found.on("command", onCommand);
+        found.addListener("command", onCommand);
         const timeOut = setTimeout(() => {
             timedOut = true;
             if (found) {
-                found.off("command", onCommand);
+                found.removeListener("command", onCommand);
             }
             res.sendStatus(408);
         }, parseInt(req.body.timeout) || 30000);