hfs 0.47.3 → 0.48.0-alpha2

package/src/langs/hfs-lang-de.json

@@ -0,0 +1,131 @@
+{
+    "author": "kumpu",
+    "version": 1.0,
+    "hfs_version": "0.47.2",
+    "translate": {
+        "Select": "Auswählen",
+        "n_files": "{n,plural,one{# Datei} other{# Dateien}}",
+        "n_folders": "{n,plural,one{# Ordner} other{# Ordner}}",
+        "filter_count": "{n,plural, one{# gefiltert} other{# gefiltert}}",
+        "select_count": "{n,plural, one{# ausgewählt} other{# ausgewählt}}",
+        "filter_placeholder": "Filter...",
+        "Select some files": "Dateien auswählen",
+        "zip_checkboxes": "Nutzen Sie die Kästchen um Dateien auszuwählen, danach können sie die Zip-Funktion wieder benutzen",
+        "zip_tooltip_selected": "Ausgewählte Elemente als einzelne Zip-Datei herunterladen",
+        "zip_tooltip_whole": "Die ganze Liste (ungefiltert) als einzelne Zip-Datei herunterladen. Wenn Sie einige Elemente auswählen, werden nur diese herunterladen.",
+        "zip_confirm_search": "ALLE Ergebnisse dieser Suche als Zip-Datei herunterladen?",
+        "zip_confirm_folder": "GANZEN Ordner als Zip-Datei herunterladen?",
+        "select_tooltip": "Auswahl wird benutzt von \"Zip\" und \"Löschen\" (wenn verfügbar), aber Sie können die Liste auch filtern",
+        "delete_hint": "Clicken sie erst \"Auswählen\", um zu löschen",
+        "delete_confirm": "Lösche {n,plural, one{# Element} other{# Elemente}}?",
+        "delete_completed": "Löschen: {n} abgeschlossen",
+        "delete_failed": ", {n,plural, one{# fehlgeschlagen} other{# fehlgeschlagen}}",
+        "delete_select": "Wählen sie Elemente zum Löschen aus",
+        "Delete": "Löschen",
+        "Options": "Optionen",
+        "Search": "Suche",
+        "Zip": "Zip",
+        "search_msg": "Ordner und Unterordner durchsuchen",
+        "Searching": "Suche",
+        "Searched": "Gesucht",
+        "Clear search": "Ergebnisse löschen",
+        "Interrupted": "Abgebrochen",
+        "stopped_before": "Gestoppt bevor etwas gefunden wurde",
+        "empty_list": "Keine Treffer",
+        "filter_none": "Keine Treffer für Filter",
+        "Admin-panel": "Admin-Panel",
+        "Login": "Login",
+        "Username": "Benutzer",
+        "Password": "Passwort",
+        "login_untrusted": "Login abgebrochen: Serveridentität kann nicht vertraut werden",
+        "login_bad_credentials": "Ungültige Anmeldedaten",
+        "login_bad_cookies": "Cookies funktionieren nicht - Login gescheitert",
+        "User panel": "User-Panel",
+        "Change password": "Passwort ändern",
+        "enter_pass": "Neues Passwort eingeben",
+        "enter_pass2": "Neues Passwort erneut eingeben",
+        "pass2_mismatch": "Die Passwörter stimmen nicht überein. Vorgang abgebrochen.",
+        "password_changed": "Passwort geändert",
+        "Logout": "Logout",
+        "connection error": "Verbindungsfehler",
+        "Full timestamp:": "Ganzer Zeitstempel:",
+        "Search was interrupted": "Suche wurde abgebrochen",
+        "Stop list": "Suche abbrechen",
+        "upload_starting": "Ihr Download sollte jetzt starten",
+        "wrong_account": "Account {u} hat keinen Zugriff, versuchen Sie einen anderen",
+        "no_upload_here": "Keine Uploadberechtigung für den momentanen Ordner",
+        "Create folder": "Ordner erstellen",
+        "Pick files": "Dateien auswählen",
+        "Pick folder": "Ordner auswählen",
+        "send_files": "Uploade {n,plural,one{# Datei} other{# Dateien}}, {size}",
+        "Clear": "Upload abbrechen",
+        "failed_upload": "Konnte {name} nicht hochladen",
+        "confirm_resume": "Upload fortsetzen?",
+        "file too large": "Datei zu groß",
+        "Enter folder name": "Ordnername eingeben",
+        "Successfully created": "Erstellung erfolgreich",
+        "enter_folder": "Ordner öffnen",
+        "folder_exists": "Ein Ordner mit diesem Namen existiert bereits",
+        "Sort by:": "Sortieren nach: {by}",
+        "name": "Name",
+        "extension": "Dateityp",
+        "size": "Größe",
+        "time": "Datum",
+        "Invert order": "Umgekehrte Reihenfolge",
+        "Folders first": "Ordner zuerst",
+        "Numeric names": "Numerische Namen",
+        "theme:": "Theme:",
+        "auto": "Auto",
+        "light": "Hell",
+        "dark": "Dunkel",
+        "parent folder": "Übergeordneter Ordner",
+        "home": "Home",
+        "Continue": "Fortfahren",
+        "Confirm": "Bestätigen",
+        "Don't": "Abbrechen",
+        "Warning": "Warnung",
+        "Error": "Fehler",
+        "Info": "Info",
+        "Unauthorized": "Nicht autorisiert",
+        "Forbidden": "Verboten",
+        "Not found": "Nicht gefunden",
+        "Server error": "Server Fehler",
+        "Upload": "Upload",
+        "upload_concluded": "Upload abgeschlossen:",
+        "upload_finished": "{n} abgeschlossen ({size})",
+        "upload_errors": "{n} fehlgeschlagen",
+        "upload_file_rejected": "Einige Dateien wurden nicht akzeptiert",
+        "File menu": "Dateimenü",
+        "Folder menu": "Ordnermenü",
+        "Name": "Name",
+        "file_open": "Öffnen",
+        "Download": "Download",
+        "Missing permission": "Fehlende Berechtigung",
+        "Reload": "Neu laden",
+        "Get list": "Liste anzeigen",
+        "Skip existing files": "Überspringe existierende Dateien ",
+        "Size": "Größe",
+        "Timestamp": "Datum",
+        "Show": "Anzeigen",
+        "Loading failed": "Laden fehlgeschlagen",
+        "Rename": "Umbenennen",
+        "Tiles mode:": "Kachelmodus:",
+        "off": "Aus",
+        "Operation successful": "Operation erfolgreich",
+        "Uploader": "Uploader",
+        "Download counter": "Downloadzähler",
+        "Switch zoom mode": "Zoom Modus wechseln",
+        "Full screen": "Vollbild",
+        "File Show help": "Dateianzeige - Hilfe",
+        "showHelpMain": "Tastaturbefehle:",
+        "showHelp_←/→": "←/→",
+        "showHelp_↑/↓": "↑/↓",
+        "showHelp_space": "Leertaste",
+        "showHelp_←/→_body": "vorherige/nächste Datei",
+        "showHelp_↑/↓_body": "Hohe Bilder scrollen",
+        "showHelp_space_body": "Auswählen",
+        "showHelp_D_body": "Download",
+        "showHelp_Z_body": "Zoom Modus",
+        "showHelp_F_body": "Vollbildmodus"
+    }
+}

