hfs 0.55.0-alpha2 → 0.55.0-beta3

package/src/listen.js

@@ -49,7 +49,7 @@ const persistence_1 = require("./persistence");
 let httpSrv;
 let httpsSrv;
 const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', !const_1.DEV);
-exports.baseUrl = (0, config_1.defineConfig)('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 => { var _a; return (_a = /(?<=\/\/)[^\/]+/.exec(x)) === null || _a === void 0 ? void 0 : _a[0]; }); // compiled is host only
 async function getBaseUrlOrDefault() {
     return exports.baseUrl.get() || await nat_1.defaultBaseUrl.get();
 }
@@ -163,7 +163,7 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
     events_1.default.emit('httpsReady');
     nat_1.defaultBaseUrl.proto = 'https';
     nat_1.defaultBaseUrl.port = (_f = getCurrentPort(httpsSrv)) !== null && _f !== void 0 ? _f : 0;
-});
+}, { wait: 200 }); // give time to have key and cert ready
 exports.cert = (0, config_1.defineConfig)('cert', '');
 exports.privateKey = (0, config_1.defineConfig)('private_key', '');
 const httpsNeeds = [exports.cert, exports.privateKey];
@@ -180,7 +180,6 @@ for (const cfg of httpsNeeds) {
         httpsOptions[k] = '';
         unwatch = (0, watchLoad_1.watchLoad)(v, async (data) => {
             httpsOptions[k] = data;
-            await (0, misc_1.wait)(500); // when a file is written, give some time for the other to be ready
             await considerHttps();
         }, { immediateFirst: true }).unwatch;
         await considerHttps();
@@ -201,8 +200,10 @@ function startServer(srv, { port, host }) {
         if (!srv)
             return resolve(0);
         try {
-            if (port === const_1.PORT_DISABLED || !host && !await testIpV4()) // !host means ipV4+6, and if v4 port alone is busy we won't be notified of the failure, so we'll first test it on its own
+            if (port === const_1.PORT_DISABLED)
                 return resolve(0);
+            if (!host && !await testIpV4()) // !host means ipV4+6, and if v4 port alone is busy we won't be notified of the failure, so we'll first test it on its own
+                throw srv.error;
             // from a few tests, this seems enough to support the expect-100 http/1.1 mechanism, at least with curl -T, not used by chrome|firefox anyway
             srv.on('checkContinue', (req, res) => srv.emit('request', req, res));
             port = await listen(host);
@@ -212,16 +213,16 @@ function startServer(srv, { port, host }) {
         }
         catch (e) {
             srv.error = String(e);
-            console.error(srv.name, "couldn't listen on port", port, srv.error);
+            console.error(srv.name, `couldn't listen on port ${port}:`, srv.error);
             resolve(0);
         }
     });
     async function testIpV4() {
-        const res = await listen('0.0.0.0');
-        await new Promise(res => srv === null || srv === void 0 ? void 0 : srv.close(res));
+        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
         return res > 0;
     }
-    function listen(host) {
+    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 }, () => {
                 const ad = srv.address();
@@ -246,7 +247,8 @@ function startServer(srv, { port, host }) {
                     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.error = `port ${port} busy: ${await srv.busy || "unknown process"}`;
                 }
-                console.error(srv.name, srv.error);
+                if (!silence)
+                    console.error(srv.name, srv.error);
                 resolve(0);
             }
         });

package/src/plugins.js

@@ -48,6 +48,8 @@ const first_1 = require("./first");
 const frontEndApis_1 = require("./frontEndApis");
 const index_1 = require("./index");
 const block_1 = require("./block");
+const lang_1 = require("./lang");
+const i18n_1 = require("./i18n");
 exports.PATH = 'plugins';
 exports.DISABLING_SUFFIX = '-disabled';
 exports.STORAGE_FOLDER = 'storage';
@@ -129,7 +131,7 @@ function getPluginConfigFields(id) {
 exports.getPluginConfigFields = getPluginConfigFields;
 async function initPlugin(pl, morePassedToInit) {
     var _a;
-    return Object.assign(pl, await ((_a = pl.init) === null || _a === void 0 ? void 0 : _a.call(pl, {
+    const res = await ((_a = pl.init) === null || _a === void 0 ? void 0 : _a.call(pl, {
         Const,
         require,
         getConnections: connections_1.getConnections,
@@ -141,7 +143,8 @@ async function initPlugin(pl, morePassedToInit) {
         addBlock: block_1.addBlock,
         misc,
         ...morePassedToInit
-    })));
+    }));
+    return Object.assign(pl, typeof res === 'function' ? { unload: res } : res);
 }
 const already = new Set();
 function warnOnce(msg) {
@@ -502,6 +505,9 @@ function watchPlugin(id, path) {
                         }
                     });
                 },
+                async i18n(ctx) {
+                    return (0, i18n_1.i18nFromTranslations)(await (0, lang_1.getLangData)(ctx));
+                },
             });
             const folder = (0, path_1.dirname)(module);
             const { sections, unwatch } = (0, customHtml_1.watchLoadCustomHtml)(folder);

package/src/serveFile.js

