hfs 0.51.1 → 0.52.0-alpha2

package/src/cross.js

@@ -17,8 +17,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasProp = exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.randomId = exports.getOrSet = 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.splitAt = exports.removeStarting = exports.enforceFinal = exports.objSameKeys = exports.haveTimeout = exports.wait = 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 = void 0;
-exports.shortenAgent = exports.matches = exports.makeMatcher = exports.runAt = exports.pathEncode = exports.promiseBestEffort = exports.escapeHTML = exports.ipForUrl = exports.isIpLan = exports.isIpLocalHost = exports.xlate = exports.isEqualLax = exports.isWindowsDrive = exports.isIP = exports.isPrimitive = exports.formatTimestamp = exports.repeat = exports.asyncGeneratorToArray = exports.filterMapGenerator = exports.throw_ = void 0;
+exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.randomId = exports.getOrSet = 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.splitAt = exports.strinsert = exports.removeStarting = exports.enforceFinal = exports.objSameKeys = exports.haveTimeout = exports.wait = 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 = void 0;
+exports.shortenAgent = 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.isWindowsDrive = exports.isIP = exports.isPrimitive = exports.formatTimestamp = exports.repeat = exports.asyncGeneratorToArray = exports.filterMapGenerator = exports.throw_ = exports.hasProp = 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"));
@@ -38,10 +38,12 @@ exports.FRONTEND_OPTIONS = {
     folders_first: true,
     sort_numerics: false,
     theme: '',
+    auto_play_seconds: 5,
 };
 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',
+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',
     'max_downloads', 'max_downloads_per_ip', 'max_downloads_per_account', 'roots', 'roots_mandatory']);
 exports.LIST = { add: '+', remove: '-', update: '=', props: 'props', ready: 'ready', error: 'e' };
 exports.WHO_ANYONE = true;
@@ -103,6 +105,10 @@ function removeStarting(sub, s) {
     return s.startsWith(sub) ? s.slice(sub.length) : s;
 }
 exports.removeStarting = removeStarting;