package/src/langs/hfs-lang-it.json

@@ -28,7 +28,7 @@
         "Searching": "Cercando",
         "Searched": "Risultati ricerca",
         "Clear search": "Annulla ricerca",
-        "Interrupted": "interrotto",
+        "Interrupted": "Interrotto",
         "stopped_before": "Ricerca interrotta prima di trovare risultati",
         "empty_list": "Non c'è niente qui",
         "filter_none": "Nessun elemento corrisponde al filtro impostato",

package/src/listen.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUrls = exports.getServerStatus = exports.httpsPortCfg = exports.openAdmin = exports.portCfg = exports.getHttpsWorkingPort = void 0;
+exports.getUrls = exports.getIps = exports.getServerStatus = exports.httpsPortCfg = exports.openAdmin = exports.portCfg = exports.getHttpsWorkingPort = void 0;
 const http = __importStar(require("http"));
 const config_1 = require("./config");
 const index_1 = require("./index");
@@ -41,6 +41,8 @@ const const_1 = require("./const");
 const find_process_1 = __importDefault(require("find-process"));
 const adminApis_1 = require("./adminApis");
 const lodash_1 = __importDefault(require("lodash"));
+const crypto_1 = require("crypto");
+const api_net_1 = require("./api.net");
 let httpSrv;
 let httpsSrv;
 const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', !const_1.DEV);
