@andersbakken/fisk 4.0.29 → 4.0.31

package/monitor/fisk-monitor.js

@@ -3,7 +3,7 @@
 
 var blessed = require('@andersbakken/blessed');
 var require$$0$4 = require('events');
-var require$$1$1 = require('https');
+var require$$1 = require('https');
 var require$$2$1 = require('http');
 var require$$3 = require('net');
 var require$$4 = require('tls');
@@ -11,17 +11,17 @@ var require$$0$3 = require('crypto');
 var require$$6 = require('url');
 var require$$0$1 = require('zlib');
 var require$$0 = require('fs');
-var require$$1 = require('path');
+var path = require('path');
 var require$$2 = require('os');
 var require$$0$2 = require('stream');
 var assert = require('assert');
-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 }; }
 
 var blessed__default = /*#__PURE__*/_interopDefaultLegacy(blessed);
 var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$4);
-var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
+var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
 var require$$2__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$2$1);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
@@ -29,11 +29,11 @@ var require$$0__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$0$3);
 var require$$6__default = /*#__PURE__*/_interopDefaultLegacy(require$$6);
 var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
-var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
+var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
 var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert);
-var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
+var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 
 var bufferUtilExports = {};
 var bufferUtil$1 = {
@@ -69,7 +69,7 @@ function requireNodeGypBuild$1 () {
 	if (hasRequiredNodeGypBuild$1) return nodeGypBuild;
 	hasRequiredNodeGypBuild$1 = 1;
 	var fs = require$$0__default["default"];
-	var path = require$$1__default["default"];
+	var path = path__default["default"];
 	var os = require$$2__default["default"];
 
 	// Workaround to fix webpack's build warnings: 'the request of a dependency is an expression'
@@ -2566,7 +2566,7 @@ function format$2(extensions) {
 var extension = { format: format$2, parse: parse$2 };
 
 const EventEmitter$1 = require$$0__default$4["default"];
-const https = require$$1__default$1["default"];
+const https = require$$1__default["default"];
 const http = require$$2__default$1["default"];
 const net = require$$3__default["default"];
 const tls = require$$4__default["default"];
@@ -4838,10 +4838,10 @@ function requireResolve () {
 	hasRequiredResolve = 1;
 
 	// Dependencies
-	var path = require$$1__default["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;
@@ -4931,7 +4931,7 @@ function requireResolve () {
 }
 
 var appRootPath$1 = function(dirname) {
-	var path = require$$1__default["default"];
+	var path = path__default["default"];
 	var resolve = requireResolve();
 	var appRootPath = resolve(dirname);
 
@@ -4966,7 +4966,7 @@ var xdgBasedir = {};
 
 (function (exports) {
 	const os = require$$2__default["default"];
-	const path = require$$1__default["default"];
+	const path = path__default["default"];
 
 	const home = os.homedir();
 	const env = process.env;
@@ -4994,273 +4994,269 @@ var xdgBasedir = {};
 	}
 } (xdgBasedir));
 
-var minimist;
-var hasRequiredMinimist;
+function hasKey(obj, keys) {
+	var o = obj;
+	keys.slice(0, -1).forEach(function (key) {
+		o = o[key] || {};
+	});
 
-function requireMinimist () {
-	if (hasRequiredMinimist) return minimist;
-	hasRequiredMinimist = 1;
-	minimist = function (args, opts) {
-	    if (!opts) opts = {};
-	    
-	    var flags = { bools : {}, strings : {}, unknownFn: null };
+	var key = keys[keys.length - 1];
+	return key in o;
+}
 
-	    if (typeof opts['unknown'] === 'function') {
-	        flags.unknownFn = opts['unknown'];
-	    }
+function isNumber(x) {
+	if (typeof x === 'number') { return true; }
+	if ((/^0x[0-9a-f]+$/i).test(x)) { return true; }
+	return (/^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/).test(x);
+}
 
-	    if (typeof opts['boolean'] === 'boolean' && opts['boolean']) {
-	      flags.allBools = true;
-	    } else {
-	      [].concat(opts['boolean']).filter(Boolean).forEach(function (key) {
-	          flags.bools[key] = true;
-	      });
-	    }
-	    
-	    var aliases = {};
-	    Object.keys(opts.alias || {}).forEach(function (key) {
-	        aliases[key] = [].concat(opts.alias[key]);
-	        aliases[key].forEach(function (x) {
-	            aliases[x] = [key].concat(aliases[key].filter(function (y) {
-	                return x !== y;
-	            }));
-	        });
-	    });
-
-	    [].concat(opts.string).filter(Boolean).forEach(function (key) {
-	        flags.strings[key] = true;
-	        if (aliases[key]) {
-	            flags.strings[aliases[key]] = true;
-	        }
-	     });
-
-	    var defaults = opts['default'] || {};
-	    
-	    var argv = { _ : [] };
-	    Object.keys(flags.bools).forEach(function (key) {
-	        setArg(key, defaults[key] === undefined ? false : defaults[key]);
-	    });
-	    
-	    var notFlags = [];
-
-	    if (args.indexOf('--') !== -1) {
-	        notFlags = args.slice(args.indexOf('--')+1);
-	        args = args.slice(0, args.indexOf('--'));
-	    }
+function isConstructorOrProto(obj, key) {
+	return (key === 'constructor' && typeof obj[key] === 'function') || key === '__proto__';
+}
 
-	    function argDefined(key, arg) {
-	        return (flags.allBools && /^--[^=]+$/.test(arg)) ||
-	            flags.strings[key] || flags.bools[key] || aliases[key];
-	    }
+var minimist = function (args, opts) {
+	if (!opts) { opts = {}; }
 
-	    function setArg (key, val, arg) {
-	        if (arg && flags.unknownFn && !argDefined(key, arg)) {
-	            if (flags.unknownFn(arg) === false) return;
-	        }
+	var flags = {
+		bools: {},
+		strings: {},
+		unknownFn: null,
+	};
 
-	        var value = !flags.strings[key] && isNumber(val)
-	            ? Number(val) : val
-	        ;
-	        setKey(argv, key.split('.'), value);
-	        
-	        (aliases[key] || []).forEach(function (x) {
-	            setKey(argv, x.split('.'), value);
-	        });
-	    }
+	if (typeof opts.unknown === 'function') {
+		flags.unknownFn = opts.unknown;
+	}
 
-	    function setKey (obj, keys, value) {
-	        var o = obj;
-	        for (var i = 0; i < keys.length-1; i++) {
-	            var key = keys[i];
-	            if (isConstructorOrProto(o, key)) return;
-	            if (o[key] === undefined) o[key] = {};
-	            if (o[key] === Object.prototype || o[key] === Number.prototype
-	                || o[key] === String.prototype) o[key] = {};
-	            if (o[key] === Array.prototype) o[key] = [];
-	            o = o[key];
-	        }
+	if (typeof opts.boolean === 'boolean' && opts.boolean) {
+		flags.allBools = true;
+	} else {
+		[].concat(opts.boolean).filter(Boolean).forEach(function (key) {
+			flags.bools[key] = true;
+		});
+	}
 
-	        var key = keys[keys.length - 1];
-	        if (isConstructorOrProto(o, key)) return;
-	        if (o === Object.prototype || o === Number.prototype
-	            || o === String.prototype) o = {};
-	        if (o === Array.prototype) o = [];
-	        if (o[key] === undefined || flags.bools[key] || typeof o[key] === 'boolean') {
-	            o[key] = value;
-	        }
-	        else if (Array.isArray(o[key])) {
-	            o[key].push(value);
-	        }
-	        else {
-	            o[key] = [ o[key], value ];
-	        }
-	    }
-	    
-	    function aliasIsBoolean(key) {
-	      return aliases[key].some(function (x) {
-	          return flags.bools[x];
-	      });
-	    }
+	var aliases = {};
 
-	    for (var i = 0; i < args.length; i++) {
-	        var arg = args[i];
-	        
-	        if (/^--.+=/.test(arg)) {
-	            // Using [\s\S] instead of . because js doesn't support the
-	            // 'dotall' regex modifier. See:
-	            // http://stackoverflow.com/a/1068308/13216
-	            var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
-	            var key = m[1];
-	            var value = m[2];
-	            if (flags.bools[key]) {
-	                value = value !== 'false';
-	            }
-	            setArg(key, value, arg);
-	        }
-	        else if (/^--no-.+/.test(arg)) {
-	            var key = arg.match(/^--no-(.+)/)[1];
-	            setArg(key, false, arg);
-	        }
-	        else if (/^--.+/.test(arg)) {
-	            var key = arg.match(/^--(.+)/)[1];
-	            var next = args[i + 1];
-	            if (next !== undefined && !/^-/.test(next)
-	            && !flags.bools[key]
-	            && !flags.allBools
-	            && (aliases[key] ? !aliasIsBoolean(key) : true)) {
-	                setArg(key, next, arg);
-	                i++;
-	            }
-	            else if (/^(true|false)$/.test(next)) {
-	                setArg(key, next === 'true', arg);
-	                i++;
-	            }
-	            else {
-	                setArg(key, flags.strings[key] ? '' : true, arg);
-	            }
-	        }
-	        else if (/^-[^-]+/.test(arg)) {
-	            var letters = arg.slice(1,-1).split('');
-	            
-	            var broken = false;
-	            for (var j = 0; j < letters.length; j++) {
-	                var next = arg.slice(j+2);
-	                
-	                if (next === '-') {
-	                    setArg(letters[j], next, arg);
-	                    continue;
-	                }
-	                
-	                if (/[A-Za-z]/.test(letters[j]) && /=/.test(next)) {
-	                    setArg(letters[j], next.split('=')[1], arg);
-	                    broken = true;
-	                    break;
-	                }
-	                
-	                if (/[A-Za-z]/.test(letters[j])
-	                && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
-	                    setArg(letters[j], next, arg);
-	                    broken = true;
-	                    break;
-	                }
-	                
-	                if (letters[j+1] && letters[j+1].match(/\W/)) {
-	                    setArg(letters[j], arg.slice(j+2), arg);
-	                    broken = true;
-	                    break;
-	                }
-	                else {
-	                    setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg);
-	                }
-	            }
-	            
-	            var key = arg.slice(-1)[0];
-	            if (!broken && key !== '-') {
-	                if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1])
-	                && !flags.bools[key]
-	                && (aliases[key] ? !aliasIsBoolean(key) : true)) {
-	                    setArg(key, args[i+1], arg);
-	                    i++;
-	                }
-	                else if (args[i+1] && /^(true|false)$/.test(args[i+1])) {
-	                    setArg(key, args[i+1] === 'true', arg);
-	                    i++;
-	                }
-	                else {
-	                    setArg(key, flags.strings[key] ? '' : true, arg);
-	                }
-	            }
-	        }
-	        else {
-	            if (!flags.unknownFn || flags.unknownFn(arg) !== false) {
-	                argv._.push(
-	                    flags.strings['_'] || !isNumber(arg) ? arg : Number(arg)
-	                );
-	            }
-	            if (opts.stopEarly) {
-	                argv._.push.apply(argv._, args.slice(i + 1));
-	                break;
-	            }
-	        }
-	    }
-	    
-	    Object.keys(defaults).forEach(function (key) {
-	        if (!hasKey(argv, key.split('.'))) {
-	            setKey(argv, key.split('.'), defaults[key]);
-	            
-	            (aliases[key] || []).forEach(function (x) {
-	                setKey(argv, x.split('.'), defaults[key]);
-	            });
-	        }
-	    });
-	    
-	    if (opts['--']) {
-	        argv['--'] = new Array();
-	        notFlags.forEach(function(key) {
-	            argv['--'].push(key);
-	        });
-	    }
-	    else {
-	        notFlags.forEach(function(key) {
-	            argv._.push(key);
-	        });
-	    }
+	function aliasIsBoolean(key) {
+		return aliases[key].some(function (x) {
+			return flags.bools[x];
+		});
+	}
 
-	    return argv;
-	};
+	Object.keys(opts.alias || {}).forEach(function (key) {
+		aliases[key] = [].concat(opts.alias[key]);
+		aliases[key].forEach(function (x) {
+			aliases[x] = [key].concat(aliases[key].filter(function (y) {
+				return x !== y;
+			}));
+		});
+	});
+
+	[].concat(opts.string).filter(Boolean).forEach(function (key) {
+		flags.strings[key] = true;
+		if (aliases[key]) {
+			[].concat(aliases[key]).forEach(function (k) {
+				flags.strings[k] = true;
+			});
+		}
+	});
 
-	function hasKey (obj, keys) {
-	    var o = obj;
-	    keys.slice(0,-1).forEach(function (key) {
-	        o = (o[key] || {});
-	    });
+	var defaults = opts.default || {};
 
-	    var key = keys[keys.length - 1];
-	    return key in o;
+	var argv = { _: [] };
+
+	function argDefined(key, arg) {
+		return (flags.allBools && (/^--[^=]+$/).test(arg))
+			|| flags.strings[key]
+			|| flags.bools[key]
+			|| aliases[key];
 	}
 
-	function isNumber (x) {
-	    if (typeof x === 'number') return true;
-	    if (/^0x[0-9a-f]+$/i.test(x)) return true;
-	    return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
+	function setKey(obj, keys, value) {
+		var o = obj;
+		for (var i = 0; i < keys.length - 1; i++) {
+			var key = keys[i];
+			if (isConstructorOrProto(o, key)) { return; }
+			if (o[key] === undefined) { o[key] = {}; }
+			if (
+				o[key] === Object.prototype
+				|| o[key] === Number.prototype
+				|| o[key] === String.prototype
+			) {
+				o[key] = {};
+			}
+			if (o[key] === Array.prototype) { o[key] = []; }
+			o = o[key];
+		}
+
+		var lastKey = keys[keys.length - 1];
+		if (isConstructorOrProto(o, lastKey)) { return; }
+		if (
+			o === Object.prototype
+			|| o === Number.prototype
+			|| o === String.prototype
+		) {
+			o = {};
+		}
+		if (o === Array.prototype) { o = []; }
+		if (o[lastKey] === undefined || flags.bools[lastKey] || typeof o[lastKey] === 'boolean') {
+			o[lastKey] = value;
+		} else if (Array.isArray(o[lastKey])) {
+			o[lastKey].push(value);
+		} else {
+			o[lastKey] = [o[lastKey], value];
+		}
 	}
 
+	function setArg(key, val, arg) {
+		if (arg && flags.unknownFn && !argDefined(key, arg)) {
+			if (flags.unknownFn(arg) === false) { return; }
+		}
+
+		var value = !flags.strings[key] && isNumber(val)
+			? Number(val)
+			: val;
+		setKey(argv, key.split('.'), value);
 
-	function isConstructorOrProto (obj, key) {
-	    return key === 'constructor' && typeof obj[key] === 'function' || key === '__proto__';
+		(aliases[key] || []).forEach(function (x) {
+			setKey(argv, x.split('.'), value);
+		});
 	}
-	return minimist;
-}
 
-/*global require,module,process*/
+	Object.keys(flags.bools).forEach(function (key) {
+		setArg(key, defaults[key] === undefined ? false : defaults[key]);
+	});
 
-const fs = require$$0__default["default"];
-const path = require$$1__default["default"];
-const appPath = appRootPath;
-const xdg = xdgBasedir;
+	var notFlags = [];
 
-function split(data)
-{
+	if (args.indexOf('--') !== -1) {
+		notFlags = args.slice(args.indexOf('--') + 1);
+		args = args.slice(0, args.indexOf('--'));
+	}
+
+	for (var i = 0; i < args.length; i++) {
+		var arg = args[i];
+		var key;
+		var next;
+
+		if ((/^--.+=/).test(arg)) {
+			// Using [\s\S] instead of . because js doesn't support the
+			// 'dotall' regex modifier. See:
+			// http://stackoverflow.com/a/1068308/13216
+			var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
+			key = m[1];
+			var value = m[2];
+			if (flags.bools[key]) {
+				value = value !== 'false';
+			}
+			setArg(key, value, arg);
+		} else if ((/^--no-.+/).test(arg)) {
+			key = arg.match(/^--no-(.+)/)[1];
+			setArg(key, false, arg);
+		} else if ((/^--.+/).test(arg)) {
+			key = arg.match(/^--(.+)/)[1];
+			next = args[i + 1];
+			if (
+				next !== undefined
+				&& !(/^(-|--)[^-]/).test(next)
+				&& !flags.bools[key]
+				&& !flags.allBools
+				&& (aliases[key] ? !aliasIsBoolean(key) : true)
+			) {
+				setArg(key, next, arg);
+				i += 1;
+			} else if ((/^(true|false)$/).test(next)) {
+				setArg(key, next === 'true', arg);
+				i += 1;
+			} else {
+				setArg(key, flags.strings[key] ? '' : true, arg);
+			}
+		} else if ((/^-[^-]+/).test(arg)) {
+			var letters = arg.slice(1, -1).split('');
+
+			var broken = false;
+			for (var j = 0; j < letters.length; j++) {
+				next = arg.slice(j + 2);
+
+				if (next === '-') {
+					setArg(letters[j], next, arg);
+					continue;
+				}
+
+				if ((/[A-Za-z]/).test(letters[j]) && next[0] === '=') {
+					setArg(letters[j], next.slice(1), arg);
+					broken = true;
+					break;
+				}
+
+				if (
+					(/[A-Za-z]/).test(letters[j])
+					&& (/-?\d+(\.\d*)?(e-?\d+)?$/).test(next)
+				) {
+					setArg(letters[j], next, arg);
+					broken = true;
+					break;
+				}
+
+				if (letters[j + 1] && letters[j + 1].match(/\W/)) {
+					setArg(letters[j], arg.slice(j + 2), arg);
+					broken = true;
+					break;
+				} else {
+					setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg);
+				}
+			}
+
+			key = arg.slice(-1)[0];
+			if (!broken && key !== '-') {
+				if (
+					args[i + 1]
+					&& !(/^(-|--)[^-]/).test(args[i + 1])
+					&& !flags.bools[key]
+					&& (aliases[key] ? !aliasIsBoolean(key) : true)
+				) {
+					setArg(key, args[i + 1], arg);
+					i += 1;
+				} else if (args[i + 1] && (/^(true|false)$/).test(args[i + 1])) {
+					setArg(key, args[i + 1] === 'true', arg);
+					i += 1;
+				} else {
+					setArg(key, flags.strings[key] ? '' : true, arg);
+				}
+			}
+		} else {
+			if (!flags.unknownFn || flags.unknownFn(arg) !== false) {
+				argv._.push(flags.strings._ || !isNumber(arg) ? arg : Number(arg));
+			}
+			if (opts.stopEarly) {
+				argv._.push.apply(argv._, args.slice(i + 1));
+				break;
+			}
+		}
+	}
+
+	Object.keys(defaults).forEach(function (k) {
+		if (!hasKey(argv, k.split('.'))) {
+			setKey(argv, k.split('.'), defaults[k]);
+
+			(aliases[k] || []).forEach(function (x) {
+				setKey(argv, x.split('.'), defaults[k]);
+			});
+		}
+	});
+
+	if (opts['--']) {
+		argv['--'] = notFlags.slice();
+	} else {
+		notFlags.forEach(function (k) {
+			argv._.push(k);
+		});
+	}
+
+	return argv;
+};
+
+function split(data) {
     const pre = data.split("\n");
     // rejoin with lines that starts with a whitespace
     const out = [];
@@ -5279,7 +5275,8 @@ function split(data)
                 --idx;
             if (idx < cur.length - 1)
                 cur = cur.substr(0, idx + 1);
-        } else if (cur.length > 0) {
+        }
+        else if (cur.length > 0) {
             out.push(cur.trim());
             cur = line.trim();
         }
@@ -5289,9 +5286,7 @@ function split(data)
     }
     return out;
 }
-
-function realValue(v)
-{
+function realValue(v) {
     if (typeof v !== "string")
         return v;
     if (/^[-0-9.]+$/.exec(v)) {
@@ -5300,119 +5295,130 @@ function realValue(v)
             return vf;
     }
     switch (v) {
-    case "true":
-        return true;
-    case "false":
-        return false;
+        case "true":
+            return true;
+        case "false":
+            return false;
     }
     return v;
 }
-
-class Options {
+class Engine {
+    argv;
+    prefix;
+    additionalFiles;
+    applicationPath;
+    debug;
+    options;
+    configDirs;
     constructor(options, argv) {
         this.argv = Object.assign({}, argv);
         this.prefix = options.prefix;
         this.additionalFiles = options.additionalFiles || [];
-        this.applicationPath = options.noApplicationPath ? "" : appPath.toString();
-        this.debug = options.debug;
+        this.applicationPath = options.noApplicationPath ? "" : appRootPath.toString();
+        this.debug = options.debug ?? false;
         this.options = {};
-        this.configDirs = this.argv["config-dir"] ||  options.configDirs || xdg.configDirs;
+        this.configDirs = this.argv["config-dir"] || options.configDirs || xdgBasedir.configDirs;
         this._read();
     }
-
     value(name) {
         // foo-bar becomes FOO_BAR as env
-        if (name in this.argv)
+        if (name in this.argv) {
             return this.argv[name];
+        }
         const envname = (this.prefix + "_" + name).replace(/-/g, "_").toUpperCase();
-        if (envname in process.env)
+        if (envname in process.env) {
             return realValue(process.env[envname]);
-
-        if (name in this.options)
+        }
+        if (name in this.options) {
             return this.options[name];
+        }
         return undefined;
     }
-
+    string(name) {
+        const ret = this.value(name);
+        if (ret === undefined) {
+            return undefined;
+        }
+        return String(ret);
+    }
     _homedir() {
         let home = process.env.home;
         if (home) {
-            return path.join(home, ".config");
+            return path__default["default"].join(home, ".config");
         }
         return undefined;
     }
-
     _log(...args) {
         if (this.debug)
             console.log(...args);
     }
-
     _read() {
         // if we have a config file passed, read it
-        let file = this.value("config-file");
+        let file = this.string("config-file");
         if (!file && this.prefix)
             file = this.prefix + ".conf";
         if (!file)
             return;
-
         let data = [];
         let seen = new Set();
-        const Failed = 0;
-        const Success = 1;
-        const Seen = 2;
-        const read = file => {
+        const read = (file) => {
             if (seen.has(file))
-                return Seen;
+                return 2 /* OptionsReadResult.Seen */;
             seen.add(file);
             try {
-                const contents = fs.readFileSync(file, "utf8");
+                const contents = require$$0__default["default"].readFileSync(file, "utf8");
                 this._log(`Loaded ${contents.length} bytes from ${file}`);
-
                 if (contents) {
-                    data.push({ file: file, contents: contents });
-                    return Success;
+                    data.push({ file, contents });
+                    return 1 /* OptionsReadResult.Success */;
                 }
-            } catch (e) {
+            }
+            catch (e) {
                 this._log(`Failed to load ${file}`);
             }
-            return Failed;
+            return 0 /* OptionsReadResult.Failed */;
         };
-
         // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
-        if (path.isAbsolute(file)) {
+        if (path__default["default"].isAbsolute(file)) {
             read(file);
-        } else {
+        }
+        else {
             this.additionalFiles.forEach(file => {
-                if (path.isAbsolute(file) && read(file) == Failed)
+                if (path__default["default"].isAbsolute(file) && read(file) == 0 /* OptionsReadResult.Failed */) {
                     read(file + ".conf");
+                }
             });
             ([this.applicationPath, this._homedir()].concat(this.configDirs)).forEach(root => {
                 // in case we appended with undefined
-                if (!root)
+                if (!root) {
                     return;
+                }
                 this.additionalFiles.forEach(additional => {
-                    if (!path.isAbsolute(additional)) {
-                        let file = path.join(root, additional);
-                        if (read(file) == Failed)
+                    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 = path.join(root, file);
-                if (read(filePath) == Failed)
+                let filePath = path__default["default"].join(root, file);
+                if (read(filePath) == 0 /* OptionsReadResult.Failed */) {
                     read(filePath + ".conf");
+                }
             });
         }
         for (let i = data.length - 1; i >= 0; --i) {
             let str = data[i].contents;
-            if (!str)
+            if (!str) {
                 continue;
+            }
             try {
                 let obj = JSON.parse(str);
                 for (let key in obj) {
                     this._log(`Assigning ${JSON.stringify(obj[key])} over ${JSON.stringify(this.options[key])} for ${key} from ${data[i].file} (JSON)`);
                     this.options[key] = obj[key];
                 }
-            } catch (err) {
+            }
+            catch (err) {
                 const items = split(str);
                 for (let j = 0; j < items.length; ++j) {
                     const item = items[j].trim();
@@ -5425,12 +5431,12 @@ class Options {
                         this._log("Couldn't find =", item);
                         continue;
                     }
-                    const key = item.substr(0, eq).trim();
+                    const key = item.substring(0, eq).trim();
                     if (!key.length) {
                         this._log("empty key", item);
                         continue;
                     }
-                    const value = item.substr(eq + 1).trim();
+                    const value = item.substring(eq + 1).trim();
                     this._log(`Assigning ${value} over ${this.options[key]} for ${key} from ${data[i].file} (INI)`);
                     this.options[key] = value;
                 }
@@ -5438,37 +5444,34 @@ class Options {
         }
     }
 }
-
-const data = {};
-
-var options = function(options, argv) {
-    if (!argv)
-        argv = requireMinimist()(process.argv.slice(2));
-    if (!(options instanceof Object))
-        options = { prefix: options || "" };
-
-    data.options = new Options(options, argv);
-    let ret = function(name, defaultValue) {
-        const val = data.options.value(name);
-        if (typeof val === "undefined")
+function options (optionsOptions, argv) {
+    if (!argv) {
+        argv = minimist(process.argv.slice(2));
+    }
+    if (!(optionsOptions instanceof Object)) {
+        optionsOptions = { prefix: optionsOptions || "" };
+    }
+    const engine = new Engine(optionsOptions, argv);
+    function value(name, defaultValue) {
+        const val = engine.value(name);
+        if (val === undefined)
             return defaultValue;
         return val;
-    };
-    ret.prefix = options.prefix;
-    ret.int = function(name, defaultValue) {
-        const v = parseInt(data.options.value(name));
+    }
+    function float(name, defaultValue) {
+        const v = parseFloat(engine.string(name) || "");
         if (typeof v === "number" && !isNaN(v))
             return v;
         return defaultValue;
-    };
-    ret.float = function(name, defaultValue) {
-        const v = parseFloat(data.options.value(name));
+    }
+    function int(name, defaultValue) {
+        const v = parseInt(engine.string(name) || "");
         if (typeof v === "number" && !isNaN(v))
             return v;
         return defaultValue;
-    };
-    ret.json = function(name, defaultValue) {
-        const opt = data.options.value(name);
+    }
+    function json(name, defaultValue) {
+        const opt = engine.value(name);
         if (opt === undefined)
             return defaultValue;
         if (typeof opt !== "string")
@@ -5476,12 +5479,22 @@ var options = function(options, argv) {
         try {
             const json = JSON.parse(opt);
             return json;
-        } catch (e) {
+        }
+        catch (e) {
         }
         return defaultValue;
-    };
-    return ret;
-};
+    }
+    function string(name, defaultValue) {
+        return engine.string(name) ?? defaultValue;
+    }
+    return Object.assign(value, {
+        prefix: optionsOptions.prefix,
+        float,
+        int,
+        json,
+        string,
+    });
+}
 
 const option = options({
     prefix: "fisk/monitor",