@andersbakken/fisk 4.0.1 → 4.0.3

package/builder/fisk-builder.js

@@ -5450,7 +5450,7 @@ function push$1(dest, name, elem) {
  * @return {Object} The parsed object
  * @public
  */
-function parse$f(header) {
+function parse$e(header) {
   const offers = Object.create(null);
 
   if (header === undefined || header === '') return offers;
@@ -5625,7 +5625,7 @@ function format$6(extensions) {
     .join(', ');
 }
 
-var extension = { format: format$6, parse: parse$f };
+var extension = { format: format$6, parse: parse$e };
 
 const EventEmitter$2 = EventEmitter__default["default"];
 const https = require$$1__default$1["default"];
@@ -5647,7 +5647,7 @@ const {
   NOOP
 } = constants;
 const { addEventListener, removeEventListener } = eventTarget;
-const { format: format$5, parse: parse$e } = extension;
+const { format: format$5, parse: parse$d } = extension;
 const { toBuffer } = bufferUtilExports;
 
 const readyStates = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'];
@@ -6277,7 +6277,7 @@ function initAsClient(websocket, address, protocols, options) {
 
     if (perMessageDeflate) {
       try {
-        const extensions = parse$e(res.headers['sec-websocket-extensions']);
+        const extensions = parse$d(res.headers['sec-websocket-extensions']);
 
         if (extensions[PerMessageDeflate$1.extensionName]) {
           perMessageDeflate.accept(extensions[PerMessageDeflate$1.extensionName]);
@@ -6738,7 +6738,7 @@ const { createServer, STATUS_CODES } = require$$2__default["default"];
 
 const PerMessageDeflate = permessageDeflate;
 const WebSocket$1 = websocket;
-const { format: format$4, parse: parse$d } = extension;
+const { format: format$4, parse: parse$c } = extension;
 const { GUID, kWebSocket } = constants;
 
 const keyRegex = /^[+/0-9A-Za-z]{22}==$/;
@@ -6939,7 +6939,7 @@ class WebSocketServer extends EventEmitter$1 {
       );
 
       try {
-        const offers = parse$d(req.headers['sec-websocket-extensions']);
+        const offers = parse$c(req.headers['sec-websocket-extensions']);
 
         if (offers[PerMessageDeflate.extensionName]) {
           perMessageDeflate.accept(offers[PerMessageDeflate.extensionName]);
@@ -9155,7 +9155,7 @@ var bytes$1 = {
 
 bytes$1.exports = bytes;
 bytesExports.format = format$3;
-bytesExports.parse = parse$c;
+bytesExports.parse = parse$b;
 
 /**
  * Module variables.
@@ -9194,7 +9194,7 @@ var parseRegExp = /^((-|\+)?(\d+(?:\.\d+)?)) *(kb|mb|gb|tb|pb)$/i;
 
 function bytes(value, options) {
   if (typeof value === 'string') {
-    return parse$c(value);
+    return parse$b(value);
   }
 
   if (typeof value === 'number') {
@@ -9279,7 +9279,7 @@ function format$3(value, options) {
  * @public
  */
 
-function parse$c(val) {
+function parse$b(val) {
   if (typeof val === 'number' && !isNaN(val)) {
     return val;
   }
@@ -9364,7 +9364,7 @@ var TYPE_REGEXP = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+\/[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
  */
 
 contentType.format = format$2;
-contentType.parse = parse$b;
+contentType.parse = parse$a;
 
 /**
  * Format object to media type.
@@ -9415,7 +9415,7 @@ function format$2 (obj) {
  * @public
  */
 
-function parse$b (string) {
+function parse$a (string) {
   if (!string) {
     throw new TypeError('argument string is required')
   }
@@ -23362,7 +23362,7 @@ var typeRegExp = /^ *([A-Za-z0-9][A-Za-z0-9!#$&^_-]{0,126})\/([A-Za-z0-9][A-Za-z
  */
 
 mediaTyper.format = format$1;
-mediaTyper.parse = parse$a;
+mediaTyper.parse = parse$9;
 
 /**
  * Format object to media type.
@@ -23429,7 +23429,7 @@ function format$1(obj) {
  * @api public
  */
 
-function parse$a(string) {
+function parse$9(string) {
   if (!string) {
     throw new TypeError('argument string is required')
   }
@@ -37225,7 +37225,7 @@ var normalizeParseOptions = function normalizeParseOptions(opts) {
     };
 };
 
-var parse$9 = function (str, opts) {
+var parse$8 = function (str, opts) {
     var options = normalizeParseOptions(opts);
 
     if (str === '' || str === null || typeof str === 'undefined') {
@@ -37252,12 +37252,12 @@ var parse$9 = function (str, opts) {
 };
 
 var stringify$1 = stringify_1;
-var parse$8 = parse$9;
+var parse$7 = parse$8;
 var formats = formats$3;
 
 var lib$1 = {
     formats: formats,
-    parse: parse$8,
+    parse: parse$7,
     stringify: stringify$1
 };
 
@@ -37931,7 +37931,7 @@ var parseurl$1 = {
  */
 
 var url = require$$0__default$3["default"];
-var parse$7 = url.parse;
+var parse$6 = url.parse;
 var Url = url.Url;
 
 /**
@@ -38010,7 +38010,7 @@ function originalurl (req) {
 
 function fastparse (str) {
   if (typeof str !== 'string' || str.charCodeAt(0) !== 0x2f /* / */) {
-    return parse$7(str)
+    return parse$6(str)
   }
 
   var pathname = str;
@@ -38037,7 +38037,7 @@ function fastparse (str) {
       case 0x23: /* #  */
       case 0xa0:
       case 0xfeff:
-        return parse$7(str)
+        return parse$6(str)
     }
   }
 
@@ -40157,7 +40157,7 @@ var contentDisposition$2 = {
  */
 
 contentDisposition$2.exports = contentDisposition$1;
-contentDispositionExports.parse = parse$6;
+contentDispositionExports.parse = parse$5;
 
 /**
  * Module dependencies.
@@ -40456,7 +40456,7 @@ function getlatin1 (val) {
  * @public
  */
 
-function parse$6 (string) {
+function parse$5 (string) {
   if (!string || typeof string !== 'string') {
     throw new TypeError('argument string is required')
   }
@@ -43771,7 +43771,7 @@ var ms$1 = function (val, options) {
   options = options || {};
   var type = typeof val;
   if (type === 'string' && val.length > 0) {
-    return parse$5(val);
+    return parse$4(val);
   } else if (type === 'number' && isFinite(val)) {
     return options.long ? fmtLong(val) : fmtShort(val);
   }
@@ -43789,7 +43789,7 @@ var ms$1 = function (val, options) {
  * @api private
  */
 
-function parse$5(str) {
+function parse$4(str) {
   str = String(str);
   if (str.length > 100) {
     return;
@@ -45241,7 +45241,7 @@ function forwarded$1 (req) {
   }
 
   // simple header parsing
-  var proxyAddrs = parse$4(req.headers['x-forwarded-for'] || '');
+  var proxyAddrs = parse$3(req.headers['x-forwarded-for'] || '');
   var socketAddr = getSocketAddr(req);
   var addrs = [socketAddr].concat(proxyAddrs);
 
@@ -45270,7 +45270,7 @@ function getSocketAddr (req) {
  * @private
  */
 
-function parse$4 (header) {
+function parse$3 (header) {
   var end = header.length;
   var list = [];
   var start = header.length;
@@ -48460,7 +48460,7 @@ var typeis = typeIsExports;
 var http$1 = require$$2__default["default"];
 var fresh = fresh_1;
 var parseRange = rangeParser_1;
-var parse$3 = parseurlExports;
+var parse$2 = parseurlExports;
 var proxyaddr = proxyAddrExports;
 
 /**
@@ -48850,7 +48850,7 @@ defineGetter(req, 'subdomains', function subdomains() {
  */
 
 defineGetter(req, 'path', function path() {
-  return parse$3(this).pathname;
+  return parse$2(this).pathname;
 });
 
 /**
@@ -49034,7 +49034,7 @@ var cookie$1 = {};
  * @public
  */
 
-cookie$1.parse = parse$2;
+cookie$1.parse = parse$1;
 cookie$1.serialize = serialize;
 
 /**
@@ -49066,7 +49066,7 @@ var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
  * @public
  */
 
-function parse$2(str, options) {
+function parse$1(str, options) {
   if (typeof str !== 'string') {
     throw new TypeError('argument str must be a string');
   }
@@ -49343,7 +49343,7 @@ function append (header, field) {
 
   // get fields array
   var fields = !Array.isArray(field)
-    ? parse$1(String(field))
+    ? parse(String(field))
     : field;
 
   // assert on invalid field names
@@ -49360,7 +49360,7 @@ function append (header, field) {
 
   // enumerate current values
   var val = header;
-  var vals = parse$1(header.toLowerCase());
+  var vals = parse(header.toLowerCase());
 
   // unspecified vary
   if (fields.indexOf('*') !== -1 || vals.indexOf('*') !== -1) {
@@ -49390,7 +49390,7 @@ function append (header, field) {
  * @private
  */
 
-function parse$1 (header) {
+function parse (header) {
   var end = 0;
   var list = [];
   var start = 0;
@@ -54981,76 +54981,6 @@ var options = function(options, argv) {
     return ret;
 };
 
-let durationRE = /(-?(?:\d+\.?\d*|\d*\.?\d+)(?:e[-+]?\d+)?)\s*([\p{L}]*)/uig;
-
-
-/**
- * conversion ratios
- */
-
-parse.nanosecond =
-parse.ns = 1 / 1e6;
-
-parse['µs'] =
-parse['μs'] =
-parse.us =
-parse.microsecond = 1 / 1e3;
-
-parse.millisecond =
-parse.ms =
-parse[''] = 1;
-
-parse.second =
-parse.sec =
-parse.s = parse.ms * 1000;
-
-parse.minute =
-parse.min =
-parse.m = parse.s * 60;
-
-parse.hour =
-parse.hr =
-parse.h = parse.m * 60;
-
-parse.day =
-parse.d = parse.h * 24;
-
-parse.week =
-parse.wk =
-parse.w = parse.d * 7;
-
-parse.month =
-parse.b =
-parse.d * (365.25 / 12);
-
-parse.year =
-parse.yr =
-parse.y = parse.d * 365.25;
-
-/**
- * convert `str` to ms
- *
- * @param {String} str
- * @param {String} format
- * @return {Number}
- */
-
-function parse(str='', format='ms'){
-  var result = null;
-  // ignore commas/placeholders
-  str = (str+'').replace(/(\d)[,_](\d)/g, '$1$2');
-  str.replace(durationRE, function(_, n, units){
-    units = unitRatio(units);
-    if (units) result = (result || 0) + parseFloat(n, 10) * units;
-  });
-
-  return result && (result / (unitRatio(format) || 1))
-}
-
-function unitRatio(str) {
-  return parse[str] || parse[str.toLowerCase().replace(/s$/, '')]
-}
-
 const option = options({
     prefix: "fisk/builder",
     noApplicationPath: true,
@@ -55076,34 +55006,6 @@ process.on("uncaughtException", (err) => {
     quitOnError(option)();
 });
 let debug = option("debug");
-let restartOnInactivity = Number(option("restart-on-inactivity"));
-if (typeof restartOnInactivity === "string") {
-    restartOnInactivity = parse(restartOnInactivity);
-}
-let shutdownTimer;
-function restartShutdownTimer() {
-    if (restartOnInactivity > 0) {
-        if (shutdownTimer) {
-            clearTimeout(shutdownTimer);
-        }
-        const shutdownNow = () => {
-            console.log("shutting down now due to inactivity");
-            // child_process.exec("shutdown -h now");
-        };
-        if (restartOnInactivity <= 10000) {
-            shutdownTimer = setTimeout(shutdownNow, restartOnInactivity);
-        }
-        else {
-            shutdownTimer = setTimeout(() => {
-                console.log("shutting down in 10 seconds due to inactivity");
-                shutdownTimer = setTimeout(shutdownNow, 10000);
-            }, restartOnInactivity - 10000);
-        }
-    }
-}
-if (restartOnInactivity) {
-    restartShutdownTimer();
-}
 let objectCache;
 function getFromCache(job, cb) {
     // console.log("got job", job.sha1, objectCache ? objectCache.state(job.sha1) : false);
@@ -55576,7 +55478,6 @@ client.on("requestEnvironments", () => {
     client.send("environments", { environments: Object.keys(environments) });
 });
 client.on("connect", () => {
-    restartShutdownTimer();
     console.log("connected");
     if (connectInterval) {
         clearInterval(connectInterval);
@@ -55695,7 +55596,6 @@ function startPending() {
     }
 }
 server.on("job", (job) => {
-    restartShutdownTimer();
     const vm = environments[job.hash];
     if (!vm) {
         console.error("No vm for this hash", job.hash);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@andersbakken/fisk",
-    "version": "4.0.1",
+    "version": "4.0.3",
     "description": "Fisk, a distributed compile system",
     "scripts": {
         "lint": "eslint . --ext .ts",
@@ -41,7 +41,6 @@
         "humanize-duration": "^3.17.0",
         "lowdb": "^1.0.0",
         "minimist": "^1.2.5",
-        "parse-duration": "^1.0.2",
         "posix": "^4.2.0",
         "pretty-bytes": "^6.0.0",
         "typescript": "^4.3.5",