hfs 0.55.0-alpha2 → 0.55.0-beta4

package/src/langs/hfs-lang-ro.json

@@ -1,7 +1,7 @@
 {
-    "author": "Ovidiu",
+    "author": "<0x1g3n>",
     "version": 1.0,
-    "hfs_version": "0.53.0",
+    "hfs_version": "0.54.0",
     "translate": {
         "Select": "Selectează",
         "n_files": "{n,plural,one{# fișier} other{# fișiere}}",
@@ -10,12 +10,12 @@
         "select_count": "{n,plural, one{# selectat} other{# selectate}}",
         "filter_placeholder": "Tastează aici pentru a filtra lista de mai jos (caută după cuvinte cheie)",
         "Select some files": "Selectează câteva fișiere",
-        "zip_checkboxes": "Folosește căsuțele de selectare pentru a alege fișierele, apoi poți folosi Zip din nou",
-        "zip_tooltip_selected": "Descarcă elementele selectate ca un singur fișier zip",
-        "zip_tooltip_whole": "Descarcă întreaga listă (nefiltrată) ca un singur fișier zip. Dacă selectezi câteva elemente, doar acelea vor fi descărcate.",
-        "zip_confirm_search": "Ești sigur că vrei să descarci TOATE rezultatele acestei căutări sub formă de arhivă ZIP?",
-        "zip_confirm_folder": "Ești sigur că vrei să descarci ÎNTREGUL folder sub formă de arhivă ZIP?",
-        "select_tooltip": "Selecția se aplică pentru \"Zip\" și \"Șterge\" (când sunt disponibile), dar poți, de asemenea, filtra lista",
+        "zip_checkboxes": "Folosește căsuțele de selectare pentru a alege fișierele, apoi poți folosi ZIP din nou",
+        "zip_tooltip_selected": "Descarcă elementele selectate sub un singur fișier .ZIP",
+        "zip_tooltip_whole": "Descarcă întreaga listă (nefiltrată) ca un singur fișier .ZIP. Dacă selectezi câteva elemente, doar acelea vor fi descărcate.",
+        "zip_confirm_search": "Ești sigur că vrei să descarci TOATE rezultatele acestei căutări sub formă de arhivă .ZIP?",
+        "zip_confirm_folder": "Ești sigur că vrei să descarci ÎNTREGUL folder sub formă de arhivă .ZIP?",
+        "select_tooltip": "Selecția se aplică pentru \"ZIP\" și \"Șterge\" (când sunt disponibile), dar poți, de asemenea, filtra lista",
         "delete_hint": "Pentru a șterge, prima dată fă clic pe Selectează",
         "delete_confirm": "Ștergi {n,plural, one{# element} other{# elemente}}?",
         "delete_completed": "Ștergere: {n} completată",
@@ -24,7 +24,7 @@
         "Delete": "Șterge",
         "Options": "Opțiuni",
         "Search": "Căutare",
-        "Zip": "Zip",
+        "Zip": "Arhivă ZIP",
         "search_msg": "Caută în acest folder și în sub-foldere",
         "Searching": "Căutare",
         "Searched": "Căutat",
@@ -33,13 +33,13 @@
         "stopped_before": "Oprit înainte de a găsi ceva",
         "empty_list": "Lista este goală. Nu este nimic aici",
         "filter_none": "Niciun rezultat pentru filtrul aplicat",
-        "Admin-panel": "Panoul de administrare",
+        "Admin-panel": "Panoul Administratorului",
         "Login": "Autentificare",
-        "Username": "Nume utilizator",
+        "Username": "Nume de utilizator",
         "Password": "Parolă",
         "login_untrusted": "Autentificare anulată: identitatea serverului nu poate fi de încredere",
-        "login_bad_credentials": "Numele de utilizator sau parola sunt incorecte. Te rugăm să re-efectuezi logarea.",
-        "login_bad_cookies": "Cookies nefuncționale - autentificare eșuată",
+        "login_bad_credentials": "Numele de utilizator sau parola sunt incorecte. Te rog să re-efectuezi logarea.",
+        "login_bad_cookies": "Cookie-uri nefuncționale - autentificare eșuată",
         "User panel": "Panoul utilizatorului",
         "Change password": "Schimbă parola",
         "enter_pass": "Introdu noua parolă",
@@ -65,8 +65,8 @@
         "Enter folder name": "Introdu numele folderului",
         "Successfully created": "Creat cu succes",
         "enter_folder": "Intră în folder",
-        "folder_exists": "Există deja un folderul cu același nume",
-        "Sort by:": "Sortați după: {by}",
+        "folder_exists": "Există deja un folder cu același nume",
+        "Sort by:": "Sortează după: {by}",
         "name": "nume",
         "extension": "extensie",
         "size": "dimensiune",
@@ -78,7 +78,7 @@
         "auto": "automat",
         "light": "luminos",
         "dark": "întunecat",
-        "parent folder": "Folder sursă",
+        "parent folder": "Folder sursă (rădăcină)",
         "home": "acasă",
         "Continue": "Continuă",
         "Confirm": "Confirmă",
@@ -127,7 +127,7 @@
         "in_queue": "{n} în așteptare",
         "enter_comment": "Comentariu pentru {name}",
         "Comment": "Comentariu",
-        "upload_dd_hint": "Poți încărca fișiere făcând drag&drop pe lista de fișiere",
+        "upload_dd_hint": "Poți încărca fișiere făcând drag&drop în lista cu fișierele deja existente",
         "Upload not available": "Încărcarea nu este disponibilă",
         "Cut": "Decupează",
         "n_items": "{n,plural, one{# element} other{# elemente}}",
@@ -161,6 +161,8 @@
         "Show details": "Arată detalii",
         "upload_conflict": "deja există",
         "Logged in": "Autentificat cu succes",
-        "Logged out": "Deconectat cu succes"
+        "Logged out": "Deconectat cu succes",
+        "Cancel": "Anulează",
+        "allow_session_ip_change": "Permite schimbarea adresei IP pe durata sesiunilor de logare"
     }
 }

