@andersbakken/fisk 4.0.27 → 4.0.29

package/scheduler/fisk-scheduler.js

@@ -88,20 +88,10 @@ class Database {
                         records = {};
                     }
                     records[key] = value;
-                    fs__default["default"].writeFile(this.path + ".tmp", JSON.stringify(records) + "\n", (err) => {
-                        if (err) {
-                            reject(err);
-                        }
-                        else {
-                            fs__default["default"].rename(this.path + ".tmp", this.path, (err) => {
-                                if (err) {
-                                    reject(new Error(`Failed to rename ${this.path}.tmp to ${this.path} ${err}`));
-                                }
-                                else {
-                                    resolve();
-                                }
-                            });
-                        }
+                    fs__default["default"].writeFile(this.path + ".tmp", JSON.stringify(records) + "\n", () => {
+                        fs__default["default"].rename(this.path + ".tmp", this.path, () => {
+                            resolve();
+                        });
                         this.finishedOperation();
                     });
                 })
@@ -139,9 +129,9 @@ class Database {
                         try {
                             resolve(JSON.parse(data));
                         }
-                        catch (err) {
+                        catch (error) {
                             fs__default["default"].renameSync(this.path, this.path + ".error");
-                            reject(new Error(`Failed to parse JSON from file: ${this.path} ${err}`));
+                            reject(new Error(`Failed to parse JSON from file: ${this.path} ${error.message}`));
                         }
                     }
                 }
@@ -205,12 +195,12 @@ class Environment {
         }
         console.log("Created environment", JSON.stringify(this), originalPath);
     }
-    toString() {
-        return JSON.stringify(this, null, 4);
-    }
     get file() {
         return `${this.hash}_${this.system}.tar.gz`;
     }
