hfs 0.57.26 → 0.57.27-beta2

package/src/listen.js

@@ -70,17 +70,19 @@ const consoleLog_1 = require("./consoleLog");
 let httpSrv;
 let httpsSrv;
 const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', true);
-exports.baseUrl = (0, config_1.defineConfig)(misc_1.CFG.base_url, '', x => { var _a; return (_a = /(?<=\/\/)[^\/]+/.exec(x)) === null || _a === void 0 ? void 0 : _a[0]; }); // compiled is host only
+exports.baseUrl = (0, config_1.defineConfig)(misc_1.CFG.base_url, '', x => /(?<=\/\/)[^\/]+/.exec(x)?.[0]); // compiled is host only
 async function getBaseUrlOrDefault() {
     return exports.baseUrl.get() || await nat_1.defaultBaseUrl.get();
 }
 function getHttpsWorkingPort() {
-    var _a;
-    return (httpsSrv === null || httpsSrv === void 0 ? void 0 : httpsSrv.listening) && ((_a = httpsSrv.address()) === null || _a === void 0 ? void 0 : _a.port);
+    return httpsSrv?.listening && httpsSrv.address()?.port;
 }
-const commonServerOptions = { requestTimeout: 0 };
+const commonServerOptions = {
+    requestTimeout: 0, // disable timeout on long uploads
+    maxHeaderSize: 32768, // allow a larger header for a larger list in ?get=zip
+};
 // these are properties that can be assigned to the server object