+function strinsert(s, at, insert, remove = 0) {
+    return s.slice(0, at) + insert + s.slice(at + remove);
+}
+exports.strinsert = strinsert;
 function splitAt(sub, all) {
     if (typeof sub === 'number')
         return [all.slice(0, sub), all.slice(sub + 1)];
@@ -168,7 +174,7 @@ function basename(path) {
 }
 exports.basename = basename;
 function dirname(path) {
-    return path.slice(0, path.lastIndexOf('/', path.length - 1));
+    return path.slice(0, Math.max(0, path.lastIndexOf('/', path.length - 1)));
 }
 exports.dirname = dirname;
 function tryJson(s, except) {
@@ -296,12 +302,17 @@ async function asyncGeneratorToArray(generator) {
     return ret;
 }
 exports.asyncGeneratorToArray = asyncGeneratorToArray;
-function repeat(every, cb) {
-    return Promise.allSettled([cb()]).then(() => setTimeout(() => repeat(every, cb), every));
+function repeat(everyMs, cb) {
+    let stop = false;
+    setTimeout(async () => {
+        while (!stop && await Promise.allSettled([cb()]))
+            await wait(everyMs);
+    });
+    return () => stop = true;
 }
 exports.repeat = repeat;
 function formatTimestamp(x) {
-    return x ? new Date(x).toLocaleString() : '-';
+    return !x ? '-' : (x instanceof Date ? x : new Date(x)).toLocaleString();
 }
 exports.formatTimestamp = formatTimestamp;
 function isPrimitive(x) {
@@ -387,6 +398,13 @@ function matches(s, mask, emptyMaskReturns = false) {
     return makeMatcher(mask, emptyMaskReturns)(s); // adding () will allow us to use the pipe at root level
 }
 exports.matches = matches;
+function replace(s, symbols, delimiter = '') {
+    const [open, close] = splitAt(' ', delimiter);
+    for (const [k, v] of typedEntries(symbols))
+        s = s.replace(open + k + close, lodash_1.default.isFunction(v) ? v() : v);
+    return s;
+}
+exports.replace = replace;
 function shortenAgent(agent) {
     var _a;
     return lodash_1.default.findKey(BROWSERS, re => re.test(agent))

package/src/customHtml.js

@@ -8,7 +8,7 @@ const promises_1 = require("fs/promises");
 const plugins_1 = require("./plugins");
 const FILE = 'custom.html';
 exports.customHtmlSections = ['beforeHeader', 'afterHeader', 'afterMenuBar', 'afterList',
-    'top', 'bottom', 'afterEntryName', 'beforeLogin', 'unauthorized'];
+    'top', 'bottom', 'afterEntryName', 'beforeLogin', 'unauthorized', 'htmlHead'];
 exports.customHtmlState = (0, vanilla_1.proxy)({
     sections: watchLoadCustomHtml().state
 });

package/src/ddns.js

@@ -0,0 +1,53 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get_dynamic_dns_error = void 0;
+const config_1 = require("./config");
+const cross_1 = require("./cross");
+const lodash_1 = __importDefault(require("lodash"));
+const util_http_1 = require("./util-http");
+const node_net_1 = require("node:net");
+const net_1 = require("net");
+const const_1 = require("./const");
+const events_1 = __importDefault(require("./events"));
+const stream_1 = require("stream");
+const nat_1 = require("./nat");
+// optionally you can append '>' and a regular expression to determine what body is considered successful
+const dynamicDnsUrl = (0, config_1.defineConfig)(cross_1.CFG.dynamic_dns_url, '');
+let stop;
+let last;
+dynamicDnsUrl.sub(v => {
+    stop === null || stop === void 0 ? void 0 : stop();
+    if (!v)
+        return;
+    let lastIps;
+    const [templateUrl, re] = (0, cross_1.splitAt)('>', v);
+    stop = (0, cross_1.repeat)(cross_1.HOUR, async () => {
+        const ips = await (0, nat_1.getPublicIps)();
+        if (lodash_1.default.isEqual(lastIps, ips))
+            return;
+        lastIps = ips;
+        const url = (0, cross_1.replace)(templateUrl, {
+            IPX: ips[0] || '',
+            IP4: lodash_1.default.find(ips, node_net_1.isIPv4) || '',
+            IP6: lodash_1.default.find(ips, net_1.isIPv6) || '',
+        }, '$');
+        const error = await (0, util_http_1.httpWithBody)(url, { httpThrow: false, headers: { 'User-Agent': "HFS/" + const_1.VERSION } }) // UA specified as requested by no-ip guidelines
+            .then(async (res) => {
+            const str = String(res.body).trim();
+            return (re ? str.match(re) : res.ok) ? '' : (str || res.statusMessage);
+        }, (err) => err.code || err.message || String(err));
+        last = { ts: new Date().toJSON(), error, url };
+        events_1.default.emit('dynamicDnsError', last);
+        console.log('dynamic dns update', error || 'ok');
+    });
+});
+async function* get_dynamic_dns_error() {
+    while (1) {
+        yield last;
+        await (0, stream_1.once)(events_1.default, 'dynamicDnsError');
+    }
+}
+exports.get_dynamic_dns_error = get_dynamic_dns_error;

package/src/github.js

@@ -78,12 +78,12 @@ async function downloadPlugin(repo, { branch = '', overwrite = false } = {}) {
                     return false;
                 let dest = path.slice(folder.length);
                 if (dest === MAIN) // avoid being possibly loaded before the download is complete
-                    dest += plugins_1.DISABLING_POSTFIX;
+                    dest += plugins_1.DISABLING_SUFFIX;
                 dest = (0, path_1.join)(installPath, dest);
                 return (0, promises_1.rm)(dest, { force: true }).then(() => dest, () => false);
             });
             const main = (0, path_1.join)(installPath, MAIN);
-            await (0, promises_1.rename)(main + plugins_1.DISABLING_POSTFIX, main) // we are good now, restore name
+            await (0, promises_1.rename)(main + plugins_1.DISABLING_SUFFIX, main) // we are good now, restore name
                 .catch(e => { throw e.code !== 'ENOENT' ? e : new apiMiddleware_1.ApiError(const_1.HTTP_NOT_ACCEPTABLE, "missing main file"); });
             return folder;
         }

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

@@ -132,6 +132,15 @@
         "Cancel clipboard": "Annulla appunti",
         "to_clipboard_source": "Torna all'origine'",
         "Paste": "Incolla",
-        "clipboard_list": "Elementi negli appunti"
+        "clipboard_list": "Elementi negli appunti",
+        "Close": "Chiudi",
+        "Folder": "Cartella",
+        "Web page": "Pagina web",
+        "Link": "Link",
+        "Auto-play": "Auto-play",
+        "autoplay_seconds": "Secondi di attesa mostrando immagini",
+        "Select all": "Seleziona tutto",
+        "go_first": "Vai all'inizio",
+        "go_last": "Vai alla fine"
     }
 }

