@andersbakken/fisk 4.0.49 → 4.0.52

package/builder/fisk-builder.js

@@ -7626,6 +7626,10 @@ class ObjectCache extends EventEmitter__default["default"] {
         this.purge(0);
     }
     add(response, contents) {
+        if (!response.sha1) {
+            console.error("Cannot add to cache without valid sha1", response);
+            return;
+        }
         if (response.sha1 in this.pending) {
             console.log("Already writing this, I suppose this is possible", response);
             return;
@@ -51219,6 +51223,11 @@ class Server extends EventEmitter__default["default"] {
                 if (Array.isArray(builderIp)) {
                     builderIp = String(builderIp);
                 }
+                const sha1 = req.headers["x-fisk-sha1"];
+                if (Array.isArray(sha1)) {
+                    error("Bad sha1 header [" + sha1.join(", ") + "]");
+                    return;
+                }
                 client = new Job({
                     builderIp,
                     hash,
@@ -51227,7 +51236,7 @@ class Server extends EventEmitter__default["default"] {
                     ip,
                     name,
                     priority: parseInt(String(req.headers["x-fisk-priority"])),
-                    sha1: String(req.headers["x-fisk-sha1"]),
+                    sha1,
                     sourceFile: String(req.headers["x-fisk-sourcefile"]),
                     user: String(req.headers["x-fisk-user"]),
                     supportsCompressedResponse: req.headers["x-fisk-supports-compressed-response"] === "true",
@@ -55266,7 +55275,7 @@ function getFromCache(job, cb) {
     // console.log("got job", job.sha1, objectCache ? objectCache.state(job.sha1) : false);
     // if (objectCache)
     //     console.log("objectCache", job.sha1, objectCache.state(job.sha1), objectCache.keys);
-    if (!objectCache || objectCache.state(job.sha1) !== "exists") {
+    if (!objectCache || !job.sha1 || objectCache.state(job.sha1) !== "exists") {
         return false;
     }
     const file = path__default["default"].join(objectCache.dir, job.sha1);
@@ -55305,7 +55314,9 @@ function getFromCache(job, cb) {
                     fs$3.closeSync(fd);
                 }
                 if (err) {
-                    objectCache === null || objectCache === void 0 ? void 0 : objectCache.remove(job.sha1);
+                    if (job.sha1) {
+                        objectCache === null || objectCache === void 0 ? void 0 : objectCache.remove(job.sha1);
+                    }
                     job.close();
                 }
                 else {

package/package.json

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