package/src/langs/hfs-lang-ru.json

@@ -1,7 +1,7 @@
 {
     "author": "Mefistofell, SanokKule, ItsNeverLight",
     "version": 2.6,
-    "hfs_version": "0.54.0",
+    "hfs_version": "0.55.0",
     "translate": {
         "Select": "Выбор",
         "n_files": "{n,plural, one{# файл} few{# файла} many{# файлов}}",
@@ -168,6 +168,7 @@
         "Logged out": "Выход выполнен",
         "Cancel": "Отмена",
         "allow_session_ip_change": "Разрешить смену IP в этой сессии",
-        "focus_hint": "Набирая текст на клавиатуре, вы можете выполнять поиск и выбирать элементы из списка."
+        "focus_hint": "Набирая текст на клавиатуре, вы можете выполнять поиск и выбирать элементы из списка.",
+        "copy_links": "Копировать ссылки"
     }
 }

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/perm.js

@@ -4,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeSrpHelper = exports.accountCanLoginAdmin = exports.accountCanLogin = exports.accountHasPassword = exports.getFromAccount = exports.delAccount = exports.addAccount = exports.renameAccount = exports.normalizeUsername = exports.accountsConfig = exports.updateAccount = exports.createAdmin = exports.saveSrpInfo = exports.getAccount = exports.expandUsername = void 0;
+exports.changeSrpHelper = exports.accountCanLoginAdmin = exports.accountCanLogin = exports.accountHasPassword = exports.getFromAccount = exports.delAccount = exports.addAccount = exports.renameAccount = exports.normalizeUsername = exports.accountsConfig = exports.updateAccount = exports.createAdmin = exports.saveSrpInfo = exports.getAccount = exports.ctxBelongsTo = exports.expandUsername = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const misc_1 = require("./misc");
 const config_1 = require("./config");
 const tssrp6a_1 = require("tssrp6a");
 const events_1 = __importDefault(require("./events"));
 const apiMiddleware_1 = require("./apiMiddleware");
