hfs 0.57.26 → 0.57.27-beta2

package/src/cross.js

@@ -101,7 +101,7 @@ __exportStar(require("./cross-const"), exports);
 exports.WEBSITE = 'https://rejetto.com/hfs/';
 exports.REPO_URL = `https://github.com/${cross_const_1.HFS_REPO}/`;
 exports.WIKI_URL = exports.REPO_URL + 'wiki/';
-exports.MINUTE = 60000;
+exports.MINUTE = 60_000;
 exports.HOUR = 60 * exports.MINUTE;
 exports.DAY = 24 * exports.HOUR;
 exports.MAX_TILE_SIZE = 10;
@@ -146,10 +146,9 @@ function isWhoObject(v) {
 }
 const MULTIPLIERS = ['', 'K', 'M', 'G', 'T'];
 function formatBytes(n, { post = 'B', k = 0, digits = NaN, sep = ' ' } = {}) {
-    var _a;
     if (isNaN(Number(n)) || n < 0)
         return '';
-    k || (k = (_a = formatBytes.k) !== null && _a !== void 0 ? _a : 1024); // default value
+    k ||= formatBytes.k ?? 1024; // default value
     const i = n && Math.min(MULTIPLIERS.length - 1, Math.floor(Math.log2(n) / Math.log2(k)));
     n /= k ** i;
     const nAsString = i && !isNaN(digits) ? n.toFixed(digits)
@@ -176,7 +175,11 @@ function wait(ms, val) {
 }
 // throws after ms
 function haveTimeout(ms, job, error) {
-    return Promise.race([job, wait(ms).then(() => { throw error || Error('timeout'); })]);
+    let h;
+    return Promise.race([
+        job.finally(() => clearTimeout(h)), // don't leave pending timeout if the job is done first
+        new Promise((_resolve, reject) => h = setTimeout(() => reject(error || Error('timeout')), ms))
+    ]);
 }
 function objSameKeys(src, newValue) {
     return Object.fromEntries(Object.entries(src).map(([k, v]) => [k, newValue(v, k)]));
@@ -227,7 +230,7 @@ function try_(cb, onException) {
         return cb();
     }
     catch (e) {
-        return onException === null || onException === void 0 ? void 0 : onException(e);
+        return onException?.(e);
     }
 }
 function with_(par, cb) {
@@ -253,8 +256,7 @@ function pendingPromise() {
     return Object.assign(ret, takeOut);
 }
 function basename(path) {
-    var _a;
-    return ((_a = path.match(/([^\\/]+)[\\/]*$/)) === null || _a === void 0 ? void 0 : _a[1]) || '';
+    return path.match(/([^\\/]+)[\\/]*$/)?.[1] || '';
 }
 function dirname(path) {
     return path.slice(0, Math.max(0, path.lastIndexOf('/', path.length - 1)));
@@ -263,8 +265,8 @@ function tryJson(s, except) {
     try {
         return s && JSON.parse(s);
     }
-    catch (_a) {
-        return except === null || except === void 0 ? void 0 : except(s);
+    catch {
+        return except?.(s);
     }
 }
 function swap(obj, k1, k2) {
@@ -377,7 +379,7 @@ function repeat(everyMs, cb) {
             try {
                 await cb(stopIt);
             } // you can use stopIt passed as a parameter or the returned value, whatever makes you happy
-            catch (_a) { }
+            catch { }
             await wait(everyMs);
         }
     })();
@@ -418,17 +420,15 @@ function isTimestampString(v) {
     return typeof v === 'string' && /^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d+)?Z*$/.test(v);
 }
 function isEqualLax(a, b, overrideRule) {
-    var _a;
-    return (_a = overrideRule === null || overrideRule === void 0 ? void 0 : overrideRule(a, b)) !== null && _a !== void 0 ? _a : (a == b || a && b && typeof a === 'object' && typeof b === 'object'
+    return overrideRule?.(a, b) ?? (a == b || a && b && typeof a === 'object' && typeof b === 'object'
         && Object.entries(a).every(([k, v]) => isEqualLax(v, b[k], overrideRule))
         && Object.entries(b).every(([k, v]) => k in a /*already checked*/ || isEqualLax(v, a[k], overrideRule)));
 }
 function xlate(input, table) {
-    var _a;
-    return (_a = table[input]) !== null && _a !== void 0 ? _a : input;
+    return table[input] ?? input;
 }
 function normalizeHost(host) {
-    return host[0] === '[' ? host.slice(1, host.indexOf(']')) : host === null || host === void 0 ? void 0 : host.split(':')[0];
+    return host[0] === '[' ? host.slice(1, host.indexOf(']')) : host?.split(':')[0];
 }
 function isIpLocalHost(ip) {
     return ip === '::1' || ip.endsWith('127.0.0.1');
@@ -480,9 +480,8 @@ function makeMatcher(mask, emptyMaskReturns = false) {
 }
 // this is caching all matchers, so don't use it with frequently changing masks. Benchmarks revealed that _.memoize make it slower than not using it, while this simple cache can speed up to 30x
 function matches(s, mask, emptyMaskReturns = false) {
-    var _a, _b;
-    const cache = (_a = matches).cache || (_a.cache = {});
-    return (cache[_b = mask + (emptyMaskReturns ? '1' : '0')] || (cache[_b] = makeMatcher(mask, emptyMaskReturns)))(s);
+    const cache = matches.cache ||= {};
+    return (cache[mask + (emptyMaskReturns ? '1' : '0')] ||= makeMatcher(mask, emptyMaskReturns))(s);
 }
 // if delimiter is specified, it is prefixed to symbols. If it contains a space, the part after the space is considered as suffix.
 function replace(s, symbols, delimiter = '') {
@@ -513,7 +512,7 @@ function safeDecodeURIComponent(s) {
     try {
         return decodeURIComponent(s);
     }
-    catch (_a) {
+    catch {
         return s;
     }
 }
@@ -543,9 +542,8 @@ function toMutable(value) {
     return Array.isArray(value) ? value.slice() : { ...value };
 }
 function shortenAgent(agent) {
-    var _a;
     return lodash_1.default.findKey(BROWSERS, re => re.test(agent))
-        || ((_a = /^[^/(]+ ?/.exec(agent)) === null || _a === void 0 ? void 0 : _a[0])
+        || /^[^/(]+ ?/.exec(agent)?.[0]
         || agent;
 }
 const BROWSERS = {

package/src/customHtml.js

@@ -22,7 +22,6 @@ exports.disableCustomHtml = (0, config_1.defineConfig)(misc_1.CFG.disable_custom
 function watchLoadCustomHtml(folder = '') {
     const sections = new Map();
     const res = (0, watchLoad_1.watchLoad)((0, misc_1.prefix)('', folder, '/') + FILE, data => {
-        var _a;
         const re = /^\[([^\]]+)] *$/gm;
         sections.clear();
         if (!data)
@@ -31,10 +30,10 @@ function watchLoadCustomHtml(folder = '') {
         do {
             let last = re.lastIndex;
             const match = re.exec(data);
-            const content = data.slice(last, !match ? undefined : re.lastIndex - (((_a = match === null || match === void 0 ? void 0 : match[0]) === null || _a === void 0 ? void 0 : _a.length) || 0)).trim();
+            const content = data.slice(last, !match ? undefined : re.lastIndex - (match?.[0]?.length || 0)).trim();
             if (content)
                 sections.set(name, content);
-            name = match === null || match === void 0 ? void 0 : match[1];
+            name = match?.[1];
         } while (name);
     });
     return Object.assign(res, { sections });
@@ -50,7 +49,7 @@ function getAllSections() {
     return Object.fromEntries(all.map(x => [x, getSection(x)]));
 }
 async function saveCustomHtml(sections) {
-    const text = Object.entries(sections).filter(([k, v]) => v === null || v === void 0 ? void 0 : v.trim()).map(([k, v]) => `[${k}]\n${v}\n\n`).join('');
+    const text = Object.entries(sections).filter(([k, v]) => v?.trim()).map(([k, v]) => `[${k}]\n${v}\n\n`).join('');
     await (0, promises_1.writeFile)(FILE, text);
     exports.customHtml.sections.clear();
     for (const [k, v] of Object.entries(sections))

package/src/ddns.js

@@ -22,8 +22,8 @@ let stopFetching;
 let lastIPs;
 let lastMap;
 events_1.default.onListeners(EVENT, cbs => {
-    stopFetching === null || stopFetching === void 0 ? void 0 : stopFetching();
-    if (!(cbs === null || cbs === void 0 ? void 0 : cbs.size))
+    stopFetching?.();
+    if (!cbs?.size)
         return;
     stopFetching = (0, cross_1.repeat)(cross_1.HOUR, async () => {
         const IPs = await (0, nat_1.getPublicIps)();
@@ -41,7 +41,7 @@ events_1.default.onListeners(EVENT, cbs => {
 let stopListening;
 let last;
 dynamicDnsUrl.sub(v => {
-    stopListening === null || stopListening === void 0 ? void 0 : stopListening();
+    stopListening?.();
     if (!v)
         return;
     stopListening = events_1.default.on(EVENT, async () => {
@@ -60,7 +60,7 @@ dynamicDnsUrl.sub(v => {
         }));
         last = lodash_1.default.find(all, 'error') || all[0]; // the system is designed for just one result, and we give precedence to errors
         events_1.default.emit('dynamicDnsError', last);
-        console.log('dynamic dns update', (last === null || last === void 0 ? void 0 : last.error) || 'ok');
+        console.log('dynamic dns update', last?.error || 'ok');
     }, { callNow: true });
 });
 async function get_dynamic_dns_error() {

package/src/debounceAsync.js

@@ -19,7 +19,7 @@ callback, options = {}) {
     const interceptingWrapper = (...args) => latestDebouncer = debouncer(...args);
     return Object.assign(interceptingWrapper, {
         clearRetain: () => latestCallback = undefined,
-        flush: () => runningCallback !== null && runningCallback !== void 0 ? runningCallback : exec(),
+        flush: () => runningCallback ?? exec(),
         isWorking: () => runningCallback,
         ...cancelable && {
             cancel() {
@@ -32,10 +32,10 @@ callback, options = {}) {
         if (reuseRunning && runningCallback)
             return runningCallback;
         const now = Date.now();
-        if (latestCallback && now - latestTimestamp < (latestHasFailed ? retainFailure !== null && retainFailure !== void 0 ? retainFailure : retain : retain))
+        if (latestCallback && now - latestTimestamp < (latestHasFailed ? retainFailure ?? retain : retain))
             return await latestCallback;
         whoIsWaiting = args;
-        waitingSince || (waitingSince = now);
+        waitingSince ||= now;
         const waitingCap = maxWait - (now - (waitingSince || started));
         const waitFor = Math.min(waitingCap, leading ? wait - (now - started) : wait);
         if (waitFor > 0)

package/src/errorPages.js

@@ -11,7 +11,6 @@ function getErrorSections() {
 }
 // to be used with errors whose recipient is possibly human
 async function sendErrorPage(ctx, code = ctx.status) {
-    var _a, _b;
     ctx.type = 'text';
     ctx.set('content-disposition', ''); // reset ctx.attachment (or forceDownload)
     ctx.status = code;
@@ -21,8 +20,8 @@ async function sendErrorPage(ctx, code = ctx.status) {
     const lang = await (0, lang_1.getLangData)(ctx);
     if (!lang)
         return;
-    const trans = (_a = Object.values(lang)[0]) === null || _a === void 0 ? void 0 : _a.translate;
-    ctx.body = (_b = trans === null || trans === void 0 ? void 0 : trans[msg]) !== null && _b !== void 0 ? _b : msg;
+    const trans = Object.values(lang)[0]?.translate;
+    ctx.body = trans?.[msg] ?? msg;
     const errorPage = (0, customHtml_1.getSection)(ctx.status === cross_1.HTTP_UNAUTHORIZED ? 'unauthorized' : String(ctx.status));
     if (!errorPage)
         return;

package/src/events.js

@@ -4,11 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BetterEventEmitter = void 0;
 const LISTENERS_SUFFIX = '\0listeners';
 class BetterEventEmitter {
-    constructor() {
-        this.listeners = new Map();
-        this.preventDefault = Symbol();
-        this.stop = this.preventDefault; // legacy pre-0.54 (introduced in 0.53)
-    }
+    listeners = new Map();
+    preventDefault = Symbol();
+    stop = this.preventDefault; // legacy pre-0.54 (introduced in 0.53)
     on(event, listener, { warnAfter = 10, callNow = false } = {}) {
         if (typeof event === 'string')
             event = [event];
@@ -25,7 +23,7 @@ class BetterEventEmitter {
             try {
                 listener();
             }
-            catch (_a) { }
+            catch { }
         return () => {
             for (const e of event) {
                 const cbs = this.listeners.get(e);
@@ -47,7 +45,7 @@ class BetterEventEmitter {
             off = this.on(event, function (...args) {
                 off();
                 resolve(args.slice(0, -1)); // remove the extra argument at the end of our emit()
-                return listener === null || listener === void 0 ? void 0 : listener(...args);
+                return listener?.(...args);
             });
         });
         return Object.assign(off, { then: pro.then.bind(pro) });
@@ -60,12 +58,11 @@ class BetterEventEmitter {
         };
     }
     anyListener(event) {
-        var _a;
-        return Boolean((_a = this.listeners.get(event)) === null || _a === void 0 ? void 0 : _a.size);
+        return Boolean(this.listeners.get(event)?.size);
     }
     emit(event, ...args) {
         let cbs = this.listeners.get(event);
-        if (!(cbs === null || cbs === void 0 ? void 0 : cbs.size))
+        if (!cbs?.size)
             return;
         const output = [];
         let prevented = false;

package/src/fileAttr.js

@@ -24,10 +24,9 @@ if ((0, fs_1.existsSync)(FN))
 const FILE_ATTR_PREFIX = 'user.hfs.'; // user. prefix to be linux compatible
 /* @param v must be JSON-able or undefined */
 async function storeFileAttr(path, k, v) {
-    var _a, _b;
     const s = await (0, util_files_1.statWithTimeout)(path).catch(() => null);
     // since we don't have fsx.remove, we simulate it with an empty string
-    if (s && await (fsx === null || fsx === void 0 ? void 0 : fsx.set(path, FILE_ATTR_PREFIX + k, v === undefined ? '' : JSON.stringify(v)).then(() => 1, () => 0))) {
+    if (s && await fsx?.set(path, FILE_ATTR_PREFIX + k, v === undefined ? '' : JSON.stringify(v)).then(() => 1, () => 0)) {
         if (const_1.IS_WINDOWS)
             (0, promises_2.utimes)(path, s.atime, s.mtime); // restore timestamps, necessary only on Windows
         return true;
@@ -39,14 +38,15 @@ async function storeFileAttr(path, k, v) {
         else
             await fileAttrDb.open(FN);
     // pipe should be a safe separator
-    return (_b = await ((_a = fileAttrDb.put(`${path}|${k}`, v)) === null || _a === void 0 ? void 0 : _a.catch((e) => {
+    return await fileAttrDb.put(`${path}|${k}`, v)?.catch((e) => {
         console.error("couldn't store metadata on", path, String(e.message || e));
         return false;
-    }))) !== null && _b !== void 0 ? _b : true; // if put is undefined, the value was already there
+    }) ?? true; // if put is undefined, the value was already there
 }
 async function loadFileAttr(path, k) {
-    var _a;
-    return (_a = await (fsx === null || fsx === void 0 ? void 0 : fsx.get(path, FILE_ATTR_PREFIX + k).then((x) => x === '' ? undefined : (0, cross_1.tryJson)(String(x)), () => fileAttrDb.isOpen() ? fileAttrDb.get(`${path}|${k}`) : null))) !== null && _a !== void 0 ? _a : undefined; // normalize, as we get null instead of undefined on windows
+    return await fsx?.get(path, FILE_ATTR_PREFIX + k)
+        .then((x) => x === '' ? undefined : (0, cross_1.tryJson)(String(x)), () => fileAttrDb.isOpen() ? fileAttrDb.get(`${path}|${k}`) : null)
+        ?? undefined; // normalize, as we get null instead of undefined on windows
 }
 async function purgeFileAttr() {
     let n = 0;

package/src/first.js

@@ -10,17 +10,22 @@ function onProcessExit(cb) {
 }
 exports.quitting = false;
 onProcessExit(() => exports.quitting = true);
-onFirstEvent(process, ['exit', 'SIGQUIT', 'SIGTERM', 'SIGINT', 'SIGHUP'], signal => Promise.allSettled(Array.from(cbs).map(cb => cb(signal))).then(() => {
-    console.log('quitting');
+onFirstEvent(process, ['exit', 'SIGQUIT', 'SIGTERM', 'SIGINT', 'SIGHUP']).then(([signal]) => Promise.allSettled(Array.from(cbs).map(cb => cb(signal))).then(() => {
+    console.log('quitting', signal || '');
     process.exit(0);
 }));
-function onFirstEvent(emitter, events, cb) {
-    let already = false;
-    for (const e of events)
-        emitter.once(e, (...args) => {
+function onFirstEvent(emitter, events) {
+    return new Promise(resolve => {
+        let already = false;
+        for (const e of events)
+            emitter.on(e, listener);
+        function listener(...args) {
             if (already)
                 return;
             already = true;
-            cb(...args);
-        });
+            for (const e of events)
+                emitter.removeListener(e, listener);
+            resolve(args);
+        }
+    });
 }

package/src/frontEndApis.js

@@ -70,7 +70,7 @@ exports.frontEndApis = {
         });
     },
     async get_file_details({ uris }, ctx) {
-        if (typeof (uris === null || uris === void 0 ? void 0 : uris[0]) !== 'string')
+        if (typeof uris?.[0] !== 'string')
             return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, 'bad uris');
         const isAdmin = (0, adminApis_1.ctxAdminAccess)(ctx);
         return {
@@ -114,7 +114,7 @@ exports.frontEndApis = {
         const node = await (0, vfs_1.urlToNode)(uri, ctx);
         if (!node)
             throw new apiMiddleware_1.ApiError(const_1.HTTP_NOT_FOUND);
-        if ((0, vfs_1.isRoot)(node) || dest.includes('/') || (0, util_files_1.dirTraversal)(dest))
+        if ((0, vfs_1.isRoot)(node) || dest.includes('/') || (0, util_files_1.hasDirTraversal)(dest))
             throw new apiMiddleware_1.ApiError(const_1.HTTP_FORBIDDEN);
         if (!(0, vfs_1.hasPermission)(node, 'can_delete', ctx))
             throw new apiMiddleware_1.ApiError(const_1.HTTP_UNAUTHORIZED);
@@ -147,12 +147,12 @@ exports.frontEndApis = {
                 if (typeof from1 !== 'string')
                     return const_1.HTTP_BAD_REQUEST;
                 const srcNode = await (0, vfs_1.urlToNode)(from1, ctx);
-                const src = srcNode === null || srcNode === void 0 ? void 0 : srcNode.source;
+                const src = srcNode?.source;
                 if (!src)
                     return const_1.HTTP_NOT_FOUND;
                 const dest = (0, path_1.join)(destNode.source, (0, path_1.basename)(src));
                 if (lodash_1.default.isFunction(override))
-                    return override === null || override === void 0 ? void 0 : override(srcNode, dest);
+                    return override?.(srcNode, dest);
                 return (0, vfs_1.statusCodeForMissingPerm)(srcNode, 'can_delete', ctx)
                     || (0, promises_1.rename)(src, dest).catch(async (e) => {
                         if (e.code !== 'EXDEV')
@@ -200,7 +200,7 @@ exports.frontEndApis = {
         let bytes = 0;
         let files = 0;
         for await (const n of (0, vfs_1.walkNode)(folder, { ctx, onlyFiles: true, depth: Infinity })) {
-            bytes += await (0, vfs_1.nodeStats)(n).then(x => (x === null || x === void 0 ? void 0 : x.size) || 0, () => 0);
+            bytes += await (0, vfs_1.nodeStats)(n).then(x => x?.size || 0, () => 0);
             files++;
             partialFolderSize[id] = { bytes, files };
         }

package/src/geo.js

@@ -20,10 +20,9 @@ setInterval(checkFiles, misc_1.DAY); // keep updated at run-time
 // benchmark: memoize can make this 44x faster
 exports.ip2country = lodash_1.default.memoize((ip) => ip2location.getCountryShortAsync(ip).then(v => v === '-' ? '' : v, () => ''));
 const geoFilter = async (ctx, next) => {
-    var _a;
     if (enabled.get() && !(0, misc_1.isLocalHost)(ctx) && !(0, misc_1.isIpLan)(ctx.ip)) {
         const { connection } = ctx.state;
-        const country = (_a = connection.country) !== null && _a !== void 0 ? _a : (connection.country = await (0, exports.ip2country)(ctx.ip));
+        const country = connection.country ??= await (0, exports.ip2country)(ctx.ip);
         if (country)
             (0, connections_1.updateConnection)(connection, { country });
         if (!ctx.state.skipFilters && allow.get() !== null)
@@ -37,7 +36,6 @@ function isOpen() {
     return Boolean(ip2location.getPackageVersion());
 }
 async function checkFiles() {
-    var _a, _b;
     if (!enabled.get())
         return;
     const ZIP_FILE = 'IP2LOCATION-LITE-DB1.IPV6.BIN';
@@ -57,11 +55,11 @@ async function checkFiles() {
                 ip2location.close();
             await (0, promises_1.unlink)(LOCAL_FILE).catch(() => { });
             await (0, promises_1.rename)(TEMP, LOCAL_FILE);
-            (_b = (_a = exports.ip2country.cache).clear) === null || _b === void 0 ? void 0 : _b.call(_a);
+            exports.ip2country.cache.clear?.();
             console.log(`${name} download completed`);
         }
         catch (e) {
-            console.error(`Failed to download ${name}${mtime ? ", falling back on old data" : ''}:`, (e === null || e === void 0 ? void 0 : e.message) || String(e));
+            console.error(`Failed to download ${name}${mtime ? ", falling back on old data" : ''}:`, e?.message || String(e));
         }
     else if (isOpen())
         return;

package/src/github.js

@@ -39,15 +39,13 @@ function getGithubDefaultBranch(repo) {
     if (!repo.includes('/'))
         throw 'malformed repo';
     return branchCache.try(repo, async () => {
-        var _a;
         for (const b of ['main', 'master']) // try to not consume api quota
             if (await (0, misc_1.httpString)(`https://github.com/${repo}/raw/refs/heads/${b}/dist/plugin.js`, { method: 'HEAD', noRedirect: true }).then(() => 1, () => 0))
                 return b;
-        return (_a = (await getRepoInfo(repo))) === null || _a === void 0 ? void 0 : _a.default_branch;
+        return (await getRepoInfo(repo))?.default_branch;
     });
 }
 async function downloadPlugin(repo, { branch = '', overwrite = false } = {}) {
-    var _a, _b, _c;
     if (typeof repo !== 'string')
         repo = repo.main;
     if (exports.downloading[repo])
@@ -63,19 +61,19 @@ async function downloadPlugin(repo, { branch = '', overwrite = false } = {}) {
         if (customRepo) { // custom repo
             if (!pl)
                 throw new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, "bad repo");
-            const customRepo = (((_b = (_a = pl).getData) === null || _b === void 0 ? void 0 : _b.call(_a)) || pl).repo;
-            let url = customRepo === null || customRepo === void 0 ? void 0 : customRepo.zip;
+            const customRepo = (pl.getData?.() || pl).repo;
+            let url = customRepo?.zip;
             if (!url)
                 throw new apiMiddleware_1.ApiError(const_1.HTTP_SERVER_ERROR, "bad plugin");
             if (!url.includes('//'))
                 url = customRepo.web + url;
-            return await go(url, pl === null || pl === void 0 ? void 0 : pl.id, (_c = customRepo.zipRoot) !== null && _c !== void 0 ? _c : DIST_ROOT);
+            return await go(url, pl?.id, customRepo.zipRoot ?? DIST_ROOT);
         }
-        branch || (branch = await getGithubDefaultBranch(repo));
+        branch ||= await getGithubDefaultBranch(repo);
         const short = repo.split('/')[1]; // second part, repo without the owner
         if (!short)
             throw new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, "bad repo");
-        const folder = overwrite && (pl === null || pl === void 0 ? void 0 : pl.id) // use existing folder
+        const folder = overwrite && pl?.id // use existing folder
             || (getFolder2repo().hasOwnProperty(short) ? repo.replace('/', '-') // longer form only if another plugin is using short form, to avoid overwriting
                 : short.replace(/^hfs-/, ''));
         const GITHUB_ZIP_ROOT = short + '-' + branch; // GitHub puts everything within this folder
@@ -137,7 +135,7 @@ async function downloadPlugin(repo, { branch = '', overwrite = false } = {}) {
             await (0, promises_1.rename)(tempInstallPath, installPath)
                 .catch(e => { throw e.code !== 'ENOENT' ? e : new apiMiddleware_1.ApiError(const_1.HTTP_NOT_ACCEPTABLE, "missing main file"); });
             if (wasRunning)
-                if (await (0, misc_1.waitFor)(() => (0, plugins_1.getPluginInfo)(folder), { timeout: 10000 }))
+                if (await (0, misc_1.waitFor)(() => (0, plugins_1.getPluginInfo)(folder), { timeout: 10_000 }))
                     void (0, plugins_1.startPlugin)(folder) // don't wait, in case it fails to start. We still use startPlugin instead of enablePlugin, as it will take care of disabling other themes.
                         .catch(console.warn);
             events_1.default.emit('pluginDownloaded', { id: folder, repo });
@@ -167,7 +165,7 @@ async function readOnlinePlugin(repo, branch = '') {
             main = pl.repo.web + main;
         return (0, plugins_1.parsePluginSource)(main, await (0, misc_1.httpString)(main)); // use 'repo' as 'id' client-side
     }
-    branch || (branch = await getGithubDefaultBranch(repo));
+    branch ||= await getGithubDefaultBranch(repo);
     const res = await readGithubFile(`${repo}/${branch}/${DIST_ROOT}/${plugins_1.PLUGIN_MAIN_FILE}`);
     const pl = (0, plugins_1.parsePluginSource)(repo, res); // use 'repo' as 'id' client-side
     pl.branch = branch;
@@ -175,13 +173,13 @@ async function readOnlinePlugin(repo, branch = '') {
 }
 async function readOnlineCompatiblePlugin(repo, branch = '') {
     const pl = await readOnlinePlugin(repo, branch);
-    if (!(pl === null || pl === void 0 ? void 0 : pl.apiRequired))
+    if (!pl?.apiRequired)
         return; // mandatory field
     if (!pl.badApi)
         return pl;
     // we try other branches (starting with 'api')
     const res = await apiGithub('repos/' + repo + '/branches');
-    const branches = res.map((x) => x === null || x === void 0 ? void 0 : x.name)
+    const branches = res.map((x) => x?.name)
         .filter((x) => typeof x === 'string' && x.startsWith('api'))
         .sort().reverse();
     for (const branch of branches) {
@@ -234,7 +232,7 @@ async function* apiGithubPaginated(uri) {
     }
 }
 async function isPluginBlacklisted(repo) {
-    return (0, exports.getProjectInfo)().then(x => { var _a, _b; return ((_b = (_a = x === null || x === void 0 ? void 0 : x.repo_blacklist) === null || _a === void 0 ? void 0 : _a[repo]) === null || _b === void 0 ? void 0 : _b.message) || ''; }, () => undefined);
+    return (0, exports.getProjectInfo)().then(x => x?.repo_blacklist?.[repo]?.message || '', () => undefined);
 }
 async function searchPlugins(text = '', { skipRepos = [''] } = {}) {
     // github doesn't allow complex search, so we have to do it multiple times and merge the results
@@ -245,7 +243,6 @@ async function searchPlugins(text = '', { skipRepos = [''] } = {}) {
     const list = await Promise.all(searches.map(x => (0, misc_1.asyncGeneratorToArray)(apiGithubPaginated(`search/repositories?q=topic:hfs-plugin+${x}`))));
     const deduped = lodash_1.default.uniqBy(list.flat(), x => x.full_name);
     return new misc_1.AsapStream(deduped.map(async (it) => {
-        var _a;
         const repo = it.full_name;
         if (skipRepos.includes(repo) || await isPluginBlacklisted(repo))
             return;
@@ -255,7 +252,7 @@ async function searchPlugins(text = '', { skipRepos = [''] } = {}) {
         Object.assign(pl, {
             repo, // overwrite parsed value, that may be wrong
             downloading: exports.downloading[repo],
-            license: (_a = it.license) === null || _a === void 0 ? void 0 : _a.spdx_id,
+            license: it.license?.spdx_id,
         }, lodash_1.default.pick(it, ['pushed_at', 'stargazers_count', 'default_branch']));
         return pl;
     }));
@@ -273,7 +270,7 @@ exports.getProjectInfo = (0, misc_1.debounceAsync)(() => argv_1.argv.central ===
     .then(o => {
     if (o)
         cachedCentralInfo.set(o);
-    o || (o = { ...cachedCentralInfo.get() || builtIn }); // fall back to built-in
+    o ||= { ...cachedCentralInfo.get() || builtIn }; // fall back to built-in
     // merge byVersions info in the main object, but collect alerts separately, to preserve multiple instances
     const allAlerts = [o.alert];
     for (const [ver, more] of Object.entries((0, misc_1.popKey)(o, 'byVersion') || {}))
@@ -296,4 +293,4 @@ exports.getProjectInfo = (0, misc_1.debounceAsync)(() => argv_1.argv.central ===
             (0, plugins_1.enablePlugin)(p.id, false);
     }
     return o;
-}), { retain: misc_1.HOUR, retainFailure: 60000 });
+}), { retain: misc_1.HOUR, retainFailure: 60_000 });

package/src/i18n.js

@@ -21,11 +21,10 @@ function i18nFromTranslations(translations, embedded = 'en') {
     }
     // If one of the keys is an "id", that should be the first. If one of the keys should work as a fallback, that should be the last. Use 'fallback' parameter if you don't want the fallback to work as a key.
     function t(keyOrTpl, params, fallback) {
-        var _a, _b;
         if (!keyOrTpl)
             return '';
         // memoize?
-        const keys = isTemplateStringsArray(keyOrTpl) ? [(fallback !== null && fallback !== void 0 ? fallback : (fallback = keyOrTpl[0]))]
+        const keys = isTemplateStringsArray(keyOrTpl) ? [(fallback ??= keyOrTpl[0])]
             : Array.isArray(keyOrTpl) ? keyOrTpl : [keyOrTpl];
         if (typeof params === 'string' && !fallback) {
             fallback = params;
@@ -38,7 +37,7 @@ function i18nFromTranslations(translations, embedded = 'en') {
         if (!state.disabled)
             for (const key of keys) {
                 for (const lang of searchLangs)
-                    if (found = (_b = (_a = state.translations[selectedLang = lang]) === null || _a === void 0 ? void 0 : _a.translate) === null || _b === void 0 ? void 0 : _b[key])
+                    if (found = state.translations[selectedLang = lang]?.translate?.[key])
                         break;
                 if (found)
                     break;
@@ -111,7 +110,7 @@ function i18nFromTranslations(translations, embedded = 'en') {
         yield [s.slice(ofs), false];
     }
     function isTemplateStringsArray(x) {
-        return (x === null || x === void 0 ? void 0 : x.raw) && Array.isArray(x);
+        return x?.raw && Array.isArray(x);
     }
     return {
         t,

package/src/icons.js

@@ -24,7 +24,7 @@ function watchIconsFolder(parentFolder, cb) {
             }
             cb(res);
         }
-        catch (_a) {
+        catch {
             cb(undefined);
         } // no such dir
     }), true);

package/src/index.js

@@ -4,7 +4,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.app = void 0;
 const koa_1 = __importDefault(require("koa"));
@@ -39,7 +38,7 @@ if (new config_1.Version(process.versions.node).olderThan('18.15.0')) {
     process.exit(2);
 }
 process.title = 'HFS ' + const_1.VERSION;
-const keys = ((_a = process.env.COOKIE_SIGN_KEYS) === null || _a === void 0 ? void 0 : _a.split(','))
+const keys = process.env.COOKIE_SIGN_KEYS?.split(',')
     || [(0, misc_1.randomId)(30)]; // randomness at start gives some extra security, btu also invalidates existing sessions
 exports.app = new koa_1.default({ keys });
 exports.app.use(middlewares_1.sessionMiddleware)
@@ -78,7 +77,7 @@ process.on('uncaughtException', (err) => {
         try {
             console.error("uncaught:", err);
         }
-        catch (_a) { } // in case we are writing to a closed terminal, we may throw with "write eio at afterwritedispatched", causing an infinite loop
+        catch { } // in case we are writing to a closed terminal, we may throw with "write eio at afterwritedispatched", causing an infinite loop
 });
 // this warning is scaring users, and has been removed in node 20.12.0 https://github.com/nodejs/node/pull/51204
 const original = process.emitWarning;

package/src/lang.js

@@ -24,7 +24,7 @@ function code2file(code) {
 function file2code(fn) {
     return fn.replace(PREFIX, '').replace(SUFFIX, '');
 }
-const cache = (0, expiringCache_1.expiringCache)(3000); // 3 seconds for both a good dx and acceptable performance
+const cache = (0, expiringCache_1.expiringCache)(3_000); // 3 seconds for both a good dx and acceptable performance
 async function getLangData(ctxOrLangCsv) {
     if (typeof ctxOrLangCsv !== 'string') {
         const ctx = ctxOrLangCsv;
@@ -35,7 +35,6 @@ async function getLangData(ctxOrLangCsv) {
     }
     const csv = ctxOrLangCsv.toLowerCase();
     return cache.try(csv, async () => {
-        var _a;
         const langs = csv.split(',');
         const ret = {};
         let i = 0;
@@ -47,7 +46,7 @@ async function getLangData(ctxOrLangCsv) {
             try {
                 ret[k] = JSON.parse(await (0, promises_1.readFile)(fn, 'utf8'));
             } // allow external files to override embedded translations
-            catch (_b) {
+            catch {
                 if ((0, misc_1.hasProp)(embedded_1.default, k))
                     ret[k] = lodash_1.default.cloneDeep(embedded_1.default[k]);
                 else {
@@ -60,9 +59,9 @@ async function getLangData(ctxOrLangCsv) {
                     }
                 }
             }
-            const fromPlugins = (0, misc_1.onlyTruthy)(await Promise.all((0, plugins_1.mapPlugins)(async (pl) => { var _a; return (_a = (0, misc_1.tryJson)(await (0, promises_1.readFile)((0, path_1.join)(pl.folder, fn), 'utf8').catch(() => ''))) === null || _a === void 0 ? void 0 : _a.translate; })));
+            const fromPlugins = (0, misc_1.onlyTruthy)(await Promise.all((0, plugins_1.mapPlugins)(async (pl) => (0, misc_1.tryJson)(await (0, promises_1.readFile)((0, path_1.join)(pl.folder, fn), 'utf8').catch(() => ''))?.translate)));
             if (fromPlugins.length)
-                lodash_1.default.defaults((_a = (ret[k] || (ret[k] = {}))).translate || (_a.translate = {}), ...fromPlugins); // be sure we have an entry for k
+                lodash_1.default.defaults((ret[k] ||= {}).translate ||= {}, ...fromPlugins); // be sure we have an entry for k
             i++;
         }
         return ret;
@@ -71,7 +70,7 @@ async function getLangData(ctxOrLangCsv) {
 let forceLangData;
 let undo;
 (0, config_1.defineConfig)(misc_1.CFG.force_lang, '', v => {
-    undo === null || undo === void 0 ? void 0 : undo();
+    undo?.();
     if (!v)
         return forceLangData = undefined;
     const translation = embedded_1.default[v];