hfs 0.57.26 → 0.57.27-beta3

package/src/plugins.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLUGIN_MAIN_FILE = exports.pluginsConfig = exports.suspendPlugins = exports.enablePlugins = exports.pluginsWatcher = exports.SERVER_CODE_ID = exports.Plugin = exports.pluginsMiddleware = exports.STORAGE_FOLDER = exports.DELETE_ME_SUFFIX = exports.DISABLING_SUFFIX = exports.PATH = void 0;
+exports.PLUGIN_MAIN_FILE = exports.pluginsConfig = exports.suspendPlugins = exports.enablePlugins = exports.pluginsWatcher = exports.SERVER_CODE_ID = exports.Plugin = exports.pluginsMiddleware = exports.pluginsScanned = exports.STORAGE_FOLDER = exports.DELETE_ME_SUFFIX = exports.DISABLING_SUFFIX = exports.PATH = void 0;
 exports.isPluginRunning = isPluginRunning;
 exports.isPluginEnabled = isPluginEnabled;
 exports.enablePlugin = enablePlugin;
@@ -61,6 +61,7 @@ const Const = __importStar(require("./const"));
 const misc_1 = require("./misc");
 const misc = __importStar(require("./misc"));
 const config_1 = require("./config");
+const vfs_1 = require("./vfs");
 const serveFile_1 = require("./serveFile");
 const events_1 = __importDefault(require("./events"));
 const promises_1 = require("fs/promises");
@@ -83,6 +84,7 @@ exports.PATH = 'plugins';
 exports.DISABLING_SUFFIX = '-disabled';
 exports.DELETE_ME_SUFFIX = '-delete_me' + exports.DISABLING_SUFFIX;
 exports.STORAGE_FOLDER = 'storage';
