hfs 0.55.0-alpha2 → 0.55.0-beta4

package/frontend/assets/{sha512-legacy-B6NU-5wp.js → sha512-legacy-CP10jckG.js}

@@ -1,4 +1,4 @@
-System.register(["./index-legacy-XBchFTt7.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-XBchFTt7.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-alpha2",
+  "version": "0.55.0-beta4",
   "description": "HTTP File Server",
   "keywords": [
     "file server",
@@ -72,7 +72,7 @@
   "dependencies": {
     "@gregoranders/csv": "^0.0.13",
     "@koa/router": "^13.0.1",
-    "@node-rs/crc32": "^1.10.3",
+    "@node-rs/crc32": "^1.10.6",
     "@rejetto/kvstorage": "^0.13.0",
     "acme-client": "^5.4.0",
     "buffer-crc32": "^1.0.0",

package/src/api.accounts.js

@@ -16,7 +16,17 @@ function prepareAccount(ac) {
         username: ac.username,
         hasPassword: (0, perm_1.accountHasPassword)(ac),
         adminActualAccess: (0, perm_1.accountCanLoginAdmin)(ac),
+        canLogin: (0, perm_1.accountHasPassword)(ac) ? (0, perm_1.accountCanLogin)(ac) : undefined,
         invalidated: auth_1.invalidateSessionBefore.get(ac.username),
+        members: (0, misc_1.with_)(Object.values(perm_1.accountsConfig.get()), accounts => {
+            const ret = [];
+            let news = [ac.username];
+            while (news.length) {
+                news = accounts.filter(a => { var _a; return (_a = a.belongs) === null || _a === void 0 ? void 0 : _a.some(x => news.includes(x)); }).map(x => x.username);
+                ret.push(...news);
+            }
+            return ret.sort();
+        })
     };
 }
 exports.default = {

package/src/api.plugins.js

@@ -14,6 +14,7 @@ const promises_1 = require("fs/promises");
 const github_1 = require("./github");
 const const_1 = require("./const");
 const SendList_1 = require("./SendList");
+const immer_1 = __importDefault(require("immer"));
 const apis = {
     get_plugins({}, ctx) {
         const list = new SendList_1.SendListReadable({ addAtStart: [...(0, plugins_1.mapPlugins)(serialize, false), ...(0, plugins_1.getAvailablePlugins)().map(serialize)] });
@@ -168,10 +169,13 @@ const apis = {
 };
 exports.default = apis;
 function serialize(p) {
-    const o = 'getData' in p ? Object.assign(lodash_1.default.pick(p, ['id', 'started']), p.getData())
+    let o = 'getData' in p ? Object.assign(lodash_1.default.pick(p, ['id', 'started']), p.getData())
         : { ...p }; // _.defaults mutates object, and we don't want that
     if (typeof o.repo === 'object') // custom repo
         o.repo = o.repo.web;
+    o = (0, immer_1.default)(o, (o) => {
+        lodash_1.default.each(o.config, x => x.showIf && (x.showIf = String(x.showIf)));
+    });
     return lodash_1.default.defaults(o, { started: null, badApi: null }); // nulls should be used to be sure to overwrite previous values,
 }
 async function checkDependencies(plugin) {

package/src/auth.js

@@ -9,6 +9,7 @@ const cross_const_1 = require("./cross-const");
 const tssrp6a_1 = require("tssrp6a");
 const srp_1 = require("./srp");
 const cross_1 = require("./cross");
+const expiringCache_1 = require("./expiringCache");
 const node_crypto_1 = require("node:crypto");
 const events_1 = __importDefault(require("./events"));
 const srp6aNimbusRoutines = new tssrp6a_1.SRPRoutines(new tssrp6a_1.SRPParameters());
@@ -23,17 +24,16 @@ async function srpServerStep1(account) {
     return { srpServer, salt, pubKey: String(srpServer.B) }; // cast to string cause bigint can't be jsonized
 }
 exports.srpServerStep1 = srpServerStep1;
-const cache = {};
+const cache = (0, expiringCache_1.expiringCache)(60000);
 async function srpCheck(username, password) {
     const account = (0, perm_1.getAccount)(username);
     if (!(account === null || account === void 0 ? void 0 : account.srp) || !password)
         return;
     const k = (0, node_crypto_1.createHash)('sha256').update(username + password + account.srp).digest("hex");
-    const good = await (0, cross_1.getOrSet)(cache, k, async () => {
+    const good = await cache.try(k, async () => {
         const { srpServer, salt, pubKey } = await srpServerStep1(account);
         const client = await (0, srp_1.srpClientPart)(username, password, salt, pubKey);
-        setTimeout(() => delete cache[k], 60000);
-        return srpServer.step2(client.A, client.M1).then(() => 1, () => 0);
+        return srpServer.step2(client.A, client.M1).then(() => true, () => false);
     });
     return good ? account : undefined;
 }

package/src/config.js

@@ -1,5 +1,28 @@
 "use strict";
 // This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -14,6 +37,8 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const events_1 = __importDefault(require("./events"));
 const promises_1 = require("fs/promises");
+const immer_1 = __importStar(require("immer"));
+(0, immer_1.setAutoFreeze)(false); // we still want to mess with objects later (eg: account.belongs)
 // keep definition of config properties
 const configProps = {};
 let started = false; // this will tell the difference for subscribeConfig()s that are called before or after config is loaded
@@ -78,7 +103,7 @@ function defineConfig(k, defaultValue, compiler) {
         },
         set(v) {
             if (typeof v === 'function')
-                this.set(v(this.get()));
+                this.set((0, immer_1.default)(this.get(), v));
             else
                 setConfig1(k, v);
         },

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

@@ -30,7 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CONFIG_FILE = exports.MIME_AUTO = exports.APP_PATH = exports.IS_BINARY = exports.IS_MAC = exports.IS_WINDOWS = exports.HFS_REPO_BRANCH = exports.RUNNING_BETA = exports.VERSION = exports.BUILD_TIMESTAMP = exports.HFS_STARTED = exports.ORIGINAL_CWD = exports.DEV = exports.ARGS_FILE = exports.argv = exports.HFS_REPO = exports.COMPATIBLE_API_VERSION = exports.API_VERSION = void 0;
+exports.CONFIG_FILE = exports.MIME_AUTO = exports.APP_PATH = exports.IS_BINARY = exports.IS_MAC = exports.IS_WINDOWS = exports.HFS_REPO_BRANCH = exports.RUNNING_BETA = exports.VERSION = exports.BUILD_TIMESTAMP = exports.HFS_STARTED = exports.ORIGINAL_CWD = exports.DEV = exports.ARGS_FILE = exports.argv = exports.COMPATIBLE_API_VERSION = exports.API_VERSION = void 0;
 const minimist_1 = __importDefault(require("minimist"));
 const fs = __importStar(require("fs"));
 const os_1 = require("os");
@@ -38,9 +38,8 @@ 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.1;
+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.HFS_REPO = 'rejetto/hfs';
 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
 exports.ARGS_FILE = (0, path_1.join)((0, os_1.homedir)(), 'hfs-args');
@@ -55,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-06T09:04:29.634Z";
+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-const.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HTTP_MESSAGES = exports.HTTP_SERVICE_UNAVAILABLE = exports.HTTP_SERVER_ERROR = exports.HTTP_TOO_MANY_REQUESTS = exports.HTTP_FAILED_DEPENDENCY = exports.HTTP_FOOL = exports.HTTP_RANGE_NOT_SATISFIABLE = exports.HTTP_PAYLOAD_TOO_LARGE = exports.HTTP_PRECONDITION_FAILED = exports.HTTP_CONFLICT = exports.HTTP_NOT_ACCEPTABLE = exports.HTTP_METHOD_NOT_ALLOWED = exports.HTTP_NOT_FOUND = exports.HTTP_FORBIDDEN = exports.HTTP_UNAUTHORIZED = exports.HTTP_BAD_REQUEST = exports.HTTP_NOT_MODIFIED = exports.HTTP_TEMPORARY_REDIRECT = exports.HTTP_MOVED_PERMANENTLY = exports.HTTP_PARTIAL_CONTENT = exports.HTTP_NO_CONTENT = exports.HTTP_OK = exports.PLUGIN_CUSTOM_REST_PREFIX = exports.NBSP = exports.PORT_DISABLED = exports.PLUGINS_PUB_URI = exports.API_URI = exports.ADMIN_URI = exports.FRONTEND_URI = exports.SPECIAL_URI = void 0;
+exports.HTTP_MESSAGES = exports.HTTP_SERVICE_UNAVAILABLE = exports.HTTP_SERVER_ERROR = exports.HTTP_TOO_MANY_REQUESTS = exports.HTTP_FAILED_DEPENDENCY = exports.HTTP_FOOL = exports.HTTP_RANGE_NOT_SATISFIABLE = exports.HTTP_PAYLOAD_TOO_LARGE = exports.HTTP_PRECONDITION_FAILED = exports.HTTP_CONFLICT = exports.HTTP_NOT_ACCEPTABLE = exports.HTTP_METHOD_NOT_ALLOWED = exports.HTTP_NOT_FOUND = exports.HTTP_FORBIDDEN = exports.HTTP_UNAUTHORIZED = exports.HTTP_BAD_REQUEST = exports.HTTP_NOT_MODIFIED = exports.HTTP_TEMPORARY_REDIRECT = exports.HTTP_MOVED_PERMANENTLY = exports.HTTP_PARTIAL_CONTENT = exports.HTTP_NO_CONTENT = exports.HTTP_OK = exports.HFS_REPO = exports.PLUGIN_CUSTOM_REST_PREFIX = exports.NBSP = exports.PORT_DISABLED = exports.PLUGINS_PUB_URI = exports.API_URI = exports.ADMIN_URI = exports.FRONTEND_URI = exports.SPECIAL_URI = void 0;
 exports.SPECIAL_URI = '/~/';
 exports.FRONTEND_URI = exports.SPECIAL_URI + 'frontend/';
 exports.ADMIN_URI = exports.SPECIAL_URI + 'admin/';
@@ -9,6 +9,7 @@ exports.PLUGINS_PUB_URI = exports.SPECIAL_URI + 'plugins/';
 exports.PORT_DISABLED = -1;
 exports.NBSP = '\xA0';
 exports.PLUGIN_CUSTOM_REST_PREFIX = '_';
+exports.HFS_REPO = 'rejetto/hfs';
 exports.HTTP_OK = 200;
 exports.HTTP_NO_CONTENT = 204;
 exports.HTTP_PARTIAL_CONTENT = 206;

package/src/cross.js

@@ -18,14 +18,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitFor = exports.newObj = exports.findDefined = exports.isOrderedEqual = exports.swap = exports.tryJson = exports.dirname = exports.basename = exports.pendingPromise = exports._dbg = exports._log = exports.wantArray = exports.formatPerc = exports.with_ = exports.try_ = exports.setHidden = exports.onlyTruthy = exports.truthy = exports.stringAfter = exports.splitAt = exports.strinsert = exports.removeStarting = exports.enforceStarting = exports.enforceFinal = exports.objFromKeys = exports.objSameKeys = exports.haveTimeout = exports.wait = exports.join = exports.prefix = exports.formatSpeed = exports.formatBytes = exports.isWhoObject = exports.PERM_KEYS = exports.defaultPerms = exports.WHO_ANY_ACCOUNT = exports.WHO_NO_ONE = exports.WHO_ANYONE = exports.LIST = exports.CFG = exports.THEME_OPTIONS = exports.SORT_BY_OPTIONS = exports.FRONTEND_OPTIONS = exports.MAX_TILE_SIZE = exports.DAY = exports.HOUR = exports.MINUTE = exports.WIKI_URL = exports.REPO_URL = exports.WEBSITE = void 0;
-exports.shortenAgent = exports.popKey = exports.safeDecodeURIComponent = exports.callable = exports.mapFilter = exports.inCommon = exports.replace = exports.matches = exports.makeMatcher = exports.runAt = exports.pathEncode = exports.promiseBestEffort = exports.escapeHTML = exports.ipForUrl = exports.isIpLan = exports.isIpLocalHost = exports.xlate = exports.isEqualLax = exports.isTimestampString = exports.isWindowsDrive = exports.isIP = exports.isPrimitive = exports.isNumeric = exports.formatDate = exports.formatTime = exports.formatTimestamp = exports.repeat = exports.asyncGeneratorToArray = exports.filterMapGenerator = exports.throw_ = exports.hasProp = exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.randomId = exports.getOrSet = void 0;
+exports.shortenAgent = exports.popKey = exports.safeDecodeURIComponent = exports.callable = exports.mapFilter = exports.inCommon = exports.replace = exports.matches = exports.makeMatcher = exports.runAt = exports.pathEncode = exports.promiseBestEffort = exports.escapeHTML = exports.ipForUrl = exports.isIpLan = exports.isIpLocalHost = exports.normalizeHost = exports.xlate = exports.isEqualLax = exports.isTimestampString = exports.isWindowsDrive = exports.isIP = exports.isPrimitive = exports.isNumeric = exports.formatDate = exports.formatTime = exports.formatTimestamp = exports.repeat = exports.asyncGeneratorToArray = exports.filterMapGenerator = exports.throw_ = exports.hasProp = exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.randomId = exports.getOrSet = void 0;
 // This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 // all content here is shared between client and server
 const lodash_1 = __importDefault(require("lodash"));
-const picomatch_1 = __importDefault(require("picomatch/lib/picomatch")); // point directly to the browser-compatible source
+const picomatch_1 = __importDefault(require("picomatch/lib/picomatch"));
+const cross_const_1 = require("./cross-const"); // point directly to the browser-compatible source
 __exportStar(require("./cross-const"), exports);
 exports.WEBSITE = 'https://rejetto.com/hfs/';
-exports.REPO_URL = 'https://github.com/rejetto/hfs/';
+exports.REPO_URL = `https://github.com/${cross_const_1.HFS_REPO}/`;
 exports.WIKI_URL = exports.REPO_URL + 'wiki/';
 exports.MINUTE = 60000;
 exports.HOUR = 60 * exports.MINUTE;
@@ -38,15 +39,17 @@ exports.FRONTEND_OPTIONS = {
     invert_order: false,
     folders_first: true,
     sort_numerics: false,
+    title_with_path: true,
     theme: '',
     auto_play_seconds: 5,
+    disableTranslation: false,
 };
 exports.SORT_BY_OPTIONS = ['name', 'extension', 'size', 'time'];
 exports.THEME_OPTIONS = { auto: '', light: 'light', dark: 'dark' };
 exports.CFG = constMap(['geo_enable', 'geo_allow', 'geo_list', 'geo_allow_unknown', 'dynamic_dns_url',
     'log', 'error_log', 'log_rotation', 'dont_log_net', 'log_gui', 'log_api', 'log_ua', 'log_spam', 'track_ips',
     'max_downloads', 'max_downloads_per_ip', 'max_downloads_per_account', 'roots', 'force_address', 'split_uploads',
-    'allow_session_ip_change', 'force_lang', 'suspend_plugins']);
+    'allow_session_ip_change', 'force_lang', 'suspend_plugins', 'base_url', 'size_1024']);
 exports.LIST = { add: '+', remove: '-', update: '=', props: 'props', ready: 'ready', error: 'e' };
 exports.WHO_ANYONE = true;
 exports.WHO_NO_ONE = false;
@@ -68,9 +71,11 @@ function isWhoObject(v) {
 }
 exports.isWhoObject = isWhoObject;
 const MULTIPLIERS = ['', 'K', 'M', 'G', 'T'];
-function formatBytes(n, { post = 'B', k = 1024, digits = NaN, sep = ' ' } = {}) {
+function formatBytes(n, { post = 'B', k = 0, digits = NaN, sep = ' ' } = {}) {
+    var _a;
     if (isNaN(Number(n)) || n < 0)
         return '';
+    k || (k = (_a = formatBytes.k) !== null && _a !== void 0 ? _a : 1024); // default value
     const i = n && Math.min(MULTIPLIERS.length - 1, Math.floor(Math.log2(n) / Math.log2(k)));
     n /= k ** i;
     const nAsString = i && !isNaN(digits) ? n.toFixed(digits)
@@ -79,8 +84,7 @@ function formatBytes(n, { post = 'B', k = 1024, digits = NaN, sep = ' ' } = {})
 } // formatBytes
 exports.formatBytes = formatBytes;
 function formatSpeed(n, options = {}) {
-    return formatBytes(n, { post: 'B/s', k: 1000, ...options })
-        .replace('K', 'k'); // ref https://en.wikipedia.org/wiki/Data-rate_units
+    return formatBytes(n, { post: 'B/s', ...options });
 }
 exports.formatSpeed = formatSpeed;
 function prefix(pre, v, post = '') {
@@ -386,6 +390,10 @@ function xlate(input, table) {
     return (_a = table[input]) !== null && _a !== void 0 ? _a : input;
 }
 exports.xlate = xlate;
+function normalizeHost(host) {
+    return host[0] === '[' ? host.slice(1, host.indexOf(']')) : host === null || host === void 0 ? void 0 : host.split(':')[0];
+}
+exports.normalizeHost = normalizeHost;
 function isIpLocalHost(ip) {
     return ip === '::1' || ip.endsWith('127.0.0.1');
 }

package/src/expiringCache.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.expiringCache = void 0;
+function expiringCache(ttl) {
+    const o = new Map();
+    return Object.assign(o, {
+        try(k, creator) {
+            let ret = o.get(k);
+            if (ret === undefined) {
+                ret = creator();
+                o.set(k, ret);
+                Promise.resolve(ret).then(() => // in case of async, wait for it to be done before starting the timer
+                 setTimeout(() => o.delete(k), ttl));
+            }
+            return ret;
+        },
+    });
+}
+exports.expiringCache = expiringCache;

package/src/i18n.js

@@ -0,0 +1,125 @@
+"use strict";
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.i18nFromTranslations = void 0;
+const valtio_1 = require("valtio");
+const utils_1 = require("valtio/utils");
+function i18nFromTranslations(translations, embedded = 'en') {
+    const state = (0, valtio_1.proxy)({
+        embedded,
+        disabled: false,
+        translations, // all dictionaries
+    });
+    const searchLangs = [];
+    (0, utils_1.watch)(get => {
+        const snapshot = get(state);
+        searchLangs.splice(0, Infinity, 'all', ...Object.keys(snapshot.translations), snapshot.embedded); // replace completely
+    });
+    const warns = new Set(); // avoid duplicates
+    function getLangs() {
+        return Object.keys(state.translations);
+    }
+    // If one of the keys is an "id", that should be the first. If one of the keys should work as a fallback, that should be the last. Use 'fallback' parameter if you don't want the fallback to work as a key.
+    function t(keyOrTpl, params, fallback) {
+        var _a, _b;
+        if (!keyOrTpl)
+            return '';
+        // memoize?
+        const keys = isTemplateStringsArray(keyOrTpl) ? [(fallback !== null && fallback !== void 0 ? fallback : (fallback = keyOrTpl[0]))]
+            : Array.isArray(keyOrTpl) ? keyOrTpl : [keyOrTpl];
+        if (typeof params === 'string' && !fallback) {
+            fallback = params;
+            params = null;
+        }
+        let found;
+        let selectedLang = ''; // keep track of where we find the translation
+        const { embedded } = state;
+        const langs = Object.keys(state.translations);
+        if (!state.disabled)
+            for (const key of keys) {
+                for (const lang of searchLangs)
+                    if (found = (_b = (_a = state.translations[selectedLang = lang]) === null || _a === void 0 ? void 0 : _a.translate) === null || _b === void 0 ? void 0 : _b[key])
+                        break;
+                if (!warns.has(key) && langs.length && langs[0] !== embedded) {
+                    warns.add(key);
+                    console.debug("miss i18n:", key);
+                }
+            }
+        if (!found) {
+            found = fallback || keys[keys.length - 1];
+            selectedLang = embedded;
+        }
+        return Array.from(tokenizer(found)).map(([s, inside]) => {
+            if (!inside)
+                return s;
+            const [k, cmd, rest] = s.split(',').map(x => x.trim());
+            if (!params)
+                throw "missing params on " + keys[0];
+            const v = k && params[k];
+            if (cmd === 'plural' && rest)
+                return plural(v, rest);
+            return v || v === 0 ? v : '';
+        }).join('');
+        function plural(v, rest) {
+            const plural = !Intl.PluralRules ? 'other'
+                : new Intl.PluralRules(selectedLang || embedded).select(Number(v));
+            let other = '';
+            let pickNext = false;
+            let collectOther = false;
+            for (const [s, inside] of tokenizer(rest)) {
+                if (pickNext)
+                    return pick(s);
+                if (collectOther) {
+                    other = s;
+                    collectOther = false;
+                }
+                if (inside)
+                    continue;
+                const selectors = s.trim().split(/\s+/);
+                pickNext = selectors.some(sel => sel[0] === '=' && v === Number(sel.slice(1))
+                    || sel === plural);
+                collectOther = !pickNext && selectors.includes('other');
+            }
+            return pick(other);
+            function pick(s) {
+                return s.replace('#', String(v));
+            }
+        }
+    }
+    function* tokenizer(s) {
+        let ofs = 0;
+        while (1) {
+            const open = s.indexOf('{', ofs);
+            if (open < 0)
+                break;
+            yield [s.slice(ofs, open), false];
+            let stack = 1;
+            ofs = open + 1;
+            while (stack && ofs < s.length) {
+                if (s[ofs] === '{')
+                    stack++;
+                else if (s[ofs] === '}')
+                    stack--;
+                ofs++;
+            }
+            if (stack)
+                return console.debug('tokenizer: unclosed'); // invalid, abort
+            yield [s.slice(open + 1, ofs - 1), true];
+        }
+        yield [s.slice(ofs), false];
+    }
+    function isTemplateStringsArray(x) {
+        return (x === null || x === void 0 ? void 0 : x.raw) && Array.isArray(x);
+    }
+    return {
+        t,
+        state,
+        getLangs,
+        i18nWrapperProps: () => ({ lang: getLangs()[0] || state.embedded }),
+        useI18N() {
+            (0, valtio_1.useSnapshot)(state);
+            return { t };
+        }
+    };
+}
+exports.i18nFromTranslations = i18nFromTranslations;

package/src/lang.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLangData = exports.file2code = exports.code2file = void 0;
 const misc_1 = require("./misc");
+const expiringCache_1 = require("./expiringCache");
 const promises_1 = require("fs/promises");
 const config_1 = require("./config");
 const watchLoad_1 = require("./watchLoad");
@@ -23,42 +24,49 @@ function file2code(fn) {
     return fn.replace(PREFIX, '').replace(SUFFIX, '');
 }
 exports.file2code = file2code;
-async function getLangData(ctx) {
-    var _a;
-    const param = String(ctx.query.lang || '');
-    if (!param && forceLangData)
-        return forceLangData;
-    const ret = {};
-    const csv = param || ctx.get('Accept-Language') || '';
-    const langs = (0, misc_1.wantArray)(csv.split(',').map(x => x.toLowerCase()));
-    let i = 0;
-    while (i < langs.length) {
-        let k = langs[i] || ''; // shut up ts
-        if (!k || k === EMBEDDED_LANGUAGE)
-            break;
-        const fn = code2file(k);
-        try {
-            ret[k] = JSON.parse(await (0, promises_1.readFile)(fn, 'utf8'));
-        }
-        catch (_b) {
-            if ((0, misc_1.hasProp)(embedded_1.default, k))
-                ret[k] = embedded_1.default[k];
-            else {
-                do {
-                    k = k.substring(0, k.lastIndexOf('-'));
-                } while (k && langs.includes(k));
-                if (k) {
-                    langs[i] = k; // overwrite and retry
-                    continue;
+const cache = (0, expiringCache_1.expiringCache)(3000); // 3 seconds for both a good dx and acceptable performance
+async function getLangData(ctxOrLangCsv) {
+    if (typeof ctxOrLangCsv !== 'string') {
+        const ctx = ctxOrLangCsv;
+        const param = String(ctx.query.lang || '');
+        if (!param && forceLangData)
+            return forceLangData;
+        ctxOrLangCsv = param || ctx.get('Accept-Language') || '';
+    }
+    const csv = ctxOrLangCsv.toLowerCase();
+    return cache.try(csv, async () => {
+        var _a;
+        const langs = csv.split(',');
+        const ret = {};
+        let i = 0;
+        while (i < langs.length) {
+            let k = langs[i] || ''; // shut up ts
+            if (!k || k === EMBEDDED_LANGUAGE)
+                break;
+            const fn = code2file(k);
+            try {
+                ret[k] = JSON.parse(await (0, promises_1.readFile)(fn, 'utf8'));
+            } // allow external files to override embedded translations
+            catch (_b) {
+                if ((0, misc_1.hasProp)(embedded_1.default, k))
+                    ret[k] = lodash_1.default.cloneDeep(embedded_1.default[k]);
+                else {
+                    do {
+                        k = k.substring(0, k.lastIndexOf('-'));
+                    } while (k && langs.includes(k));
+                    if (k) {
+                        langs[i] = k; // overwrite and retry
+                        continue;
+                    }
                 }
             }
+            const fromPlugins = (0, misc_1.onlyTruthy)(await Promise.all((0, plugins_1.mapPlugins)(async (pl) => { var _a; return (_a = (0, misc_1.tryJson)(await (0, promises_1.readFile)((0, path_1.join)(pl.folder, fn), 'utf8').catch(() => ''))) === null || _a === void 0 ? void 0 : _a.translate; })));
+            if (fromPlugins.length)
+                lodash_1.default.defaults((_a = (ret[k] || (ret[k] = {}))).translate || (_a.translate = {}), ...fromPlugins); // be sure we have an entry for k
+            i++;
         }
-        const fromPlugins = (0, misc_1.onlyTruthy)(await Promise.all((0, plugins_1.mapPlugins)(async (pl) => { var _a; return (_a = (0, misc_1.tryJson)(await (0, promises_1.readFile)((0, path_1.join)(pl.folder, fn), 'utf8').catch(() => ''))) === null || _a === void 0 ? void 0 : _a.translate; })));
-        if (fromPlugins.length)
-            lodash_1.default.defaults((_a = (ret[k] || (ret[k] = {}))).translate || (_a.translate = {}), ...fromPlugins); // be sure we have an entry for k
-        i++;
-    }
-    return ret;
+        return ret;
+    });
 }
 exports.getLangData = getLangData;
 let forceLangData;

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"
     }
 }