hfs 0.37.0 → 0.38.2

package/frontend/assets/index-6d4e81f7.css

@@ -0,0 +1 @@
+@charset "UTF-8";:root{height:100dvh;--bg: #fff;--text: #555;--ghost-contrast: #8882;--faint-contrast: #8884;--mild-contrast: #8886;--good-contrast: #000a;--button-bg: #68a;--button-text: #eaeaea;--focus-color: #468;--separator: " \2013  "}:root .theme-dark{--bg: #000;--text: #999;--good-contrast: #fffa;--button-bg: #345;--button-text: #999;color-scheme:dark}:root .theme-dark a{color:#8ac}:root .theme-dark .dialog-closer{background:#633}:root .theme-dark .dialog-icon{color:#ccc}:root .theme-dark .dialog-icon .icon{color:#aaa;margin-left:-1px;font-size:95%}:root .theme-dark .dialog-backdrop{background:rgba(51,51,51,.7333333333)}:root .theme-dark .error-msg{color:#b88;background-color:#623}:root .theme-dark button.toggled{color:#eee}body{background:var(--bg);margin:0;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}body,button,select,input{font-size:12pt}#root{max-width:50em;margin:auto;min-height:100vh;display:flex;flex-direction:column}body,input{color:var(--text)}code{font-family:source-code-pro,Menlo,Monaco,Consolas,Courier New,monospace}input:not([type=checkbox]),select{padding:.3em .4em;border-radius:.5em;background:var(--bg);border-color:var(--mild-contrast);color:var(--good-contrast);max-width:100%;box-sizing:border-box;width:100%}input[type=checkbox]{transform:scale(1.7);accent-color:var(--button-bg)}label input[type=checkbox]{margin-right:.8em}select{text-align:center}.hidden{display:none!important}.icon{font-size:1.2em}.icon.mirror:before{transform:scaleX(-1)}a{text-decoration:none;color:#57a}button{background-color:var(--button-bg);color:var(--button-text);padding:.5em 1em;border:transparent;text-decoration:none;border-radius:.3em;vertical-align:middle;cursor:pointer}button.toggled{color:#fff;text-shadow:0 0 3px #fff}button:focus-visible,.breadcrumb:focus-visible{outline:3px solid var(--focus-color)}a>button{width:100%}input:focus-visible,select:focus-visible,ul a:focus-visible{border-radius:.3em;border-color:transparent;outline:2px solid var(--focus-color)}.error-msg{background-color:#faa;color:#833;padding:.5em 1em}header{position:sticky;top:0;background:var(--bg);padding:.2em;z-index:1}.before-sliding{width:0!important;flex:0!important;margin:0!important;height:0!important;padding:0!important;overflow:hidden!important;transition:all .5s}.show-sliding{transition:all .5s;overflow:clip;flex:1;white-space:nowrap}.ani-working{animation:1s blink infinite}@keyframes blink{0%{opacity:1}50%{opacity:.2}}@keyframes spin{to{transform:rotate(360deg)}}@keyframes fade-in{0%{opacity:0}to{opacity:1}}.spinner,.icon.spinner:before{animation:1.5s spin infinite linear}.icon.emoji.spinner{display:inline-block}.breadcrumb{padding:.1em .6em .2em;line-height:1.8em;border-radius:.7em;background-color:var(--button-bg);color:var(--button-text);border-top:1px solid #666;margin-right:-.1em}.breadcrumb:nth-child(-n+3) .icon{padding:0 .2em}#folder-stats,#filter-bar>span{font-size:90%}#folder-stats{margin:.4em 0 0 .5em;float:right}#folder-stats .icon{margin-right:.3em}#filter{flex:1;box-sizing:border-box}#filter-bar{display:flex;align-items:center;gap:.8em;margin:.2em 0 0;padding:2px 0 1px 11px;height:1.8em}#filter-bar input[type=checkbox]{margin-top:.5em}#filter-bar span:empty{display:none}ul.dir{flex:1;padding:0;margin:0;clear:both}ul.dir>p{text-align:center}ul.dir li{display:block;list-style-type:none;padding:.3em .3em .4em;border-bottom:1px solid var(--faint-contrast)}ul.dir li:nth-of-type(odd){background-color:var(--ghost-contrast)}ul.dir li input[type=checkbox]{margin:0 .8em}ul.dir li a{word-break:break-word;padding-right:.3em}ul.dir li a .icon{margin-right:.3em}ul.dir li a.container-folder:hover{text-decoration:underline}ul.dir li .entry-props{float:right;font-size:90%;margin-left:4px;margin-top:.3em;font-variant-numeric:tabular-nums}ul.dir li .entry-props .entry-size-unit{margin-left:.3em}ul.dir li>div:last-of-type{clear:both}ul.dir li.page-separator{margin-top:1em;position:relative}ul.dir li.page-separator:before{content:attr(label);position:absolute;top:-1.8em;font-size:smaller;margin-left:calc(50% - 1em);opacity:.9}#menu-bar{display:flex;justify-content:space-evenly;flex-wrap:wrap}#menu-bar>*{flex:1;margin:.1em}#menu-bar button{padding-left:0;padding-right:0}#searched{margin:.2em}#user-panel{display:flex;flex-direction:column;gap:1em}#user-panel a>button{width:100%}button label{cursor:inherit;margin-left:.5em}.dialog-backdrop.working{font-size:5em;animation:1s fade-in}.dialog-content{padding:.2em}.dialog-alert .dialog-content{text-align:center}.dialog-alert .dialog-content p{text-align:left;display:inline-block}.dialog{min-width:11em;--color: var(--button-bg)}#paging{position:sticky;bottom:0;display:flex;gap:.1em;background:var(--bg);padding:0 .2em .2em}#paging>button{z-index:1}#paging button{box-shadow:0 0 .3em .3em #0003}#paging #paging-middle{padding:0 .5em;margin:0 -.3em;display:flex;gap:.5em;flex:1;overflow-x:auto}#paging #paging-middle>button{flex:1;padding-top:0;padding-bottom:0}#paging button{background:var(--button-bg);text-align:center;white-space:nowrap;padding:.5em}.upload-progress:before{content:var(--separator)}.entry-size:after{content:var(--separator)}.upload-progress{min-width:4em;display:inline-block;margin-left:.5em}.upload-list td:nth-child(1){width:0}.upload-list td:nth-child(2){text-align:right;width:0;white-space:nowrap;padding-left:.5em}.upload-list td:nth-child(3){padding:.2em .5em;word-break:break-word}.dialog-login form{display:flex;flex-direction:column;gap:1.2em}.dialog-login label{display:block;margin-bottom:.5em;margin-left:.1em}@media (min-width: 42em){body{scrollbar-width:thin;scrollbar-color:var(--button-bg) var(--ghost-contrast)}body::-webkit-scrollbar{width:12px}body::-webkit-scrollbar-track{background:var(--ghost-contrast)}body::-webkit-scrollbar-thumb{background-color:var(--button-bg);border-radius:20px;border:1px solid var(--ghost-contrast)}}@media (max-width: 42em){:root{--ghost-contrast: #8883}body,button,select{font-size:14pt}#menu-bar button label,#filter-bar button label{display:none}#filter-bar{margin-top:.4em}#filter-bar button{width:17.6vw;height:2.3em}.breadcrumb{word-break:break-all}.breadcrumb .icon{font-size:24px}}.dialog-backdrop{position:fixed;inset:0;background:#888a;display:flex;justify-content:center;align-items:center;z-index:1000}.dialog{background:#fff;background:var(--bg);padding:max(.5em,1vw);border-radius:1em;position:relative;margin:0 3vw;overflow:hidden;max-height:calc(100vh - 2em);display:flex;justify-content:center}.dialog-icon{color:#fff;background-color:var(--color);position:absolute;top:0;width:1.8em;height:1.7em;text-align:center;border-radius:.8em 0}.dialog-title{margin-top:-.4em;font-size:110%;position:absolute}.dialog-icon~.dialog-title{text-align:center}.dialog-closer{border-radius:0 .8em;right:0;padding:0;background-color:#c88}.dialog-icon~.dialog-content{margin-top:2em}.dialog-type{left:0;top:0;overflow:hidden;line-height:1.7em;opacity:.8}.dialog-content{overflow:auto;max-height:calc(100vh - 4.5em)}.dialog-content p{white-space:pre-wrap;margin:.5em 0}.dialog-confirm .dialog-content button{margin-top:1em}.dialog-alert-info{--color: #282 }.dialog-alert-warning{--color: #c91 }.dialog-alert-error{--color: #822}@media (max-width: 42em){.dialog-icon{font-size:120%}.dialog-icon~.dialog-content{margin-top:2.5em}.dialog-title{margin-top:-.2em}}.dialog-prompt label{display:block;margin-bottom:.5em;margin-left:.1em}

package/{admin/assets/sha512-9a451918.js → frontend/assets/sha512-57b80c96.js}

@@ -1,4 +1,4 @@
-import{c as SF}from"./index-3867a36f.js";function OF(iF,hF){for(var eF=0;eF<hF.length;eF++){const tF=hF[eF];if(typeof tF!="string"&&!Array.isArray(tF)){for(const w in tF)if(w!=="default"&&!(w in iF)){const lF=Object.getOwnPropertyDescriptor(tF,w);lF&&Object.defineProperty(iF,w,lF.get?lF:{enumerable:!0,get:()=>tF[w]})}}}return Object.freeze(Object.defineProperty(iF,Symbol.toStringTag,{value:"Module"}))}var EF={},UF={get exports(){return EF},set exports(iF){EF=iF}};/*
+import{c as SF}from"./index-4b763f31.js";function OF(iF,hF){for(var eF=0;eF<hF.length;eF++){const tF=hF[eF];if(typeof tF!="string"&&!Array.isArray(tF)){for(const w in tF)if(w!=="default"&&!(w in iF)){const lF=Object.getOwnPropertyDescriptor(tF,w);lF&&Object.defineProperty(iF,w,lF.get?lF:{enumerable:!0,get:()=>tF[w]})}}}return Object.freeze(Object.defineProperty(iF,Symbol.toStringTag,{value:"Module"}))}var EF={},UF={get exports(){return EF},set exports(iF){EF=iF}};/*
  * [js-sha512]{@link https://github.com/emn178/js-sha512}
  *
  * @version 0.8.0

package/frontend/index.html

@@ -4,16 +4,12 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=0" />
     <link href="/fontello.css" rel="stylesheet" />
-    <link rel="icon"/>
-    <script>SESSION = _HFS_SESSION_</script>
-    <title>_HFS_TITLE_</title>
-    <script type="module" crossorigin src="/assets/index-420a7286.js"></script>
-    <link rel="stylesheet" href="/assets/index-216f7ea9.css">
+    
+    <script type="module" crossorigin src="/assets/index-4b763f31.js"></script>
+    <link rel="stylesheet" href="/assets/index-6d4e81f7.css">
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    
     <div id="root"></div>
-    <div hidden>_HFS_PLUGINS_</div>
   </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.37.0",
+  "version": "0.38.2",
   "description": "HTTP File Server",
   "keywords": [
     "file server",
@@ -28,6 +28,7 @@
     "dist-modules": "cp package*.json dist && cd dist && npm ci --omit=dev && npm run dist-crclib && rm package-lock.json && cd .. && node prune_modules",
     "dist-crclib": "npm i -f --no-save --omit=dev @node-rs/crc32-win32-x64-msvc @node-rs/crc32-darwin-arm64 @node-rs/crc32-darwin-x64  ",
     "dist-win": "cp package*.json dist && cd dist && npm ci --omit=dev && npm i -f --no-save --omit=dev @node-rs/crc32-win32 && pkg . -C gzip -t node16-win-x64",
+    "dist-mac": "cp package*.json dist && cd dist && npm ci --omit=dev && pkg . -C gzip -t node16-macos-arm64",
     "dist-node": "npm run dist-modules && cd dist && zip hfs-node.zip -r * -x *.zip *.exe hfs-* *.log logs"
   },
   "engines": {
@@ -59,7 +60,7 @@
   },
   "dependencies": {
     "@koa/router": "^10.1.1",
-    "@node-rs/crc32": "^1.5.1",
+    "@node-rs/crc32": "^1.6.0",
     "basic-auth": "^2.0.1",
     "buffer-crc32": "^0.2.13",
     "cidr-tools": "^4.3.0",

package/plugins/download-counter/public/style.css

@@ -1 +1 @@
-.download-counter::after { content: " — " }
+.download-counter::after { content: var(--separator) }

package/src/adminApis.js

@@ -39,7 +39,6 @@ const api_monitor_1 = __importDefault(require("./api.monitor"));
 const api_lang_1 = __importDefault(require("./api.lang"));
 const connections_1 = require("./connections");
 const misc_1 = require("./misc");
-const lodash_1 = __importDefault(require("lodash"));
 const events_1 = __importDefault(require("./events"));
 const perm_1 = require("./perm");
 const middlewares_1 = require("./middlewares");
@@ -49,6 +48,7 @@ const readline = __importStar(require("readline"));
 const log_1 = require("./log");
 const child_process_1 = require("child_process");
 const util_1 = require("util");
+const customHtml_1 = require("./customHtml");
 exports.adminApis = {
     ...api_vfs_1.default,
     ...api_accounts_1.default,
@@ -56,44 +56,47 @@ exports.adminApis = {
     ...api_monitor_1.default,
     ...api_lang_1.default,
     async set_config({ values: v }) {
-        var _a, _b;
+        var _a;
         if (v) {
-            const st = (0, listen_1.getStatus)();
-            const noHttp = ((_a = v.port) !== null && _a !== void 0 ? _a : listen_1.portCfg.get()) < 0 || !st.httpSrv.listening;
-            const noHttps = ((_b = v.https_port) !== null && _b !== void 0 ? _b : listen_1.httpsPortCfg.get()) < 0 || !st.httpsSrv.listening;
-            if (noHttp && noHttps)
-                return new apiMiddleware_1.ApiError(const_1.HTTP_FORBIDDEN, "You cannot switch off both http and https ports");
             await (0, config_1.setConfig)(v);
+            if (v.port === 0 || v.https_port === 0)
+                return (_a = await (0, misc_1.waitFor)(async () => {
+                    const st = await (0, listen_1.getServerStatus)();
+                    // wait for all random ports to be done, so we communicate new numbers
+                    if ((v.port !== 0 || st.http.listening)
+                        && (v.https_port !== 0 || st.https.listening))
+                        return st;
+                }, { timeout: 1000 })) !== null && _a !== void 0 ? _a : new apiMiddleware_1.ApiError(const_1.HTTP_SERVER_ERROR, "something went wrong changing ports");
         }
         return {};
     },
     get_config: config_1.getWholeConfig,
+    get_custom_html() {
+        return {
+            sections: Object.fromEntries([
+                ...customHtml_1.customHtmlSections.map(k => [k, '']),
+                ...customHtml_1.customHtmlState.sections
+            ])
+        };
+    },
+    async set_custom_html({ sections }) {
+        await (0, customHtml_1.saveCustomHtml)(sections);
+        return {};
+    },
     async get_status() {
-        const st = (0, listen_1.getStatus)();
         return {
             started: const_1.HFS_STARTED,
             build: const_1.BUILD_TIMESTAMP,
             version: const_1.VERSION,
             apiVersion: const_1.API_VERSION,
             compatibleApiVersion: const_1.COMPATIBLE_API_VERSION,
-            http: await serverStatus(st.httpSrv, listen_1.portCfg.get()),
-            https: await serverStatus(st.httpsSrv, listen_1.httpsPortCfg.get()),
+            ...await (0, listen_1.getServerStatus)(),
             urls: (0, listen_1.getUrls)(),
             proxyDetected: (0, middlewares_1.getProxyDetected)(),
             frpDetected: exports.localhostAdmin.get() && !(0, middlewares_1.getProxyDetected)()
                 && (0, connections_1.getConnections)().every(misc_1.isLocalHost)
                 && await frpDebounced(),
         };
-        async function serverStatus(h, configuredPort) {
-            var _a;
-            const busy = await h.busy;
-            await (0, misc_1.wait)(0); // simple trick to wait for also .error to be updated. If this trickery becomes necessary elsewhere, then we should make also error a Promise.
-            return {
-                ...lodash_1.default.pick(h, ['listening', 'error']),
-                busy,
-                port: ((_a = h === null || h === void 0 ? void 0 : h.address()) === null || _a === void 0 ? void 0 : _a.port) || configuredPort,
-            };
-        }
     },
     async save_pem({ cert, private_key, name = 'self' }) {
         if (!cert || !private_key)

package/src/api.monitor.js

@@ -79,7 +79,9 @@ const apis = {
                 user: (0, perm_1.getCurrentUsername)(ctx),
                 agent: getBrowser(ctx.get('user-agent')),
                 archive: ctx.state.archive,
-                path: (ctx.fileSource || ctx.state.archive) && ctx.path // only for downloading files
+                upload: ctx.state.uploadProgress,
+                path: ctx.state.uploadPath
+                    || (ctx.fileSource || ctx.state.archive) && ctx.path // only uploads and downloads
             };
         }
     },

package/src/api.plugins.js

@@ -62,7 +62,7 @@ const apis = {
         return {
             enabled: plugins_1.enablePlugins.get().includes(id),
             config: {
-                ...(0, misc_1.objSameKeys)((0, plugins_1.getPluginConfigFields)(id) || {}, v => v === null || v === void 0 ? void 0 : v.defaultValue),
+                ...(0, misc_1.newObj)((0, plugins_1.getPluginConfigFields)(id) || {}, v => v === null || v === void 0 ? void 0 : v.defaultValue),
                 ...plugins_1.pluginsConfig.get()[id]
             }
         };

package/src/api.vfs.js

@@ -73,7 +73,7 @@ const apis = {
             if ((_a = parent === null || parent === void 0 ? void 0 : parent.children) === null || _a === void 0 ? void 0 : _a.find(x => (0, vfs_1.getNodeName)(x) === props.name))
                 return new apiMiddleware_1.ApiError(const_1.HTTP_CONFLICT, 'name already present');
         }
-        props = (0, misc_1.objSameKeys)(props, v => v === null ? undefined : v); // null is a way to serialize undefined, that will restore default values
+        props = (0, misc_1.newObj)(props, v => v === null ? undefined : v); // null is a way to serialize undefined, that will restore default values
         if (props.masks && typeof props.masks !== 'object')
             delete props.masks;
         Object.assign(n, props);

package/src/config.js

@@ -101,7 +101,7 @@ function getConfig(k) {
 }
 exports.getConfig = getConfig;
 function getWholeConfig({ omit, only }) {
-    const defs = (0, misc_1.objSameKeys)(configProps, x => x.defaultValue);
+    const defs = (0, misc_1.newObj)(configProps, x => x.defaultValue);
     let copy = lodash_1.default.defaults({}, state, defs);
     if (omit === null || omit === void 0 ? void 0 : omit.length)
         copy = lodash_1.default.omit(copy, omit);
@@ -113,7 +113,7 @@ exports.getWholeConfig = getWholeConfig;
 // pass a value to `save` to force saving decision, or leave undefined for auto. Passing false will also reset previously loaded configs.
 function setConfig(newCfg, save) {
     if (!started) { // first time we consider also CLI args
-        const argCfg = lodash_1.default.pickBy((0, misc_1.objSameKeys)(configProps, (x, k) => const_1.argv[k]), x => x !== undefined);
+        const argCfg = lodash_1.default.pickBy((0, misc_1.newObj)(configProps, (x, k) => const_1.argv[k]), x => x !== undefined);
         if (!lodash_1.default.isEmpty(argCfg)) {
             (0, exports.saveConfigAsap)().then(); // don't set `save` argument, as it would interfere below at check `save===false`
             Object.assign(newCfg, argCfg);

package/src/connections.js

@@ -12,6 +12,7 @@ class Connection {
         this.socket = socket;
         this.started = new Date();
         this.sent = 0;
+        this.got = 0;
         all.push(this);
         socket.on('close', () => {
             all.splice(all.indexOf(this), 1);

package/src/const.js

@@ -38,12 +38,12 @@ 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 = "2023-02-24T21:59:58.935Z";
+exports.BUILD_TIMESTAMP = "2023-03-07T12:16:23.728Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.DAY = 86400000;
 exports.SESSION_DURATION = exports.DAY;
-exports.API_VERSION = 5; // afterEntryName
+exports.API_VERSION = 6; // config.frontend
 exports.COMPATIBLE_API_VERSION = 1; // while changes in the api are not breaking, this number stays the same, otherwise is made equal to API_VERSION
 exports.SPECIAL_URI = '/~/';
 exports.FRONTEND_URI = exports.SPECIAL_URI + 'frontend/';

package/src/customHtml.js

@@ -0,0 +1,54 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.saveCustomHtml = exports.getSection = exports.customHtmlState = exports.customHtmlSections = void 0;
+const fs_1 = require("fs");
+const events_1 = __importDefault(require("./events"));
+const misc_1 = require("./misc");
+const frontEndApis_1 = require("./frontEndApis");
+const watchLoad_1 = require("./watchLoad");
+const valtio_1 = require("valtio");
+const promises_1 = require("fs/promises");
+exports.customHtmlSections = ['top', 'bottom', 'beforeHeader', 'afterHeader',
+    'afterMenuBar', 'afterEntryName', 'afterList'];
+exports.customHtmlState = (0, valtio_1.proxy)({
+    sections: new Map()
+});
+const FILE = 'custom.html';
+if (!(0, fs_1.existsSync)(FILE))
+    events_1.default.once('config ready', () => {
+        const legacy = (0, misc_1.prefix)('[beforeHeader]\n', frontEndApis_1.customHeader.get());
+        (0, fs_1.writeFileSync)(FILE, legacy);
+        frontEndApis_1.customHeader.set(undefined); // get rid of it
+    });
+(0, watchLoad_1.watchLoad)(FILE, data => {
+    var _a;
+    const re = /^\[(\w+)] *$/gm;
+    exports.customHtmlState.sections.clear();
+    if (!data)
+        return;
+    let name = 'top';
+    do {
+        let last = re.lastIndex;
+        const match = re.exec(data);
+        const content = data.slice(last, !match ? undefined : re.lastIndex - (((_a = match === null || match === void 0 ? void 0 : match[0]) === null || _a === void 0 ? void 0 : _a.length) || 0)).trim();
+        if (content)
+            exports.customHtmlState.sections.set(name, content);
+        name = match === null || match === void 0 ? void 0 : match[1];
+    } while (name);
+});
+function getSection(name) {
+    return exports.customHtmlState.sections.get(name) || '';
+}
+exports.getSection = getSection;
+async function saveCustomHtml(sections) {
+    const text = Object.entries(sections).filter(([k, v]) => v === null || v === void 0 ? void 0 : v.trim()).map(([k, v]) => `[${k}]\n${v}\n\n`).join('');
+    await (0, promises_1.writeFile)(FILE, text);
+    exports.customHtmlState.sections.clear();
+    for (const [k, v] of Object.entries(sections))
+        if (v)
+            exports.customHtmlState.sections.set(k, v);
+}
+exports.saveCustomHtml = saveCustomHtml;

package/src/frontEndApis.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.notifyClient = exports.frontEndApis = void 0;
+exports.notifyClient = exports.frontEndApis = exports.customHeader = void 0;
 const apiMiddleware_1 = require("./apiMiddleware");
 const api_file_list_1 = require("./api.file_list");
 const api_auth = __importStar(require("./api.auth"));
@@ -39,13 +39,10 @@ const vfs_1 = require("./vfs");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const misc_1 = require("./misc");
-const customHeader = (0, config_1.defineConfig)('custom_header');
+exports.customHeader = (0, config_1.defineConfig)('custom_header');
 exports.frontEndApis = {
     file_list: api_file_list_1.file_list,
     ...api_auth,
-    config() {
-        return Object.fromEntries([customHeader].map(x => [x.key(), x.get()]));
-    },
     get_notifications({ channel }, ctx) {
         apiAssertTypes({ string: { channel } });
         const list = new apiMiddleware_1.SendListReadable();

package/src/github.js

@@ -75,7 +75,7 @@ async function apiGithub(uri) {
         throw res.statusCode;
     return JSON.parse(res.body);
 }
-async function* searchPlugins(text) {
+async function* searchPlugins(text = '') {
     var _a;
     const res = await apiGithub('search/repositories?q=topic:hfs-plugin+' + encodeURI(text));
     for (const it of res.items) {

package/src/listen.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.getUrls = exports.getStatus = exports.httpsPortCfg = exports.openAdmin = exports.portCfg = void 0;
+exports.getUrls = exports.getServerStatus = exports.httpsPortCfg = exports.openAdmin = exports.portCfg = void 0;
 const http = __importStar(require("http"));
 const config_1 = require("./config");
 const index_1 = require("./index");
@@ -191,13 +191,23 @@ function stopServer(srv) {
         });
     });
 }
-function getStatus() {
+async function getServerStatus() {
     return {
-        httpSrv,
-        httpsSrv,
+        http: await serverStatus(httpSrv, exports.portCfg.get()),
+        https: await serverStatus(httpsSrv, exports.httpsPortCfg.get()),
     };
+    async function serverStatus(h, configuredPort) {
+        var _a;
+        const busy = await h.busy;
+        await (0, misc_1.wait)(0); // simple trick to wait for also .error to be updated. If this trickery becomes necessary elsewhere, then we should make also error a Promise.
+        return {
+            ...lodash_1.default.pick(h, ['listening', 'error']),
+            busy,
+            port: ((_a = h === null || h === void 0 ? void 0 : h.address()) === null || _a === void 0 ? void 0 : _a.port) || configuredPort,
+        };
+    }
 }
-exports.getStatus = getStatus;
+exports.getServerStatus = getServerStatus;
 const ignore = /^(lo|.*loopback.*|virtualbox.*|.*\(wsl\).*|llw\d|awdl\d|utun\d|anpi\d)$/i; // avoid giving too much information
 function getUrls() {
     return Object.fromEntries((0, misc_1.onlyTruthy)([httpSrv, httpsSrv].map(srv => {

package/src/middlewares.js

@@ -198,7 +198,7 @@ async function srpCheck(username, password) {
 const paramsDecoder = async (ctx, next) => {
     ctx.params = ctx.method === 'POST' && ctx.originalUrl.startsWith(const_1.API_URI)
         ? (0, misc_1.tryJson)(await (0, misc_1.stream2string)(ctx.req))
-        : (0, misc_1.objSameKeys)(ctx.query, x => Array.isArray(x) ? x : (0, misc_1.tryJson)(x));
+        : (0, misc_1.newObj)(ctx.query, x => Array.isArray(x) ? x : (0, misc_1.tryJson)(x));
     await next();
 };
 exports.paramsDecoder = paramsDecoder;

package/src/misc.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.try_ = exports.stream2string = exports.tryJson = exports.same = exports.isLocalHost = exports.with_ = exports.typedKeys = exports.objRenameKey = exports.onOff = exports.pendingPromise = exports.onlyTruthy = exports.truthy = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.randomId = exports.getOrSet = exports.wantArray = exports.wait = exports.objSameKeys = exports.setHidden = exports.prefix = exports.enforceFinal = exports.debounceAsync = void 0;
+exports.try_ = exports.stream2string = exports.tryJson = exports.same = exports.isLocalHost = exports.with_ = exports.typedKeys = exports.objRenameKey = exports.onOff = exports.pendingPromise = exports.onlyTruthy = exports.truthy = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.randomId = exports.getOrSet = exports.wantArray = exports.waitFor = exports.wait = exports.newObj = exports.setHidden = exports.prefix = exports.enforceFinal = exports.debounceAsync = void 0;
 const path_1 = require("path");
 const lodash_1 = __importDefault(require("lodash"));
 const assert_1 = __importDefault(require("assert"));
@@ -36,21 +36,45 @@ function prefix(pre, v, post = '') {
 }
 exports.prefix = prefix;
 function setHidden(dest, src) {
-    return Object.defineProperties(dest, objSameKeys(src, value => ({
+    return Object.defineProperties(dest, newObj(src, value => ({
         enumerable: false,
         writable: true,
         value,
     })));
 }
 exports.setHidden = setHidden;
-function objSameKeys(src, newValue) {
-    return Object.fromEntries(Object.entries(src).map(([k, v]) => [k, newValue(v, k)]));
+function newObj(src, newValue) {
+    if (!src)
+        return {};
+    const pairs = Object.entries(src).map(([k, v]) => {
+        if (typeof k === 'symbol')
+            return;
+        let _k = k;
+        const newV = newValue(v, k, (newK) => {
+            _k = newK;
+            return true; // for convenient expression concatenation
+        });
+        return _k !== undefined && [_k, newV];
+    });
+    return Object.fromEntries(onlyTruthy(pairs));
 }
-exports.objSameKeys = objSameKeys;
+exports.newObj = newObj;
 function wait(ms) {
     return new Promise(res => setTimeout(res, ms));
 }
 exports.wait = wait;
+async function waitFor(cb, { interval = 200, timeout = Infinity } = {}) {
+    const started = Date.now();
+    while (1) {
+        const res = await cb();
+        if (res)
+            return res;
+        if (Date.now() - started >= timeout)
+            return;
+        await wait(interval);
+    }
+}
+exports.waitFor = waitFor;
 function wantArray(x) {
     return x == null ? [] : Array.isArray(x) ? x : [x];
 }

package/src/serveGuiFiles.js

@@ -37,11 +37,15 @@ const apiMiddleware_1 = require("./apiMiddleware");
 const path_1 = require("path");
 const misc_1 = require("./misc");
 const adminApis_1 = require("./adminApis");
+const valtio_1 = require("valtio");
+const customHtml_1 = require("./customHtml");
+const lodash_1 = __importDefault(require("lodash"));
 // in case of dev env we have our static files within the 'dist' folder'
 const DEV_STATIC = process.env.DEV ? 'dist/' : '';
 function serveStatic(uri) {
     const folder = uri.slice(2, -1); // we know folder is very similar to uri
-    const cache = {};
+    let cache = {};
+    (0, valtio_1.subscribe)(customHtml_1.customHtmlState, () => cache = {}); // reset cache at every change
     return async (ctx, next) => {
         if (ctx.method === 'OPTIONS') {
             ctx.status = const_1.HTTP_NO_CONTENT;
@@ -79,13 +83,54 @@ function adjustBundlerLinks(path, uri, data) {
 async function treatIndex(ctx, body, filesUri) {
     const session = await (0, api_auth_1.refresh_session)({}, ctx);
     ctx.set('etag', '');
-    return body
+    const isFrontend = filesUri === const_1.FRONTEND_URI;
+    const css = (0, plugins_1.mapPlugins)((plug, k) => { var _a; return (_a = (isFrontend ? plug.frontend_css : null)) === null || _a === void 0 ? void 0 : _a.map(f => const_1.PLUGINS_PUB_URI + k + '/' + f); }).flat().filter(Boolean);
+    const js = (0, plugins_1.mapPlugins)((plug, k) => { var _a; return (_a = (isFrontend ? plug.frontend_js : null)) === null || _a === void 0 ? void 0 : _a.map(f => const_1.PLUGINS_PUB_URI + k + '/' + f); }).flat().filter(Boolean);
+    // expose plugins' configs that are declared with 'frontend' attribute
+    const plugins = Object.fromEntries((0, misc_1.onlyTruthy)((0, plugins_1.mapPlugins)((pl, name) => {
+        var _a, _b;
+        let configs = (0, misc_1.newObj)((0, plugins_1.getPluginConfigFields)(name), (v, k, skip) => {
+            var _a, _b, _c, _d, _e;
+            return !v.frontend ? skip() :
+                ((_c = (_b = (_a = plugins_1.pluginsConfig.get()) === null || _a === void 0 ? void 0 : _a[name]) === null || _b === void 0 ? void 0 : _b[k]) !== null && _c !== void 0 ? _c : (_e = (_d = pl.getData().config) === null || _d === void 0 ? void 0 : _d[k]) === null || _e === void 0 ? void 0 : _e.defaultValue);
+        });
+        configs = ((_b = (_a = (0, plugins_1.getPluginInfo)(name)).onFrontendConfig) === null || _b === void 0 ? void 0 : _b.call(_a, configs)) || configs;
+        return !lodash_1.default.isEmpty(configs) && [name, configs];
+    })));
+    let ret = body
         .replace(/((?:src|href) *= *['"])\/?(?![a-z]+:\/\/)/g, '$1' + filesUri)
-        .replace('<link rel="icon"/>', `<link rel="icon" href="${adminApis_1.favicon.get() ? '/favicon.ico' : 'data:;'}" />`)
-        .replace('_HFS_TITLE_', adminApis_1.title.get())
-        .replace('_HFS_SESSION_', session instanceof apiMiddleware_1.ApiError ? 'null' : JSON.stringify(session))
-        // replacing this text allow us to avoid injecting in frontends that don't support plugins. Don't use a <--comment--> or it will be removed by webpack
-        .replace('_HFS_PLUGINS_', pluginsInjection);
+        .replace('</head>', () => `
+            ${!isFrontend ? '' : `
+                <title>${adminApis_1.title.get()}</title>
+                <link rel="icon" href="${adminApis_1.favicon.get() ? '/favicon.ico' : 'data:;'}" />
+            `}
+            <script>
+            HFS = ${JSON.stringify({
+        VERSION: const_1.VERSION,
+        API_VERSION: const_1.API_VERSION,
+        session: session instanceof apiMiddleware_1.ApiError ? null : session,
+        plugins,
+        customHtml: lodash_1.default.omit(Object.fromEntries(customHtml_1.customHtmlState.sections), ['top', 'bottom']), // excluding sections we apply in this phase  
+    }, null, 4)}
+            document.documentElement.setAttribute('ver', '${const_1.VERSION.split('-')[0] /*for style selectors*/}')
+            </script>
+            <style>
+            :root {
+                ${lodash_1.default.map(plugins, (configs, pluginName) => lodash_1.default.map(configs, (v, k) => `--${pluginName}-${k}: ${serializeCss(v)};`).join('\n')).join('')}
+            }
+            </style>
+            ${css.map(uri => `<link rel='stylesheet' type='text/css' href='${uri}'/>`).join('\n')}
+            ${js.map(uri => `<script defer src='${uri}'></script>`).join('\n')}
+        </head>`);
+    if (isFrontend)
+        ret = ret
+            .replace('<body>', '<body>' + (0, customHtml_1.getSection)('top'))
+            .replace('</body>', (0, customHtml_1.getSection)('bottom') + '</body>');
+    return ret;
+}
+function serializeCss(v) {
+    return typeof v === 'string' && /^#[0-9a-fA-F]{3,8}|rgba?\(.+\)$/.test(v) ? v
+        : JSON.stringify(v);
 }
 function serveProxied(port, uri) {
     if (!port)
@@ -104,12 +149,6 @@ function serveProxied(port, uri) {
         return proxy.apply(this, arguments);
     };
 }
-function pluginsInjection() {
-    const css = (0, plugins_1.mapPlugins)((plug, k) => { var _a; return (_a = plug.frontend_css) === null || _a === void 0 ? void 0 : _a.map(f => const_1.PLUGINS_PUB_URI + k + '/' + f); }).flat().filter(Boolean);
-    const js = (0, plugins_1.mapPlugins)((plug, k) => { var _a; return (_a = plug.frontend_js) === null || _a === void 0 ? void 0 : _a.map(f => const_1.PLUGINS_PUB_URI + k + '/' + f); }).flat().filter(Boolean);
-    return css.map(uri => `\n<link rel='stylesheet' type='text/css' href='${uri}'/>`).join('')
-        + js.map(uri => `\n<script defer src='${uri}'></script>`).join('');
-}
 function serveGuiFiles(proxyPort, uri) {
     return serveProxied(proxyPort, uri) || serveStatic(uri);
 }

package/src/throttler.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.totalInSpeed = exports.totalOutSpeed = exports.totalGot = exports.totalSent = exports.throttler = void 0;
+exports.totalInSpeed = exports.totalOutSpeed = exports.totalGot = exports.totalSent = exports.roundSpeed = exports.throttler = void 0;
 const stream_1 = require("stream");
 const ThrottledStream_1 = require("./ThrottledStream");
 const config_1 = require("./config");
@@ -39,7 +39,7 @@ const throttler = async (ctx, next) => {
     const DELAY = 1000;
     const update = lodash_1.default.debounce(() => {
         const ts = conn[SymThrStr];
-        const outSpeed = roundKb(ts.getSpeed());
+        const outSpeed = roundSpeed(ts.getSpeed());
         (0, connections_1.updateConnection)(conn, { outSpeed, sent: ts.getBytesSent() });
         /* in case this stream stands still for a while (before the end), we'll have neither 'sent' or 'close' events,
         * so who will take care to updateConnection? This artificial next-call will ensure just that */
@@ -67,9 +67,10 @@ const throttler = async (ctx, next) => {
         ctx.response.length = bak;
 };
 exports.throttler = throttler;
-function roundKb(n) {
+function roundSpeed(n) {
     return lodash_1.default.round(n, 1) || lodash_1.default.round(n, 3); // further precision if necessary
 }
+exports.roundSpeed = roundSpeed;
 exports.totalSent = 0;
 exports.totalGot = 0;
 exports.totalOutSpeed = 0;
@@ -85,7 +86,7 @@ setInterval(() => {
     lastSent = exports.totalSent;
     const deltaGotKb = (exports.totalGot - lastGot) / 1000;
     lastGot = exports.totalGot;
-    exports.totalOutSpeed = roundKb(deltaSentKb / past);
-    exports.totalInSpeed = roundKb(deltaGotKb / past);
+    exports.totalOutSpeed = roundSpeed(deltaSentKb / past);
+    exports.totalInSpeed = roundSpeed(deltaGotKb / past);
 }, 1000);
 events_1.default.on('connection', (c) => c.socket.on('data', data => exports.totalGot += data.length));

package/src/upload.js

@@ -12,6 +12,9 @@ const misc_1 = require("./misc");
 const frontEndApis_1 = require("./frontEndApis");
 const config_1 = require("./config");
 const util_os_1 = require("./util-os");
+const connections_1 = require("./connections");
+const throttler_1 = require("./throttler");
+const lodash_1 = __importDefault(require("lodash"));
 exports.deleteUnfinishedUploadsAfter = (0, config_1.defineConfig)('delete_unfinished_uploads_after');
 exports.minAvailableMb = (0, config_1.defineConfig)('min_available_mb', 100);
 const dontOverwriteUploading = (0, config_1.defineConfig)('dont_overwrite_uploading', false);
@@ -62,7 +65,8 @@ function uploadWriter(base, path, ctx) {
         tempName = resumable;
     }
     cancelDeletion(tempName);
-    ret.on('close', () => {
+    trackProgress();
+    ret.once('close', () => {
         if (!ctx.req.aborted) {
             let dest = fullPath;
             if (dontOverwriteUploading.get() && fs_1.default.existsSync(dest)) {
@@ -87,6 +91,24 @@ function uploadWriter(base, path, ctx) {
         delayedDelete(tempName, sec);
     });
     return ret;
+    function trackProgress() {
+        let lastGot = 0;
+        let lastGotTime = 0;
+        const conn = (0, connections_1.socket2connection)(ctx.socket);
+        if (!conn)
+            return () => { };
+        ctx.state.uploadPath = ctx.path + path;
+        (0, connections_1.updateConnection)(conn, { ctx });
+        const h = setInterval(() => {
+            const now = Date.now();
+            const got = ret.bytesWritten;
+            const inSpeed = (0, throttler_1.roundSpeed)((got - lastGot) / (now - lastGotTime));
+            lastGot = got;
+            lastGotTime = now;
+            (0, connections_1.updateConnection)(conn, { inSpeed, got, uploadProgress: lodash_1.default.round(got / reqSize, 3) });
+        }, 1000);
+        ret.once('close', () => clearInterval(h));
+    }
     function delayedDelete(path, secs, cb) {
         clearTimeout(waitingToBeDeleted[path]);
         waitingToBeDeleted[path] = setTimeout(() => {