+exports.pluginsScanned = (0, misc_1.pendingPromise)();
 setTimeout(async () => {
     for (const x of await (0, promises_1.readdir)(exports.PATH))
         if (x.endsWith(exports.DELETE_ME_SUFFIX))
@@ -90,8 +92,7 @@ setTimeout(async () => {
 }, 1000);
 const plugins = new Map(); // now that we care about the order, a simple object wouldn't do, because numbers are always at the beginning
 function isPluginRunning(id) {
-    var _a;
-    return Boolean((_a = plugins.get(id)) === null || _a === void 0 ? void 0 : _a.started);
+    return Boolean(plugins.get(id)?.started);
 }
 function isPluginEnabled(id, considerSuspension = false) {
     return (!considerSuspension || !exports.suspendPlugins.get()) && exports.enablePlugins.get().includes(id);
@@ -113,8 +114,7 @@ async function stopPlugin(id) {
     await waitRunning(id, false);
 }
 async function startPlugin(id) {
-    var _a;
-    if ((_a = getPluginInfo(id)) === null || _a === void 0 ? void 0 : _a.isTheme)
+    if (getPluginInfo(id)?.isTheme)
         await Promise.all(mapPlugins((pl, id) => pl.isTheme && stopPlugin(id)));
     enablePlugin(id);
     await waitRunning(id);
@@ -132,7 +132,7 @@ function setPluginConfig(id, changes) {
     exports.pluginsConfig.set(allConfigs => {
         const fields = getPluginConfigFields(id);
         const oldConfig = allConfigs[id];
-        const newConfig = changes && lodash_1.default.pickBy({ ...oldConfig, ...changes }, (v, k) => { var _a; return v != null && !(0, misc_1.same)(v, (_a = fields === null || fields === void 0 ? void 0 : fields[k]) === null || _a === void 0 ? void 0 : _a.defaultValue); });
+        const newConfig = changes && lodash_1.default.pickBy({ ...oldConfig, ...changes }, (v, k) => v != null && !(0, misc_1.same)(v, fields?.[k]?.defaultValue));
         return { ...allConfigs, [id]: lodash_1.default.isEmpty(newConfig) ? undefined : newConfig };
     });
 }
@@ -146,16 +146,13 @@ function findPluginByRepo(repo) {
             return pl;
     return lodash_1.default.find(inactivePlugins, match);
     function match(rec) {
-        var _a, _b;
-        return repo === ((_b = (_a = rec === null || rec === void 0 ? void 0 : rec.repo) === null || _a === void 0 ? void 0 : _a.main) !== null && _b !== void 0 ? _b : rec === null || rec === void 0 ? void 0 : rec.repo);
+        return repo === (rec?.repo?.main ?? rec?.repo);
     }
 }
 function getPluginConfigFields(id) {
-    var _a;
-    return (_a = plugins.get(id)) === null || _a === void 0 ? void 0 : _a.getData().config;
+    return plugins.get(id)?.getData().config;
 }
 async function initPlugin(pl, morePassedToInit) {
-    var _a;
     const undoEvents = [];
     const timeouts = [];
     const controlledEvents = Object.create(events_1.default, (0, misc_1.objFromKeys)(['on', 'once', 'multi'], k => ({
@@ -165,12 +162,12 @@ async function initPlugin(pl, morePassedToInit) {
             return ret;
         }
     })));
-    const res = await ((_a = pl.init) === null || _a === void 0 ? void 0 : _a.call(pl, {
+    const res = await pl.init?.({
         Const, require,
         // intercept all subscriptions, so to be able to undo them on unload
         events: controlledEvents,
         log: console.log,
-        setError(msg) { setError((morePassedToInit === null || morePassedToInit === void 0 ? void 0 : morePassedToInit.id) || 'server_code', msg); },
+        setError(msg) { setError(morePassedToInit?.id || 'server_code', msg); },
         getHfsConfig: config_1.getConfig,
         setInterval() {
             const ret = setInterval(...arguments);
@@ -191,10 +188,10 @@ async function initPlugin(pl, morePassedToInit) {
             controlledEvents.on('listening', ({ server }) => cb(server));
         },
         misc, _: lodash_1.default,
-        customApiCall, notifyClient: frontEndApis_1.notifyClient, addBlock: block_1.addBlock, ctxBelongsTo: perm_1.ctxBelongsTo, getConnections: connections_1.getConnections,
+        customApiCall, notifyClient: frontEndApis_1.notifyClient, addBlock: block_1.addBlock, ctxBelongsTo: perm_1.ctxBelongsTo, getConnections: connections_1.getConnections, normalizeFilename: vfs_1.normalizeFilename,
         getCurrentUsername: auth_1.getCurrentUsername, getAccount: perm_1.getAccount, getUsernames: perm_1.getUsernames, addAccount: perm_1.addAccount, delAccount: perm_1.delAccount, updateAccount: perm_1.updateAccount, renameAccount: perm_1.renameAccount,
         ...morePassedToInit
-    }));
+    });
     Object.assign(pl, typeof res === 'function' ? { unload: res } : res);
     (0, misc_1.patchKey)(pl, 'unload', was => () => {
         for (const x of timeouts)
@@ -215,15 +212,13 @@ function warnOnce(msg) {
     console.log('Warning: ' + msg);
 }
 const pluginsMiddleware = async (ctx, next) => {
-    var _a;
     const after = {};
     // run middleware plugins
     let lastStatus = ctx.status;
     let lastBody = ctx.body;
     await Promise.all(mapPlugins(async (pl, id) => {
-        var _a;
         try {
-            const res = await ((_a = pl.middleware) === null || _a === void 0 ? void 0 : _a.call(pl, ctx));
+            const res = await pl.middleware?.(ctx);
             if (lastStatus !== ctx.status || lastBody !== ctx.body) {
                 console.debug("plugin changed response", id);
                 lastStatus = ctx.status;
@@ -248,7 +243,7 @@ const pluginsMiddleware = async (ctx, next) => {
             const a = path.substring(const_1.PLUGINS_PUB_URI.length).split('/');
             const name = a.shift();
             if (plugins.has(name)) { // do it only if the plugin is loaded
-                if ((_a = ctx.get('referer')) === null || _a === void 0 ? void 0 : _a.endsWith('/'))
+                if (ctx.get('referer')?.endsWith('/'))
                     ctx.state.considerAsGui = true;
                 await (0, serveFile_1.serveFile)(ctx, plugins.get(name).folder + '/public/' + a.join('/'), const_1.MIME_AUTO);
             }
@@ -265,7 +260,7 @@ const pluginsMiddleware = async (ctx, next) => {
             printError(id, e);
         }
     function printError(id, e) {
-        console.log(`error middleware plugin ${id}: ${(e === null || e === void 0 ? void 0 : e.message) || e}`);
+        console.log(`error middleware plugin ${id}: ${e?.message || e}`);
         console.debug(e);
     }
 };
@@ -275,12 +270,18 @@ events_1.default.once('app', () => Object.assign(index_1.app.context, {
     stop() { return this.isStopped = true; }
 }));
 class Plugin {
+    id;
+    folder;
+    data;
+    onUnload;
+    started = new Date();
+    icons;
+    log;
     constructor(id, folder, data, onUnload) {
         this.id = id;
         this.folder = folder;
         this.data = data;
         this.onUnload = onUnload;
-        this.started = new Date();
         if (!data)
             throw 'invalid data';
         this.log = [];
@@ -313,41 +314,36 @@ class Plugin {
             plugins.set(k, temp);
         }
     }
-    get version() { var _a; return (_a = this.data) === null || _a === void 0 ? void 0 : _a.version; }
-    get description() { var _a; return (_a = this.data) === null || _a === void 0 ? void 0 : _a.description; }
-    get apiRequired() { var _a; return (_a = this.data) === null || _a === void 0 ? void 0 : _a.apiRequired; }
-    get isTheme() { var _a; return (_a = this.data) === null || _a === void 0 ? void 0 : _a.isTheme; }
-    get repo() { var _a; return (_a = this.data) === null || _a === void 0 ? void 0 : _a.repo; }
-    get depend() { var _a; return (_a = this.data) === null || _a === void 0 ? void 0 : _a.depend; }
-    get afterPlugin() { var _a; return (_a = this.data) === null || _a === void 0 ? void 0 : _a.afterPlugin; }
-    get beforePlugin() { var _a; return (_a = this.data) === null || _a === void 0 ? void 0 : _a.beforePlugin; }
+    get version() { return this.data?.version; }
+    get description() { return this.data?.description; }
+    get apiRequired() { return this.data?.apiRequired; }
+    get isTheme() { return this.data?.isTheme; }
+    get repo() { return this.data?.repo; }
+    get depend() { return this.data?.depend; }
+    get afterPlugin() { return this.data?.afterPlugin; }
+    get beforePlugin() { return this.data?.beforePlugin; }
     get middleware() {
-        var _a;
-        return (_a = this.data) === null || _a === void 0 ? void 0 : _a.middleware;
+        return this.data?.middleware;
     }
     get frontend_css() {
-        var _a;
-        return (_a = this.data) === null || _a === void 0 ? void 0 : _a.frontend_css;
+        return this.data?.frontend_css;
     }
     get frontend_js() {
-        var _a;
-        return (_a = this.data) === null || _a === void 0 ? void 0 : _a.frontend_js;
+        return this.data?.frontend_js;
     }
     get onDirEntry() {
-        var _a;
-        return (_a = this.data) === null || _a === void 0 ? void 0 : _a.onDirEntry;
+        return this.data?.onDirEntry;
     }
     getData() {
         return this.data;
     }
     async unload(reloading = false) {
-        var _a, _b;
         if (!this.started)
             return;
         this.started = null;
         const { id } = this;
         try {
-            await ((_b = (_a = this.data) === null || _a === void 0 ? void 0 : _a.unload) === null || _b === void 0 ? void 0 : _b.call(_a));
+            await this.data?.unload?.();
         }
         catch (e) {
             console.log('error unloading plugin', id, String(e));
@@ -362,11 +358,10 @@ class Plugin {
 exports.Plugin = Plugin;
 exports.SERVER_CODE_ID = '.'; // a name that will surely be not found among plugin folders
 const serverCode = (0, config_1.defineConfig)('server_code', '', async (script, { k }) => {
-    var _a;
     try {
-        (_a = (await serverCode.compiled())) === null || _a === void 0 ? void 0 : _a.unload();
+        (await serverCode.compiled())?.unload();
     }
-    catch (_b) { }
+    catch { }
     const res = {};
     try {
         new Function('exports', script)(res); // parse
@@ -414,7 +409,7 @@ if (!(0, fs_1.existsSync)(exports.PATH))
     try {
         (0, fs_1.mkdirSync)(exports.PATH);
     }
-    catch (_a) { }
+    catch { }
 exports.pluginsWatcher = (0, misc_1.watchDir)(exports.PATH, rescanAsap);
 exports.enablePlugins = (0, config_1.defineConfig)('enable_plugins', ['antibrute']);
 exports.enablePlugins.sub(rescanAsap);
@@ -426,22 +421,23 @@ async function rescan() {
     console.debug('scanning plugins');
     const patterns = [exports.PATH + '/*'];
     if (const_1.APP_PATH !== process.cwd())
-        patterns.unshift((0, misc_1.adjustStaticPathForGlob)(const_1.APP_PATH) + '/' + patterns[0]); // first search bundled plugins, because otherwise they won't be loaded because of the folders with same name in .hfs/plugins (used for storage)
-    const met = [];
+        patterns.unshift((0, misc_1.escapeGlobPath)(const_1.APP_PATH) + '/' + patterns[0]); // first search bundled plugins, because otherwise they won't be loaded because of the folders with same name in .hfs/plugins (used for storage)
+    const existing = [];
     for (const { path, dirent } of await (0, fast_glob_1.default)(patterns, { onlyFiles: false, suppressErrors: true, objectMode: true })) {
         if (!dirent.isDirectory() || path.endsWith(exports.DISABLING_SUFFIX))
             continue;
         const id = path.split('/').slice(-1)[0];
-        met.push(id);
+        existing.push(id);
         if (!pluginWatchers.has(id))
             pluginWatchers.set(id, watchPlugin(id, (0, path_1.join)(path, exports.PLUGIN_MAIN_FILE)));
     }
     for (const [id, cancelWatcher] of pluginWatchers.entries())
-        if (!met.includes(id)) {
+        if (!existing.includes(id)) {
             enablePlugin(id, false);
             cancelWatcher();
             pluginWatchers.delete(id);
         }
+    exports.pluginsScanned.resolve();
 }
 function watchPlugin(id, path) {
     console.debug('plugin watch', id);
@@ -499,14 +495,13 @@ function watchPlugin(id, path) {
         events_1.default.emit('pluginStopped', p);
     }
     async function start() {
-        var _a;
         if (starting)
             return;
         try {
             starting = (0, misc_1.pendingPromise)();
             // if dependencies are not ready right now, we give some time. Not super-solid but good enough for now.
             const info = await parsePlugin();
-            if (!await (0, misc_1.waitFor)(() => lodash_1.default.isEmpty(getMissingDependencies(info)), { timeout: 5000 }))
+            if (!await (0, misc_1.waitFor)(() => lodash_1.default.isEmpty(getMissingDependencies(info)), { timeout: 5_000 }))
                 throw Error("plugin missing dependencies: " + lodash_1.default.map(getMissingDependencies(info), x => x.repo).join(', '));
             if (getPluginInfo(id))
                 setError(id, '');
@@ -517,7 +512,7 @@ function watchPlugin(id, path) {
             calculateBadApi(pluginData);
             if (pluginData.badApi)
                 throw Error(pluginData.badApi);
-            await (alreadyRunning === null || alreadyRunning === void 0 ? void 0 : alreadyRunning.unload(true));
+            await alreadyRunning?.unload(true);
             console.debug("starting plugin", id);
             const storageDir = (0, path_1.resolve)(exports.PATH, id, exports.STORAGE_FOLDER) + (const_1.IS_WINDOWS ? '\\' : '/');
             await (0, promises_1.mkdir)(storageDir, { recursive: true });
@@ -551,9 +546,8 @@ function watchPlugin(id, path) {
                     });
                 },
                 getConfig(cfgKey) {
-                    var _a, _b, _c, _d;
-                    const cur = (_a = exports.pluginsConfig.get()) === null || _a === void 0 ? void 0 : _a[id];
-                    return cfgKey ? (_b = cur === null || cur === void 0 ? void 0 : cur[cfgKey]) !== null && _b !== void 0 ? _b : (_d = (_c = pluginData.config) === null || _c === void 0 ? void 0 : _c[cfgKey]) === null || _d === void 0 ? void 0 : _d.defaultValue
+                    const cur = exports.pluginsConfig.get()?.[id];
+                    return cfgKey ? cur?.[cfgKey] ?? pluginData.config?.[cfgKey]?.defaultValue
                         : lodash_1.default.defaults(cur, (0, misc_1.objSameKeys)(pluginData.config, x => x.defaultValue));
                 },
                 setConfig: (cfgKey, value) => setPluginConfig(id, { [cfgKey]: value }),
@@ -605,23 +599,22 @@ function watchPlugin(id, path) {
         }
         catch (e) {
             await markItInactive();
-            const parsed = (_a = e.stack) === null || _a === void 0 ? void 0 : _a.split('\n\n'); // this form is used by syntax-errors inside the plugin, which is useful to show
-            const where = (parsed === null || parsed === void 0 ? void 0 : parsed.length) > 1 ? `\n${parsed[0]}` : '';
+            const parsed = e.stack?.split('\n\n'); // this form is used by syntax-errors inside the plugin, which is useful to show
+            const where = parsed?.length > 1 ? `\n${parsed[0]}` : '';
             e = (0, misc_1.prefix)('', e.message, where) || String(e);
             setError(id, e);
         }
         finally {
-            starting === null || starting === void 0 ? void 0 : starting.resolve();
+            starting?.resolve();
             starting = undefined;
         }
     }
 }
 function customApiCall(method, ...params) {
-    return mapPlugins(pl => { var _a, _b; return (_b = (_a = pl.getData().customApi) === null || _a === void 0 ? void 0 : _a[method]) === null || _b === void 0 ? void 0 : _b.call(_a, ...params); });
+    return mapPlugins(pl => pl.getData().customApi?.[method]?.(...params));
 }
 function getError(id) {
-    var _a;
-    return (_a = getPluginInfo(id)) === null || _a === void 0 ? void 0 : _a.error;
+    return getPluginInfo(id)?.error;
 }
 // returns true if there's an error, and it has changed
 function setError(id, error) {
@@ -638,15 +631,13 @@ function setError(id, error) {
     return true;
 }
 function deleteModule(id) {
-    var _a;
-    var _b;
     const { cache } = require;
     // build reversed map of dependencies
     const requiredBy = { '.': ['.'] }; // don't touch main entry
     for (const k in cache)
         if (k !== id)
-            for (const child of (0, misc_1.wantArray)((_a = cache[k]) === null || _a === void 0 ? void 0 : _a.children))
-                (requiredBy[_b = child.id] || (requiredBy[_b] = [])).push(k);
+            for (const child of (0, misc_1.wantArray)(cache[k]?.children))
+                (requiredBy[child.id] ||= []).push(k);
     const deleted = [];
     (function deleteCache(id) {
         const mod = cache[id];
@@ -661,17 +652,16 @@ function deleteModule(id) {
 }
 (0, first_1.onProcessExit)(() => Promise.allSettled(mapPlugins(pl => pl.unload())));
 function parsePluginSource(id, source) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const pl = { id };
-    pl.description = (0, misc_1.tryJson)((_a = /exports.description\s*=\s*(".*")/.exec(source)) === null || _a === void 0 ? void 0 : _a[1]);
-    pl.repo = (0, misc_1.tryJson)((_b = /exports.repo\s*=\s*(\S*)/.exec(source)) === null || _b === void 0 ? void 0 : _b[1]);
-    pl.version = (_d = Number((_c = /exports.version\s*=\s*(\d*\.?\d+)/.exec(source)) === null || _c === void 0 ? void 0 : _c[1])) !== null && _d !== void 0 ? _d : undefined;
-    pl.apiRequired = (_f = (0, misc_1.tryJson)((_e = /exports.apiRequired\s*=\s*([ \d.,[\]]+)/.exec(source)) === null || _e === void 0 ? void 0 : _e[1])) !== null && _f !== void 0 ? _f : undefined;
-    pl.isTheme = (_h = (0, misc_1.tryJson)((_g = /exports.isTheme\s*=\s*(true|false|"light"|"dark")/.exec(source)) === null || _g === void 0 ? void 0 : _g[1])) !== null && _h !== void 0 ? _h : (id.endsWith('-theme') || undefined);
-    pl.preview = (_k = (0, misc_1.tryJson)((_j = /exports.preview\s*=\s*(.+)/.exec(source)) === null || _j === void 0 ? void 0 : _j[1])) !== null && _k !== void 0 ? _k : undefined;
-    pl.depend = (_m = (0, misc_1.tryJson)((_l = /exports.depend\s*=\s*(\[[\s\S]*?])/m.exec(source)) === null || _l === void 0 ? void 0 : _l[1])) === null || _m === void 0 ? void 0 : _m.filter((x) => typeof x.repo === 'string' && x.version === undefined || typeof x.version === 'number'
+    pl.description = (0, misc_1.tryJson)(/exports.description\s*=\s*(".*")/.exec(source)?.[1]);
+    pl.repo = (0, misc_1.tryJson)(/exports.repo\s*=\s*(\S*)/.exec(source)?.[1]);
+    pl.version = Number(/exports.version\s*=\s*(\d*\.?\d+)/.exec(source)?.[1]) ?? undefined;
+    pl.apiRequired = (0, misc_1.tryJson)(/exports.apiRequired\s*=\s*([ \d.,[\]]+)/.exec(source)?.[1]) ?? undefined;
+    pl.isTheme = (0, misc_1.tryJson)(/exports.isTheme\s*=\s*(true|false|"light"|"dark")/.exec(source)?.[1]) ?? (id.endsWith('-theme') || undefined);
+    pl.preview = (0, misc_1.tryJson)(/exports.preview\s*=\s*(.+)/.exec(source)?.[1]) ?? undefined;
+    pl.depend = (0, misc_1.tryJson)(/exports.depend\s*=\s*(\[[\s\S]*?])/m.exec(source)?.[1])?.filter((x) => typeof x.repo === 'string' && x.version === undefined || typeof x.version === 'number'
         || console.warn("plugin dependency discarded", x));
-    pl.changelog = (0, misc_1.tryJson)((_o = /exports.changelog\s*=\s*(\[[\s\S]*?])/m.exec(source)) === null || _o === void 0 ? void 0 : _o[1]);
+    pl.changelog = (0, misc_1.tryJson)(/exports.changelog\s*=\s*(\[[\s\S]*?])/m.exec(source)?.[1]);
     if (Array.isArray(pl.apiRequired) && (pl.apiRequired.length !== 2 || !pl.apiRequired.every(lodash_1.default.isFinite))) // validate [from,to] form
         pl.apiRequired = undefined;
     calculateBadApi(pl);
@@ -685,13 +675,13 @@ function calculateBadApi(data) {
             : undefined;
 }
 function getMissingDependencies(plugin) {
-    return (0, misc_1.onlyTruthy)(((plugin === null || plugin === void 0 ? void 0 : plugin.depend) || []).map((dep) => {
+    return (0, misc_1.onlyTruthy)((plugin?.depend || []).map((dep) => {
         const res = findPluginByRepo(dep.repo);
         const error = !res ? 'missing'
             : (res.version || 0) < dep.version ? 'version'
                 : !isPluginEnabled(res.id) ? 'disabled'
                     : !isPluginRunning(res.id) ? 'stopped'
                         : '';
-        return error && { repo: dep.repo, error, id: res === null || res === void 0 ? void 0 : res.id };
+        return error && { repo: dep.repo, error, id: res?.id };
     }));
 }

package/src/roots.js

@@ -17,7 +17,6 @@ exports.roots = (0, config_1.defineConfig)(misc_1.CFG.roots, {}, map => {
 });
 const forceAddress = (0, config_1.defineConfig)(misc_1.CFG.force_address, false);
 const rootsMiddleware = (ctx, next) => (() => {
-    var _a;
     if (!ctx.path) // it was once reported "Cannot read properties of null (reading 'startsWith')" but I can't reproduce it, and it shouldn't happen anyway
         return (0, connections_1.disconnect)(ctx, 'no path'); // let's assume that such requests can't be served anyway. This will leave a trace with an ip, anyway
     ctx.state.originalPath = ctx.path;
@@ -33,7 +32,7 @@ const rootsMiddleware = (ctx, next) => (() => {
     }
     if (lodash_1.default.isEmpty(exports.roots.get()))
         return;
-    const root = ctx.state.root = (_a = exports.roots.compiled()) === null || _a === void 0 ? void 0 : _a(ctx.host);
+    const root = ctx.state.root = exports.roots.compiled()?.(ctx.host);
     if (!ctx.state.skipFilters && forceAddress.get()
         && root === undefined && !(0, misc_1.isLocalHost)(ctx) && ctx.host !== listen_1.baseUrl.compiled())
         return (0, connections_1.disconnect)(ctx, forceAddress.key()); // returning truthy will not call next

package/src/selfCheck.js

@@ -21,7 +21,6 @@ const selfCheckMiddleware = (ctx, next) => {
 };
 exports.selfCheckMiddleware = selfCheckMiddleware;
 async function selfCheck(url) {
-    var _a;
     const prjInfo = await (0, github_1.getProjectInfo)();
     console.log(`checking server ${url}`);
     const parsed = new URL(url);
@@ -39,7 +38,7 @@ async function selfCheck(url) {
                     console.debug(svc);
                     body = applySymbols(body);
                     serviceUrl = applySymbols(serviceUrl);
-                    const res = await (0, cross_1.haveTimeout)(6000, (0, util_http_1.httpString)(serviceUrl, { family, ...rest, body }));
+                    const res = await (0, cross_1.haveTimeout)(6_000, (0, util_http_1.httpString)(serviceUrl, { family, ...rest, body }));
                     const success = new RegExp(regexpSuccess).test(res);
                     const failure = new RegExp(regexpFailure).test(res);
                     if (success === failure)
@@ -49,7 +48,7 @@ async function selfCheck(url) {
                 }));
             }
             catch (e) {
-                console.debug(((_a = e === null || e === void 0 ? void 0 : e.errors) === null || _a === void 0 ? void 0 : _a.map(String)) || (e === null || e === void 0 ? void 0 : e.cause) || String(e));
+                console.debug(e?.errors?.map(String) || e?.cause || String(e));
             }
         }
     }
@@ -57,6 +56,8 @@ async function selfCheck(url) {
         selfChecking = false;
     }
     function applySymbols(s) {
-        return s === null || s === void 0 ? void 0 : s.replace('$IP', parsed.hostname).replace('$PORT', parsed.port || (parsed.protocol === 'https:' ? '443' : '80')).replace('$URL', url.replace(/\/$/, '') + CHECK_URL);
+        return s?.replace('$IP', parsed.hostname)
+            .replace('$PORT', parsed.port || (parsed.protocol === 'https:' ? '443' : '80'))
+            .replace('$URL', url.replace(/\/$/, '') + CHECK_URL);
     }
 }

package/src/serveFile.js

@@ -41,7 +41,6 @@ function disposition(ctx, name, forceDownload = false) {
         + `filename="${toAsciiEquivalent(name)}"; filename*=UTF-8''${encodeURIComponent(name)}`);
 }
 async function serveFileNode(ctx, node) {
-    var _a;
     const { source, mime } = node;
     const name = (0, vfs_1.getNodeName)(node);
     const mimeString = typeof mime === 'string' ? mime
@@ -55,7 +54,7 @@ async function serveFileNode(ctx, node) {
     ctx.state.vfsNode = node; // useful to tell service files from files shared by the user
     const download = 'dl' in ctx.query;
     disposition(ctx, name, download);
-    if (!download && ((_a = ctx.get('referer')) === null || _a === void 0 ? void 0 : _a.endsWith('/')) && (0, misc_1.with_)(ctx.get('accept'), x => x && !x.includes('text')))
+    if (!download && ctx.get('referer')?.endsWith('/') && (0, misc_1.with_)(ctx.get('accept'), x => x && !x.includes('text')))
         ctx.state.considerAsGui = true;
     await serveFile(ctx, source || '', mimeString);
     if (await maxDownloadsPerAccount(ctx) === undefined) // returning false will not execute other limits
@@ -71,7 +70,7 @@ const cacheControlDiskFiles = (0, config_1.defineConfig)('cache_control_disk_fil
 async function serveFile(ctx, source, mime, content) {
     if (!source)
         return;
-    mime !== null && mime !== void 0 ? mime : (mime = mimeCfg.compiled()((0, path_1.basename)(source)));
+    mime ??= mimeCfg.compiled()((0, path_1.basename)(source));
     if (mime === undefined || mime === const_1.MIME_AUTO)
         mime = mime_types_1.default.lookup(source) || '';
     if (mime)
@@ -104,7 +103,7 @@ async function serveFile(ctx, source, mime, content) {
         const range = applyRange(ctx, size);
         ctx.body = (0, fs_1.createReadStream)(source, range);
         if (ctx.state.vfsNode)
-            monitorAsDownload(ctx, size, range === null || range === void 0 ? void 0 : range.start);
+            monitorAsDownload(ctx, size, range?.start);
     }
     catch (e) {
         return ctx.status = const_1.HTTP_NOT_FOUND;
@@ -133,10 +132,10 @@ function applyRange(ctx, totalSize = ctx.response.length) {
     const [unit, ranges] = range.split('=');
     if (unit !== 'bytes')
         return ctx.throw(const_1.HTTP_BAD_REQUEST, 'bad range unit');
-    if (ranges === null || ranges === void 0 ? void 0 : ranges.includes(','))
+    if (ranges?.includes(','))
         return ctx.throw(const_1.HTTP_BAD_REQUEST, 'multi-range not supported');
-    let bytes = ranges === null || ranges === void 0 ? void 0 : ranges.split('-');
-    if (!(bytes === null || bytes === void 0 ? void 0 : bytes.length))
+    let bytes = ranges?.split('-');
+    if (!bytes?.length)
         return ctx.throw(const_1.HTTP_BAD_REQUEST, 'bad range');
     const max = totalSize - 1;
     const start = bytes[0] ? Number(bytes[0]) : Math.max(0, totalSize - Number(bytes[1])); // a negative start is relative to the end

package/src/serveGuiAndSharedFiles.js

@@ -33,12 +33,11 @@ const serveFrontendPrefixed = (0, koa_mount_1.default)(cross_const_1.FRONTEND_UR
 const serveAdminFiles = (0, serveGuiFiles_1.serveGuiFiles)(process.env.ADMIN_PROXY, cross_const_1.ADMIN_URI);
 const serveAdminPrefixed = (0, koa_mount_1.default)(cross_const_1.ADMIN_URI.slice(0, -1), serveAdminFiles);
 const serveGuiAndSharedFiles = async (ctx, next) => {
-    var _a, _b;
     const { path } = ctx;
     // dynamic import on frontend|admin (used for non-https login) while developing (vite4) is not producing a relative path
     if (const_1.DEV && path.startsWith('/node_modules/')) {
         const { referer: r } = ctx.headers;
-        return (0, misc_1.try_)(() => { var _a; return r && ((_a = new URL(r).pathname) === null || _a === void 0 ? void 0 : _a.startsWith(cross_const_1.ADMIN_URI)); }) ? serveAdminFiles(ctx, next)
+        return (0, misc_1.try_)(() => r && new URL(r).pathname?.startsWith(cross_const_1.ADMIN_URI)) ? serveAdminFiles(ctx, next)
             : serveFrontendFiles(ctx, next);
     }
     if (path.startsWith(cross_const_1.FRONTEND_URI))
@@ -53,11 +52,11 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
         if (!iconName)
             return;
         const plugin = a.length > 1 && (0, plugins_1.getPluginInfo)(a[0]); // an extra level in the path indicates a plugin
-        const file = plugin ? (_a = plugin.icons) === null || _a === void 0 ? void 0 : _a[iconName] : icons_1.customizedIcons === null || icons_1.customizedIcons === void 0 ? void 0 : icons_1.customizedIcons[iconName];
+        const file = plugin ? plugin.icons?.[iconName] : icons_1.customizedIcons?.[iconName];
         if (!file)
             return;
         ctx.state.considerAsGui = true;
-        return (0, serveFile_1.serveFile)(ctx, (0, path_1.join)((plugin === null || plugin === void 0 ? void 0 : plugin.folder) || '', icons_1.ICONS_FOLDER, file), const_1.MIME_AUTO);
+        return (0, serveFile_1.serveFile)(ctx, (0, path_1.join)(plugin?.folder || '', icons_1.ICONS_FOLDER, file), const_1.MIME_AUTO);
     }
     const { get } = ctx.query;
     const getUploadTempHash = get === cross_const_1.UPLOAD_TEMP_HASH;
@@ -71,7 +70,7 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
         ctx.state.uploadPath = decPath;
         if (getUploadTempHash)
             return !folder.source ? (0, errorPages_1.sendErrorPage)(ctx, cross_const_1.HTTP_NOT_FOUND)
-                : ctx.body = await (0, misc_1.parseFile)((0, upload_1.getUploadTempFor)((0, path_1.join)(folder.source, rest)), calcHash); // negligible memory leak
+                : ctx.body = await (0, misc_1.loadFileCached)((0, upload_1.getUploadTempFor)((0, path_1.join)(folder.source, rest)), calcHash); // negligible memory leak
         const dest = (0, upload_1.uploadWriter)(folder, folderUri, rest, ctx);
         if (dest) {
             ctx.req.pipe(dest).on('error', err => {
@@ -126,7 +125,7 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
         if ((0, vfs_1.statusCodeForMissingPerm)(node, 'can_delete', ctx))
             return;
         try {
-            if ((_b = (await events_1.default.emitAsync('deleting', { node, ctx }))) === null || _b === void 0 ? void 0 : _b.isDefaultPrevented())
+            if ((await events_1.default.emitAsync('deleting', { node, ctx }))?.isDefaultPrevented())
                 return ctx.status = cross_const_1.HTTP_FAILED_DEPENDENCY;
             await (0, promises_1.rm)(source, { recursive: true });
             void (0, comments_1.setCommentFor)(source, ''); // necessary only to clean a possible descript.ion or kvstorage
@@ -141,7 +140,7 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
         const found = await (0, vfs_1.urlToNode)(node.default, ctx, node);
         if (found && /\.html?/i.test(node.default))
             ctx.state.considerAsGui = true;
-        node = found !== null && found !== void 0 ? found : node;
+        node = found ?? node;
     }
     if (get === 'icon')
         return (0, serveFile_1.serveFile)(ctx, node.icon || '|'); // pipe to cause not-found
@@ -172,8 +171,7 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
 };
 exports.serveGuiAndSharedFiles = serveGuiAndSharedFiles;
 async function sendFolderList(node, ctx) {
-    var _a;
-    if ((_a = (await events_1.default.emitAsync('getList', { node, ctx }))) === null || _a === void 0 ? void 0 : _a.isDefaultPrevented())
+    if ((await events_1.default.emitAsync('getList', { node, ctx }))?.isDefaultPrevented())
         return;
     let { depth = 0, folders, prepend } = ctx.query;
     ctx.type = 'text';