hfs 0.57.24 → 0.57.27-beta2

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];

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

@@ -43,7 +43,6 @@ const events_1 = require("events");
 const config_1 = require("./config");
 const fs_1 = require("fs");
 const util = __importStar(require("util"));
-const promises_1 = require("fs/promises");
 const lodash_1 = __importDefault(require("lodash"));
 const util_files_1 = require("./util-files");
 const auth_1 = require("./auth");
@@ -55,30 +54,32 @@ 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;
         try {
-            const stats = await (0, promises_1.stat)(path);
+            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.
@@ -116,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())) {
@@ -150,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 && {
@@ -163,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,8 +171,8 @@ const logMw = async (ctx, next) => {
         if (events_2.default.anyListener(logger.name)) // small optimization: this event can happen often, while most times there's no listener, and the parameters object is constructed pointlessly. A benchmark measured it 20% faster (just the line), while maybe it was not necessary.
             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, 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, (_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))));
+         (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, length?.toString() ?? '-', lodash_1.default.isEmpty(extra) ? '' : JSON.stringify(JSON.stringify(extra))));
     });
 };
 exports.logMw = logMw;
@@ -187,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
@@ -196,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)