@andersbakken/fisk 4.0.43 → 4.0.45

package/builder/fisk-builder.js

@@ -14,8 +14,8 @@ var path$k = require('path');
 var os$1 = require('os');
 var require$$0$4 = require('stream');
 var assert$1 = require('assert');
+var util$2 = require('util');
 var require$$0$7 = require('constants');
-var require$$4$2 = require('util');
 var require$$0$8 = require('tty');
 var require$$0$9 = require('buffer');
 var require$$1$3 = require('string_decoder');
@@ -38,8 +38,8 @@ var path__default = /*#__PURE__*/_interopDefaultLegacy(path$k);
 var os__default = /*#__PURE__*/_interopDefaultLegacy(os$1);
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0$4);
 var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert$1);
+var util__default = /*#__PURE__*/_interopDefaultLegacy(util$2);
 var require$$0__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$0$7);
-var require$$4__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$4$2);
 var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
 var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$9);
 var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
@@ -4205,7 +4205,8 @@ class Client extends EventEmitter__default["default"] {
             this.emit("objectCache", res.headers["x-fisk-object-cache"] === "true");
         });
         this.ws.on("message", (msg) => {
-            const error = (err) => {
+            const error = (...args) => {
+                const err = util__default["default"].format(...args);
                 if (this.ws) {
                     this.ws.send(`{"error": "${err}"}`);
                     this.ws.close();
@@ -4232,7 +4233,7 @@ class Client extends EventEmitter__default["default"] {
                         return;
                     }
                     if (!json.type) {
-                        error("Bad message, no type");
+                        error("Bad message, no type", json);
                         return;
                     }
                     console.log("got message from scheduler", json.type);
@@ -4866,7 +4867,7 @@ var polyfills = polyfills$1;
 var legacy = legacyStreams;
 var clone = clone_1;
 
-var util$1 = require$$4__default$1["default"];
+var util$1 = util__default["default"];
 
 /* istanbul ignore next - node 0.x polyfill */
 var gracefulQueue;
@@ -10722,7 +10723,7 @@ function requireNode () {
 	hasRequiredNode = 1;
 	(function (module, exports) {
 		var tty = require$$0__default$4["default"];
-		var util = require$$4__default$1["default"];
+		var util = util__default["default"];
 
 		/**
 		 * This is the Node.js implementation of `debug()`.
@@ -35921,7 +35922,7 @@ var callBound$1 = function callBoundIntrinsic(name, allowMissing) {
 	return intrinsic;
 };
 
-var util_inspect = require$$4__default$1["default"].inspect;
+var util_inspect = util__default["default"].inspect;
 
 var hasMap = typeof Map === 'function' && Map.prototype;
 var mapSizeDescriptor = Object.getOwnPropertyDescriptor && hasMap ? Object.getOwnPropertyDescriptor(Map.prototype, 'size') : null;
@@ -44274,7 +44275,7 @@ var parseRange$1 = rangeParser_1;
 var path$1 = path__default["default"];
 var statuses$1 = statuses$3;
 var Stream = require$$0__default["default"];
-var util = require$$4__default$1["default"];
+var util = util__default["default"];
 
 /**
  * Path function references.
@@ -51482,7 +51483,8 @@ class VM extends EventEmitter__default["default"] {
     }
 }
 
-const Version = 6;
+const Version = 5;
+const ObjectCacheFormatVersion = 1;
 function cacheDir(option) {
     let dir = option("cache-dir");
     if (!dir) {
@@ -51513,11 +51515,36 @@ function validateCache(option) {
     buf.writeUInt32BE(Version);
     fs$3.writeFileSync(file, buf);
 }
+function validateObjectCache(option) {
+    const dir = cacheDir(option);
+    const objectCacheDir = option.string("object-cache-dir") || path__default["default"].join(dir, "objectcache");
+    const file = path__default["default"].join(objectCacheDir, "version");
+    let version;
+    try {
+        version = fs$3.readFileSync(file);
+        if (version.readUInt32BE() === ObjectCacheFormatVersion) {
+            return;
+        }
+    }
+    catch (err) {
+        /* */
+    }
+    if (version) {
+        console.log(`Wrong object cache version. Destroying object cache ${objectCacheDir}`);
+    }
+    fs$3.removeSync(objectCacheDir);
+    fs$3.mkdirpSync(objectCacheDir);
+    const buf = Buffer.allocUnsafe(4);
+    buf.writeUInt32BE(ObjectCacheFormatVersion);
+    fs$3.writeFileSync(file, buf);
+}
 function common$1(option) {
     validateCache(option);
+    validateObjectCache(option);
     return {
         cacheDir: cacheDir.bind(undefined, option),
-        Version
+        Version,
+        ObjectCacheFormatVersion
     };
 }
 

package/daemon/fisk-daemon.js

@@ -7,10 +7,10 @@ var require$$0 = require('constants');
 var require$$0$1 = require('stream');
 var require$$4 = require('util');
 var assert$1 = require('assert');
-var require$$1$1 = require('path');
+var path$h = require('path');
 var os$1 = require('os');
 var net = require('net');
-var require$$1$2 = require('module');
+var require$$1$1 = require('module');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -20,10 +20,10 @@ var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
 var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert$1);
-var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
+var path__default = /*#__PURE__*/_interopDefaultLegacy(path$h);
 var os__default = /*#__PURE__*/_interopDefaultLegacy(os$1);
 var net__default = /*#__PURE__*/_interopDefaultLegacy(net);
-var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
+var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 
 const Constants = {
     // client codes
@@ -1332,7 +1332,7 @@ function retry () {
 	};
 } (fs$j));
 
-const path$g = require$$1__default$1["default"];
+const path$g = path__default["default"];
 
 // get drive on windows
 function getRootPath (p) {
@@ -1357,7 +1357,7 @@ var win32 = {
 };
 
 const fs$h = gracefulFs;
-const path$f = require$$1__default$1["default"];
+const path$f = path__default["default"];
 const invalidWin32Path$1 = win32.invalidWin32Path;
 
 const o777$1 = parseInt('0777', 8);
@@ -1419,7 +1419,7 @@ function mkdirs$2 (p, opts, callback, made) {
 var mkdirs_1$1 = mkdirs$2;
 
 const fs$g = gracefulFs;
-const path$e = require$$1__default$1["default"];
+const path$e = path__default["default"];
 const invalidWin32Path = win32.invalidWin32Path;
 
 const o777 = parseInt('0777', 8);
@@ -1487,7 +1487,7 @@ var mkdirs_1 = {
 
 const fs$f = gracefulFs;
 const os = os__default["default"];
-const path$d = require$$1__default$1["default"];
+const path$d = path__default["default"];
 
 // HFS, ext{2,3}, FAT do not, Node.js v0.10 does not
 function hasMillisResSync () {
@@ -1576,7 +1576,7 @@ var buffer$1 = function (size) {
 };
 
 const fs$e = gracefulFs;
-const path$c = require$$1__default$1["default"];
+const path$c = path__default["default"];
 const mkdirpSync$1 = mkdirs_1.mkdirsSync;
 const utimesSync = utimes$1.utimesMillisSync;
 
@@ -1810,7 +1810,7 @@ var pathExists_1 = {
 };
 
 const fs$c = gracefulFs;
-const path$b = require$$1__default$1["default"];
+const path$b = path__default["default"];
 const mkdirp$1 = mkdirs_1.mkdirs;
 const pathExists$7 = pathExists_1.pathExists;
 const utimes = utimes$1.utimesMillis;
@@ -2090,7 +2090,7 @@ var copy$1 = {
 };
 
 const fs$b = gracefulFs;
-const path$a = require$$1__default$1["default"];
+const path$a = path__default["default"];
 const assert = assert__default["default"];
 
 const isWindows = (process.platform === 'win32');
@@ -2412,7 +2412,7 @@ var remove$2 = {
 
 const u$7 = universalify.fromCallback;
 const fs$a = require$$1__default["default"];
-const path$9 = require$$1__default$1["default"];
+const path$9 = path__default["default"];
 const mkdir$5 = mkdirs_1;
 const remove$1 = remove$2;
 
@@ -2458,7 +2458,7 @@ var empty = {
 };
 
 const u$6 = universalify.fromCallback;
-const path$8 = require$$1__default$1["default"];
+const path$8 = path__default["default"];
 const fs$9 = gracefulFs;
 const mkdir$4 = mkdirs_1;
 const pathExists$6 = pathExists_1.pathExists;
@@ -2506,7 +2506,7 @@ var file$1 = {
 };
 
 const u$5 = universalify.fromCallback;
-const path$7 = require$$1__default$1["default"];
+const path$7 = path__default["default"];
 const fs$8 = gracefulFs;
 const mkdir$3 = mkdirs_1;
 const pathExists$5 = pathExists_1.pathExists;
@@ -2565,7 +2565,7 @@ var link$1 = {
   createLinkSync
 };
 
-const path$6 = require$$1__default$1["default"];
+const path$6 = path__default["default"];
 const fs$7 = gracefulFs;
 const pathExists$4 = pathExists_1.pathExists;
 
@@ -2694,7 +2694,7 @@ var symlinkType_1 = {
 };
 
 const u$4 = universalify.fromCallback;
-const path$5 = require$$1__default$1["default"];
+const path$5 = path__default["default"];
 const fs$5 = gracefulFs;
 const _mkdirs = mkdirs_1;
 const mkdirs = _mkdirs.mkdirs;
@@ -2923,7 +2923,7 @@ var jsonfile = {
   writeJsonSync: jsonFile$3.writeFileSync
 };
 
-const path$4 = require$$1__default$1["default"];
+const path$4 = path__default["default"];
 const mkdir$2 = mkdirs_1;
 const pathExists$2 = pathExists_1.pathExists;
 const jsonFile$2 = jsonfile;
@@ -2950,7 +2950,7 @@ function outputJson (file, data, options, callback) {
 var outputJson_1 = outputJson;
 
 const fs$4 = gracefulFs;
-const path$3 = require$$1__default$1["default"];
+const path$3 = path__default["default"];
 const mkdir$1 = mkdirs_1;
 const jsonFile$1 = jsonfile;
 
@@ -2982,7 +2982,7 @@ jsonFile.readJSONSync = jsonFile.readJsonSync;
 var json = jsonFile;
 
 const fs$3 = gracefulFs;
-const path$2 = require$$1__default$1["default"];
+const path$2 = path__default["default"];
 const copySync = copySync$1.copySync;
 const removeSync = remove$2.removeSync;
 const mkdirpSync = mkdirs_1.mkdirsSync;
@@ -3099,7 +3099,7 @@ var moveSync_1 = {
 
 const u$1 = universalify.fromCallback;
 const fs$2 = gracefulFs;
-const path$1 = require$$1__default$1["default"];
+const path$1 = path__default["default"];
 const copy = copy$1.copy;
 const remove = remove$2.remove;
 const mkdirp = mkdirs_1.mkdirp;
@@ -3180,7 +3180,7 @@ var move_1 = {
 
 const u = universalify.fromCallback;
 const fs$1 = gracefulFs;
-const path = require$$1__default$1["default"];
+const path = path__default["default"];
 const mkdir = mkdirs_1;
 const pathExists = pathExists_1.pathExists;
 
@@ -3254,7 +3254,7 @@ class Server extends EventEmitter__default["default"] {
         super();
         this.option = option;
         this.debug = option("debug");
-        this.file = option("socket", require$$1__default$1["default"].join(common.cacheDir(), "socket"));
+        this.file = option("socket", path__default["default"].join(common.cacheDir(), "socket"));
         this.server = undefined;
         this.option = option;
         this._connections = {};
@@ -3384,17 +3384,18 @@ class Slots extends EventEmitter__default["default"] {
     }
 }
 
-const Version = 6;
+const Version = 5;
+const ObjectCacheFormatVersion = 1;
 function cacheDir(option) {
     let dir = option("cache-dir");
     if (!dir) {
-        dir = require$$1__default$1["default"].join(os__default["default"].homedir(), ".cache", "fisk", require$$1__default$1["default"].basename(option.prefix || ""));
+        dir = path__default["default"].join(os__default["default"].homedir(), ".cache", "fisk", path__default["default"].basename(option.prefix || ""));
     }
     return dir;
 }
 function validateCache(option) {
     const dir = cacheDir(option);
-    const file = require$$1__default$1["default"].join(dir, "version");
+    const file = path__default["default"].join(dir, "version");
     // console.log(dir);
     let version;
     try {
@@ -3415,11 +3416,36 @@ function validateCache(option) {
     buf.writeUInt32BE(Version);
     fs.writeFileSync(file, buf);
 }
+function validateObjectCache(option) {
+    const dir = cacheDir(option);
+    const objectCacheDir = option.string("object-cache-dir") || path__default["default"].join(dir, "objectcache");
+    const file = path__default["default"].join(objectCacheDir, "version");
+    let version;
+    try {
+        version = fs.readFileSync(file);
+        if (version.readUInt32BE() === ObjectCacheFormatVersion) {
+            return;
+        }
+    }
+    catch (err) {
+        /* */
+    }
+    if (version) {
+        console.log(`Wrong object cache version. Destroying object cache ${objectCacheDir}`);
+    }
+    fs.removeSync(objectCacheDir);
+    fs.mkdirpSync(objectCacheDir);
+    const buf = Buffer.allocUnsafe(4);
+    buf.writeUInt32BE(ObjectCacheFormatVersion);
+    fs.writeFileSync(file, buf);
+}
 function common$1(option) {
     validateCache(option);
+    validateObjectCache(option);
     return {
         cacheDir: cacheDir.bind(undefined, option),
-        Version
+        Version,
+        ObjectCacheFormatVersion
     };
 }
 
@@ -3431,10 +3457,10 @@ function requireResolve () {
 	hasRequiredResolve = 1;
 
 	// Dependencies
-	var path = require$$1__default$1["default"];
+	var path = path__default["default"];
 
 	// Load global paths
-	var globalPaths = require$$1__default$2["default"].globalPaths;
+	var globalPaths = require$$1__default$1["default"].globalPaths;
 
 	// Guess at NPM's global install dir
 	var npmGlobalPrefix;
@@ -3524,7 +3550,7 @@ function requireResolve () {
 }
 
 var appRootPath$1 = function(dirname) {
-	var path = require$$1__default$1["default"];
+	var path = path__default["default"];
 	var resolve = requireResolve();
 	var appRootPath = resolve(dirname);
 
@@ -3559,7 +3585,7 @@ var xdgBasedir = {};
 
 (function (exports) {
 	const os = os__default["default"];
-	const path = require$$1__default$1["default"];
+	const path = path__default["default"];
 
 	const home = os.homedir();
 	const env = process.env;
@@ -3931,7 +3957,7 @@ class Engine {
     _homedir() {
         let home = process.env.home;
         if (home) {
-            return require$$1__default$1["default"].join(home, ".config");
+            return path__default["default"].join(home, ".config");
         }
         return undefined;
     }
@@ -3966,12 +3992,12 @@ class Engine {
             return 0 /* OptionsReadResult.Failed */;
         };
         // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
-        if (require$$1__default$1["default"].isAbsolute(file)) {
+        if (path__default["default"].isAbsolute(file)) {
             read(file);
         }
         else {
             this.additionalFiles.forEach(file => {
-                if (require$$1__default$1["default"].isAbsolute(file) && read(file) == 0 /* OptionsReadResult.Failed */) {
+                if (path__default["default"].isAbsolute(file) && read(file) == 0 /* OptionsReadResult.Failed */) {
                     read(file + ".conf");
                 }
             });
@@ -3981,13 +4007,13 @@ class Engine {
                     return;
                 }
                 this.additionalFiles.forEach(additional => {
-                    if (!require$$1__default$1["default"].isAbsolute(additional)) {
-                        let file = require$$1__default$1["default"].join(root, additional);
+                    if (!path__default["default"].isAbsolute(additional)) {
+                        let file = path__default["default"].join(root, additional);
                         if (read(file) == 0 /* OptionsReadResult.Failed */)
                             read(file + ".conf");
                     }
                 });
-                let filePath = require$$1__default$1["default"].join(root, file);
+                let filePath = path__default["default"].join(root, file);
                 if (read(filePath) == 0 /* OptionsReadResult.Failed */) {
                     read(filePath + ".conf");
                 }

package/package.json

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

package/scheduler/fisk-scheduler.js

@@ -52518,7 +52518,8 @@ class Server extends require$$0__default$2["default"] {
     }
 }
 
-const Version = 6;
+const Version = 5;
+const ObjectCacheFormatVersion = 1;
 function cacheDir(option) {
     let dir = option("cache-dir");
     if (!dir) {
@@ -52549,11 +52550,36 @@ function validateCache(option) {
     buf.writeUInt32BE(Version);
     fs$4.writeFileSync(file, buf);
 }
+function validateObjectCache(option) {
+    const dir = cacheDir(option);
+    const objectCacheDir = option.string("object-cache-dir") || path__default["default"].join(dir, "objectcache");
+    const file = path__default["default"].join(objectCacheDir, "version");
+    let version;
+    try {
+        version = fs$4.readFileSync(file);
+        if (version.readUInt32BE() === ObjectCacheFormatVersion) {
+            return;
+        }
+    }
+    catch (err) {
+        /* */
+    }
+    if (version) {
+        console.log(`Wrong object cache version. Destroying object cache ${objectCacheDir}`);
+    }
+    fs$4.removeSync(objectCacheDir);
+    fs$4.mkdirpSync(objectCacheDir);
+    const buf = Buffer.allocUnsafe(4);
+    buf.writeUInt32BE(ObjectCacheFormatVersion);
+    fs$4.writeFileSync(file, buf);
+}
 function common$1(option) {
     validateCache(option);
+    validateObjectCache(option);
     return {
         cacheDir: cacheDir.bind(undefined, option),
-        Version
+        Version,
+        ObjectCacheFormatVersion
     };
 }