hfs 3.2.2 → 3.3.0-beta2

package/src/listen.js

@@ -69,11 +69,12 @@ const argv_1 = require("./argv");
 const consoleLog_1 = require("./consoleLog");
 const first_1 = require("./first");
 const fileAttr_1 = require("./fileAttr");
+const uploadOwners_1 = require("./uploadOwners");
 let httpSrv;
 let httpsSrv;
 // the update relaunch can keep a bridge process alive, so we proactively close listeners here to release ports before the next binary binds; do it before (5) the storage file is closed, because sockets write there
 (0, first_1.onProcessExit)(() => Promise.all([stopServer(httpSrv), stopServer(httpsSrv)]), 5);
-const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', true);
+const openBrowserAtStart = (0, config_1.defineConfig)(misc_1.CFG.open_browser_at_start, true);
 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();
@@ -87,7 +88,7 @@ const commonServerOptions = {
 };
 // these are properties that can be assigned to the server object
 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(), fileAttr_1.fileAttrDb.isOpening(), events_1.default.once('app')]);
+const readyToListen = Promise.all([persistence_1.storedMap.isOpening(), fileAttr_1.fileAttrDb.isOpening(), uploadOwners_1.uploadOwners.isOpening(), events_1.default.once('app')]);
 const considerHttp = (0, misc_1.debounceAsync)(async () => {
     await readyToListen;
     void stopServer(httpSrv);
@@ -109,8 +110,8 @@ const considerHttp = (0, misc_1.debounceAsync)(async () => {
     }
 });
 let openOnce = true;
-exports.portCfg = (0, config_1.defineConfig)('port', 80);
-const listenInterface = (0, config_1.defineConfig)('listen_interface', '');
+exports.portCfg = (0, config_1.defineConfig)(misc_1.CFG.port, 80);
+const listenInterface = (0, config_1.defineConfig)(misc_1.CFG.listen_interface, '');
 (0, config_1.subMultipleConfigs)(considerHttp, [exports.portCfg, listenInterface]);
 function openAdmin() {
     for (const srv of [httpSrv, httpsSrv]) {
@@ -123,7 +124,7 @@ function openAdmin() {
         const baseUrl = `${srv.name}://${hostname}:${a.port}`;
         (0, open_1.default)(baseUrl + const_1.ADMIN_URI, { wait: true }).catch(async (e) => {
             console.debug(String(e));
-            console.warn("Cannot launch browser on this machine >PLEASE< open your browser and reach one of these (you may need a different address)", ...Object.values(await getUrls()).flat().map(x => '\n - ' + x + const_1.ADMIN_URI));
+            console.warn("Cannot launch browser on this machine – open your browser and reach one of these (you may need a different address)", ...Object.values(await getUrls()).flat().map(x => '\n - ' + x + const_1.ADMIN_URI));
             if (!(0, adminApis_1.anyAccountCanLoginAdmin)())
                 (0, consoleLog_1.consoleHint)(`you can enter this command: create-admin YOUR_PASSWORD`);
         });
@@ -138,7 +139,8 @@ function getCertObject() {
     const all = new crypto_1.X509Certificate(c);
     const some = lodash_1.default.pick(all, ['subject', 'issuer', 'validFrom', 'validTo']);
     const ret = lodash_1.default.mapValues(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(/, */) });
+    return Object.assign(ret, { altNames: all.subjectAltName?.split(/, */)
+            .map(x => x.replace(/^(?:DNS:|IP Address:)/, '')) });
 }
 const considerHttps = (0, misc_1.debounceAsync)(async () => {
     await readyToListen;
@@ -205,8 +207,8 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
     nat_1.defaultBaseUrl.proto = 'https';
     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);
+exports.cert = (0, config_1.defineConfig)(misc_1.CFG.cert, '', load);
+exports.privateKey = (0, config_1.defineConfig)(misc_1.CFG.private_key, '', load);
 const httpsNeeds = [exports.cert, exports.privateKey];
 function load(v, { object }) {
     object.watcher?.unwatch();
@@ -216,7 +218,7 @@ function load(v, { object }) {
     object.watcher = (0, watchLoad_1.watchLoad)(v, x => object.setCompiled(x), { immediateFirst: true });
     return '';
 }
-exports.httpsPortCfg = (0, config_1.defineConfig)('https_port', const_1.PORT_DISABLED);
+exports.httpsPortCfg = (0, config_1.defineConfig)(misc_1.CFG.https_port, const_1.PORT_DISABLED);
 (0, config_1.subMultipleConfigs)(considerHttps, [exports.httpsPortCfg, listenInterface, ...httpsNeeds]);
 const genericInterfaceNames = {
     '0.0.0.0': "any IPv4",
@@ -273,12 +275,14 @@ function startServer(srv, { port, host }) {
                 srv.error = String(e);
                 srv.busy = undefined;
                 const { code } = e;
-                if (code)
+                // share the lookup with status readers, but classify the error from its resolved result
+                if (code === 'EADDRINUSE' || code === 'EACCES')
                     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
+                const busy = await srv.busy;
+                if (code === 'EACCES' && port < 1024 && !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)
-                    srv.error = `port ${port} busy: ${await srv.busy || "unknown process"}`;
+                if (code === 'EADDRINUSE' || busy)
+                    srv.error = `port ${port} busy: ${busy || "unknown process"}`;
                 if (!silence)
                     console.error(srv.name, srv.error);
                 resolve(0);

package/src/log.js

@@ -82,8 +82,14 @@ class Logger {
         this.reopen();
     }
     reopen() {
-        return this.stream = (0, util_files_1.createFileWithPath)(this.path, { flags: 'a' })
-            ?.on('error', () => this.stream = undefined);
+        const { path } = this;
+        const s = this.stream = (0, util_files_1.createFileWithPath)(path, { flags: 'a' });
+        s?.on('error', e => {
+            if (this.stream === s) // a late error from an old stream must not detach its replacement
+                this.stream = undefined;
+            console.error("Cannot write log file", path, String(e));
+        });
+        return s;
     }
 }
 // we'll have names same as config keys. These are used also by the get_log api.
@@ -103,6 +109,7 @@ const logRotation = (0, config_1.defineConfig)(misc_1.CFG.log_rotation, 'weekly'
 const dontLogNet = (0, config_1.defineConfig)(misc_1.CFG.dont_log_net, '127.0.0.1|::1', v => (0, misc_1.makeNetMatcher)(v));
 const logUA = (0, config_1.defineConfig)(misc_1.CFG.log_ua, false);
 const logSpam = (0, config_1.defineConfig)(misc_1.CFG.log_spam, false);
+const logHost = (0, config_1.defineConfig)(misc_1.CFG.log_host, false);
 const debounce = lodash_1.default.debounce(cb => cb(), 1000); // with this technique, i'll be able to debounce some code respecting the references in its closure
 const logMw = async (ctx, next) => {
     const reqStart = new Date(); // request start
@@ -176,6 +183,8 @@ const logMw = async (ctx, next) => {
             ctx.logExtra({ country: conn.country });
         if (logUA.get())
             ctx.logExtra({ ua: ctx.get('user-agent') || undefined });
+        if (logHost.get())
+            ctx.logExtra({ host: ctx.get('host') || undefined });
         const extra = ctx.state.logExtra;
         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: reqEnd, uri, extra });

package/src/middlewares.js

@@ -21,10 +21,10 @@ const config_1 = require("./config");
 const koa_session_1 = __importDefault(require("koa-session"));
 const index_1 = require("./index");
 const events_1 = __importDefault(require("./events"));
-const forceHttps = (0, config_1.defineConfig)('force_https', true);
-(0, config_1.defineConfig)('ignore_proxies', false);
-const allowAuthorizationHeader = (0, config_1.defineConfig)('authorization_header', true);
-exports.sessionDuration = (0, config_1.defineConfig)('session_duration', Number(process.env.SESSION_DURATION) || misc_1.DAY / 1000, v => v * 1000);
+const forceHttps = (0, config_1.defineConfig)(misc_1.CFG.force_https, true);
+(0, config_1.defineConfig)(misc_1.CFG.ignore_proxies, false);
+const allowAuthorizationHeader = (0, config_1.defineConfig)(misc_1.CFG.authorization_header, true);
+exports.sessionDuration = (0, config_1.defineConfig)(misc_1.CFG.session_duration, Number(process.env.SESSION_DURATION) || misc_1.DAY / 1000, v => v * 1000);
 exports.gzipper = (0, koa_compress_1.default)({
     threshold: 2048,
     gzip: { flush: zlib_1.constants.Z_SYNC_FLUSH }, // flush is necessary for SSE, at least in Chrome145

package/src/misc.js

@@ -120,15 +120,15 @@ function asyncGeneratorToReadable(generator) {
     const iterator = generator[Symbol.asyncIterator]();
     return new stream_1.Readable({
         objectMode: true,
-        destroy() {
-            void iterator.return?.();
+        destroy(error, callback) {
+            Promise.resolve(iterator.return?.()).then(() => callback(error), callback);
         },
         read() {
             iterator.next().then(it => {
                 if (it.done)
                     this.emit('ending');
                 return this.push(it.done ? null : it.value);
-            });
+            }, e => this.destroy(e));
         }
     });
 }

package/src/multipartUpload.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleMultipartUpload = handleMultipartUpload;
 const busboy_1 = __importDefault(require("busboy"));
-const events_1 = require("events");
 const vfs_1 = require("./vfs");
 const path_1 = require("path");
 const upload_1 = require("./upload");
@@ -46,7 +45,7 @@ async function handleMultipartUpload(ctx, node) {
         ctx.status = cross_const_1.HTTP_BAD_REQUEST;
     });
     ctx.req.pipe(bb);
-    await (0, events_1.once)(bb, 'finish');
+    await new Promise(res => (0, first_1.onFirstEvent)(bb, ['finish', 'error'], res)); // parser errors are handled above as 400 and must complete the request without rejecting
     await Promise.all(fileJobs);
     if (!ctx.state.uploads?.length) {
         if (!errors.length)

package/src/nat.js

@@ -33,7 +33,7 @@ exports.defaultBaseUrl = (0, valtio_1.proxy)({
         return `${this.proto}://${(0, cross_1.ipForUrl)(ip || 'localhost')}${!port || port === defPort ? '' : ':' + port}`;
     }
 });
-exports.mappedPort = (0, config_1.defineConfig)('mapped_port', 0);
+exports.mappedPort = (0, config_1.defineConfig)(cross_1.CFG.mapped_port, 0);
 exports.upnpEnabled = (0, config_1.defineConfig)(cross_1.CFG.upnp_enabled, true);
 let upnpClient;
 // poll external ip – when UPnP is enabled, asking the modem is inexpensive, so it can be done often

package/src/outboundProxy.js

@@ -5,6 +5,13 @@ const util_http_1 = require("./util-http");
 const util_os_1 = require("./util-os");
 const const_1 = require("./const");
 const cross_1 = require("./cross");
+const node_net_1 = require("node:net");
+(0, config_1.defineConfig)(cross_1.CFG.outbound_interface, '', v => {
+    if (!v || (0, node_net_1.isIP)(v))
+        return util_http_1.httpStream.defaultLocalAddress = v || undefined;
+    console.warn("Invalid outbound interface IP", v);
+    util_http_1.httpStream.defaultLocalAddress = undefined;
+});
 const outboundProxy = (0, config_1.defineConfig)(cross_1.CFG.outbound_proxy, '', v => {
     util_http_1.httpStream.defaultProxy = undefined;
     if (!v)

package/src/perm.js

@@ -59,7 +59,7 @@ function getAccount(username, normalize = true) {
 function saveSrpInfo(account, salt, verifier) {
     account.srp = String(salt) + '|' + String(verifier);
 }
-const createAdminConfig = (0, config_1.defineConfig)('create-admin', '');
+const createAdminConfig = (0, config_1.defineConfig)(misc_1.CFG['create-admin'], '');
 createAdminConfig.sub(v => {
     if (!v)
         return;
@@ -79,7 +79,9 @@ async function updateAccount(account, change) {
         await change?.(account);
     else {
         const u = normalizeUsername(change.username || '');
-        if (u && u !== usernameWas && getAccount(u))
+        if (!u)
+            delete change.username;
+        else if (u !== usernameWas && getAccount(u))
             throw "username already exists";
         Object.assign(account, lodash_1.default.mapValues(change, x => x || undefined));
     }
@@ -111,7 +113,7 @@ async function updateAccount(account, change) {
         saveAccountsAsap();
 }
 const saveAccountsAsap = config_1.saveConfigAsap;
-exports.accounts = (0, config_1.defineConfig)('accounts', {});
+exports.accounts = (0, config_1.defineConfig)(misc_1.CFG.accounts, {});
 exports.accounts.sub(lodash_1.default.debounce(obj => {
     // consider some validation here, in case of manual edit of the config
     lodash_1.default.each(obj, (rec, k) => {

package/src/plugins.js

@@ -80,6 +80,7 @@ const perm_1 = require("./perm");
 const auth_1 = require("./auth");
 const icons_1 = require("./icons");
 const listen_1 = require("./listen");
+const serverCode_1 = require("./serverCode");
 exports.PATH = 'plugins';
 exports.DISABLING_SUFFIX = '-disabled';
 exports.DELETE_ME_SUFFIX = '-delete_me' + exports.DISABLING_SUFFIX;
@@ -121,7 +122,7 @@ async function startPlugin(id) {
 }
 async function waitRunning(id, state = true) {
     while (isPluginRunning(id) !== state) {
-        await (0, misc_1.wait)(500);
+        await (0, misc_1.wait)(50);
         const error = getError(id);
         if (error)
             throw Error(error);
@@ -152,9 +153,10 @@ function findPluginByRepo(repo) {
 function getPluginConfigFields(id) {
     return plugins.get(id)?.getData().config;
 }
-async function initPlugin(pl, morePassedToInit) {
+async function initPlugin(pl, morePassedToInit, onInitError) {
     const undoEvents = [];
     const timeouts = [];
+    let unload = pl.unload;
     const controlledEvents = Object.create(events_1.default, (0, misc_1.objFromKeys)(['on', 'once', 'multi'], k => ({
         value() {
             if (k === 'multi')
@@ -183,7 +185,7 @@ async function initPlugin(pl, morePassedToInit) {
             }
         }
     })));
-    const res = await pl.init?.({
+    const res = await (0, misc_1.callAsPromise)(() => pl.init?.({
         Const, require,
         // intercept all subscriptions, so to be able to undo them on unload
         events: controlledEvents,
@@ -220,18 +222,25 @@ async function initPlugin(pl, morePassedToInit) {
         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
+    })).catch(async (e) => {
+        // failed initialization must not leave any partially allocated plugin resources active
+        await cleanup().catch(console.error);
+        await onInitError?.();
+        throw e;
     });
     Object.assign(pl, typeof res === 'function' ? { unload: res } : res);
-    (0, misc_1.patchKey)(pl, 'unload', was => () => {
+    unload = pl.unload;
+    (0, misc_1.patchKey)(pl, 'unload', () => cleanup);
+    events_1.default.emit('pluginInitialized', pl);
+    return pl;
+    async function cleanup() {
         for (const x of timeouts)
             clearTimeout(x);
         for (const cb of undoEvents)
             cb();
-        if (typeof was === 'function')
-            return was(...arguments);
-    });
-    events_1.default.emit('pluginInitialized', pl);
-    return pl;
+        if (typeof unload === 'function')
+            return unload();
+    }
 }
 const pluginsMiddleware = async (ctx, next) => {
     const after = {};
@@ -286,7 +295,7 @@ const pluginsMiddleware = async (ctx, next) => {
             printError(id, e);
         }
     function printChange(id) {
-        if (id === exports.SERVER_CODE_ID || (lastStatus === ctx.status && lastBody === ctx.body))
+        if (id.startsWith(exports.SERVER_CODE_ID) || (lastStatus === ctx.status && lastBody === ctx.body))
             return;
         console.debug("Plugin changed response:", id);
         lastStatus = ctx.status;
@@ -355,6 +364,7 @@ class Plugin {
     get depend() { return this.data?.depend; }
     get afterPlugin() { return this.data?.afterPlugin; }
     get beforePlugin() { return this.data?.beforePlugin; }
+    get disableDefaultStyle() { return this.data?.disableDefaultStyle; }
     get middleware() {
         return this.data?.middleware;
     }
@@ -382,34 +392,44 @@ class Plugin {
             console.log('Error unloading plugin', id, String(e));
         }
         await this.onUnload();
-        if (!reloading && id !== exports.SERVER_CODE_ID) // we already printed 'reloading'
+        if (!reloading && !id.startsWith(exports.SERVER_CODE_ID)) // we already printed 'reloading'
             console.log('Unloaded plugin', id);
         if (this.data)
             this.data.unload = undefined;
     }
 }
 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 }) => {
-    try {
-        (await serverCode.compiled())?.unload();
-    }
-    catch { }
-    const res = {};
-    try {
-        new Function('exports,require', script)(res, require); // parse
-        await initPlugin(res);
-        res.getCustomHtml = () => (0, misc_1.callable)(res.customHtml) || {};
-        return new Plugin(exports.SERVER_CODE_ID, '', res, lodash_1.default.noop);
-    }
-    catch (e) {
-        return console.error(k + ':', e.message || String(e));
-    }
+exports.SERVER_CODE_ID = '/'; // a name that will surely be not found among plugin folders
+let unloadServerCode = lodash_1.default.noop;
+(0, config_1.defineConfig)(misc_1.CFG.server_code, '').sub(async (text) => {
+    await unloadServerCode();
+    const asPlugins = await Promise.all((0, serverCode_1.parseServerCode)(text).map(async ({ name, code }, i) => {
+        const res = {};
+        try {
+            new Function('exports,require', code)(res, require); // parse
+            await initPlugin(res);
+            res.getCustomHtml = () => (0, misc_1.callable)(res.customHtml) || {};
+            // server-code sections can share or omit names, so include the index to keep internal plugin ids unique
+            return new Plugin(exports.SERVER_CODE_ID + i + ':' + name, '', res, lodash_1.default.noop);
+        }
+        catch (e) {
+            return console.error(name + ':', e.message || String(e));
+        }
+    }));
+    // server_code is a side-effect config, so keep its cleanup outside compiled()
+    unloadServerCode = () => Promise.all(asPlugins.map(p => {
+        try {
+            return p?.unload();
+        } // catch sync errors
+        catch (e) {
+            console.error(e);
+        }
+    })).catch(console.error);
 });
 function mapPlugins(cb, includeServerCode = true) {
     let i = 0;
     return Array.from(plugins).map(([plName, pl]) => {
-        if (!includeServerCode && plName === exports.SERVER_CODE_ID)
+        if (!includeServerCode && plName.startsWith(exports.SERVER_CODE_ID))
             return;
         try {
             return cb(pl, plName, i++);
@@ -421,7 +441,7 @@ function mapPlugins(cb, includeServerCode = true) {
 }
 function firstPlugin(cb, includeServerCode = true) {
     for (const [plName, pl] of plugins.entries()) {
-        if (!includeServerCode && plName === exports.SERVER_CODE_ID)
+        if (!includeServerCode && plName.startsWith(exports.SERVER_CODE_ID))
             continue;
         try {
             const ret = cb(pl, plName);
@@ -444,10 +464,10 @@ if (!(0, fs_1.existsSync)(exports.PATH))
     }
     catch { }
 exports.pluginsWatcher = (0, misc_1.watchDir)(exports.PATH, rescanAsap);
-exports.enablePlugins = (0, config_1.defineConfig)('enable_plugins', ['antibrute']);
+exports.enablePlugins = (0, config_1.defineConfig)(misc_1.CFG.enable_plugins, ['antibrute']);
 exports.enablePlugins.sub(rescanAsap);
 exports.suspendPlugins = (0, config_1.defineConfig)(misc_1.CFG.suspend_plugins, false);
-exports.pluginsConfig = (0, config_1.defineConfig)('plugins_config', {});
+exports.pluginsConfig = (0, config_1.defineConfig)(misc_1.CFG.plugins_config, {});
 exports.PLUGIN_MAIN_FILE = 'plugin.js';
 const pluginWatchers = new Map();
 async function rescan() {
@@ -548,7 +568,7 @@ function watchPlugin(id, path) {
                 throw Error(pluginData.badApi);
             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 ? '\\' : '/');
+            const storageDir = (0, path_1.resolve)(exports.PATH, id, exports.STORAGE_FOLDER) + path_1.sep;
             await (0, promises_1.mkdir)(storageDir, { recursive: true });
             const openDbs = [];
             const subbedConfigs = [];
@@ -607,7 +627,7 @@ function watchPlugin(id, path) {
                 async i18n(ctx) {
                     return (0, i18n_1.i18nFromTranslations)(await (0, lang_1.getLangData)(ctx), const_1.EMBEDDED_LANGUAGE);
                 },
-            });
+            }, unloadResources);
             const folder = (0, path_1.dirname)(module);
             const { sections, unwatch } = (0, customHtml_1.watchLoadCustomHtml)(folder);
             pluginData.getCustomHtml = () => Object.assign(Object.fromEntries(sections), (0, misc_1.callable)(pluginData.customHtml) || {});
@@ -615,10 +635,7 @@ function watchPlugin(id, path) {
             const plugin = new Plugin(id, folder, pluginData, async () => {
                 unwatchIcons();
                 unwatch();
-                for (const x of subbedConfigs)
-                    x();
-                await Promise.allSettled(openDbs.map(x => x.close()));
-                openDbs.length = 0;
+                await unloadResources();
             });
             pluginReady.resolve();
             if (alreadyRunning)
@@ -630,6 +647,12 @@ function watchPlugin(id, path) {
                 events_1.default.emit(wasInstalled ? 'pluginStarted' : 'pluginInstalled', plugin);
             }
             events_1.default.emit('pluginStarted:' + id);
+            async function unloadResources() {
+                for (const x of subbedConfigs)
+                    x();
+                await Promise.allSettled(openDbs.map(x => x.close()));
+                openDbs.length = 0;
+            }
         }
         catch (e) {
             await markItInactive();

package/src/selfCheck.js

@@ -24,7 +24,8 @@ async function selfCheck(url) {
     const prjInfo = await (0, github_1.getProjectInfo)();
     console.log(`Checking server ${url}`);
     const parsed = new URL(url);
-    const family = !(0, net_1.isIP)(parsed.hostname) ? undefined : (0, net_1.isIPv6)(parsed.hostname) ? 6 : 4;
+    const hostname = (0, cross_1.normalizeHost)(parsed.hostname);
+    const family = !(0, net_1.isIP)(hostname) ? undefined : (0, net_1.isIPv6)(hostname) ? 6 : 4;
     try {
         ++activeSelfChecks;
         for (const services of lodash_1.default.chunk(lodash_1.default.shuffle(prjInfo.selfCheckServices), 2)) {
@@ -38,7 +39,7 @@ async function selfCheck(url) {
                     console.debug(svc);
                     body = applySymbols(body);
                     serviceUrl = applySymbols(serviceUrl);
-                    const timeout = 8_000;
+                    const timeout = 9_000;
                     const res = await (0, cross_1.haveTimeout)(timeout, (0, util_http_1.httpString)(serviceUrl, { family, timeout, ...rest, body }));
                     const success = new RegExp(regexpSuccess).test(res);
                     const failure = new RegExp(regexpFailure).test(res);
@@ -60,7 +61,7 @@ async function selfCheck(url) {
         --activeSelfChecks;
     }
     function applySymbols(s) {
-        return s?.replace('$IP', parsed.hostname)
+        return s?.replace('$IP', hostname)
             .replace('$PORT', parsed.port || (parsed.protocol === 'https:' ? '443' : '80'))
             .replace('$URL', url.replace(/\/$/, '') + CHECK_URL);
     }

package/src/serveFile.js

@@ -25,7 +25,7 @@ const errorPages_1 = require("./errorPages");
 const stream_1 = require("stream");
 const crypto_1 = require("crypto");
 const iconv_lite_1 = __importDefault(require("iconv-lite"));
-const allowedReferer = (0, config_1.defineConfig)('allowed_referer', '');
+const allowedReferer = (0, config_1.defineConfig)(misc_1.CFG.allowed_referer, '');
 const maxDownloads = downloadLimiter((0, config_1.defineConfig)(misc_1.CFG.max_downloads, 0), () => true);
 const maxDownloadsPerIp = downloadLimiter((0, config_1.defineConfig)(misc_1.CFG.max_downloads_per_ip, 0), ctx => ctx.ip);
 const maxDownloadsPerAccount = downloadLimiter((0, config_1.defineConfig)(misc_1.CFG.max_downloads_per_account, 0), ctx => (0, auth_1.getCurrentUsername)(ctx) || undefined);
@@ -66,13 +66,13 @@ async function serveFileNode(ctx, node) {
     if (await maxDownloadsPerAccount(ctx) === undefined) // returning false will not execute other limits
         await maxDownloads(ctx) || await maxDownloadsPerIp(ctx);
 }
-const mimeCfg = (0, config_1.defineConfig)('mime', {}, obj => {
+const mimeCfg = (0, config_1.defineConfig)(misc_1.CFG.mime, {}, obj => {
     const matchers = Object.keys(obj).map(k => (0, misc_1.makeMatcher)(k));
     const values = Object.values(obj);
     return (name) => values[matchers.findIndex(matcher => matcher(name))];
 });
 // after this number of seconds, the browser should check the server to see if there's a newer version of the file
-const cacheControlDiskFiles = (0, config_1.defineConfig)('cache_control_disk_files', 5);
+const cacheControlDiskFiles = (0, config_1.defineConfig)(misc_1.CFG.cache_control_disk_files, 5);
 async function serveFile(ctx, filePath, mime, cached) {
     if (!filePath)
         return;

package/src/serveGuiAndSharedFiles.js

@@ -11,7 +11,7 @@ const events_1 = __importDefault(require("./events"));
 const cross_const_1 = require("./cross-const");
 const upload_1 = require("./upload");
 const multipartUpload_1 = require("./multipartUpload");
-const events_2 = require("events");
+const promises_1 = require("stream/promises");
 const stream_1 = require("stream");
 const serveFile_1 = require("./serveFile");
 const const_1 = require("./const");
@@ -24,11 +24,12 @@ const misc_1 = require("./misc");
 const roots_1 = require("./roots");
 const xxhashjs_1 = __importDefault(require("xxhashjs"));
 const fs_1 = __importDefault(require("fs"));
-const promises_1 = require("fs/promises");
+const promises_2 = require("fs/promises");
 const comments_1 = require("./comments");
 const basicWeb_1 = require("./basicWeb");
 const icons_1 = require("./icons");
 const plugins_1 = require("./plugins");
+const uploadOwners_1 = require("./uploadOwners");
 const serveFrontendFiles = (0, serveGuiFiles_1.serveGuiFiles)(process.env.FRONTEND_PROXY, cross_const_1.FRONTEND_URI);
 const serveFrontendPrefixed = (0, koa_mount_1.default)(cross_const_1.FRONTEND_URI.slice(0, -1), serveFrontendFiles);
 const serveAdminFiles = (0, serveGuiFiles_1.serveGuiFiles)(process.env.ADMIN_PROXY, cross_const_1.ADMIN_URI);
@@ -70,7 +71,7 @@ const serveSharedFiles = async (ctx, next) => {
         const decPath = (0, misc_1.safeDecodeURIComponent)(path, '');
         const fn = (0, path_1.basename)(decPath);
         const folderUri = (0, misc_1.pathEncode)((0, path_1.dirname)(decPath)); // re-encode to get readable urls
-        const folder = await (0, vfs_1.urlToNode)(folderUri, ctx, vfs_1.vfs, true); // we don't require the folder to already exist, but to be mapped on disk AND to have proper permissions
+        const folder = await (0, vfs_1.urlToNode)(folderUri, ctx, vfs_1.vfs.compiled(), true); // we don't require the folder to already exist, but to be mapped on disk AND to have proper permissions
         if (!folder)
             return (0, errorPages_1.sendErrorPage)(ctx, cross_const_1.HTTP_NOT_FOUND);
         ctx.state.uploadPath = decPath;
@@ -110,8 +111,9 @@ const serveSharedFiles = async (ctx, next) => {
         try {
             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 });
+            await (0, promises_2.rm)(source, { recursive: true });
             await (0, misc_1.deleteStoredFileAttrs)(source);
+            (0, uploadOwners_1.deleteUploadOwner)(path);
             void (0, comments_1.setCommentFor)(source, ''); // necessary only to clean a possible descript.ion or kvstorage
             return ctx.status = cross_const_1.HTTP_OK;
         }
@@ -189,9 +191,8 @@ async function calcHash(fn, limit = Infinity) {
             done();
         }
     });
-    fs_1.default.createReadStream(fn, { end: limit - 1 }).pipe(stream);
     console.debug('Hashing', fn);
-    await (0, events_2.once)(stream, 'finish');
+    await (0, promises_1.pipeline)(fs_1.default.createReadStream(fn, { end: limit - 1 }), stream);
     console.debug('Hashed', fn);
     return hash.digest().toString(16);
 }

package/src/serveGuiFiles.js

@@ -104,6 +104,18 @@ async function treatIndex(ctx, filesUri, body) {
     })));
     const timestamp = await getFaviconTimestamp();
     const lang = await (0, lang_1.getLangData)(ctx);
+    let group = 0; // this represents the loading-group: all plugins with the same group can be loaded concurrently
+    const loadScripts = (0, misc_1.onlyTruthy)((0, plugins_1.mapPlugins)((p, id) => {
+        const js = p.frontend_js?.map(f => f.includes('//') ? f : pub + id + '/' + f);
+        if (!js?.length)
+            return;
+        if (p.afterPlugin) // an afterPlugin constraint needs a loading barrier before this plugin's scripts
+            group++;
+        const ret = { id, group, js };
+        if (p.beforePlugin) // a beforePlugin constraint creates a loading barrier after this plugin's scripts
+            group++;
+        return ret;
+    }));
     return body
         .replace(/((?:src|href) *= *['"])\/?(?!([a-z]+:\/)?\/)(?!\?)/g, '$1' + ctx.state.revProxyPath + filesUri)
         .replace(/<(\/)?(head|body)>/g, (all, isClose, name) => {
@@ -120,11 +132,12 @@ async function treatIndex(ctx, filesUri, body) {
                 pathSeparator: path_1.sep,
                 session: session instanceof apiMiddleware_1.ApiError ? null : session,
                 plugins,
-                loadScripts: Object.fromEntries((0, plugins_1.mapPlugins)((p, id) => [id, p.frontend_js?.map(f => f.includes('//') ? f : pub + id + '/' + f)])),
+                loadScripts,
                 prefixUrl: ctx.state.revProxyPath || '',
                 proxyDetected: Boolean((0, middlewares_1.getProxyDetected)()),
                 dontOverwriteUploading: upload_1.dontOverwriteUploading.get(),
                 splitUploads: splitUploads.get(),
+                disableDefaultStyle: (0, plugins_1.mapPlugins)(p => p.disableDefaultStyle).some(Boolean),
                 kb: size1024.compiled(),
                 forceTheme: (0, plugins_1.mapPlugins)(p => lodash_1.default.isString(p.isTheme) ? p.isTheme : undefined).find(Boolean),
                 customHtml: lodash_1.default.omit((0, customHtml_1.getAllSections)(), ['top', 'bottom', 'htmlHead', 'style']), // exclude the sections we already apply in this phase
@@ -194,7 +207,7 @@ function serveProxied(port, uri) {
     import('koa-better-http-proxy').then(lib => // dynamic import to avoid having this in final distribution
      proxy = lib.default('127.0.0.1:' + port, {
         parseReqBody: false, // the dev GUI proxy serves app/assets, so avoid koa-better-http-proxy trying to reread ctx.req
-        proxyReqPathResolver: (ctx) => shouldServeApp(ctx) ? '/' : ctx.path,
+        proxyReqPathResolver: (ctx) => shouldServeApp(ctx) ? '/' : ctx.url,
         userResDecorator(_res, data, ctx) {
             return shouldServeApp(ctx) ? treatIndex(ctx, uri, String(data))
                 : adjustBundlerLinks(ctx, uri, data);

package/src/serverCode.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SERVER_CODE_SPLIT = void 0;
+exports.parseServerCode = parseServerCode;
+const lodash_1 = __importDefault(require("lodash"));
+const cross_1 = require("./cross");
+exports.SERVER_CODE_SPLIT = '//---';
+function parseServerCode(text) {
+    const split = text.split(new RegExp('(?:^|\n)' + lodash_1.default.escapeRegExp(exports.SERVER_CODE_SPLIT), 'g'));
+    const ret = [];
+    let first = true;
+    for (const part of split)
+        if (first) { // first is special, no name
+            first = false;
+            const code = part.trim();
+            if (code)
+                ret.push({ name: '', code });
+        }
+        else {
+            const [name, code] = (0, cross_1.splitAt)('\n', part);
+            ret.push({ name, code });
+        }
+    return ret;
+}