@@ -59,7 +61,7 @@ exports.portCfg.sub(async (port) => {
     if (!port)
         return;
     httpSrv.on('connection', connections_1.newConnection);
-    printUrls(port, 'http');
+    printUrls(httpSrv.name);
     if (openBrowserAtStart.get() && !const_1.argv.updated)
         openAdmin();
 });
@@ -69,9 +71,9 @@ function openAdmin() {
         if (!a || typeof a === 'string')
             continue;
         const baseUrl = srv.name + '://localhost:' + a.port;
-        (0, open_1.default)(baseUrl + const_1.ADMIN_URI, { wait: true }).catch(e => {
+        (0, open_1.default)(baseUrl + const_1.ADMIN_URI, { wait: true }).catch(async (e) => {
             console.debug(String(e));
-            console.warn("cannot launch browser on this machine >PLEASE< open your browser and reach one of these (you may need a different address)", ...Object.values(getUrls()).flat().map(x => '\n - ' + x + const_1.ADMIN_URI));
+            console.warn("cannot launch browser on this machine >PLEASE< open your browser and reach one of these (you may need a different address)", ...Object.values(await getUrls()).flat().map(x => '\n - ' + x + const_1.ADMIN_URI));
             if (!(0, adminApis_1.anyAccountCanLoginAdmin)())
                 console.log(`HINT: you can enter command: create-admin YOUR_PASSWORD`);
         });
@@ -81,19 +83,27 @@ function openAdmin() {
 }
 exports.openAdmin = openAdmin;
 const considerHttps = (0, misc_1.debounceAsync)(async () => {
-    var _a, _b;
+    var _a, _b, _c;
     stopServer(httpsSrv).then();
     let port = exports.httpsPortCfg.get();
     try {
         while (!index_1.app)
             await (0, misc_1.wait)(100);
-        httpsSrv = Object.assign(https.createServer(port < 0 ? {} : { key: httpsOptions.private_key, cert: httpsOptions.cert }, index_1.app.callback()), { name: 'https', error: undefined });
+        httpsSrv = Object.assign(https.createServer(port === PORT_DISABLED ? {} : { key: httpsOptions.private_key, cert: httpsOptions.cert }, index_1.app.callback()), { name: 'https' });
         if (port >= 0) {
+            const cert = new crypto_1.X509Certificate(httpsOptions.cert);
+            const cn = (_a = cert.subject.split('CN=')[1]) === null || _a === void 0 ? void 0 : _a.split('\n')[0];
+            if (cn)
+                console.log("certificate loaded for", cn);
+            const now = new Date();
+            httpsSrv.error = new Date(cert.validFrom) > now ? "certificate not valid yet"
+                : new Date(cert.validTo) < now ? "certificate expired"
+                    : undefined;
             const namesForOutput = { cert: 'certificate', private_key: 'private key' };
-            const missing = (_a = httpsNeeds.find(x => !x.get())) === null || _a === void 0 ? void 0 : _a.key();
+            const missing = (_b = httpsNeeds.find(x => !x.get())) === null || _b === void 0 ? void 0 : _b.key();
             if (missing)
                 return httpsSrv.error = "missing " + namesForOutput[missing];
-            const cantRead = (_b = httpsNeeds.find(x => !httpsOptions[x.key()])) === null || _b === void 0 ? void 0 : _b.key();
+            const cantRead = (_c = httpsNeeds.find(x => !httpsOptions[x.key()])) === null || _c === void 0 ? void 0 : _c.key();
             if (cantRead)
                 return httpsSrv.error = "cannot read " + namesForOutput[cantRead];
         }
@@ -107,7 +117,7 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
     if (!port)
         return;
     httpsSrv.on('connection', connections_1.newConnection);
-    printUrls(port, 'https');
+    printUrls(httpsSrv.name);
 });
 const cert = (0, config_1.defineConfig)('cert', '');
 const privateKey = (0, config_1.defineConfig)('private_key', '');
@@ -130,14 +140,15 @@ for (const cfg of httpsNeeds) {
         await considerHttps();
     });
 }
-exports.httpsPortCfg = (0, config_1.defineConfig)('https_port', -1);
+const PORT_DISABLED = -1;
+exports.httpsPortCfg = (0, config_1.defineConfig)('https_port', PORT_DISABLED);
 exports.httpsPortCfg.sub(considerHttps);
 function startServer(srv, { port, host }) {
     return new Promise(async (resolve) => {
         if (!srv)
             return 0;
         try {
-            if (port < 0 || !host && !await testIpV4()) // !host means ipV4+6, and if v4 port alone is busy we won't be notified of the failure, so we'll first test it on its own
+            if (port === PORT_DISABLED || !host && !await testIpV4()) // !host means ipV4+6, and if v4 port alone is busy we won't be notified of the failure, so we'll first test it on its own
                 return resolve(0);
             // from a few tests, this seems enough to support the expect-100 http/1.1 mechanism, at least with curl -T, not used by chrome|firefox anyway
             srv.on('checkContinue', (req, res) => srv.emit('request', req, res));
@@ -216,40 +227,36 @@ async function getServerStatus() {
 }
 exports.getServerStatus = getServerStatus;
 const ignore = /^(lo|.*loopback.*|virtualbox.*|.*\(wsl\).*|llw\d|awdl\d|utun\d|anpi\d)$/i; // avoid giving too much information
-function getUrls() {
+async function getIps() {
+    const ips = (0, misc_1.onlyTruthy)(Object.entries((0, os_1.networkInterfaces)()).map(([name, nets]) => nets && !ignore.test(name)
+        && v4first((0, misc_1.onlyTruthy)(nets.map(net => !net.internal && net.address)))[0] // for each interface we consider only 1 address
+    )).flat();
+    const e = await api_net_1.externalIp;
+    if (e)
+        ips.unshift(e);
+    return v4first(ips)
+        .filter((x, i, a) => a.length > 1 || !x.startsWith('169.254')); // 169.254 = dhcp failure on the interface, but keep it if it's our only one
+    function v4first(a) {
+        return lodash_1.default.sortBy(a, x => x.includes(':'));
+    }
+}
+exports.getIps = getIps;
+async function getUrls() {
+    const ips = (await getIps()).map(ip => ip.includes(':') ? '[' + ip + ']' : ip);
     return Object.fromEntries((0, misc_1.onlyTruthy)([httpSrv, httpsSrv].map(srv => {
         var _a;
         if (!(srv === null || srv === void 0 ? void 0 : srv.listening))
             return false;
         const port = (_a = srv === null || srv === void 0 ? void 0 : srv.address()) === null || _a === void 0 ? void 0 : _a.port;
         const appendPort = port === (srv.name === 'https' ? 443 : 80) ? '' : ':' + port;
-        const urls = (0, misc_1.onlyTruthy)(Object.entries((0, os_1.networkInterfaces)()).map(([name, nets]) => nets && !ignore.test(name) && nets.map(net => {
-            if (net.internal)
-                return;
-            let { address } = net;
-            if (address.includes(':'))
-                address = '[' + address + ']';
-            return srv.name + '://' + address + appendPort;
-        })).flat());
+        const urls = ips.map(ip => `${srv.name}://${ip}${appendPort}`);
         return urls.length && [srv.name, urls];
     })));
 }
 exports.getUrls = getUrls;
-function printUrls(port, proto) {
-    if (!port)
-        return;
-    for (const [name, nets] of Object.entries((0, os_1.networkInterfaces)())) {
-        if (!nets || ignore.test(name))
-            continue;
-        lodash_1.default.remove(nets, 'internal');
-        const first = nets[0];
-        if (!first)
-            continue;
-        const best = lodash_1.default.find(nets, { family: 'IPv4' }) || first;
-        const appendPort = port === (proto === 'https' ? 443 : 80) ? '' : ':' + port;
-        let { address } = best;
-        if (address.includes(':'))
-            address = '[' + address + ']';
-        console.log('network', name, proto + '://' + address + appendPort);
-    }
+function printUrls(srvName) {
+    getUrls().then(urls => {
+        for (const url of urls[srvName])
+            console.log('serving on', url);
+    });
 }

package/src/log.js

@@ -89,7 +89,7 @@ const logMw = async (ctx, next) => {
     // don't await, as we don't want to hold the middlewares chain
     ctx.state.completed = Promise.race([(0, stream_1.once)(ctx.res, 'finish'), (0, stream_1.once)(ctx.res, 'close')]);
     ctx.state.completed.then(() => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         if (ctx.state.dont_log)
             return;
         if (dontLogNet.compiled()(ctx.ip))
@@ -120,16 +120,19 @@ const logMw = async (ctx, next) => {
                     return;
             }
         }
-        const format = '%s - %s [%s] "%s %s HTTP/%s" %d %s\n'; // Apache's Common Log Format
+        const format = '%s - %s [%s] "%s %s HTTP/%s" %d %s %s\n'; // Apache's Common Log Format
         const a = now.toString().split(' ');
         const date = a[2] + '/' + a[1] + '/' + a[3] + ':' + a[4] + ' ' + ((_b = a[5]) === null || _b === void 0 ? void 0 : _b.slice(3));
         const user = (0, perm_1.getCurrentUsername)(ctx);
         const length = (_c = ctx.state.length) !== null && _c !== void 0 ? _c : ctx.length;
-        const uri = (_d = ctx.originalUrl) === null || _d === void 0 ? void 0 : _d.replace(/&?csrf=[^&]+/, ''); // temporary workaround. To avoid csrf in url we need to stop using EventSource.
-        events_1.default.emit(logger.name, Object.assign(lodash_1.default.pick(ctx, ['ip', 'method', 'status']), { length, user, ts: now, uri }));
+        const uri = ctx.originalUrl;
+        const extra = ctx.state.includesLastByte && ctx.vfsNode && { dl: 1 }
+            || ctx.state.uploadPath && { ul: ctx.state.uploadPath, size: ctx.state.uploadSize }
+            || undefined;
+        events_1.default.emit(logger.name, Object.assign(lodash_1.default.pick(ctx, ['ip', 'method', 'status']), { length, user, ts: now, uri, extra }));
         debounce(() => // once in a while we check if the file is still good (not deleted, etc), or we'll reopen it
          (0, promises_1.stat)(logger.path).catch(() => logger.reopen())); // async = smoother but we may lose some entries
-        stream.write(util.format(format, ctx.ip, user || '-', date, ctx.method, uri, ctx.req.httpVersion, ctx.status, (_e = length === null || length === void 0 ? void 0 : length.toString()) !== null && _e !== void 0 ? _e : '-'));
+        stream.write(util.format(format, ctx.ip, user || '-', date, ctx.method, uri, ctx.req.httpVersion, ctx.status, (_d = length === null || length === void 0 ? void 0 : length.toString()) !== null && _d !== void 0 ? _d : '-', extra ? JSON.stringify(JSON.stringify(extra)) : ''));
     });
 };
 exports.logMw = logMw;

package/src/middlewares.js

@@ -248,11 +248,9 @@ async function srpCheck(username, password) {
     const clientRes2 = await clientRes1.step2(BigInt(salt), BigInt(pubKey));
     return await step1.step2(clientRes2.A, clientRes2.M1).then(() => true, () => false);
 }
-// unify get/post parameters, with JSON decoding to not be limited to strings
 const paramsDecoder = async (ctx, next) => {
     ctx.params = ctx.method === 'POST' && ctx.originalUrl.startsWith(const_1.API_URI)
-        ? (0, misc_1.tryJson)(await (0, misc_1.stream2string)(ctx.req))
-        : (0, misc_1.newObj)(ctx.query, x => Array.isArray(x) ? x : (0, misc_1.tryJson)(x));
+        && ((0, misc_1.tryJson)(await (0, misc_1.stream2string)(ctx.req)) || {});
     await next();
 };
 exports.paramsDecoder = paramsDecoder;

package/src/misc.js

@@ -18,92 +18,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.throw_ = exports.try_ = exports.stream2string = exports.tryJson = exports.same = exports.matches = exports.makeMatcher = exports.makeNetMatcher = exports.isLocalHost = exports.with_ = exports.hasProp = exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.onOff = exports.pendingPromise = exports.onlyTruthy = exports.truthy = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.randomId = exports.getOrSet = exports.wantArray = exports.waitFor = exports.wait = exports.newObj = exports.setHidden = exports.prefix = exports.removeStarting = exports.enforceFinal = exports.debounceAsync = void 0;
+exports.asyncGeneratorToReadable = exports.stream2string = exports.same = exports.matches = exports.makeMatcher = exports.makeNetMatcher = exports.isLocalHost = exports.onOff = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.debounceAsync = void 0;
 const path_1 = require("path");
 const lodash_1 = __importDefault(require("lodash"));
 const assert_1 = __importDefault(require("assert"));
 __exportStar(require("./util-http"), exports);
-__exportStar(require("./util-generators"), exports);
 __exportStar(require("./util-files"), exports);
+__exportStar(require("./cross"), exports);
+const stream_1 = require("stream");
+const micromatch_1 = require("micromatch");
+const node_net_1 = require("node:net");
 const debounceAsync_1 = __importDefault(require("./debounceAsync"));
 exports.debounceAsync = debounceAsync_1.default;
-const micromatch_1 = require("micromatch");
-const cidr_tools_1 = __importDefault(require("cidr-tools"));
-function enforceFinal(sub, s) {
-    return s.endsWith(sub) ? s : s + sub;
-}
-exports.enforceFinal = enforceFinal;
-function removeStarting(sub, s) {
-    return s.startsWith(sub) ? s.slice(sub.length) : s;
-}
-exports.removeStarting = removeStarting;
-function prefix(pre, v, post = '') {
-    return v ? pre + v + post : '';
-}
-exports.prefix = prefix;
-function setHidden(dest, src) {
-    return Object.defineProperties(dest, newObj(src, value => ({
-        enumerable: false,
-        writable: true,
-        value,
-    })));
-}
-exports.setHidden = setHidden;
-function newObj(src, returnNewValue, recur = false) {
-    if (!src)
-        return {};
-    const pairs = Object.entries(src).map(([k, v]) => {
-        if (typeof k === 'symbol')
-            return;
-        let _k = k;
-        const curDepth = typeof recur === 'number' ? recur : 0;
-        let newV = returnNewValue(v, k, (newK) => {
-            _k = newK;
-            return true; // for convenient expression concatenation
-        }, curDepth);
-        if ((recur !== false || returnNewValue.length === 4) // if callback is using depth parameter, then it wants recursion
-            && lodash_1.default.isPlainObject(newV)) // is it recurrable?
-            newV = newObj(newV, returnNewValue, curDepth + 1);
-        return _k !== undefined && [_k, newV];
-    });
-    return Object.fromEntries(onlyTruthy(pairs));
-}
-exports.newObj = newObj;
-function wait(ms) {
-    return new Promise(res => setTimeout(res, ms));
-}
-exports.wait = wait;
-async function waitFor(cb, { interval = 200, timeout = Infinity } = {}) {
-    const started = Date.now();
-    while (1) {
-        const res = await cb();
-        if (res)
-            return res;
-        if (Date.now() - started >= timeout)
-            return;
-        await wait(interval);
-    }
-}
-exports.waitFor = waitFor;
-function wantArray(x) {
-    return x == null ? [] : Array.isArray(x) ? x : [x];
-}
-exports.wantArray = wantArray;
-function getOrSet(o, k, creator) {
-    return k in o ? o[k]
-        : (o[k] = creator());
-}
-exports.getOrSet = getOrSet;
-// 10 chars is 51+bits, 8 is 41+bits
-function randomId(len = 10) {
-    if (len > 10)
-        return randomId(10) + randomId(len - 10);
-    return Math.random()
-        .toString(36)
-        .substring(2, 2 + len)
-        .replace(/l/g, 'L'); // avoid confusion reading l1
-}
-exports.randomId = randomId;
 const cbs = new Set();
 function onProcessExit(cb) {
     cbs.add(cb);
@@ -127,20 +53,6 @@ function pattern2filter(pattern) {
     return (s) => !s || !pattern || re.test((0, path_1.basename)(s));
 }
 exports.pattern2filter = pattern2filter;
-function truthy(value) {
-    return Boolean(value);
-}
-exports.truthy = truthy;
-function onlyTruthy(arr) {
-    return arr.filter(truthy);
-}
-exports.onlyTruthy = onlyTruthy;
-function pendingPromise() {
-    let takeOut;
-    const ret = new Promise((resolve, reject) => takeOut = { resolve, reject });
-    return Object.assign(ret, takeOut);
-}
-exports.pendingPromise = pendingPromise;
 // install multiple handlers and returns a handy 'uninstall' function which requires no parameter. Pass a map {event:handler}
 function onOff(em, events) {
     events = { ...events }; // avoid later modifications, as we need this later for uninstallation
@@ -154,30 +66,6 @@ function onOff(em, events) {
     };
 }
 exports.onOff = onOff;
-function objRenameKey(o, from, to) {
-    if (!o || !o.hasOwnProperty(from) || from === to)
-        return;
-    o[to] = o[from];
-    delete o[from];
-    return true;
-}
-exports.objRenameKey = objRenameKey;
-function typedKeys(o) {
-    return Object.keys(o);
-}
-exports.typedKeys = typedKeys;
-function typedEntries(o) {
-    return Object.entries(o);
-}
-exports.typedEntries = typedEntries;
-function hasProp(obj, key) {
-    return key in obj;
-}
-exports.hasProp = hasProp;
-function with_(par, cb) {
-    return cb(par);
-}
-exports.with_ = with_;
 function isLocalHost(c) {
     const ip = c.socket.remoteAddress; // don't use Context.ip as it is subject to proxied ips, and that's no use for localhost detection
     return ip && (ip === '::1' || ip.endsWith('127.0.0.1'));
@@ -193,9 +81,27 @@ function makeNetMatcher(mask, emptyMaskReturns = false) {
     const neg = ((_a = all[0]) === null || _a === void 0 ? void 0 : _a[0]) === '!';
     if (neg)
         all[0] = all[0].slice(1);
-    return (ip) => neg !== all.some(x => cidr_tools_1.default.contains(x, ip));
+    const bl = new node_net_1.BlockList();
+    for (const x of all) {
+        const m = /^([.:\d]+)(?:\/(\d+)|-(.+)|)$/.exec(x);
+        if (!m) {
+            console.warn("error in network mask", x);
+            continue;
+        }
+        const address = parseAddress(m[1]);
+        if (m[2])
+            bl.addSubnet(address, Number(m[2]));
+        else if (m[3])
+            bl.addRange(address, parseAddress(m[2]));
+        else
+            bl.addAddress(address);
+    }
+    return (ip) => neg !== bl.check(ip);
 }
 exports.makeNetMatcher = makeNetMatcher;
+function parseAddress(s) {
+    return new node_net_1.SocketAddress({ address: s, family: s.includes(':') ? 'ipv6' : 'ipv4' });
+}
 function makeMatcher(mask, emptyMaskReturns = false) {
     return mask ? (0, micromatch_1.matcher)(mask.replace(/^(!)?/, '$1(') + ')') // adding () will allow us to use the pipe at root level
         : () => emptyMaskReturns;
@@ -215,13 +121,6 @@ function same(a, b) {
     }
 }
 exports.same = same;
-function tryJson(s) {
-    try {
-        return s && JSON.parse(s);
-    }
-    catch (_a) { }
-}
-exports.tryJson = tryJson;
 async function stream2string(stream) {
     return new Promise((resolve, reject) => {
         let data = '';
@@ -238,16 +137,13 @@ async function stream2string(stream) {
     });
 }
 exports.stream2string = stream2string;
-function try_(cb, onException) {
-    try {
-        return cb();
-    }
-    catch (e) {
-        return onException === null || onException === void 0 ? void 0 : onException(e);
-    }
-}
-exports.try_ = try_;
-function throw_(err) {
-    throw err;
+function asyncGeneratorToReadable(generator) {
+    const iterator = generator[Symbol.asyncIterator]();
+    return new stream_1.Readable({
+        objectMode: true,
+        read() {
+            iterator.next().then(it => this.push(it.done ? null : it.value));
+        }
+    });
 }
-exports.throw_ = throw_;
+exports.asyncGeneratorToReadable = asyncGeneratorToReadable;