package/src/log.js

@@ -37,6 +37,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const util_files_1 = require("./util-files");
 const auth_1 = require("./auth");
 const misc_1 = require("./misc");
+const path_1 = require("path");
 const events_1 = __importDefault(require("./events"));
 const connections_1 = require("./connections");
 const index_1 = require("./index");
@@ -69,8 +70,8 @@ class Logger {
     }
 }
 // we'll have names same as config keys. These are used also by the get_log api.
-const accessLogger = new Logger('log');
-const accessErrorLog = new Logger('error_log');
+const accessLogger = new Logger(misc_1.CFG.log);
+const accessErrorLog = new Logger(misc_1.CFG.error_log);
 exports.loggers = [accessLogger, accessErrorLog];
 (0, config_1.defineConfig)(accessLogger.name, 'logs/access.log').sub(path => {
     console.debug('access log file: ' + (path || 'disabled'));
@@ -81,9 +82,9 @@ errorLogFile.sub(path => {
     console.debug('access error log: ' + (path || 'disabled'));
     accessErrorLog.setPath(path);
 });
-const logRotation = (0, config_1.defineConfig)('log_rotation', 'weekly');
-const dontLogNet = (0, config_1.defineConfig)('dont_log_net', '127.0.0.1|::1', v => (0, misc_1.makeNetMatcher)(v));
-const logUA = (0, config_1.defineConfig)('log_ua', false);
+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 debounce = lodash_1.default.debounce(cb => cb(), 1000);
 const logMw = async (ctx, next) => {
     const now = new Date();
@@ -113,9 +114,10 @@ const logMw = async (ctx, next) => {
                 || rotate === 'd' && (passed >= misc_1.DAY || now.getDate() !== last.getDate()) // checking passed will solve the case when the day of the month is the same but a month has passed
                 || rotate === 'w' && (passed >= 7 * misc_1.DAY || now.getDay() < last.getDay())) {
                 stream.end();
-                const postfix = last.getFullYear() + '-' + doubleDigit(last.getMonth() + 1) + '-' + doubleDigit(last.getDate());
+                const suffix = '-' + last.getFullYear() + '-' + doubleDigit(last.getMonth() + 1) + '-' + doubleDigit(last.getDate());
+                const newPath = (0, misc_1.strinsert)(path, path.length - (0, path_1.extname)(path).length, suffix);
                 try { // other logging requests shouldn't happen while we are renaming. Since this is very infrequent we can tolerate solving this by making it sync.
-                    (0, fs_1.renameSync)(path, path + '-' + postfix);
+                    (0, fs_1.renameSync)(path, newPath);
                 }
                 catch (e) { // ok, rename failed, but this doesn't mean we ain't gonna log
                     console.error(String(e || e.message));

package/src/middlewares.js

@@ -96,36 +96,40 @@ function getProxyDetected() {
 }
 exports.getProxyDetected = getProxyDetected;
 const prepareState = async (ctx, next) => {
-    var _a;
-    if (ctx.session) {
+    var _a, _b;
+    if ((_a = ctx.session) === null || _a === void 0 ? void 0 : _a.username) {
         if (auth_1.invalidSessions.delete(ctx.session.username))
             delete ctx.session.username;
         ctx.session.maxAge = exports.sessionDuration.compiled();
     }
     // calculate these once and for all
     ctx.state.connection = (0, connections_1.socket2connection)(ctx.socket);
-    const a = ctx.state.account = await urlLogin() || await getHttpAccount() || (0, perm_1.getAccount)((_a = ctx.session) === null || _a === void 0 ? void 0 : _a.username, false);
+    const a = ctx.state.account = await urlLogin() || await getHttpAccount() || (0, perm_1.getAccount)((_b = ctx.session) === null || _b === void 0 ? void 0 : _b.username, false);
     if (a && !(0, perm_1.accountCanLogin)(a))
         ctx.state.account = undefined;
     ctx.state.revProxyPath = ctx.get('x-forwarded-prefix');
     (0, connections_1.updateConnectionForCtx)(ctx);
     await next();
-    async function urlLogin() {
+    function urlLogin() {
         const { login } = ctx.query;
         if (!login)
             return;
         const [u, p] = (0, misc_1.splitAt)(':', String(login));
+        ctx.redirect(ctx.originalUrl.slice(0, -ctx.querystring.length - 1)); // redirect to hide credentials
+        return doLogin(u, p);
+    }
+    function getHttpAccount() {
+        const credentials = (0, basic_auth_1.default)(ctx.req);
+        return doLogin((credentials === null || credentials === void 0 ? void 0 : credentials.name) || '', (credentials === null || credentials === void 0 ? void 0 : credentials.pass) || '');
+    }
+    async function doLogin(u, p) {
         const a = await (0, auth_1.srpCheck)(u, p);
         if (a) {
-            ctx.session.username = a.username;
-            ctx.redirect(ctx.originalUrl.slice(0, -ctx.querystring.length - 1));
+            (0, auth_1.setLoggedIn)(ctx, a.username);
+            ctx.headers['x-username'] = a.username; // give an easier way to determine if the login was successful
         }
         return a;
     }
-    async function getHttpAccount() {
-        const credentials = (0, basic_auth_1.default)(ctx.req);
-        return (0, auth_1.srpCheck)((credentials === null || credentials === void 0 ? void 0 : credentials.name) || '', (credentials === null || credentials === void 0 ? void 0 : credentials.pass) || '');
-    }
 };
 exports.prepareState = prepareState;
 const paramsDecoder = async (ctx, next) => {

package/src/misc.js

@@ -118,6 +118,10 @@ function asyncGeneratorToReadable(generator) {
     const iterator = generator[Symbol.asyncIterator]();
     return new stream_1.Readable({
         objectMode: true,
+        destroy() {
+            var _a;
+            (_a = iterator.return) === null || _a === void 0 ? void 0 : _a.call(iterator);
+        },
         read() {
             iterator.next().then(it => this.push(it.done ? null : it.value));
         }

package/src/nat.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNatInfo = exports.upnpClient = exports.getBaseUrlOrDefault = exports.defaultBaseUrl = void 0;
+exports.getNatInfo = exports.getPublicIps = exports.upnpClient = exports.defaultBaseUrl = void 0;
 const valtio_1 = require("valtio");
 const nat_upnp_ts_1 = require("nat-upnp-ts");
 const debounceAsync_1 = require("./debounceAsync");
@@ -27,10 +27,6 @@ exports.defaultBaseUrl = (0, valtio_1.proxy)({
         return `${this.proto}://${this.publicIps[0] || this.externalIp || this.localIp}${!this.port || this.port === defPort ? '' : ':' + this.port}`;
     }
 });
-function getBaseUrlOrDefault() {
-    return listen_1.baseUrl.get() || exports.defaultBaseUrl.get();
-}
-exports.getBaseUrlOrDefault = getBaseUrlOrDefault;
 exports.upnpClient = new nat_upnp_ts_1.Client({ timeout: 4000 });
 const originalMethod = exports.upnpClient.getGateway;
 // other client methods call getGateway too, so this will ensure they reuse this same result
@@ -42,10 +38,10 @@ exports.upnpClient.getGateway().then(res => {
 (0, cross_1.repeat)(10 * cross_1.MINUTE, () => exports.upnpClient.getPublicIp().then(v => {
     if (v === exports.defaultBaseUrl.externalIp)
         return;
-    getPublicIps.clearRetain();
+    exports.getPublicIps.clearRetain();
     return exports.defaultBaseUrl.externalIp = v;
 }));
-const getPublicIps = (0, debounceAsync_1.debounceAsync)(async () => {
+exports.getPublicIps = (0, debounceAsync_1.debounceAsync)(async () => {
     const res = await (0, github_1.getProjectInfo)();
     const groupedByVersion = Object.values(lodash_1.default.groupBy(res.publicIpServices, x => { var _a; return (_a = x.v) !== null && _a !== void 0 ? _a : 4; }));
     const ips = await (0, cross_1.promiseBestEffort)(groupedByVersion.map(singleVersion => Promise.any(singleVersion.map(async (svc) => {
@@ -69,7 +65,7 @@ const getPublicIps = (0, debounceAsync_1.debounceAsync)(async () => {
 }, 0, { retain: 10 * cross_1.MINUTE });
 exports.getNatInfo = (0, debounceAsync_1.debounceAsync)(async () => {
     var _a, _b, _c, _d;
-    const gettingIps = getPublicIps(); // don't wait, do it in parallel
+    const gettingIps = (0, exports.getPublicIps)(); // don't wait, do it in parallel
     const res = await exports.upnpClient.getGateway().catch(() => null);
     const status = await (0, listen_1.getServerStatus)();
     const mappings = res && await (0, cross_1.haveTimeout)(5000, exports.upnpClient.getMappings()).catch(() => null);

package/src/perm.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.accountCanLoginAdmin = exports.accountCanLogin = exports.accountHasPassword = exports.getFromAccount = exports.delAccount = exports.setAccount = exports.addAccount = exports.renameAccount = exports.normalizeUsername = exports.accountsConfig = exports.updateAccount = exports.createAdmin = exports.allowClearTextLogin = 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.expandUsername = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const crypt_1 = require("./crypt");
 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");
 let accounts = {};
 // provides the username and all other usernames it inherits based on the 'belongs' attribute. Useful to check permissions
 function expandUsername(who) {
@@ -37,7 +37,6 @@ function saveSrpInfo(account, salt, verifier) {
     account.srp = String(salt) + '|' + String(verifier);
 }
 exports.saveSrpInfo = saveSrpInfo;
-exports.allowClearTextLogin = (0, config_1.defineConfig)('allow_clear_text_login', false);
 const createAdminConfig = (0, config_1.defineConfig)('create-admin', '');
 createAdminConfig.sub(v => {
     if (!v)
@@ -45,31 +44,29 @@ createAdminConfig.sub(v => {
     createAdmin(v);
     createAdminConfig.set('');
 });
-function createAdmin(pass, username = 'admin') {
+function createAdmin(password, username = 'admin') {
     const acc = addAccount(username, { admin: true });
     if (!acc)
         return console.log("cannot create, already exists");
-    updateAccount(acc, acc => { acc.password = pass; });
+    updateAccount(acc, { password });
     console.log("account admin created");
 }
 exports.createAdmin = createAdmin;
 const srp6aNimbusRoutines = new tssrp6a_1.SRPRoutines(new tssrp6a_1.SRPParameters());
-async function updateAccount(account, changer) {
-    const was = JSON.stringify(account);
-    await (changer === null || changer === void 0 ? void 0 : changer(account));
+async function updateAccount(account, change) {
+    const jsonWas = JSON.stringify(account);
+    const { username: usernameWas } = account;
+    if (typeof change === 'function')
+        await (change === null || change === void 0 ? void 0 : change(account));
+    else
+        Object.assign(account, (0, misc_1.objSameKeys)(change, x => x || undefined));
     const { username } = account;
     if (account.password) {
         console.debug('hashing password for', username);
-        if (exports.allowClearTextLogin.get())
-            account.hashed_password = await (0, crypt_1.hashPassword)(account.password);
         const res = await (0, tssrp6a_1.createVerifierAndSalt)(srp6aNimbusRoutines, username, account.password);
         saveSrpInfo(account, res.s, res.v);
         delete account.password;
     }
-    else if (!account.srp && account.hashed_password) {
-        console.log('please reset password for account', username);
-        process.exit(1);
-    }
     if (account.belongs) {
         account.belongs = (0, misc_1.wantArray)(account.belongs);
         lodash_1.default.remove(account.belongs, b => {
@@ -79,7 +76,10 @@ async function updateAccount(account, changer) {
             return true;
         });
     }
-    if (was !== JSON.stringify(account))
+    account.expire && (account.expire = new Date(account.expire));
+    if (username !== usernameWas)
+        renameAccount(usernameWas, username);
+    if (jsonWas !== JSON.stringify(account))
         saveAccountsAsap();
 }
 exports.updateAccount = updateAccount;
@@ -96,7 +96,7 @@ exports.accountsConfig.sub(obj => {
                 saveAccountsAsap();
             (0, misc_1.setHidden)(rec, { username: norm });
         }
-        updateAccount(rec).then(); // work password fields
+        updateAccount(rec, {}).then(); // work fields
     });
 });
 function normalizeUsername(username) {
@@ -126,30 +126,15 @@ function renameAccount(from, to) {
     }
 }
 exports.renameAccount = renameAccount;
-// we consider all the following fields, when falsy, as equivalent to be missing. If this changes in the future, please adjust addAccount and setAccount
-const assignableProps = ['redirect', 'ignore_limits', 'belongs', 'admin', 'disabled', 'disable_password_change'];
 function addAccount(username, props) {
     username = normalizeUsername(username);
     if (!username || getAccount(username, false))
         return;
-    const filteredProps = lodash_1.default.pickBy(lodash_1.default.pick(props, assignableProps), Boolean);
-    const copy = (0, misc_1.setHidden)(filteredProps, { username }); // have the field in the object but hidden so that stringification won't include it
+    const copy = (0, misc_1.setHidden)(lodash_1.default.pickBy(props, Boolean), { username }); // have the field in the object but hidden so that stringification won't include it
     exports.accountsConfig.set(accounts => Object.assign(accounts, { [username]: copy }));
     return copy;
 }
 exports.addAccount = addAccount;
-function setAccount(acc, changes) {
-    const rest = lodash_1.default.pick(changes, assignableProps);
-    for (const [k, v] of Object.entries(rest))
-        if (!v)
-            rest[k] = undefined;
-    Object.assign(acc, rest);
-    if (changes.username)
-        renameAccount(acc.username, changes.username);
-    saveAccountsAsap();
-    return acc;
-}
-exports.setAccount = setAccount;
 function delAccount(username) {
     if (!getAccount(username))
         return false;
@@ -174,7 +159,7 @@ function getFromAccount(account, getter) {
 }
 exports.getFromAccount = getFromAccount;
 function accountHasPassword(account) {
-    return Boolean(account.password || account.hashed_password || account.srp);
+    return Boolean(account.password || account.srp);
 }
 exports.accountHasPassword = accountHasPassword;
 function accountCanLogin(account) {
@@ -183,9 +168,18 @@ function accountCanLogin(account) {
 exports.accountCanLogin = accountCanLogin;
 function allDisabled(account) {
     var _a;
-    return Boolean(account.disabled || ((_a = account.belongs) === null || _a === void 0 ? void 0 : _a.map(u => getAccount(u, false)).every(a => a && allDisabled(a))));
+    return Boolean(account.disabled
+        || account.expire < Date.now()
+        || ((_a = account.belongs) === null || _a === void 0 ? void 0 : _a.map(u => getAccount(u, false)).every(a => a && allDisabled(a))));
 }
 function accountCanLoginAdmin(account) {
     return accountCanLogin(account) && Boolean(getFromAccount(account, a => a.admin));
 }
 exports.accountCanLoginAdmin = accountCanLoginAdmin;
+async function changeSrpHelper(account, salt, verifier) {
+    if (!salt || !verifier)
+        return new apiMiddleware_1.ApiError(misc_1.HTTP_BAD_REQUEST, 'missing parameters');
+    await updateAccount(account, account => saveSrpInfo(account, salt, verifier));
+    return {};
+}
+exports.changeSrpHelper = changeSrpHelper;

package/src/plugins.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMissingDependencies = exports.parsePluginSource = exports.rescan = exports.pluginsConfig = exports.enablePlugins = exports.pluginsWatcher = exports.getAvailablePlugins = exports.mapPlugins = exports.Plugin = exports.pluginsMiddleware = exports.getPluginConfigFields = exports.findPluginByRepo = exports.getPluginInfo = exports.setPluginConfig = exports.startPlugin = exports.stopPlugin = exports.enablePlugin = exports.isPluginEnabled = exports.isPluginRunning = exports.STORAGE_FOLDER = exports.DISABLING_POSTFIX = exports.PATH = void 0;
+exports.getMissingDependencies = exports.parsePluginSource = exports.rescan = exports.pluginsConfig = exports.enablePlugins = exports.pluginsWatcher = exports.getAvailablePlugins = exports.mapPlugins = exports.Plugin = exports.pluginsMiddleware = exports.getPluginConfigFields = exports.findPluginByRepo = exports.getPluginInfo = exports.setPluginConfig = exports.startPlugin = exports.stopPlugin = exports.enablePlugin = exports.isPluginEnabled = exports.isPluginRunning = exports.STORAGE_FOLDER = exports.DISABLING_SUFFIX = exports.PATH = void 0;
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const watchLoad_1 = require("./watchLoad");
 const lodash_1 = __importDefault(require("lodash"));
@@ -43,7 +43,7 @@ const connections_1 = require("./connections");
 const path_1 = require("path");
 const customHtml_1 = require("./customHtml");
 exports.PATH = 'plugins';
-exports.DISABLING_POSTFIX = '-disabled';
+exports.DISABLING_SUFFIX = '-disabled';
 exports.STORAGE_FOLDER = 'storage';
 const plugins = {};
 function isPluginRunning(id) {
@@ -294,7 +294,7 @@ async function rescan() {
         patterns.push((0, misc_1.adjustStaticPathForGlob)(const_1.APP_PATH) + '/' + patterns[0]);
     const met = [];
     for (const { path, dirent } of await (0, fast_glob_1.default)(patterns, { onlyFiles: false, suppressErrors: true, objectMode: true })) {
-        if (!dirent.isDirectory() || path.endsWith(exports.DISABLING_POSTFIX))
+        if (!dirent.isDirectory() || path.endsWith(exports.DISABLING_SUFFIX))
             continue;
         const id = path.split('/').slice(-1)[0];
         met.push(id);

package/src/serveGuiFiles.js

@@ -42,7 +42,7 @@ const customHtml_1 = require("./customHtml");
 const lodash_1 = __importDefault(require("lodash"));
 const config_1 = require("./config");
 const lang_1 = require("./lang");
-exports.logGui = (0, config_1.defineConfig)('log_gui', false);
+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
 // in case of dev env we have our static files within the 'dist' folder'
 const DEV_STATIC = process.env.DEV ? 'dist/' : '';
@@ -143,6 +143,7 @@ async function treatIndex(ctx, filesUri, body) {
         `);
     if (isFrontend)
         ret = ret
+            .replace('<head>', '<head>' + (0, customHtml_1.getSection)('htmlHead'))
             .replace('<body>', '<body>' + (0, customHtml_1.getSection)('top'))
             .replace('</body>', (0, customHtml_1.getSection)('bottom') + '</body>');
     return ret;

package/src/util-http.js

@@ -4,22 +4,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpStream = exports.httpString = exports.stream2string = void 0;
+exports.httpStream = exports.httpWithBody = exports.httpString = exports.stream2string = void 0;
 const node_https_1 = __importDefault(require("node:https"));
 const node_http_1 = __importDefault(require("node:http"));
 const node_stream_1 = require("node:stream");
 const lodash_1 = __importDefault(require("lodash"));
 const consumers_1 = require("node:stream/consumers");
 Object.defineProperty(exports, "stream2string", { enumerable: true, get: function () { return consumers_1.text; } });
-// in case the response is not 2xx, it will throw and the error object is the Response object
 async function httpString(url, options) {
-    const res = await httpStream(url, options);
-    if (!lodash_1.default.inRange(res.statusCode, 200, 299))
-        throw res;
-    return await (0, consumers_1.text)(res);
+    return await (0, consumers_1.text)(await httpStream(url, options));
 }
 exports.httpString = httpString;
-function httpStream(url, { body, jar, noRedirect, ...options } = {}) {
+async function httpWithBody(url, options) {
+    const req = await httpStream(url, options);
+    return Object.assign(req, {
+        ok: lodash_1.default.inRange(req.statusCode, 200, 300),
+        body: req.statusCode ? await (0, consumers_1.buffer)(req) : undefined,
+    });
+}
+exports.httpWithBody = httpWithBody;
+function httpStream(url, { body, jar, noRedirect, httpThrow, ...options } = {}) {
     return new Promise((resolve, reject) => {
         var _a, _b;
         var _c;
@@ -45,7 +49,7 @@ function httpStream(url, { body, jar, noRedirect, ...options } = {}) {
                     else
                         delete jar[k];
                 }
-            if (!res.statusCode || res.statusCode >= 400)
+            if (!res.statusCode || (httpThrow !== null && httpThrow !== void 0 ? httpThrow : true) && res.statusCode >= 400)
                 return reject(new Error(String(res.statusCode), { cause: res }));
             if (res.headers.location && !noRedirect)
                 return resolve(httpStream(res.headers.location, options));