+const auth_1 = require("./auth");
 let accounts = {};
 // provides the username and all other usernames it inherits based on the 'belongs' attribute. Useful to check permissions
 function expandUsername(who) {
@@ -27,6 +28,12 @@ function expandUsername(who) {
     return ret;
 }
 exports.expandUsername = expandUsername;
+// check if current username or any ancestor match the provided usernames
+function ctxBelongsTo(ctx, usernames) {
+    return (0, misc_1.getOrSet)(ctx.state, 'usernames', () => expandUsername((0, auth_1.getCurrentUsername)(ctx))) // cache ancestors' usernames inside context state
+        .some((u) => usernames.includes(u));
+}
+exports.ctxBelongsTo = ctxBelongsTo;
 function getAccount(username, normalize = true) {
     if (normalize)
         username = normalizeUsername(username);

package/src/plugins.js

@@ -48,6 +48,10 @@ 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");
+const perm_1 = require("./perm");
+const auth_1 = require("./auth");
 exports.PATH = 'plugins';
 exports.DISABLING_SUFFIX = '-disabled';
 exports.STORAGE_FOLDER = 'storage';
@@ -129,7 +133,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,
@@ -140,8 +144,11 @@ async function initPlugin(pl, morePassedToInit) {
         notifyClient: frontEndApis_1.notifyClient,
         addBlock: block_1.addBlock,
         misc,
+        ctxBelongsTo: perm_1.ctxBelongsTo,
+        getCurrentUsername: auth_1.getCurrentUsername,
         ...morePassedToInit
-    })));
+    }));
+    return Object.assign(pl, typeof res === 'function' ? { unload: res } : res);
 }
 const already = new Set();
 function warnOnce(msg) {
@@ -502,6 +509,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))

package/src/util-os.js

@@ -76,17 +76,18 @@ async function runCmd(cmd, args = [], options = {}) {
     return (stderr || stdout).replace(/\r/g, '');
 }
 exports.runCmd = runCmd;
+// returns pid-to-name object
 async function getWindowsServicePids() {
     var _a;
     const res = await runCmd('tasklist /svc /fo csv');
     const parsed = new csv_1.default().parse(res);
     const no = (_a = parsed === null || parsed === void 0 ? void 0 : parsed[1]) === null || _a === void 0 ? void 0 : _a[2];
-    return parsed.slice(2).filter(x => x[2] !== no).map(x => Number(x[1]));
+    return Object.fromEntries(parsed.slice(2).filter(x => x[2] !== no).map(x => [x[1], x[2]]));
 }
 exports.RUNNING_AS_SERVICE = const_1.IS_WINDOWS && getWindowsServicePids().then(x => {
-    const ret = x.includes(node_process_1.pid);
+    const ret = x[node_process_1.pid] || x[node_process_1.ppid];
     if (ret)
-        console.log("running as service");
+        console.log("running as service", ret);
     return ret;
 }, e => {
     console.log("couldn't determine if we are running as a service");

package/src/vfs.js

@@ -224,13 +224,8 @@ function statusCodeForMissingPerm(node, perm, ctx, assign = true) {
             }
             cur = who;
         } while (1);
-        if (Array.isArray(who)) {
-            const arr = who; // shut up ts
-            // check if I or any ancestor match `who`, but cache ancestors' usernames inside context state
-            const some = (0, misc_1.getOrSet)(ctx.state, 'usernames', () => (0, perm_1.expandUsername)((0, auth_1.getCurrentUsername)(ctx)))
-                .some((u) => arr.includes(u));
-            return some ? 0 : const_1.HTTP_UNAUTHORIZED;
-        }
+        if (Array.isArray(who))
+            return (0, perm_1.ctxBelongsTo)(ctx, who) ? 0 : const_1.HTTP_UNAUTHORIZED;
         return typeof who === 'boolean' ? (who ? 0 : const_1.HTTP_FORBIDDEN)
             : who === misc_1.WHO_ANY_ACCOUNT ? ((0, auth_1.getCurrentUsername)(ctx) ? 0 : const_1.HTTP_UNAUTHORIZED)
                 : (0, misc_1.throw_)(Error(`invalid permission: ${perm}=${(0, misc_1.try_)(() => JSON.stringify(who))}`));