hfs 0.55.0-beta3 → 0.55.0-beta4

package/frontend/assets/{sha512-legacy-CxvBXzw1.js → sha512-legacy-CP10jckG.js}

@@ -1,4 +1,4 @@
-System.register(["./index-legacy-CBj6uwzd.js"],(function(h,t){"use strict";var i,s;return{setters:[function(h){i=h.g,s=h.c}],execute:function(){function t(h,t){for(var i=function(){var i=t[s];if("string"!=typeof i&&!Array.isArray(i)){var r=function(t){if("default"!==t&&!(t in h)){var s=Object.getOwnPropertyDescriptor(i,t);s&&Object.defineProperty(h,t,s.get?s:{enumerable:!0,get:function(){return i[t]}})}};for(var e in i)r(e)}},s=0;s<t.length;s++)i();return Object.freeze(Object.defineProperty(h,Symbol.toStringTag,{value:"Module"}))}var r={exports:{}};
+System.register(["./index-legacy-BoMy1vEB.js"],(function(h,t){"use strict";var i,s;return{setters:[function(h){i=h.g,s=h.c}],execute:function(){function t(h,t){for(var i=function(){var i=t[s];if("string"!=typeof i&&!Array.isArray(i)){var r=function(t){if("default"!==t&&!(t in h)){var s=Object.getOwnPropertyDescriptor(i,t);s&&Object.defineProperty(h,t,s.get?s:{enumerable:!0,get:function(){return i[t]}})}};for(var e in i)r(e)}},s=0;s<t.length;s++)i();return Object.freeze(Object.defineProperty(h,Symbol.toStringTag,{value:"Module"}))}var r={exports:{}};
 /*
        * [js-sha512]{@link https://github.com/emn178/js-sha512}
        *

package/frontend/index.html

@@ -10,6 +10,6 @@
     <style class="removeAtBoot">@media (prefers-color-scheme: dark) { html { background-color: #000; color: #888; } }</style>
     <div id="root">Wait for loading or <a href="?get=basic">use basic interface now</a></div>
     <script crossorigin id="vite-legacy-polyfill" src="/assets/polyfills-legacy-DMrMt_pQ.js"></script>
-    <script crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-CBj6uwzd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-BoMy1vEB.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.55.0-beta3",
+  "version": "0.55.0-beta4",
   "description": "HTTP File Server",
   "keywords": [
     "file server",

package/src/consoleLog.js

@@ -6,16 +6,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.consoleLog = void 0;
 const events_1 = __importDefault(require("./events"));
 const cross_1 = require("./cross");
+const fs_1 = require("fs");
+const const_1 = require("./const");
 exports.consoleLog = [];
+const f = const_1.argv.consoleFile ? (0, fs_1.createWriteStream)(const_1.argv.consoleFile, 'utf-8') : null;
 for (const k of ['log', 'warn', 'error']) {
     const original = console[k];
     console[k] = (...args) => {
         const ts = new Date();
-        const rec = { ts, k, msg: args.join(' ') };
+        const msg = args.join(' ');
+        const rec = { ts, k, msg };
         exports.consoleLog.push(rec);
         if (exports.consoleLog.length > 100000) // limit to avoid infinite space
             exports.consoleLog.splice(0, 1000);
         events_1.default.emit('console', rec);
+        f === null || f === void 0 ? void 0 : f.write(`${(0, cross_1.formatTimestamp)(ts)} [${k}] ${msg}\n`);
         return original((0, cross_1.formatTime)(ts), ...args); // bundled nodejs doesn't have locales (and apparently uses en-US)
     };
 }

package/src/const.js

@@ -38,7 +38,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const path_1 = require("path");
 const cross_1 = require("./cross");
 __exportStar(require("./cross-const"), exports);
-exports.API_VERSION = 10.2;
+exports.API_VERSION = 10.3;
 exports.COMPATIBLE_API_VERSION = 1; // while changes in the api are not breaking, this number stays the same, otherwise it is made equal to API_VERSION
 exports.argv = (0, minimist_1.default)(process.argv.slice(2));
 // you can add arguments with this file, currently used for the update process on mac/linux
@@ -54,7 +54,7 @@ exports.DEV = process.env.DEV || exports.argv.dev ? 'DEV' : '';
 exports.ORIGINAL_CWD = process.cwd();
 exports.HFS_STARTED = new Date();
 const PKG_PATH = (0, path_1.join)(__dirname, '..', 'package.json');
-exports.BUILD_TIMESTAMP = "2024-12-14T14:24:01.619Z";
+exports.BUILD_TIMESTAMP = "2024-12-19T15:58:01.475Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.RUNNING_BETA = exports.VERSION.includes('-');

package/src/cross.js

@@ -39,6 +39,7 @@ exports.FRONTEND_OPTIONS = {
     invert_order: false,
     folders_first: true,
     sort_numerics: false,
+    title_with_path: true,
     theme: '',
     auto_play_seconds: 5,
     disableTranslation: false,

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

@@ -1,7 +1,7 @@
 {
     "author": "Pultsari & Win_7",
-    "version": 1.21,
-    "hfs_version": "0.54.0",
+    "version": 1.3,
+    "hfs_version": "0.55.0",
     "translate": {
         "Select": "Valitse",
         "n_files": "{n,plural,one{# tiedosto} other{# tiedostoa}}",
@@ -167,6 +167,8 @@
         "Logged in": "Kirjauduttu sisään",
         "Logged out": "Kirjauduttu ulos",
         "Cancel": "Peruuta",
-        "allow_session_ip_change": "Salli IP vaihto tämän istunnon aikana"
+        "allow_session_ip_change": "Salli IP vaihto tämän istunnon aikana",
+        "focus_hint": "Kirjoittamalla näppäimistölläsi, voit etsiä ja korostaa elementtejä listalta",
+        "copy_links": "Kopioi linkit"
     }
 }

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

@@ -156,6 +156,7 @@
         "Logged out": "Arrivederci",
         "Cancel": "Annulla",
         "allow_session_ip_change": "Permetti cambio IP in questa sessione",
-        "focus_hint": "Scrivendo sulla tastiera cerchi tra gli elementi della lista."
+        "focus_hint": "Scrivendo sulla tastiera cerchi tra gli elementi della lista.",
+        "copy_links": "Copia i link"
     }
 }

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/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

@@ -50,6 +50,8 @@ 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';
@@ -142,6 +144,8 @@ 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);

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))}`));