-const commonServerAssign = { headersTimeout: 30000, timeout: misc_1.MINUTE }; // 'headersTimeout' is not recognized by type lib, and 'timeout' is not effective when passed in parameters
+const commonServerAssign = { headersTimeout: 30_000, timeout: misc_1.MINUTE }; // 'headersTimeout' is not recognized by type lib, and 'timeout' is not effective when passed in parameters
 const readyToListen = Promise.all([persistence_1.storedMap.isOpening(), events_1.default.once('app')]);
 const considerHttp = (0, misc_1.debounceAsync)(async () => {
     await readyToListen;
@@ -105,7 +107,7 @@ const listenInterface = (0, config_1.defineConfig)('listen_interface', '');
 (0, config_1.subMultipleConfigs)(considerHttp, [exports.portCfg, listenInterface]);
 function openAdmin() {
     for (const srv of [httpSrv, httpsSrv]) {
-        const a = srv === null || srv === void 0 ? void 0 : srv.address();
+        const a = srv?.address();
         if (!a || typeof a === 'string')
             continue;
         const i = listenInterface.get();
@@ -123,21 +125,19 @@ function openAdmin() {
     console.log("openAdmin failed");
 }
 function getCertObject() {
-    var _a;
     const c = exports.cert.compiled();
     if (!c)
         return;
     const all = new crypto_1.X509Certificate(c);
     const some = lodash_1.default.pick(all, ['subject', 'issuer', 'validFrom', 'validTo']);
-    const ret = (0, misc_1.objSameKeys)(some, v => (v === null || v === void 0 ? void 0 : v.includes('=')) ? Object.fromEntries(v.split('\n').map(x => x.split('='))) : v);
-    return Object.assign(ret, { altNames: (_a = all.subjectAltName) === null || _a === void 0 ? void 0 : _a.replace(/DNS:/g, '').split(/, */) });
+    const ret = (0, misc_1.objSameKeys)(some, v => v?.includes('=') ? Object.fromEntries(v.split('\n').map(x => x.split('='))) : v);
+    return Object.assign(ret, { altNames: all.subjectAltName?.replace(/DNS:/g, '').split(/, */) });
 }
 const considerHttps = (0, misc_1.debounceAsync)(async () => {
-    var _a, _b, _c, _d;
     await readyToListen;
     void stopServer(httpsSrv);
     nat_1.defaultBaseUrl.proto = 'http';
-    nat_1.defaultBaseUrl.port = (_a = getCurrentPort(httpSrv)) !== null && _a !== void 0 ? _a : 0;
+    nat_1.defaultBaseUrl.port = getCurrentPort(httpSrv) ?? 0;
     let port = exports.httpsPortCfg.get();
     try {
         const moreOptions = Object.assign({}, ...await events_1.default.emitAsync('httpsServerOptions') || []); // emitAsync returns an array of objects
@@ -150,9 +150,9 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
         if (port >= 0) {
             const certObj = getCertObject();
             if (certObj) {
-                const cn = (_b = certObj.subject) === null || _b === void 0 ? void 0 : _b.CN;
+                const cn = certObj.subject?.CN;
                 if (cn)
-                    console.log("certificate loaded for", ((_c = certObj.altNames) === null || _c === void 0 ? void 0 : _c.join(' + ')) || cn);
+                    console.log("certificate loaded for", certObj.altNames?.join(' + ') || cn);
                 const now = new Date();
                 const from = new Date(certObj.validFrom);
                 const to = new Date(certObj.validTo);
@@ -178,7 +178,7 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
         }
     }
     catch (e) {
-        httpsSrv || (httpsSrv = Object.assign(https.createServer({}), { name: 'https' })); // a dummy container, in case creation failed because of certificate errors
+        httpsSrv ||= Object.assign(https.createServer({}), { name: 'https' }); // a dummy container, in case creation failed because of certificate errors
         httpsSrv.error = "bad private key or certificate";
         console.error("failed to create https server: check your private key and certificate", e.message);
         return;
@@ -196,14 +196,13 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
     printUrls(httpsSrv.name);
     events_1.default.emit('httpsReady');
     nat_1.defaultBaseUrl.proto = 'https';
-    nat_1.defaultBaseUrl.port = (_d = getCurrentPort(httpsSrv)) !== null && _d !== void 0 ? _d : 0;
+    nat_1.defaultBaseUrl.port = getCurrentPort(httpsSrv) ?? 0;
 }, { wait: 200 }); // give time to have key and cert ready
 exports.cert = (0, config_1.defineConfig)('cert', '', load);
 exports.privateKey = (0, config_1.defineConfig)('private_key', '', load);
 const httpsNeeds = [exports.cert, exports.privateKey];
 function load(v, { object }) {
-    var _a;
-    (_a = object.watcher) === null || _a === void 0 ? void 0 : _a.unwatch();
+    object.watcher?.unwatch();
     if (!v || v.includes('\n'))
         return v;
     // v is a path, we'll watch the file for changes
@@ -244,12 +243,12 @@ function startServer(srv, { port, host }) {
     });
     async function testIpV4() {
         const res = await listen('0.0.0.0', true);
-        await new Promise(res => srv === null || srv === void 0 ? void 0 : srv.close(res)); // close, if any, and wait
+        await new Promise(res => srv?.close(res)); // close, if any, and wait
         return res > 0;
     }
     function listen(host, silence = false) {
         return new Promise(async (resolve, reject) => {
-            srv === null || srv === void 0 ? void 0 : srv.on('error', onError).listen({ port, host }, () => {
+            srv?.on('error', onError).listen({ port, host }, () => {
                 const ad = srv.address();
                 if (!ad)
                     return reject('no address');
@@ -268,7 +267,7 @@ function startServer(srv, { port, host }) {
                 srv.busy = undefined;
                 const { code } = e;
                 if (code)
-                    srv.busy = (0, find_process_1.default)('port', port).then(res => res === null || res === void 0 ? void 0 : res.map(x => { var _a; return (0, misc_1.prefix)("Service", x.name === 'svchost.exe' && ((_a = x.cmd.split(x.name)[1]) === null || _a === void 0 ? void 0 : _a.trim())) || x.name; }).join(' + '), () => '');
+                    srv.busy = (0, find_process_1.default)('port', port).then(res => res?.map(x => (0, misc_1.prefix)("Service", x.name === 'svchost.exe' && x.cmd.split(x.name)[1]?.trim()) || x.name).join(' + '), () => '');
                 if (code === 'EACCES' && port < 1024 && !srv.busy) // on Windows, when port is used by a service, we get EACCES
                     srv.error = `lacking permission on port ${port}, try with permission (${const_1.IS_WINDOWS ? 'administrator' : 'sudo'}) or port > 1024`;
                 if (code === 'EADDRINUSE' || srv.busy)
@@ -282,7 +281,7 @@ function startServer(srv, { port, host }) {
 }
 function stopServer(srv) {
     return new Promise(resolve => {
-        if (!(srv === null || srv === void 0 ? void 0 : srv.listening))
+        if (!srv?.listening)
             return resolve(null);
         const ad = srv.address();
         if (ad && typeof ad !== 'string')
@@ -295,8 +294,7 @@ function stopServer(srv) {
     });
 }
 function getCurrentPort(srv) {
-    var _a;
-    return (_a = srv === null || srv === void 0 ? void 0 : srv.address()) === null || _a === void 0 ? void 0 : _a.port;
+    return srv?.address()?.port;
 }
 async function getServerStatus(includeSrv = true) {
     return {
@@ -304,7 +302,7 @@ async function getServerStatus(includeSrv = true) {
         https: await serverStatus(httpsSrv, exports.httpsPortCfg.get()),
     };
     async function serverStatus(srv, configuredPort) {
-        const busy = await (srv === null || srv === void 0 ? void 0 : srv.busy);
+        const busy = await srv?.busy;
         await (0, misc_1.wait)(0); // simple trick to wait for also .error to be updated. If this trickery becomes necessary elsewhere, then we should make also error a Promise.
         return {
             ...lodash_1.default.pick(srv, ['listening', 'error']),
@@ -329,17 +327,16 @@ async function getIps(external = true) {
         x => x !== nat_1.defaultBaseUrl.localIp, // use the "nat" info to put best ip first
         net_1.isIPv6 // false=IPV4 comes first
     ]);
-    nat_1.defaultBaseUrl.localIp || (nat_1.defaultBaseUrl.localIp = ret[0] || '');
+    nat_1.defaultBaseUrl.localIp ||= ret[0] || '';
     return ret;
 }
 async function getUrls() {
     const on = listenInterface.get();
     const ips = on === renderHost(on) ? [on] : await getIps();
     return Object.fromEntries((0, misc_1.onlyTruthy)([httpSrv, httpsSrv].map(srv => {
-        var _a;
-        if (!(srv === null || srv === void 0 ? void 0 : srv.listening))
+        if (!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 port = srv?.address()?.port;
         const appendPort = port === (srv.name === 'https' ? 443 : 80) ? '' : ':' + port;
         const urls = ips.map(ip => `${srv.name}://${(0, misc_1.ipForUrl)(ip)}${appendPort}`);
         return urls.length && [srv.name, urls];

package/src/log.js

@@ -54,14 +54,16 @@ const index_1 = require("./index");
 const serveGuiFiles_1 = require("./serveGuiFiles");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 class Logger {
+    name;
+    stream;
+    last;
+    path = '';
     constructor(name) {
         this.name = name;
-        this.path = '';
     }
     async setPath(path) {
-        var _a;
         this.path = path;
-        (_a = this.stream) === null || _a === void 0 ? void 0 : _a.end();
+        this.stream?.end();
         this.last = undefined;
         if (!path)
             return this.stream = undefined;
@@ -69,15 +71,15 @@ class Logger {
             const stats = await (0, util_files_1.statWithTimeout)(path);
             this.last = stats.mtime;
         }
-        catch (_b) {
-            if (await (0, util_files_1.prepareFolder)(path) === false)
+        catch {
+            if (await (0, util_files_1.ensureParentFolder)(path) === false)
                 console.log("cannot create folder for", path);
         }
         this.reopen();
     }
     reopen() {
-        var _a;
-        return this.stream = (_a = (0, util_files_1.createFileWithPath)(this.path, { flags: 'a' })) === null || _a === void 0 ? void 0 : _a.on('error', () => this.stream = undefined);
+        return this.stream = (0, util_files_1.createFileWithPath)(this.path, { flags: 'a' })
+            ?.on('error', () => this.stream = undefined);
     }
 }
 // we'll have names same as config keys. These are used also by the get_log api.
@@ -115,21 +117,20 @@ const logMw = async (ctx, next) => {
     const conn = (0, connections_1.getConnection)(ctx); // collect reference before close
     // don't await, as we don't want to hold the middlewares chain
     ctx.state.completed.then(() => {
-        var _a, _b, _c, _d;
         if (ctx.state.dontLog || ctx.state.considerAsGui && !serveGuiFiles_1.logGui.get())
             return;
         if (dontLogNet.compiled()(ctx.ip))
             return;
         const isError = ctx.status >= 400;
         const logger = isError && accessErrorLog || accessLogger;
-        const rotate = (_a = logRotation.get()) === null || _a === void 0 ? void 0 : _a[0];
+        const rotate = logRotation.get()?.[0];
         let { stream, last, path } = logger;
         if (!stream)
             return;
         logger.last = now;
         if (rotate && last) { // rotation enabled and a file exists?
             const passed = Number(now) - Number(last)
-                - 3600000; // be pessimistic and count a possible DST change
+                - 3600_000; // be pessimistic and count a possible DST change
             if (rotate === 'm' && (passed >= 31 * misc_1.DAY || now.getMonth() !== last.getMonth())
                 || rotate === 'd' && (passed >= misc_1.DAY || now.getDate() !== last.getDate()) // checking passed will solve the case when the day of the month is the same but a month has passed
                 || rotate === 'w' && (passed >= 7 * misc_1.DAY || now.getDay() < last.getDay())) {
@@ -149,9 +150,9 @@ const logMw = async (ctx, next) => {
         }
         const format = '%s - %s [%s] "%s %s HTTP/%s" %d %s %s\n'; // Apache's Common Log Format
         const a = now.toString().split(' '); // like nginx, our default log contains the time of log writing
-        const date = a[2] + '/' + a[1] + '/' + a[3] + ':' + a[4] + ' ' + ((_b = a[5]) === null || _b === void 0 ? void 0 : _b.slice(3));
+        const date = a[2] + '/' + a[1] + '/' + a[3] + ':' + a[4] + ' ' + a[5]?.slice(3);
         const user = (0, auth_1.getCurrentUsername)(ctx);
-        const length = (_c = ctx.state.length) !== null && _c !== void 0 ? _c : ctx.length;
+        const length = ctx.state.length ?? ctx.length;
         const uri = ctx.originalUrl;
         const duration = (Date.now() - Number(now)) / 1000;
         ctx.logExtra(ctx.vfsNode && {
@@ -162,7 +163,7 @@ const logMw = async (ctx, next) => {
             size: ctx.state.uploadSize,
             speed: Math.round(ctx.state.uploadSize / duration),
         });
-        if (conn === null || conn === void 0 ? void 0 : conn.country)
+        if (conn?.country)
             ctx.logExtra({ country: conn.country });
         if (logUA.get())
             ctx.logExtra({ ua: ctx.get('user-agent') || undefined });
@@ -171,7 +172,7 @@ const logMw = async (ctx, next) => {
             events_2.default.emit(logger.name, { ctx, 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, util_files_1.statWithTimeout)(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, (_d = length === null || length === void 0 ? void 0 : length.toString()) !== null && _d !== void 0 ? _d : '-', lodash_1.default.isEmpty(extra) ? '' : JSON.stringify(JSON.stringify(extra))));
+        stream.write(util.format(format, ctx.ip, user || '-', date, ctx.method, uri, ctx.req.httpVersion, ctx.status, length?.toString() ?? '-', lodash_1.default.isEmpty(extra) ? '' : JSON.stringify(JSON.stringify(extra))));
     });
 };
 exports.logMw = logMw;
@@ -186,7 +187,7 @@ function doubleDigit(n) {
 async function getRotatedFiles() {
     return Object.fromEntries(await Promise.all(exports.loggers.map(async (x) => {
         const mask = (0, misc_1.strinsert)(x.path, x.path.length - (0, path_1.extname)(x.path).length, '-2*'); // including 2, initial digit of the year, will only take rotated files and not "-error"
-        return [x.name, (await (0, fast_glob_1.default)(mask, { stats: true })).map(x => { var _a; return ({ path: x.path, size: (_a = x.stats) === null || _a === void 0 ? void 0 : _a.size }); })];
+        return [x.name, (await (0, fast_glob_1.default)(mask, { stats: true })).map(x => ({ path: x.path, size: x.stats?.size }))];
     })));
 }
 // dump console.error to file
@@ -195,11 +196,11 @@ debugLogFile.once('open', () => {
     const was = console.error;
     console.error = function (...args) {
         was.apply(this, args);
-        args = args.map(x => { var _a; return typeof x === 'string' ? x : ((_a = (0, misc_1.tryJson)(x)) !== null && _a !== void 0 ? _a : String(x)); });
+        args = args.map(x => typeof x === 'string' ? x : ((0, misc_1.tryJson)(x) ?? String(x)));
         debugLogFile.write((0, misc_1.formatTimestamp)(new Date) + ' - ' + args.join(' ') + '\n');
     };
     // limit log size
-    const LIMIT = 1000000;
+    const LIMIT = 1_000_000;
     const { path } = debugLogFile;
     (0, misc_1.repeat)(misc_1.DAY, () => {
         if ((0, fs_1.statSync)(path).size < LIMIT)

package/src/middlewares.js

@@ -53,7 +53,7 @@ let proxyDetected;
 const someSecurity = (ctx, next) => {
     ctx.request.ip = (0, connections_1.normalizeIp)(ctx.ip);
     const ss = ctx.session;
-    if ((ss === null || ss === void 0 ? void 0 : ss.username) && !(ss === null || ss === void 0 ? void 0 : ss[misc_1.ALLOW_SESSION_IP_CHANGE]))
+    if (ss?.username && !ss?.[misc_1.ALLOW_SESSION_IP_CHANGE])
         if (!ss.ip)
             ss.ip = ctx.ip;
         else if (ss.ip !== ctx.ip) {
@@ -61,7 +61,7 @@ const someSecurity = (ctx, next) => {
             ss.ip = ctx.ip;
         }
     try {
-        if ((0, misc_1.dirTraversal)(decodeURI(ctx.path)))
+        if ((0, misc_1.hasDirTraversal)(decodeURI(ctx.path)))
             return ctx.status = const_1.HTTP_FOOL;
         if (!ctx.state.skipFilters && (0, block_1.applyBlock)(ctx.socket, ctx.ip))
             return;
@@ -74,7 +74,7 @@ const someSecurity = (ctx, next) => {
         if (ctx.get('cf-ray'))
             exports.cloudflareDetected = new Date();
     }
-    catch (_a) {
+    catch {
         return ctx.status = const_1.HTTP_FOOL;
     }
     if (!ctx.secure && forceHttps.get() && (0, listen_1.getHttpsWorkingPort)() && !(0, misc_1.isLocalHost)(ctx)) {
@@ -89,20 +89,19 @@ const someSecurity = (ctx, next) => {
 exports.someSecurity = someSecurity;
 // limited to http proxies
 function getProxyDetected() {
-    if ((proxyDetected === null || proxyDetected === void 0 ? void 0 : proxyDetected.state.whenProxyDetected) < Date.now() - misc_1.DAY) // detection is reset after a day
+    if (proxyDetected?.state.whenProxyDetected < Date.now() - misc_1.DAY) // detection is reset after a day
         proxyDetected = undefined;
     return proxyDetected && { from: proxyDetected.socket.remoteAddress, for: proxyDetected.get('X-Forwarded-For') };
 }
 const prepareState = async (ctx, next) => {
-    var _a, _b;
-    if ((_a = ctx.session) === null || _a === void 0 ? void 0 : _a.username) {
+    if (ctx.session?.username) {
         if (ctx.session.ts < auth_1.invalidateSessionBefore.get(ctx.session.username))
             delete ctx.session.username;
         ctx.session.maxAge = exports.sessionDuration.compiled();
     }
     // calculate these once and for all
     ctx.state.connection = (0, connections_1.socket2connection)(ctx.socket);
-    const a = ctx.state.account = await urlLogin() || await getHttpAccount() || (0, perm_1.getAccount)((_b = ctx.session) === null || _b === void 0 ? void 0 : _b.username, false);
+    const a = ctx.state.account = await urlLogin() || await getHttpAccount() || (0, perm_1.getAccount)(ctx.session?.username, false);
     if (a && (!(0, perm_1.accountCanLogin)(a) || failAllowNet(ctx, a))) // enforce allow_net also after login
         ctx.state.account = undefined;
     ctx.state.revProxyPath = ctx.get('x-forwarded-prefix');
@@ -117,25 +116,23 @@ const prepareState = async (ctx, next) => {
         return u && (0, auth_1.clearTextLogin)(ctx, u, p, 'url');
     }
     function getHttpAccount() {
-        var _a, _b;
-        const b64 = allowAuthorizationHeader.get() && ((_a = ctx.get('authorization')) === null || _a === void 0 ? void 0 : _a.split(' ')[1]);
+        const b64 = allowAuthorizationHeader.get() && ctx.get('authorization')?.split(' ')[1];
         if (!b64)
             return;
         try {
             const [u, p] = atob(b64).split(':');
-            if (!u || u === ((_b = ctx.session) === null || _b === void 0 ? void 0 : _b.username))
+            if (!u || u === ctx.session?.username)
                 return; // providing credentials, but not needed
             return (0, auth_1.clearTextLogin)(ctx, u, p || '', 'header');
         }
-        catch (_c) { }
+        catch { }
     }
 };
 exports.prepareState = prepareState;
 function failAllowNet(ctx, a) {
-    var _a, _b;
-    const cached = (_a = ctx.session) === null || _a === void 0 ? void 0 : _a.allowNet; // won't reflect changes until session is terminated
-    const mask = cached !== null && cached !== void 0 ? cached : (0, perm_1.getFromAccount)(a || '', a => a.allow_net);
-    if (!cached && mask && ((_b = ctx.session) === null || _b === void 0 ? void 0 : _b.username))
+    const cached = ctx.session?.allowNet; // won't reflect changes until session is terminated
+    const mask = cached ?? (0, perm_1.getFromAccount)(a || '', a => a.allow_net);
+    if (!cached && mask && ctx.session?.username)
         ctx.session.allowNet = mask; // must be deleted on logout by setLoggedIn
     const ret = mask && !(0, misc_1.netMatches)(ctx.ip, mask, true);
     if (ret)

package/src/misc.js

@@ -51,12 +51,10 @@ function isLocalHost(c) {
 }
 // this will memory-leak over mask, so be careful with what you use this. Object is 3x faster than _.memoize
 function netMatches(ip, mask, emptyMaskReturns = false) {
-    var _a, _b;
-    const cache = (_a = netMatches).cache || (_a.cache = {});
-    return (cache[_b = mask + (emptyMaskReturns ? '1' : '0')] || (cache[_b] = makeNetMatcher(mask, emptyMaskReturns)))(ip); // cache the matcher
+    const cache = netMatches.cache ||= {};
+    return (cache[mask + (emptyMaskReturns ? '1' : '0')] ||= makeNetMatcher(mask, emptyMaskReturns))(ip); // cache the matcher
 }
 function makeNetMatcher(mask, emptyMaskReturns = false) {
-    var _a;
     if (!mask)
         return () => emptyMaskReturns;
     mask = mask.replaceAll(' ', '');
@@ -68,7 +66,7 @@ function makeNetMatcher(mask, emptyMaskReturns = false) {
             return (0, cross_1.makeMatcher)(mask);
         }
         const all = mask.split('|');
-        const neg = ((_a = all[0]) === null || _a === void 0 ? void 0 : _a[0]) === '!';
+        const neg = all[0]?.[0] === '!';
         if (neg)
             all[0] = all[0].slice(1);
         const bl = new node_net_1.BlockList();
@@ -83,14 +81,14 @@ function makeNetMatcher(mask, emptyMaskReturns = false) {
                 try {
                     bl.addSubnet(address, Number(m[2]));
                 }
-                catch (_b) {
+                catch {
                     throw x;
                 }
             else if (m[3])
                 try {
                     bl.addRange(address, parseAddress(m[3]));
                 }
-                catch (_c) {
+                catch {
                     throw m[3];
                 }
             else
@@ -100,7 +98,7 @@ function makeNetMatcher(mask, emptyMaskReturns = false) {
             try {
                 return neg !== bl.check(parseAddress(ip));
             }
-            catch (_a) {
+            catch {
                 console.error("invalid address ", ip);
                 return false;
             }
@@ -122,8 +120,7 @@ function asyncGeneratorToReadable(generator) {
     return new stream_1.Readable({
         objectMode: true,
         destroy() {
-            var _a;
-            void ((_a = iterator.return) === null || _a === void 0 ? void 0 : _a.call(iterator));
+            void iterator.return?.();
         },
         read() {
             iterator.next().then(it => {
@@ -136,10 +133,11 @@ function asyncGeneratorToReadable(generator) {
 }
 // produces as promises resolve, not sequentially
 class AsapStream extends stream_1.Readable {
+    promises;
+    finished = false;
     constructor(promises) {
         super({ objectMode: true });
         this.promises = promises;
-        this.finished = false;
     }
     _read() {
         if (this.finished)

package/src/nat.js

@@ -30,10 +30,10 @@ exports.defaultBaseUrl = (0, valtio_1.proxy)({
         return `${this.proto}://${(0, cross_1.ipForUrl)(ip || 'localhost')}${!port || port === defPort ? '' : ':' + port}`;
     }
 });
-exports.upnpClient = new nat_upnp_rejetto_1.Client({ timeout: 4000 });
+exports.upnpClient = new nat_upnp_rejetto_1.Client({ timeout: 4_000 });
 const originalMethod = exports.upnpClient.getGateway;
 // other client methods call getGateway too, so this will ensure they reuse this same result
-exports.upnpClient.getGateway = (0, debounceAsync_1.debounceAsync)(() => originalMethod.apply(exports.upnpClient), { retain: cross_1.HOUR, retainFailure: 30000 });
+exports.upnpClient.getGateway = (0, debounceAsync_1.debounceAsync)(() => originalMethod.apply(exports.upnpClient), { retain: cross_1.HOUR, retainFailure: 30_000 });
 exports.upnpClient.getGateway().then(res => {
     console.log("upnp found", res.gateway.description);
 }, e => console.debug('upnp failed:', e.message || String(e)));
@@ -46,16 +46,16 @@ exports.upnpClient.getGateway().then(res => {
 }, () => { }));
 exports.getPublicIps = (0, debounceAsync_1.debounceAsync)(async () => {
     const res = await (0, github_1.getProjectInfo)();
-    const groupedByVersion = Object.values(lodash_1.default.groupBy(res.publicIpServices, x => { var _a; return (_a = x.v) !== null && _a !== void 0 ? _a : 4; }));
+    const groupedByVersion = Object.values(lodash_1.default.groupBy(res.publicIpServices, x => x.v ?? 4));
     const ips = await (0, cross_1.promiseBestEffort)(groupedByVersion.map(singleVersion => Promise.any(singleVersion.map(async (svc) => {
         if (typeof svc === 'string')
             svc = { type: 'http', url: svc };
         console.debug("trying ip service", svc.url || svc.name);
         if (svc.type === 'http')
-            return (0, util_http_1.httpString)(svc.url, { timeout: 5000 });
+            return (0, util_http_1.httpString)(svc.url, { timeout: 5_000 });
         if (svc.type !== 'dns')
             throw "unsupported";
-        const resolver = new promises_1.Resolver({ timeout: 2000 });
+        const resolver = new promises_1.Resolver({ timeout: 2_000 });
         resolver.setServers(svc.ips);
         return resolver.resolve(svc.name, svc.dnsRecord);
     }).map(async (ret) => {
@@ -67,18 +67,17 @@ exports.getPublicIps = (0, debounceAsync_1.debounceAsync)(async () => {
     return exports.defaultBaseUrl.publicIps = lodash_1.default.uniq(ips.flat());
 }, { retain: 10 * cross_1.MINUTE });
 exports.getNatInfo = (0, debounceAsync_1.debounceAsync)(async () => {
-    var _a, _b, _c, _d;
     const gatewayIpPromise = findGateway().catch(() => undefined);
-    const res = await (0, cross_1.haveTimeout)(10000, exports.upnpClient.getGateway()).catch(() => null);
+    const res = await (0, cross_1.haveTimeout)(10_000, exports.upnpClient.getGateway()).catch(() => null);
     const status = await (0, listen_1.getServerStatus)();
-    const mappings = res && await (0, cross_1.haveTimeout)(5000, exports.upnpClient.getMappings()).catch(() => null);
-    console.debug("mappings found:", (mappings === null || mappings === void 0 ? void 0 : mappings.map(x => x.description).join(', ')) || "none");
+    const mappings = res && await (0, cross_1.haveTimeout)(5_000, exports.upnpClient.getMappings()).catch(() => null);
+    console.debug("mappings found:", mappings?.map(x => x.description).join(', ') || "none");
     const localIps = await (0, listen_1.getIps)(false);
     const gatewayIp = await gatewayIpPromise;
-    const localIp = (res === null || res === void 0 ? void 0 : res.address) || (gatewayIp ? lodash_1.default.maxBy(localIps, x => (0, cross_1.inCommon)(x, gatewayIp)) : localIps[0]);
-    const internalPort = ((_a = status === null || status === void 0 ? void 0 : status.https) === null || _a === void 0 ? void 0 : _a.listening) && status.https.port || ((_b = status === null || status === void 0 ? void 0 : status.http) === null || _b === void 0 ? void 0 : _b.listening) && status.http.port || undefined;
+    const localIp = res?.address || (gatewayIp ? lodash_1.default.maxBy(localIps, x => (0, cross_1.inCommon)(x, gatewayIp)) : localIps[0]);
+    const internalPort = status?.https?.listening && status.https.port || status?.http?.listening && status.http.port || undefined;
     const mapped = lodash_1.default.find(mappings, x => x.private.host === localIp && x.private.port === internalPort);
-    const externalPort = mapped === null || mapped === void 0 ? void 0 : mapped.public.port;
+    const externalPort = mapped?.public.port;
     if (localIp)
         exports.defaultBaseUrl.localIp = localIp;
     exports.defaultBaseUrl.port = externalPort || internalPort || 0;
@@ -91,18 +90,17 @@ exports.getNatInfo = (0, debounceAsync_1.debounceAsync)(async () => {
         mapped80: lodash_1.default.find(mappings, x => x.private.host === localIp && x.private.port === 80 && x.public.port === 80),
         internalPort,
         externalPort,
-        proto: ((_c = status === null || status === void 0 ? void 0 : status.https) === null || _c === void 0 ? void 0 : _c.listening) ? 'https' : ((_d = status === null || status === void 0 ? void 0 : status.http) === null || _d === void 0 ? void 0 : _d.listening) ? 'http' : '',
+        proto: status?.https?.listening ? 'https' : status?.http?.listening ? 'http' : '',
     };
 }, { reuseRunning: true });
 (0, exports.getNatInfo)();
 function findGateway() {
     return new Promise((resolve, reject) => (0, child_process_1.exec)(const_1.IS_WINDOWS || const_1.IS_MAC ? 'netstat -rn' : 'route -n', (err, out) => {
-        var _a, _b;
         if (err)
             return reject(err);
         if (!const_1.IS_WINDOWS)
-            return resolve((_a = out.match(const_1.IS_MAC ? /default +([\d.]+)/ : /^0\.0\.0\.0 +([\d.]+)/)) === null || _a === void 0 ? void 0 : _a[1]);
+            return resolve(out.match(const_1.IS_MAC ? /default +([\d.]+)/ : /^0\.0\.0\.0 +([\d.]+)/)?.[1]);
         const sortedByMetric = lodash_1.default.sortBy([...out.matchAll(/(?:0\.0\.0\.0 +){2}([\d.]+)\s+[\d.]+\s+(\d+)/g)], x => Number(x[2]));
-        resolve((_b = sortedByMetric[0]) === null || _b === void 0 ? void 0 : _b[1]); // take ip with lowest metric
+        resolve(sortedByMetric[0]?.[1]); // take ip with lowest metric
     }));
 }

package/src/outboundProxy.js

@@ -13,27 +13,27 @@ const outboundProxy = (0, config_1.defineConfig)(cross_1.CFG.outbound_proxy, '',
         if (!v || process.env.HFS_SKIP_PROXY_TEST)
             return;
         const test = 'https://google.com';
-        (0, util_http_1.httpString)(test).catch(e => { var _a; return console.error(`proxy failed for ${test} : ${((_a = e === null || e === void 0 ? void 0 : e.errors) === null || _a === void 0 ? void 0 : _a[0]) || e}`); }); // `.errors` in case of AggregateError
+        console.debug("testing proxy using", test);
+        (0, util_http_1.httpString)(test, { noRedirect: true }).catch(e => console.error(`proxy test failed on ${test} : ${e?.errors?.[0] || e}`)); // `.errors` in case of AggregateError
     }
-    catch (_a) {
+    catch {
         console.warn("invalid URL", v);
         return '';
     }
 });
 config_1.configReady.then(async ([startedWithoutConfig]) => {
-    var _a, _b, _c, _d;
     if (!const_1.IS_WINDOWS || !startedWithoutConfig)
         return;
     // try to read Windows system setting for proxy
     const out = await (0, util_os_1.reg)('query', 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings');
-    if (!Number((_a = /ProxyEnable\s+\w+\s+(.+)/.exec(out)) === null || _a === void 0 ? void 0 : _a[1]))
+    if (!Number(/ProxyEnable\s+\w+\s+(.+)/.exec(out)?.[1]))
         return;
-    const read = (_b = /ProxyServer\s+\w+\s+(.+)/.exec(out)) === null || _b === void 0 ? void 0 : _b[1];
+    const read = /ProxyServer\s+\w+\s+(.+)/.exec(out)?.[1];
     if (!read)
         return;
     // it can be like "IP:PORT" or "http=IP:PORT;https=IP:PORT;ftp=IP:PORT"
-    const url = (0, cross_1.prefix)('https://', (_c = /https=([\d:.]+)/.exec(out)) === null || _c === void 0 ? void 0 : _c[1]) // prefer https
-        || (0, cross_1.prefix)('http://', (_d = /http=([\d:.]+)/.exec(out)) === null || _d === void 0 ? void 0 : _d[1])
+    const url = (0, cross_1.prefix)('https://', /https=([\d:.]+)/.exec(out)?.[1]) // prefer https
+        || (0, cross_1.prefix)('http://', /http=([\d:.]+)/.exec(out)?.[1])
         || !read.includes('=') && 'http://' + read; // simpler form
     if (!url)
         return;

package/src/perm.js

@@ -46,8 +46,7 @@ function expandUsername(who) {
 }
 // check if current username or any ancestor match the provided usernames
 function ctxBelongsTo(ctx, usernames) {
-    var _a;
-    return ((_a = ctx.state).usernames || (_a.usernames = expandUsername((0, auth_1.getCurrentUsername)(ctx)))) // cache ancestors' usernames inside context state
+    return (ctx.state.usernames ||= expandUsername((0, auth_1.getCurrentUsername)(ctx))) // cache ancestors' usernames inside context state
         .some((u) => usernames.includes(u));
 }
 function getUsernames() {
@@ -78,7 +77,7 @@ async function updateAccount(account, change) {
     const jsonWas = JSON.stringify(account);
     const { username: usernameWas } = account;
     if (typeof change === 'function')
-        await (change === null || change === void 0 ? void 0 : change(account));
+        await change?.(account);
     else {
         const u = normalizeUsername(change.username || '');
         if (u && u !== usernameWas && getAccount(u))
@@ -106,7 +105,7 @@ async function updateAccount(account, change) {
         if (!account.belongs.length)
             delete account.belongs;
     }
-    account.expire && (account.expire = new Date(account.expire));
+    account.expire &&= new Date(account.expire);
     if (username !== usernameWas)
         renameAccount(usernameWas, username);
     if (jsonWas !== JSON.stringify(account)) // this test will miss the 'username' field, because hidden, but renameAccount is already calling saveAccountsASAP
@@ -118,7 +117,7 @@ exports.accounts.sub(lodash_1.default.debounce(obj => {
     // consider some validation here, in case of manual edit of the config
     lodash_1.default.each(obj, (rec, k) => {
         const norm = normalizeUsername(k);
-        if ((rec === null || rec === void 0 ? void 0 : rec.username) !== norm) {
+        if (rec?.username !== norm) {
             if (!rec) // an empty object in yaml is parsed as null
                 rec = obj[norm] = { username: norm };
             else if ((0, misc_1.objRenameKey)(obj, k, norm))
@@ -132,7 +131,6 @@ function normalizeUsername(username) {
     return username.toLocaleLowerCase();
 }
 function renameAccount(from, to) {
-    var _a;
     from = normalizeUsername(from);
     const as = exports.accounts.get();
     to = normalizeUsername(to);
@@ -144,7 +142,7 @@ function renameAccount(from, to) {
     (0, misc_1.setHidden)(as[to], { username: to });
     // update references
     for (const a of Object.values(as)) {
-        const idx = (_a = a.belongs) === null || _a === void 0 ? void 0 : _a.indexOf(from);
+        const idx = a.belongs?.indexOf(from);
         if (idx !== undefined && idx >= 0)
             a.belongs[idx] = to;
     }
@@ -190,15 +188,12 @@ function accountHasPassword(account) {
     return Boolean(account.password || account.srp);
 }
 function accountCanLogin(account) {
-    var _a;
-    return (accountHasPassword(account) || ((_a = account.plugin) === null || _a === void 0 ? void 0 : _a.auth)) && !accountIsDisabled(account);
+    return (accountHasPassword(account) || account.plugin?.auth) && !accountIsDisabled(account);
 }
 function accountIsDisabled(account) {
-    var _a;
     return Boolean(account.disabled
         || account.expire < Date.now()
-        || ((_a = account.belongs) === null || _a === void 0 ? void 0 : _a.length // don't every() on empty array, as it returns true
-        )
+        || account.belongs?.length // don't every() on empty array, as it returns true
             && account.belongs.map(u => getAccount(u, false)).every(a => a && accountIsDisabled(a)));
 }
 function accountCanLoginAdmin(account) {

package/src/persistence.js

@@ -9,7 +9,7 @@ exports.storedMap = new kvstorage_1.KvStorage({
     maxPutDelay: misc_1.MINUTE,
     maxPutDelayCreate: 1000,
     rewriteLater: true,
-    bucketThreshold: 10000,
+    bucketThreshold: 10_000,
 });
 exports.storedMap.open('data.kv');
 (0, first_1.onProcessExit)(() => exports.storedMap.flush());