@@ -41,7 +41,7 @@ async function serveFileNode(ctx, node) {
         : lodash_1.default.find(mime, (val, mask) => (0, misc_1.matches)(name, mask));
     if (allowedReferer.get()) {
         const ref = (_a = /\/\/([^:/]+)/.exec(ctx.get('referer'))) === null || _a === void 0 ? void 0 : _a[1]; // extract host from url
-        if (ref && ref !== host() // automatically accept if referer is basically the hosting domain
+        if (ref && ref !== (0, misc_1.normalizeHost)(ctx.host) // automatically accept if referer is basically the hosting domain
             && !(0, misc_1.matches)(ref, allowedReferer.get()))
             return ctx.status = const_1.HTTP_FORBIDDEN;
     }
@@ -54,10 +54,6 @@ async function serveFileNode(ctx, node) {
     await serveFile(ctx, source || '', mimeString);
     if (await maxDownloadsPerAccount(ctx) === undefined) // returning false will not execute other limits
         await maxDownloads(ctx) || await maxDownloadsPerIp(ctx);
-    function host() {
-        const s = ctx.host;
-        return s[0] === '[' ? s.slice(1, s.indexOf(']')) : s === null || s === void 0 ? void 0 : s.split(':')[0];
-    }
 }
 exports.serveFileNode = serveFileNode;
 const mimeCfg = (0, config_1.defineConfig)('mime', {}, obj => {

package/src/serveGuiFiles.js

@@ -19,6 +19,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const config_1 = require("./config");
 const lang_1 = require("./lang");
 const upload_1 = require("./upload");
+const size1024 = (0, config_1.defineConfig)(misc_1.CFG.size_1024, false, x => misc_1.formatBytes.k = x ? 1024 : 1000); // we both configure formatBytes, and also provide a compiled version (number instead of boolean)
 const splitUploads = (0, config_1.defineConfig)(misc_1.CFG.split_uploads, 0);
 exports.logGui = (0, config_1.defineConfig)(misc_1.CFG.log_gui, false);
 lodash_1.default.each(misc_1.FRONTEND_OPTIONS, (v, k) => (0, config_1.defineConfig)(k, v)); // define default values
@@ -102,6 +103,7 @@ async function treatIndex(ctx, filesUri, body) {
                 prefixUrl: ctx.state.revProxyPath,
                 dontOverwriteUploading: upload_1.dontOverwriteUploading.get(),
                 splitUploads: splitUploads.get(),
+                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']),
                 ...(0, misc_1.newObj)(misc_1.FRONTEND_OPTIONS, (v, k) => (0, config_1.getConfig)(k)),

package/src/update.js

@@ -127,7 +127,10 @@ async function update(tagOrUrl = '') {
     const bin = process.execPath;
     const binPath = (0, path_1.dirname)(bin);
     const binFile = 'hfs' + (const_1.IS_WINDOWS ? '.exe' : ''); // currently running bin could have been renamed
-    const newBinFile = 'new-' + binFile;
+    let newBinFile = binFile;
+    do {
+        newBinFile = 'new-' + newBinFile;
+    } while ((0, fs_1.existsSync)((0, path_1.join)(binPath, newBinFile)));
     plugins_1.pluginsWatcher.pause();
     try {
         await (0, misc_1.unzip)(updateSource, path => (0, path_1.join)(binPath, path === binFile ? newBinFile : path));

package/src/upload.js

@@ -19,6 +19,7 @@ const comments_1 = require("./comments");
 const lodash_1 = __importDefault(require("lodash"));
 const events_1 = __importDefault(require("./events"));
 const promises_1 = require("fs/promises");
+const expiringCache_1 = require("./expiringCache");
 exports.deleteUnfinishedUploadsAfter = (0, config_1.defineConfig)('delete_unfinished_uploads_after', 86400);
 exports.minAvailableMb = (0, config_1.defineConfig)('min_available_mb', 100);
 exports.dontOverwriteUploading = (0, config_1.defineConfig)('dont_overwrite_uploading', true);
@@ -35,7 +36,7 @@ function setUploadMeta(path, ctx) {
     });
 }
 // stay sync because we use this function with formidable()
-const diskSpaceCache = {};
+const diskSpaceCache = (0, expiringCache_1.expiringCache)(3000); // invalidate shortly
 const openFiles = new Set();
 function uploadWriter(base, baseUri, path, ctx) {
     let fullPath = '';
@@ -65,13 +66,10 @@ function uploadWriter(base, baseUri, path, ctx) {
             while ((closestVfsNode === null || closestVfsNode === void 0 ? void 0 : closestVfsNode.parent) && !closestVfsNode.original)
                 closestVfsNode = closestVfsNode.parent; // if it's not original, it surely has a parent
             const statDir = closestVfsNode.source;
-            if (!Object.hasOwn(diskSpaceCache, statDir)) {
-                const c = diskSpaceCache[statDir] = (0, util_os_1.getDiskSpaceSync)(statDir);
-                if (!c)
-                    throw 'miss';
-                setTimeout(() => delete diskSpaceCache[statDir], 3000); // invalidate shortly
-            }
-            const { free } = diskSpaceCache[statDir];
+            const res = diskSpaceCache.try(statDir, () => (0, util_os_1.getDiskSpaceSync)(statDir));
+            if (!res)
+                throw 'miss';
+            const { free } = res;
             if (typeof free !== 'number' || isNaN(free))
                 throw '';
             if (reqSize > free - (min || 0))