+    toString() {
+        return JSON.stringify(this, null, 4);
+    }
     canRun(system) {
         switch (system) {
             case "Linux i686":
@@ -3239,9 +3229,9 @@ var fs$5 = libExports$1;
 
 class File {
     constructor(path, hash) {
-        this._fd = fs$5.openSync(path, "w");
         this.path = path;
         this.hash = hash;
+        this._fd = fs$5.openSync(path, "w");
         this.system = undefined;
         this._writing = false;
         this.originalPath = undefined;
@@ -3320,12 +3310,18 @@ class Links {
     constructor() {
         this._targets = {};
     }
-    toString() {
-        return JSON.stringify(this, null, 4);
-    }
     get targets() {
         return this._targets;
     }
+    get targetHashes() {
+        return Object.keys(this._targets);
+    }
+    get size() {
+        return Object.keys(this._targets).length;
+    }
+    toString() {
+        return JSON.stringify(this, null, 4);
+    }
     toObject() {
         return this._targets;
     }
@@ -3346,12 +3342,6 @@ class Links {
     unset(targetHash) {
         delete this._targets[targetHash];
     }
-    get targetHashes() {
-        return Object.keys(this._targets);
-    }
-    get size() {
-        return Object.keys(this._targets).length;
-    }
 }
 
 /**
@@ -3599,28 +3589,26 @@ var mktemp_1 = {
 function untarFile(archive, file) {
     return new Promise((resolve, reject) => {
         mktemp_1.createDir("/tmp/fisk_env_infoXXXX").then((tmpdir) => {
-            console.log("fucker", tmpdir);
             child_process__default["default"].exec(`tar -zxf "${archive}" ${file}`, { cwd: tmpdir }, (err) => {
                 if (err) {
-                    // try {
-                    //     fs.removeSync(tmpdir);
-                    // } catch (e) {
-                    //     console.error("Got an error removing the temp dir", tmpdir);
-                    // }
-                    console.log("rejecting fucker", tmpdir, err);
+                    try {
+                        fs$5.removeSync(tmpdir);
+                    }
+                    catch (e) {
+                        console.error("Got an error removing the temp dir", tmpdir);
+                    }
                     reject(err);
                     return;
                 }
-                fs$5.readFile(path__default["default"].join(tmpdir, file), "utf8", (err, data) => {
+                fs$5.readFile(path__default["default"].join(tmpdir, file), "utf8", (error, data) => {
                     try {
-                        console.log("removing fucker", tmpdir);
                         fs$5.removeSync(tmpdir);
                     }
                     catch (e) {
                         console.error("Got an error removing the temp dir", tmpdir);
                     }
-                    if (err) {
-                        reject(err);
+                    if (error) {
+                        reject(error);
                     }
                     else {
                         resolve(data);
@@ -3636,6 +3624,12 @@ class Environments {
         this._data = {};
         this._links = {};
     }
+    get environments() {
+        return this._data;
+    }
+    get path() {
+        return this._path || "";
+    }
     load(db, p) {
         this._db = db;
         return db.get("links").then((l) => {
@@ -3782,12 +3776,6 @@ class Environments {
         }
         return this.syncLinks();
     }
-    get environments() {
-        return this._data;
-    }
-    get path() {
-        return this._path || "";
-    }
     environment(hash) {
         if (!(hash in this._data)) {
             return undefined;
@@ -3825,14 +3813,15 @@ Environments.instance = new Environments();
 
 class NodeData {
     constructor(size, maxSize, sha1s) {
-        this.sha1s = sha1s;
         this.size = size;
         this.maxSize = maxSize;
+        this.sha1s = sha1s;
     }
 }
 
 class SHA1Data {
     constructor(fileSize, node) {
+        this.fileSize = fileSize;
         this.fileSize = fileSize;
         this.nodes = [node];
     }
@@ -4069,7 +4058,9 @@ class ObjectCacheManager extends require$$0__default$2["default"] {
             return;
         }
         this.byNode.delete(node);
-        nodeData.sha1s.forEach((sha1) => removeFromSHA1Map(this.bySHA1, sha1, node));
+        nodeData.sha1s.forEach((sha1) => {
+            removeFromSHA1Map(this.bySHA1, sha1, node);
+        });
     }
     dump(query) {
         if ("clear" in query) {
@@ -4140,17 +4131,17 @@ class ObjectCacheManager extends require$$0__default$2["default"] {
         if (this.byNode.size >= 2) {
             // let max = 1;
             let roundRobinIndex = 0;
-            const processObject = (sha1, value) => {
+            const processObject = (sha, value) => {
                 if (max !== undefined && max <= 0) {
                     return;
                 }
                 const needed = Math.min(redundancy + 1 - value.nodes.length, this.byNode.size - 1);
                 if (needed > 0) {
-                    const needed = redundancy + 1 - value.nodes.length;
+                    const needed2 = redundancy + 1 - value.nodes.length;
                     // console.log("should distribute", key, "to", needed, "nodes");
                     let firstIdx;
                     let found = 0;
-                    while (found < needed) {
+                    while (found < needed2) {
                         if (++nodeIdx === nodes.length) {
                             nodeIdx = 0;
                         }
@@ -4184,7 +4175,7 @@ class ObjectCacheManager extends require$$0__default$2["default"] {
                         ++found;
                         data.available -= value.fileSize;
                         const src = value.nodes[roundRobinIndex++ % value.nodes.length];
-                        data.objects.push({ source: src.ip + ":" + src.port, sha1: sha1 });
+                        data.objects.push({ source: src.ip + ":" + src.port, sha1: sha });
                         if (max !== undefined && !--max) {
                             break;
                         }
@@ -4202,7 +4193,9 @@ class ObjectCacheManager extends require$$0__default$2["default"] {
                 }
             }
             else {
-                this.bySHA1.forEach((value, key) => processObject(key, value));
+                this.bySHA1.forEach((value, key) => {
+                    processObject(key, value);
+                });
             }
         }
         commands.forEach((value, key) => {
@@ -4338,11 +4331,11 @@ class Peak {
 class Client extends require$$0__default$2["default"] {
     constructor(type, ws, ip, option) {
         super();
-        this.created = new Date();
         this.type = type;
         this.ws = ws;
         this.ip = ip;
         this.option = option;
+        this.created = new Date();
         this.hostname = "";
         this.name = "";
         this.npmVersion = "";
@@ -4408,7 +4401,7 @@ class Client extends require$$0__default$2["default"] {
 
 class Builder extends Client {
     constructor(ws, ip, option) {
-        super(0 /* Builder */, ws, ip, option);
+        super(0 /* ClientType.Builder */, ws, ip, option);
         this.jobsPerformed = 0;
         this.totalCompileSpeed = 0;
         this.totalUploadSpeed = 0;
@@ -4424,7 +4417,7 @@ class Builder extends Client {
 
 class Compile extends Client {
     constructor(ws, ip, environment, sourceFile, sha1, option) {
-        super(1 /* Compile */, ws, ip, option);
+        super(1 /* ClientType.Compile */, ws, ip, option);
         this.environment = environment;
         this.sourceFile = sourceFile;
         this.sha1 = sha1;
@@ -10829,7 +10822,7 @@ function requireHttpErrors () {
 }
 
 var srcExports = {};
-var src$1 = {
+var src = {
   get exports(){ return srcExports; },
   set exports(v){ srcExports = v; },
 };
@@ -11682,18 +11675,18 @@ function requireNode () {
  * treat as a browser.
  */
 
-var hasRequiredSrc$1;
+var hasRequiredSrc;
 
-function requireSrc$1 () {
-	if (hasRequiredSrc$1) return srcExports;
-	hasRequiredSrc$1 = 1;
+function requireSrc () {
+	if (hasRequiredSrc) return srcExports;
+	hasRequiredSrc = 1;
 	(function (module) {
 		if (typeof process !== 'undefined' && process.type === 'renderer') {
 		  module.exports = requireBrowser();
 		} else {
 		  module.exports = requireNode();
 		}
-} (src$1));
+} (src));
 	return srcExports;
 }
 
@@ -35513,7 +35506,7 @@ function requireJson () {
 	var bytes = bytesExports;
 	var contentType = requireContentType();
 	var createError = requireHttpErrors();
-	var debug = requireSrc$1()('body-parser:json');
+	var debug = requireSrc()('body-parser:json');
 	var read = requireRead();
 	var typeis = requireTypeIs();
 
@@ -35753,7 +35746,7 @@ function requireRaw () {
 	 */
 
 	var bytes = bytesExports;
-	var debug = requireSrc$1()('body-parser:raw');
+	var debug = requireSrc()('body-parser:raw');
 	var read = requireRead();
 	var typeis = requireTypeIs();
 
@@ -35863,7 +35856,7 @@ function requireText () {
 
 	var bytes = bytesExports;
 	var contentType = requireContentType();
-	var debug = requireSrc$1()('body-parser:text');
+	var debug = requireSrc()('body-parser:text');
 	var read = requireRead();
 	var typeis = requireTypeIs();
 
@@ -36044,6 +36037,25 @@ function requireHasSymbols () {
 	return hasSymbols;
 }
 
+var hasProto;
+var hasRequiredHasProto;
+
+function requireHasProto () {
+	if (hasRequiredHasProto) return hasProto;
+	hasRequiredHasProto = 1;
+
+	var test = {
+		foo: {}
+	};
+
+	var $Object = Object;
+
+	hasProto = function hasProto() {
+		return { __proto__: test }.foo === test.foo && !({ __proto__: null } instanceof $Object);
+	};
+	return hasProto;
+}
+
 var implementation;
 var hasRequiredImplementation;
 
@@ -36054,43 +36066,75 @@ function requireImplementation () {
 	/* eslint no-invalid-this: 1 */
 
 	var ERROR_MESSAGE = 'Function.prototype.bind called on incompatible ';
-	var slice = Array.prototype.slice;
 	var toStr = Object.prototype.toString;
+	var max = Math.max;
 	var funcType = '[object Function]';
 
+	var concatty = function concatty(a, b) {
+	    var arr = [];
+
+	    for (var i = 0; i < a.length; i += 1) {
+	        arr[i] = a[i];
+	    }
+	    for (var j = 0; j < b.length; j += 1) {
+	        arr[j + a.length] = b[j];
+	    }
+
+	    return arr;
+	};
+
+	var slicy = function slicy(arrLike, offset) {
+	    var arr = [];
+	    for (var i = offset || 0, j = 0; i < arrLike.length; i += 1, j += 1) {
+	        arr[j] = arrLike[i];
+	    }
+	    return arr;
+	};
+
+	var joiny = function (arr, joiner) {
+	    var str = '';
+	    for (var i = 0; i < arr.length; i += 1) {
+	        str += arr[i];
+	        if (i + 1 < arr.length) {
+	            str += joiner;
+	        }
+	    }
+	    return str;
+	};
+
 	implementation = function bind(that) {
 	    var target = this;
-	    if (typeof target !== 'function' || toStr.call(target) !== funcType) {
+	    if (typeof target !== 'function' || toStr.apply(target) !== funcType) {
 	        throw new TypeError(ERROR_MESSAGE + target);
 	    }
-	    var args = slice.call(arguments, 1);
+	    var args = slicy(arguments, 1);
 
 	    var bound;
 	    var binder = function () {
 	        if (this instanceof bound) {
 	            var result = target.apply(
 	                this,
-	                args.concat(slice.call(arguments))
+	                concatty(args, arguments)
 	            );
 	            if (Object(result) === result) {
 	                return result;
 	            }
 	            return this;
-	        } else {
-	            return target.apply(
-	                that,
-	                args.concat(slice.call(arguments))
-	            );
 	        }
+	        return target.apply(
+	            that,
+	            concatty(args, arguments)
+	        );
+
 	    };
 
-	    var boundLength = Math.max(0, target.length - args.length);
+	    var boundLength = max(0, target.length - args.length);
 	    var boundArgs = [];
 	    for (var i = 0; i < boundLength; i++) {
-	        boundArgs.push('$' + i);
+	        boundArgs[i] = '$' + i;
 	    }
 
-	    bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this,arguments); }')(binder);
+	    bound = Function('binder', 'return function (' + joiny(boundArgs, ',') + '){ return binder.apply(this,arguments); }')(binder);
 
 	    if (target.prototype) {
 	        var Empty = function Empty() {};
@@ -36117,17 +36161,20 @@ function requireFunctionBind () {
 	return functionBind;
 }
 
-var src;
-var hasRequiredSrc;
+var hasown;
+var hasRequiredHasown;
 
-function requireSrc () {
-	if (hasRequiredSrc) return src;
-	hasRequiredSrc = 1;
+function requireHasown () {
+	if (hasRequiredHasown) return hasown;
+	hasRequiredHasown = 1;
 
+	var call = Function.prototype.call;
+	var $hasOwn = Object.prototype.hasOwnProperty;
 	var bind = requireFunctionBind();
 
-	src = bind.call(Function.call, Object.prototype.hasOwnProperty);
-	return src;
+	/** @type {(o: {}, p: PropertyKey) => p is keyof o} */
+	hasown = bind.call(call, $hasOwn);
+	return hasown;
 }
 
 var getIntrinsic;
@@ -36180,18 +36227,23 @@ function requireGetIntrinsic () {
 		: throwTypeError;
 
 	var hasSymbols = requireHasSymbols()();
+	var hasProto = requireHasProto()();
 
-	var getProto = Object.getPrototypeOf || function (x) { return x.__proto__; }; // eslint-disable-line no-proto
+	var getProto = Object.getPrototypeOf || (
+		hasProto
+			? function (x) { return x.__proto__; } // eslint-disable-line no-proto
+			: null
+	);
 
 	var needsEval = {};
 
-	var TypedArray = typeof Uint8Array === 'undefined' ? undefined$1 : getProto(Uint8Array);
+	var TypedArray = typeof Uint8Array === 'undefined' || !getProto ? undefined$1 : getProto(Uint8Array);
 
 	var INTRINSICS = {
 		'%AggregateError%': typeof AggregateError === 'undefined' ? undefined$1 : AggregateError,
 		'%Array%': Array,
 		'%ArrayBuffer%': typeof ArrayBuffer === 'undefined' ? undefined$1 : ArrayBuffer,
-		'%ArrayIteratorPrototype%': hasSymbols ? getProto([][Symbol.iterator]()) : undefined$1,
+		'%ArrayIteratorPrototype%': hasSymbols && getProto ? getProto([][Symbol.iterator]()) : undefined$1,
 		'%AsyncFromSyncIteratorPrototype%': undefined$1,
 		'%AsyncFunction%': needsEval,
 		'%AsyncGenerator%': needsEval,
@@ -36221,10 +36273,10 @@ function requireGetIntrinsic () {
 		'%Int32Array%': typeof Int32Array === 'undefined' ? undefined$1 : Int32Array,
 		'%isFinite%': isFinite,
 		'%isNaN%': isNaN,
-		'%IteratorPrototype%': hasSymbols ? getProto(getProto([][Symbol.iterator]())) : undefined$1,
+		'%IteratorPrototype%': hasSymbols && getProto ? getProto(getProto([][Symbol.iterator]())) : undefined$1,
 		'%JSON%': typeof JSON === 'object' ? JSON : undefined$1,
 		'%Map%': typeof Map === 'undefined' ? undefined$1 : Map,
-		'%MapIteratorPrototype%': typeof Map === 'undefined' || !hasSymbols ? undefined$1 : getProto(new Map()[Symbol.iterator]()),
+		'%MapIteratorPrototype%': typeof Map === 'undefined' || !hasSymbols || !getProto ? undefined$1 : getProto(new Map()[Symbol.iterator]()),
 		'%Math%': Math,
 		'%Number%': Number,
 		'%Object%': Object,
@@ -36237,10 +36289,10 @@ function requireGetIntrinsic () {
 		'%Reflect%': typeof Reflect === 'undefined' ? undefined$1 : Reflect,
 		'%RegExp%': RegExp,
 		'%Set%': typeof Set === 'undefined' ? undefined$1 : Set,
-		'%SetIteratorPrototype%': typeof Set === 'undefined' || !hasSymbols ? undefined$1 : getProto(new Set()[Symbol.iterator]()),
+		'%SetIteratorPrototype%': typeof Set === 'undefined' || !hasSymbols || !getProto ? undefined$1 : getProto(new Set()[Symbol.iterator]()),
 		'%SharedArrayBuffer%': typeof SharedArrayBuffer === 'undefined' ? undefined$1 : SharedArrayBuffer,
 		'%String%': String,
-		'%StringIteratorPrototype%': hasSymbols ? getProto(''[Symbol.iterator]()) : undefined$1,
+		'%StringIteratorPrototype%': hasSymbols && getProto ? getProto(''[Symbol.iterator]()) : undefined$1,
 		'%Symbol%': hasSymbols ? Symbol : undefined$1,
 		'%SyntaxError%': $SyntaxError,
 		'%ThrowTypeError%': ThrowTypeError,
@@ -36256,12 +36308,14 @@ function requireGetIntrinsic () {
 		'%WeakSet%': typeof WeakSet === 'undefined' ? undefined$1 : WeakSet
 	};
 
-	try {
-		null.error; // eslint-disable-line no-unused-expressions
-	} catch (e) {
-		// https://github.com/tc39/proposal-shadowrealm/pull/384#issuecomment-1364264229
-		var errorProto = getProto(getProto(e));
-		INTRINSICS['%Error.prototype%'] = errorProto;
+	if (getProto) {
+		try {
+			null.error; // eslint-disable-line no-unused-expressions
+		} catch (e) {
+			// https://github.com/tc39/proposal-shadowrealm/pull/384#issuecomment-1364264229
+			var errorProto = getProto(getProto(e));
+			INTRINSICS['%Error.prototype%'] = errorProto;
+		}
 	}
 
 	var doEval = function doEval(name) {
@@ -36279,7 +36333,7 @@ function requireGetIntrinsic () {
 			}
 		} else if (name === '%AsyncIteratorPrototype%') {
 			var gen = doEval('%AsyncGenerator%');
-			if (gen) {
+			if (gen && getProto) {
 				value = getProto(gen.prototype);
 			}
 		}
@@ -36344,7 +36398,7 @@ function requireGetIntrinsic () {
 	};
 
 	var bind = requireFunctionBind();
-	var hasOwn = requireSrc();
+	var hasOwn = requireHasown();
 	var $concat = bind.call(Function.call, Array.prototype.concat);
 	var $spliceApply = bind.call(Function.apply, Array.prototype.splice);
 	var $replace = bind.call(Function.call, String.prototype.replace);
@@ -36488,6 +36542,196 @@ var callBind = {
   set exports(v){ callBindExports = v; },
 };
 
+var hasPropertyDescriptors_1;
+var hasRequiredHasPropertyDescriptors;
+
+function requireHasPropertyDescriptors () {
+	if (hasRequiredHasPropertyDescriptors) return hasPropertyDescriptors_1;
+	hasRequiredHasPropertyDescriptors = 1;
+
+	var GetIntrinsic = requireGetIntrinsic();
+
+	var $defineProperty = GetIntrinsic('%Object.defineProperty%', true);
+
+	var hasPropertyDescriptors = function hasPropertyDescriptors() {
+		if ($defineProperty) {
+			try {
+				$defineProperty({}, 'a', { value: 1 });
+				return true;
+			} catch (e) {
+				// IE 8 has a broken defineProperty
+				return false;
+			}
+		}
+		return false;
+	};
+
+	hasPropertyDescriptors.hasArrayLengthDefineBug = function hasArrayLengthDefineBug() {
+		// node v0.6 has a bug where array lengths can be Set but not Defined
+		if (!hasPropertyDescriptors()) {
+			return null;
+		}
+		try {
+			return $defineProperty([], 'length', { value: 1 }).length !== 1;
+		} catch (e) {
+			// In Firefox 4-22, defining length on an array throws an exception.
+			return true;
+		}
+	};
+
+	hasPropertyDescriptors_1 = hasPropertyDescriptors;
+	return hasPropertyDescriptors_1;
+}
+
+var gopd;
+var hasRequiredGopd;
+
+function requireGopd () {
+	if (hasRequiredGopd) return gopd;
+	hasRequiredGopd = 1;
+
+	var GetIntrinsic = requireGetIntrinsic();
+
+	var $gOPD = GetIntrinsic('%Object.getOwnPropertyDescriptor%', true);
+
+	if ($gOPD) {
+		try {
+			$gOPD([], 'length');
+		} catch (e) {
+			// IE 8 has a broken gOPD
+			$gOPD = null;
+		}
+	}
+
+	gopd = $gOPD;
+	return gopd;
+}
+
+var defineDataProperty;
+var hasRequiredDefineDataProperty;
+
+function requireDefineDataProperty () {
+	if (hasRequiredDefineDataProperty) return defineDataProperty;
+	hasRequiredDefineDataProperty = 1;
+
+	var hasPropertyDescriptors = requireHasPropertyDescriptors()();
+
+	var GetIntrinsic = requireGetIntrinsic();
+
+	var $defineProperty = hasPropertyDescriptors && GetIntrinsic('%Object.defineProperty%', true);
+	if ($defineProperty) {
+		try {
+			$defineProperty({}, 'a', { value: 1 });
+		} catch (e) {
+			// IE 8 has a broken defineProperty
+			$defineProperty = false;
+		}
+	}
+
+	var $SyntaxError = GetIntrinsic('%SyntaxError%');
+	var $TypeError = GetIntrinsic('%TypeError%');
+
+	var gopd = requireGopd();
+
+	/** @type {(obj: Record<PropertyKey, unknown>, property: PropertyKey, value: unknown, nonEnumerable?: boolean | null, nonWritable?: boolean | null, nonConfigurable?: boolean | null, loose?: boolean) => void} */
+	defineDataProperty = function defineDataProperty(
+		obj,
+		property,
+		value
+	) {
+		if (!obj || (typeof obj !== 'object' && typeof obj !== 'function')) {
+			throw new $TypeError('`obj` must be an object or a function`');
+		}
+		if (typeof property !== 'string' && typeof property !== 'symbol') {
+			throw new $TypeError('`property` must be a string or a symbol`');
+		}
+		if (arguments.length > 3 && typeof arguments[3] !== 'boolean' && arguments[3] !== null) {
+			throw new $TypeError('`nonEnumerable`, if provided, must be a boolean or null');
+		}
+		if (arguments.length > 4 && typeof arguments[4] !== 'boolean' && arguments[4] !== null) {
+			throw new $TypeError('`nonWritable`, if provided, must be a boolean or null');
+		}
+		if (arguments.length > 5 && typeof arguments[5] !== 'boolean' && arguments[5] !== null) {
+			throw new $TypeError('`nonConfigurable`, if provided, must be a boolean or null');
+		}
+		if (arguments.length > 6 && typeof arguments[6] !== 'boolean') {
+			throw new $TypeError('`loose`, if provided, must be a boolean');
+		}
+
+		var nonEnumerable = arguments.length > 3 ? arguments[3] : null;
+		var nonWritable = arguments.length > 4 ? arguments[4] : null;
+		var nonConfigurable = arguments.length > 5 ? arguments[5] : null;
+		var loose = arguments.length > 6 ? arguments[6] : false;
+
+		/* @type {false | TypedPropertyDescriptor<unknown>} */
+		var desc = !!gopd && gopd(obj, property);
+
+		if ($defineProperty) {
+			$defineProperty(obj, property, {
+				configurable: nonConfigurable === null && desc ? desc.configurable : !nonConfigurable,
+				enumerable: nonEnumerable === null && desc ? desc.enumerable : !nonEnumerable,
+				value: value,
+				writable: nonWritable === null && desc ? desc.writable : !nonWritable
+			});
+		} else if (loose || (!nonEnumerable && !nonWritable && !nonConfigurable)) {
+			// must fall back to [[Set]], and was not explicitly asked to make non-enumerable, non-writable, or non-configurable
+			obj[property] = value; // eslint-disable-line no-param-reassign
+		} else {
+			throw new $SyntaxError('This environment does not support defining a property as non-configurable, non-writable, or non-enumerable.');
+		}
+	};
+	return defineDataProperty;
+}
+
+var setFunctionLength;
+var hasRequiredSetFunctionLength;
+
+function requireSetFunctionLength () {
+	if (hasRequiredSetFunctionLength) return setFunctionLength;
+	hasRequiredSetFunctionLength = 1;
+
+	var GetIntrinsic = requireGetIntrinsic();
+	var define = requireDefineDataProperty();
+	var hasDescriptors = requireHasPropertyDescriptors()();
+	var gOPD = requireGopd();
+
+	var $TypeError = GetIntrinsic('%TypeError%');
+	var $floor = GetIntrinsic('%Math.floor%');
+
+	setFunctionLength = function setFunctionLength(fn, length) {
+		if (typeof fn !== 'function') {
+			throw new $TypeError('`fn` is not a function');
+		}
+		if (typeof length !== 'number' || length < 0 || length > 0xFFFFFFFF || $floor(length) !== length) {
+			throw new $TypeError('`length` must be a positive 32-bit integer');
+		}
+
+		var loose = arguments.length > 2 && !!arguments[2];
+
+		var functionLengthIsConfigurable = true;
+		var functionLengthIsWritable = true;
+		if ('length' in fn && gOPD) {
+			var desc = gOPD(fn, 'length');
+			if (desc && !desc.configurable) {
+				functionLengthIsConfigurable = false;
+			}
+			if (desc && !desc.writable) {
+				functionLengthIsWritable = false;
+			}
+		}
+
+		if (functionLengthIsConfigurable || functionLengthIsWritable || !loose) {
+			if (hasDescriptors) {
+				define(fn, 'length', length, true, true);
+			} else {
+				define(fn, 'length', length);
+			}
+		}
+		return fn;
+	};
+	return setFunctionLength;
+}
+
 var hasRequiredCallBind;
 
 function requireCallBind () {
@@ -36497,12 +36741,13 @@ function requireCallBind () {
 
 		var bind = requireFunctionBind();
 		var GetIntrinsic = requireGetIntrinsic();
+		var setFunctionLength = requireSetFunctionLength();
 
+		var $TypeError = GetIntrinsic('%TypeError%');
 		var $apply = GetIntrinsic('%Function.prototype.apply%');
 		var $call = GetIntrinsic('%Function.prototype.call%');
 		var $reflectApply = GetIntrinsic('%Reflect.apply%', true) || bind.call($call, $apply);
 
-		var $gOPD = GetIntrinsic('%Object.getOwnPropertyDescriptor%', true);
 		var $defineProperty = GetIntrinsic('%Object.defineProperty%', true);
 		var $max = GetIntrinsic('%Math.max%');
 
@@ -36516,19 +36761,15 @@ function requireCallBind () {
 		}
 
 		module.exports = function callBind(originalFunction) {
-			var func = $reflectApply(bind, $call, arguments);
-			if ($gOPD && $defineProperty) {
-				var desc = $gOPD(func, 'length');
-				if (desc.configurable) {
-					// original length, plus the receiver, minus any additional arguments (after the receiver)
-					$defineProperty(
-						func,
-						'length',
-						{ value: 1 + $max(0, originalFunction.length - (arguments.length - 1)) }
-					);
-				}
+			if (typeof originalFunction !== 'function') {
+				throw new $TypeError('a function is required');
 			}
-			return func;
+			var func = $reflectApply(bind, $call, arguments);
+			return setFunctionLength(
+				func,
+				1 + $max(0, originalFunction.length - (arguments.length - 1)),
+				true
+			);
 		};
 
 		var applyBind = function applyBind() {
@@ -36824,6 +37065,14 @@ function requireObjectInspect () {
 	    if (isString(obj)) {
 	        return markBoxed(inspect(String(obj)));
 	    }
+	    // note: in IE 8, sometimes `global !== window` but both are the prototypes of each other
+	    /* eslint-env browser */
+	    if (typeof window !== 'undefined' && obj === window) {
+	        return '{ [object Window] }';
+	    }
+	    if (obj === commonjsGlobal) {
+	        return '{ [object globalThis] }';
+	    }
 	    if (!isDate(obj) && !isRegExp(obj)) {
 	        var ys = arrObjKeys(obj, inspect);
 	        var isPlainObject = gPO ? gPO(obj) === Object.prototype : obj instanceof Object || obj.constructor === Object;
@@ -38171,7 +38420,7 @@ function requireUrlencoded () {
 	var bytes = bytesExports;
 	var contentType = requireContentType();
 	var createError = requireHttpErrors();
-	var debug = requireSrc$1()('body-parser:urlencoded');
+	var debug = requireSrc()('body-parser:urlencoded');
 	var deprecate = depd_1('body-parser');
 	var read = requireRead();
 	var typeis = requireTypeIs();
@@ -38986,7 +39235,7 @@ function fresh$3 (url, parsedUrl) {
  * @private
  */
 
-var debug$5 = requireSrc$1()('finalhandler');
+var debug$5 = requireSrc()('finalhandler');
 var encodeUrl$2 = encodeurl;
 var escapeHtml$2 = escapeHtml_1;
 var onFinished$2 = requireOnFinished();
@@ -39523,7 +39772,7 @@ function pathtoRegexp(path, keys, options) {
  */
 
 var pathRegexp = pathToRegexp;
-var debug$4 = requireSrc$1()('express:router:layer');
+var debug$4 = requireSrc()('express:router:layer');
 
 /**
  * Module variables.
@@ -39770,7 +40019,7 @@ function getBasicNodeMethods() {
  * @private
  */
 
-var debug$3 = requireSrc$1()('express:router:route');
+var debug$3 = requireSrc()('express:router:route');
 var flatten$1 = arrayFlatten_1;
 var Layer$1 = layer;
 var methods$1 = methods$2;
@@ -40030,7 +40279,7 @@ var Route = route;
 var Layer = layer;
 var methods = methods$2;
 var mixin = utilsMergeExports;
-var debug$2 = requireSrc$1()('express:router');
+var debug$2 = requireSrc()('express:router');
 var deprecate$3 = depd_1('express');
 var flatten = arrayFlatten_1;
 var parseUrl = parseurlExports;
@@ -40796,7 +41045,7 @@ function requireQuery () {
  * @private
  */
 
-var debug$1 = requireSrc$1()('express:view');
+var debug$1 = requireSrc()('express:view');
 var path$3 = path__default["default"];
 var fs$3 = fs__default["default"];
 
@@ -44981,7 +45230,7 @@ function sortByRangeStart (a, b) {
  */
 
 var createError$1 = requireHttpErrors();
-var debug = requireSrc$1()('send');
+var debug = requireSrc()('send');
 var deprecate$2 = depd_1('send');
 var destroy = requireDestroy();
 var encodeUrl$1 = encodeurl;
@@ -47531,7 +47780,7 @@ function trustSingle (subnet) {
 	var methods = methods$2;
 	var middleware = init;
 	var query = requireQuery();
-	var debug = requireSrc$1()('express:application');
+	var debug = requireSrc()('express:application');
 	var View = view;
 	var http = require$$2__default["default"];
 	var compileETag = utils.compileETag;
@@ -51888,6 +52137,9 @@ class Server extends require$$0__default$2["default"] {
         this.nonces = new WeakMap();
         this.baseUrl = `http://localhost:${this.option.int("port", 8097)}`;
     }
+    get express() {
+        return this.app;
+    }
     listen() {
         return new Promise((resolve) => {
             this.app = express();
@@ -51945,9 +52197,6 @@ class Server extends require$$0__default$2["default"] {
             });
         });
     }
-    get express() {
-        return this.app;
-    }
     _handleCompile(req, ws, ip) {
         // look at headers
         if (!("x-fisk-environments" in req.headers)) {
@@ -52153,6 +52402,7 @@ class Server extends require$$0__default$2["default"] {
                     else {
                         console.error("Bad message without type", json);
                     }
+                    break;
                 }
                 case "object":
                     if (msg instanceof Buffer) {
@@ -52206,11 +52456,11 @@ class Server extends require$$0__default$2["default"] {
                 this._handleBuilder(req, client);
                 break;
             case "/monitor":
-                client = new Client(3 /* Monitor */, ws, ip);
+                client = new Client(3 /* ClientType.Monitor */, ws, ip);
                 this._handleMonitor(req, client);
                 break;
             case "/client_verify":
-                client = new Client(4 /* ClientVerify */, ws, ip);
+                client = new Client(4 /* ClientType.ClientVerify */, ws, ip);
                 this._handleClientVerify(req, client);
                 break;
             default:
@@ -53741,7 +53991,7 @@ const clientMinimumVersion = "3.4.96";
 const serverStartTime = Date.now();
 process.on("unhandledRejection", (reason, p) => {
     console.error("Unhandled Rejection at: Promise", p, "reason:", reason === null || reason === void 0 ? void 0 : reason.stack);
-    addLogFile({ source: "no source file", ip: "self", contents: `reason: ${reason.stack} p: ${p}\n` });
+    addLogFile({ source: "no source file", ip: "self", contents: `reason: ${reason.stack} promise` });
     // process.exit();
 });
 process.on("uncaughtException", (err) => {
@@ -53837,7 +54087,9 @@ function jobStartedOrScheduled(type, job) {
         if (monitorsLog) {
             console.log("send to monitors", info);
         }
-        monitors.forEach((monitor) => monitor.send(info));
+        monitors.forEach((monitor) => {
+            monitor.send(info);
+        });
     }
 }
 function cacheHit(builder, message) {
@@ -53875,7 +54127,9 @@ function cacheHit(builder, message) {
             console.log("send to monitors", info);
         }
         // console.log("sending info", info);
-        monitors.forEach((monitor) => monitor.send(info));
+        monitors.forEach((monitor) => {
+            monitor.send(info);
+        });
     }
 }
 function jobFinished(builder, job) {
@@ -53902,7 +54156,9 @@ function jobFinished(builder, job) {
         if (monitorsLog) {
             console.log("send to monitors", info);
         }
-        monitors.forEach((monitor) => monitor.send(info));
+        monitors.forEach((monitor) => {
+            monitor.send(info);
+        });
     }
 }
 function builderKey(ip, port) {
@@ -53955,9 +54211,13 @@ function onObjectCacheCleared() {
     jobsScheduled = 0;
     jobsFinished = 0;
     const msg = { type: "clearObjectCache" };
-    forEachBuilder((builder) => builder.send(msg));
+    forEachBuilder((builder) => {
+        builder.send(msg);
+    });
     const info = statsMessage();
-    monitors.forEach((monitor) => monitor.send(info));
+    monitors.forEach((monitor) => {
+        monitor.send(info);
+    });
 }
 function setObjectCacheEnabled(on) {
     if (on && !objectCache) {
@@ -54101,8 +54361,8 @@ function environmentsInfo() {
     const max = option("max-environment-size");
     ret.maxSizeBytes = max ? bytesExports.parse(String(max)) || 0 : 0;
     let usedSizeBytes = 0;
-    for (const hash in Environments.instance.environments) {
-        const env = Environments.instance.environments[hash];
+    for (const hsh in Environments.instance.environments) {
+        const env = Environments.instance.environments[hsh];
         if (env.size) {
             usedSizeBytes += env.size;
         }
@@ -54124,8 +54384,8 @@ server.on("listen", (app) => {
     app.get("/builders", (req, res) => {
         const ret = [];
         const now = Date.now();
-        for (const builderKey in builders) {
-            const s = builders[builderKey];
+        for (const bKey in builders) {
+            const s = builders[bKey];
             ret.push({
                 ip: s.ip,
                 name: s.name,
@@ -54223,9 +54483,9 @@ server.on("listen", (app) => {
         }
     });
     app.get("/environment/*", (req, res) => {
-        const hash = req.path.substr(13);
-        const env = Environments.instance.environment(hash);
-        console.log("got env request", hash, env);
+        const h = req.path.substr(13);
+        const env = Environments.instance.environment(h);
+        console.log("got env request", h, env);
         if (!env) {
             res.sendStatus(404);
             return;
@@ -54321,7 +54581,9 @@ function updateLogFilesToMonitors() {
             }
             const msg = { type: "logFiles", files: files || [] };
             // console.log("sending files", msg);
-            monitors.forEach((monitor) => monitor.send(msg));
+            monitors.forEach((monitor) => {
+                monitor.send(msg);
+            });
         });
     }
 }
@@ -54332,9 +54594,9 @@ function clearLogFiles() {
             return;
         }
         for (const file of files) {
-            fs$5.unlink(path__default["default"].join(logFileDir, file), (err) => {
-                if (err) {
-                    console.log("failed to remove file", path__default["default"].join(logFileDir, file), err);
+            fs$5.unlink(path__default["default"].join(logFileDir, file), (error) => {
+                if (error) {
+                    console.log("failed to remove file", path__default["default"].join(logFileDir, file), error);
                 }
             });
         }
@@ -54435,8 +54697,12 @@ server.on("builder", (builder) => {
         ++jobsStarted;
         jobStartedOrScheduled("jobStarted", job);
     });
-    builder.on("jobFinished", (job) => jobFinished(builder, job));
-    builder.on("cacheHit", (job) => cacheHit(builder, job));
+    builder.on("jobFinished", (job) => {
+        jobFinished(builder, job);
+    });
+    builder.on("cacheHit", (job) => {
+        cacheHit(builder, job);
+    });
     builder.on("jobAborted", (job) => {
         console.log(`builder: ${builder.ip}:${builder.port} aborted a job`, job);
         if (monitors.length) {
@@ -54444,7 +54710,9 @@ server.on("builder", (builder) => {
                 type: "jobAborted",
                 id: job.id
             };
-            monitors.forEach((monitor) => monitor.send(info));
+            monitors.forEach((monitor) => {
+                monitor.send(info);
+            });
         }
     });
 });
@@ -54468,21 +54736,21 @@ function requestEnvironment(compile) {
             compile.close();
             return;
         }
-        const hash = environment.hash;
-        compile.on("uploadEnvironmentData", (environment) => {
+        const hsh = environment.hash;
+        compile.on("uploadEnvironmentData", (env) => {
             if (!file) {
                 console.error("no pending file");
                 compile.send({ error: "no pending file" });
                 compile.close();
                 return;
             }
-            if (environment.last) {
+            if (env.last) {
                 gotLast = true;
-                console.log("Got environmentdata message", environment.data.length, environment.last);
+                console.log("Got environmentdata message", env.data.length, env.last);
             }
-            file.save(environment.data)
+            file.save(env.data)
                 .then(() => {
-                if (environment.last) {
+                if (env.last) {
                     assert__default["default"](file);
                     file.close();
                     compile.close();
@@ -54491,16 +54759,15 @@ function requestEnvironment(compile) {
                 return undefined;
             })
                 .then(() => {
-                if (environment.last) {
+                if (env.last) {
                     file = undefined;
                     // send any new environments to builders
-                    delete pendingEnvironments[hash];
-                    return purgeEnvironmentsToMaxSize();
+                    delete pendingEnvironments[hsh];
+                    purgeEnvironmentsToMaxSize();
                 }
-                return undefined;
             })
                 .then(() => {
-                if (environment.last) {
+                if (env.last) {
                     syncEnvironments();
                 }
             })
@@ -54558,17 +54825,17 @@ server.on("compile", (compile) => {
         ++jobsFailed;
         return;
     }
-    function score(s) {
+    const score = (s) => {
         const available = Math.min(4, s.slots - s.activeClients);
         return available * (1 - s.load);
-    }
+    };
     let builder;
     let bestScore = Number.MIN_SAFE_INTEGER;
     let env;
     // console.log("got usableEnvs", usableEnvs);
     // ### should have a function match(s) that checks for env, score and compile.builder etc
     let foundInCache = false;
-    function filterBuilder(s) {
+    const filterBuilder = (s) => {
         if (compile.builder && compile.builder !== s.ip && compile.builder !== s.name) {
             return false;
         }
@@ -54580,7 +54847,7 @@ server.on("compile", (compile) => {
             }
         }
         return true;
-    }
+    };
     if (objectCache && compile.sha1) {
         const data = objectCache.get(compile.sha1);
         if (data) {
@@ -54655,7 +54922,9 @@ server.on("compile", (compile) => {
     });
     if (peakInfo && monitors.length) {
         const info = statsMessage();
-        monitors.forEach((monitor) => monitor.send(info));
+        monitors.forEach((monitor) => {
+            monitor.send(info);
+        });
     }
     ++builder.activeClients;
     ++builder.jobsScheduled;
@@ -54710,19 +54979,19 @@ function writeConfiguration(change) {
 }
 function hash(password, salt) {
     return new Promise((resolve, reject) => {
-        crypto__default["default"].pbkdf2(password, salt, 12000, 256, "sha512", (err, hash) => {
+        crypto__default["default"].pbkdf2(password, salt, 12000, 256, "sha512", (err, hsh) => {
             if (err) {
                 reject(err);
             }
             else {
-                resolve(hash);
+                resolve(hsh);
             }
         });
     });
 }
-function randomBytes(bytes) {
+function randomBytes(byteLength) {
     return new Promise((resolve, reject) => {
-        crypto__default["default"].randomBytes(bytes, (err, result) => {
+        crypto__default["default"].randomBytes(byteLength, (err, result) => {
             if (err) {
                 reject(new Error(`Failed to random bytes ${err}`));
             }
@@ -54753,13 +55022,13 @@ server.on("monitor", (client) => {
         console.log("Got monitor", client.ip, client.hostname);
     }
     monitors.push(client);
-    function remove() {
+    const remove = () => {
         const idx = monitors.indexOf(client);
         if (idx !== -1) {
             monitors.splice(idx, 1);
         }
         client.removeAllListeners();
-    }
+    };
     let user;
     client.on("message", (messageText) => {
         var _a, _b, _c, _d;
@@ -54828,13 +55097,17 @@ server.on("monitor", (client) => {
                     .link((_a = message.srcHash) !== null && _a !== void 0 ? _a : "", (_b = message.targetHash) !== null && _b !== void 0 ? _b : "", (_c = message.arguments) !== null && _c !== void 0 ? _c : [], (_d = message.blacklist) !== null && _d !== void 0 ? _d : [])
                     .then(() => {
                     const info = { type: "listEnvironments", environments: environmentsInfo() };
-                    monitors.forEach((monitor) => monitor.send(info));
+                    monitors.forEach((monitor) => {
+                        monitor.send(info);
+                    });
                 });
                 break;
             case "unlinkEnvironments":
                 Environments.instance.unlink(message.srcHash, message.targetHash).then(() => {
                     const info = { type: "listEnvironments", environments: environmentsInfo() };
-                    monitors.forEach((monitor) => monitor.send(info));
+                    monitors.forEach((monitor) => {
+                        monitor.send(info);
+                    });
                 });
                 break;
             case "listUsers": {
@@ -54935,9 +55208,9 @@ server.on("monitor", (client) => {
                         }
                     }
                     else {
-                        return hash(message.password || "", Buffer.from(users[message.user].salt, "base64")).then((hash) => {
+                        return hash(message.password || "", Buffer.from(users[message.user].salt, "base64")).then((hsh) => {
                             var _a;
-                            if (((_a = users[message.user || ""]) === null || _a === void 0 ? void 0 : _a.hash) !== hash.toString("base64")) {
+                            if (((_a = users[message.user || ""]) === null || _a === void 0 ? void 0 : _a.hash) !== hsh.toString("base64")) {
                                 throw new Error(`Wrong password ${message.user}`);
                             }
                         });
@@ -54997,8 +55270,8 @@ server.on("monitor", (client) => {
                     };
                     return hash(message.password || "", salt);
                 })
-                    .then((hash) => {
-                    users[message.user || ""].hash = hash.toString("base64");
+                    .then((hsh) => {
+                    users[message.user || ""].hash = hsh.toString("base64");
                     return randomBytes(256);
                 })
                     .then((cookie) => {