hfs 0.48.2 → 0.49.0-alpha1

package/frontend/assets/index-cbe043ee.css

@@ -0,0 +1 @@
+@charset "UTF-8";:root{height:100dvh;--bg: #fff;--text: #555;--ghost-contrast: #8882;--ghost-contrast-alt: #eee;--faint-contrast: #8884;--mild-contrast: #8886;--good-contrast: #000a;--button-bg: #6080aa;--button-text: #eaeaea;--focus-color: #468;--separator: " – "}:root .highlightedText,:root .file-menu a:hover{color:#0006;text-shadow:0 0 3px rgba(0,0,0,.4)}:root .theme-dark{--bg: #000;--text: #999;--ghost-contrast-alt: #181818;--good-contrast: #fffa;--button-bg: #345;--button-text: #999;color-scheme:dark}:root .theme-dark .highlightedText,:root .theme-dark .file-menu a:hover,:root .file-menu .theme-dark a:hover{color:#fff;text-shadow:0 0 3px #fff}: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}: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-color: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>div{max-width:54em;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],[type=range]),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=range]{width:calc(100% - 1px)}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}[class^=fa-]:before,[class*=" fa-"]:before{margin:0}.icon{font-size:1.2em;height:1.2em;width:1.4em;display:inline-block;text-align:center}img.file-icon{height:1em}.file-icon{background-size:contain;background-repeat:no-repeat;background-position:center;vertical-align:text-bottom}.icon.mirror:before{transform:scaleX(-1)}a{text-decoration:none;color:var(--button-bg)}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:hover{outline:1px solid var(--mild-contrast)}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)}.icon-button,ul.dir li .entry-panel .file-menu-button{font-size:.7em;padding:.2em .4em;margin-left:.4em;vertical-align:bottom}.error-msg{background-color:#faa;color:#833;padding:.5em 1em}.hide-back,.upload-toolbar,header{background-color:var(--bg)}header{position:sticky;top:0;padding:.2em .1em;z-index:3}kbd{background-color:#eee;border-radius:3px;border:1px solid #b4b4b4;box-shadow:0 1px 1px #0003,0 2px #ffffffb3 inset;color:#333;display:inline-block;font-size:.85em;font-weight:700;line-height:1;padding:2px 4px;white-space:nowrap;margin-right:.5em}.before-sliding{width:0!important;flex:0!important;margin:0!important;height:0!important;padding:0!important;overflow:hidden!important;transition:flex .5s}.show-sliding{transition:flex .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;display:inline-flex;justify-content:center;align-items:center;width:min-content}.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:.5em 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 3px;height:1.8em}#filter-bar input[type=checkbox]{margin-top:.3em}#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-right:1em}@media (hover: none){ul.dir li .link-wrapper .popup-menu-button{display:none}}@media (hover: hover){ul.dir li .link-wrapper:not(:hover) .popup-menu-button{display:none}ul.dir li .link-wrapper:hover{padding:1em;margin:-1em}}ul.dir li .link-wrapper a:last-of-type{word-break:break-word;padding-right:.3em}ul.dir li .link-wrapper a .icon{margin-right:.5em;vertical-align:text-bottom;display:inline-block;text-align:center}ul.dir li .link-wrapper a:hover{text-decoration:underline}ul.dir li .entry-comment{display:inline}ul.dir li .entry-comment:before,ul.dir li .entry-comment:after{font-size:1.5em;font-family:serif;line-height:1px;position:relative}ul.dir li .entry-comment:before{content:open-quote;margin-left:.5em;margin-right:.1em;top:.2em}ul.dir li .entry-comment:after{content:"„";top:-.1em;margin-left:.1em}ul.dir li .entry-panel{float:right;padding-top:.3em;display:flex;align-items:center}ul.dir li .entry-panel .file-menu-button{margin:-3px 0 -3px .4em}ul.dir li .entry-panel .entry-details{font-size:90%;margin-left:4px;font-variant-numeric:tabular-nums}ul.dir li .entry-panel .entry-details .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>*:first-child{margin-left:0}#menu-bar>*:last-child{margin-right:0}#menu-bar button{padding:min(1vh,.5em) 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:.4em}.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)}.dialog-icon .icon{margin-left:-1px;font-size:95%;margin-top:.4em;border-radius:.6em 0}#paging{position:sticky;bottom:0;display:flex;gap:.1em;background-color: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-toolbar{position:sticky;top:-4px}.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}.miss-perm{margin:.3em}.popup-menu-button{font-size:.8em;padding:.2em .3em;position:absolute;opacity:.8;white-space:nowrap}.popup-menu-button:hover{opacity:1}.file-dialog .dialog{min-width:13em}.file-dialog-properties{word-break:break-word;line-height:1.5em;margin:0}.file-dialog-properties dt{font-weight:700}.file-dialog-properties dd{margin-left:1.5em}.file-menu{margin-top:1em;padding-top:1em;border-top:1px solid var(--faint-contrast);display:flex;flex-direction:column;gap:1em}.file-menu a{display:flex;align-items:flex-start}.file-menu a label{margin-top:.1em}.file-menu a label small{display:block}.file-menu a .icon{margin-right:.5em}#root>.tiles-mode{max-width:none;margin:0 1em;--tiles-size: 5;--name-lines: 3;--name-height: calc(4.7em + var(--tiles-size) * .4em + 1.2em * var(--name-lines));--tile-width: calc(5em + 1em * var(--tiles-size))}#root>.tiles-mode ul.dir{display:grid;grid-template-columns:repeat(auto-fill,minmax(var(--tile-width),1fr));grid-auto-rows:calc(var(--name-height) + 1.3em);gap:0 20px}#root>.tiles-mode ul.dir li{text-align:center;position:relative;display:flex;flex-direction:column;border-bottom:none;overflow-x:clip;padding:.5em 0 0}#root>.tiles-mode ul.dir li .link-wrapper:not(:hover){max-height:var(--name-height);display:block;display:-webkit-box;overflow:hidden;-webkit-line-clamp:calc(var(--name-lines) + 1);-webkit-box-orient:vertical}#root>.tiles-mode ul.dir li .link-wrapper a:last-of-type{padding:0}#root>.tiles-mode ul.dir li .link-wrapper a span{display:block}#root>.tiles-mode ul.dir li .link-wrapper a .icon.icon{font-size:calc(1.2rem + .6rem * var(--tiles-size))}#root>.tiles-mode ul.dir li .link-wrapper a img.icon{width:auto;height:1em;padding:.1em 0}#root>.tiles-mode ul.dir li .link-wrapper a .icon{font-size:4rem;display:block;margin:auto}#root>.tiles-mode ul.dir li .link-wrapper:hover{overflow:visible;display:block;z-index:1}#root>.tiles-mode ul.dir li .link-wrapper:hover .icon:before{text-decoration:none}#root>.tiles-mode ul.dir li .link-wrapper:hover{padding:0;margin:0}#root>.tiles-mode ul.dir li:nth-of-type(odd){background-color:var(--bg)}#root>.tiles-mode ul.dir li .entry-panel{justify-content:center;font-size:10pt}#root>.tiles-mode ul.dir li .entry-details{font-size:80%}#root>.tiles-mode ul.dir li.page-separator:before{content:""}#root>.tiles-mode ul.dir li input[type=checkbox]{margin:0;position:absolute;top:.3em;right:1em}#root>.tiles-mode ul.dir li .link-wrapper a{display:inline}#root>.tiles-mode ul.dir li:hover{--bg: var(--ghost-contrast-alt);background:var(--bg)}#root>.tiles-mode ul.dir li:hover .link-wrapper,#root>.tiles-mode ul.dir li:hover .entry-panel{z-index:1;background:var(--bg)}#root>.tiles-mode ul.dir li:hover input[type=checkbox]{z-index:2}#root>.tiles-mode ul.dir li:hover .entry-panel{padding-bottom:.3em}#root>.tiles-mode .entry-size:after{content:none}#root>.tiles-mode .entry-ts{display:none}#root>.tiles-mode .popup-menu-button{position:absolute;top:0;left:0}#root>.tiles-mode #filter-bar{margin-bottom:1em}#root>.tiles-mode #paging{z-index:1}#root .file-show{--nav-size: min(25vh, 25vw)}#root .file-show>div{height:100%;width:100%}#root .file-show .showing-container{width:100%;height:100%;display:flex;justify-content:center;align-items:center}#root .file-show .showing{max-width:calc(100% - var(--nav-size) * 2);max-height:100%}#root .file-show img.showing{max-width:100%}#root .file-show .main{flex:1;position:relative;max-height:100%;overflow:hidden}#root .file-show .freeY .main,#root .file-show .fullWidth .main{overflow-y:auto}#root .file-show .freeY .showing,#root .file-show .fullWidth .showing{max-height:initial;margin:auto}#root .file-show .freeY .showing-container,#root .file-show .fullWidth .showing-container{overflow:auto;align-items:flex-start}#root .file-show .fullWidth .showing-container,#root .file-show .fullWidth .showing{width:100%}#root .file-show .nav{position:absolute;margin:-.4em;font-size:var(--nav-size);cursor:pointer;opacity:.3;-webkit-text-stroke:2px black;user-select:none;transition:opacity .3s}#root .file-show .nav:hover{opacity:.7}#root .file-show .nav.nav-hidden{opacity:0}#root .file-show .bar{padding:.5em 1em;background:var(--bg);opacity:.8;display:flex;flex-wrap:wrap;align-items:center;justify-content:flex-end;gap:.5em 1.5em}#root .file-show .bar .entry-details{font-size:smaller}#root .file-show .bar .entry-ts{display:inherit}#root .file-show .bar .entry-size:after{display:none}.file-show-help kbd{margin:.5em}.file-show-help kbd:first-of-type{margin-top: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}#root>.tiles-mode{margin:0}}@media (max-height: 600px){.file-dialog .dialog-content{display:flex;gap:3em;margin:1em}.file-dialog .dialog-content .file-menu{margin-top:0;padding-top:0;border-top:none;margin-left:2em;padding-left:2em;border-left:1px solid var(--faint-contrast)}}@media (pointer: coarse){#root>.tiles-mode .file-menu-button{font-size:1em;margin-top:.3em}}.dialog-backdrop{position:fixed;inset:0;background:#8886;backdrop-filter:blur(2px);display:flex;justify-content:center;align-items:center;z-index:1000}.dialog{background:#fff;background:var(--bg);padding:max(.5em,1vw,2vh);padding-top:0;border-radius:1em;position:relative;margin:0 3vw;overflow:hidden;max-height:calc(100vh - 2em);display:flex;flex-direction:column;justify-content:center}.dialog-icon{color:#fff;background-color:var(--color);position:absolute;top:0;width:2em;height:1.8em;text-align:center;border-radius:.8em 0}.dialog-icon-text{display:flex;align-items:center;justify-content:center}.dialog-title{font-size:120%;margin:.3em 0;padding:0 .5em;min-height:1.2em}.dialog-closer~.dialog-title{margin-right:2em}.dialog-type~.dialog-title{margin-left:2em}.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:1em}.dialog-type{left:0;top:0;overflow:hidden;opacity:.7}.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:1.5em}}.dialog-prompt label{display:block;margin:.5em .1em}

package/{admin/assets/sha512-2627feb7.js → frontend/assets/sha512-82ed8772.js}

@@ -1,4 +1,4 @@
-import{g as OF,c as UF}from"./index-4e55b514.js";function gF(sF,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 sF)){const lF=Object.getOwnPropertyDescriptor(tF,w);lF&&Object.defineProperty(sF,w,lF.get?lF:{enumerable:!0,get:()=>tF[w]})}}}return Object.freeze(Object.defineProperty(sF,Symbol.toStringTag,{value:"Module"}))}var dF={exports:{}};/*
+import{g as OF,c as UF}from"./index-4cbc2ffc.js";function gF(sF,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 sF)){const lF=Object.getOwnPropertyDescriptor(tF,w);lF&&Object.defineProperty(sF,w,lF.get?lF:{enumerable:!0,get:()=>tF[w]})}}}return Object.freeze(Object.defineProperty(sF,Symbol.toStringTag,{value:"Module"}))}var dF={exports:{}};/*
  * [js-sha512]{@link https://github.com/emn178/js-sha512}
  *
  * @version 0.8.0

package/frontend/index.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=0" />
     <link href="/fontello.css" rel="stylesheet" />
     
-    <script type="module" crossorigin src="/assets/index-e24651da.js"></script>
-    <link rel="stylesheet" href="/assets/index-cadcb0e9.css">
+    <script type="module" crossorigin src="/assets/index-4cbc2ffc.js"></script>
+    <link rel="stylesheet" href="/assets/index-cbe043ee.css">
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.48.2",
+  "version": "0.49.0-alpha1",
   "description": "HTTP File Server",
   "keywords": [
     "file server",
@@ -16,7 +16,7 @@
     "start-frontend": "npm run start --workspace=frontend",
     "start-admin": "npm run start --workspace=admin",
     "build-all": "npm audit --omit=dev && rm -rf dist && npm i && npm run build-server && npm run build-frontend && npm run build-admin && echo COMPLETED",
-    "build-server": "rm -rf dist/src dist/plugins && tsc --target es2018 && touch package.json && cp -v -r package.json README* LICENSE* plugins dist && find dist -name .DS_Store -delete && node afterbuild.js",
+    "build-server": "rm -rf dist/src dist/plugins && tsc --target es2018 && touch package.json && cp -v -r package.json central.json README* LICENSE* plugins dist && find dist -name .DS_Store -delete && node afterbuild.js",
     "build-frontend": "npm run build --workspace=frontend",
     "build-admin": "npm run build --workspace=admin",
     "server-for-test": "node dist/src --cwd . --config tests && rm custom.html",
@@ -78,7 +78,7 @@
     "limiter": "^2.1.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.6",
-    "nat-upnp": "github:kaden-sharpin/node-nat-upnp",
+    "nat-upnp-ts": "^2.0.1",
     "node-html-parser": "^6.1.5",
     "open": "^8.4.0",
     "tssrp6a": "^3.0.0",

package/plugins/download-counter/plugin.js

@@ -44,21 +44,20 @@ exports.init = async api => {
         frontend_js: 'main.js',
         frontend_css: 'style.css',
         unload: () => save.flush(), // we may have pending savings
-        middleware: (ctx) =>
-            () => { // execute after other middlewares are done
-                if (ctx.status >= 300 || ctx.state.download_counter_ignore || ctx.state.includesLastByte === false) return
-                if (!(ctx.vfsNode || api.getConfig('archives') && ctx.state.archive)) return
-                ctx.state.completed.then(() => {
-                    const key = uri2key(ctx.path)
-                    const entries = ctx.vfsNode ? [key]
-                        : ctx.state.originalStream?.getArchiveEntries?.().filter(x => x.at(-1) !== '/').map(x => key + uri2key(x))
-                    if (!entries) return
-                    for (const k of entries)
-                        counters[k] = counters[k] + 1 || 1
-                    save()
-                })
-            },
-        onDirEntry: ({ entry, listUri }) => {
+        middleware: ctx => () => { // callback = execute after other middlewares are done
+            if (ctx.status >= 300 || ctx.state.download_counter_ignore || ctx.state.includesLastByte === false) return
+            if (!(ctx.vfsNode || api.getConfig('archives') && ctx.state.archive)) return
+            ctx.state.completed.then(() => {
+                const key = uri2key(ctx.path)
+                const entries = ctx.vfsNode ? [key]
+                    : ctx.state.originalStream?.getArchiveEntries?.().filter(x => x.at(-1) !== '/').map(x => key + uri2key(x))
+                if (!entries) return
+                for (const k of entries)
+                    counters[k] = counters[k] + 1 || 1
+                save()
+            })
+        },
+        onDirEntry({ entry, listUri })  {
             const k = uri2key(listUri + entry.n)
             const n = counters[k]
             if (n)

package/src/adminApis.js

@@ -107,6 +107,7 @@ exports.adminApis = {
             compatibleApiVersion: const_1.COMPATIBLE_API_VERSION,
             ...await (0, listen_1.getServerStatus)(),
             urls: await (0, listen_1.getUrls)(),
+            ips: await (0, listen_1.getIps)(false),
             baseUrl: middlewares_1.baseUrl.get(),
             updatePossible: !(0, update_1.updateSupported)() ? false : await (0, update_1.localUpdateAvailable)() ? 'local' : true,
             proxyDetected: (0, middlewares_1.getProxyDetected)(),

package/src/api.file_list.js

@@ -12,6 +12,10 @@ const plugins_1 = require("./plugins");
 const misc_1 = require("./misc");
 const lodash_1 = __importDefault(require("lodash"));
 const const_1 = require("./const");
+const config_1 = require("./config");
+const path_1 = require("path");
+const DESCRIPT_ION = 'descript.ion';
+const descriptIon = (0, config_1.defineConfig)('descript_ion', true);
 const get_file_list = async ({ uri, offset, limit, search, c }, ctx) => {
     var _a;
     const node = await (0, vfs_1.urlToNode)(uri || '/', ctx);
@@ -57,14 +61,19 @@ const get_file_list = async ({ uri, offset, limit, search, c }, ctx) => {
         for await (const sub of walker) {
             if (ctx.aborted)
                 break;
-            if (!filter((0, vfs_1.getNodeName)(sub)))
+            const name = (0, vfs_1.getNodeName)(sub);
+            if (descriptIon.get() && name === DESCRIPT_ION)
+                continue;
+            if (!filter(name))
                 continue;
             const entry = await nodeToDirEntry(ctx, sub);
             if (!entry)
                 continue;
+            entry.comment = await getCommentFor(sub.source);
             const cbParams = { entry, ctx, listUri: uri, node: sub };
             try {
-                if (onDirEntryHandlers.some(cb => cb(cbParams) === false))
+                const res = await Promise.all(onDirEntryHandlers.map(cb => cb(cbParams)));
+                if (res.some(x => x === false))
                     continue;
             }
             catch (e) {
@@ -123,3 +132,18 @@ const get_file_list = async ({ uri, offset, limit, search, c }, ctx) => {
     }
 };
 exports.get_file_list = get_file_list;
+async function getCommentFor(path) {
+    return !path || !descriptIon.get() ? undefined
+        : readDescription((0, path_1.dirname)(path)).then(x => x.get((0, misc_1.basename)(path)), () => undefined);
+}
+function readDescription(path) {
+    return (0, misc_1.parseFile)((0, path_1.join)(path, DESCRIPT_ION), txt => new Map(txt.split('\n').map(line => {
+        const quoted = line[0] === '"' ? 1 : 0;
+        const i = quoted ? line.indexOf('"', 2) : line.indexOf(' ');
+        const fn = line.slice(quoted, i - quoted);
+        let comment = line.slice(i + 1);
+        if (comment.endsWith('\x04\xc2'))
+            comment = comment.slice(0, -2).replaceAll('\\n', '\n');
+        return [fn, comment];
+    })));
+}

package/src/api.net.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.acmeMiddleware = exports.externalIp = void 0;
+exports.makeCert = exports.acme_email = exports.acme_domain = exports.acmeMiddleware = exports.externalIp = void 0;
 const apiMiddleware_1 = require("./apiMiddleware");
-const nat_upnp_1 = require("nat-upnp");
+const nat_upnp_ts_1 = require("nat-upnp-ts");
 const const_1 = require("./const");
 const axios_1 = __importDefault(require("axios"));
 const node_html_parser_1 = require("node-html-parser");
@@ -20,22 +20,24 @@ const acme_client_1 = __importDefault(require("acme-client"));
 const promises_1 = __importDefault(require("fs/promises"));
 const http_1 = require("http");
 const promises_2 = require("dns/promises");
-const client = new nat_upnp_1.Client({ timeout: 4000 });
-const originalMethod = client.getGateway;
+const config_1 = require("./config");
+const events_1 = __importDefault(require("./events"));
+const upnpClient = new nat_upnp_ts_1.Client({ timeout: 4000 });
+const originalMethod = upnpClient.getGateway;
 // other client methods call getGateway too, so this will ensure they reuse this same result
-client.getGateway = (0, misc_1.debounceAsync)(() => originalMethod.apply(client), 0, { retain: misc_1.HOUR, retainFailure: 30000 });
-client.getGateway().catch(() => { });
+upnpClient.getGateway = (0, misc_1.debounceAsync)(() => originalMethod.apply(upnpClient), 0, { retain: misc_1.HOUR, retainFailure: 30000 });
+upnpClient.getGateway().catch(() => { });
 exports.externalIp = Promise.resolve(''); // poll external ip
 (0, misc_1.repeat)(10 * misc_1.MINUTE, () => {
     const was = exports.externalIp;
-    exports.externalIp = client.getPublicIp().catch(() => was); //fallback to previous value
+    exports.externalIp = upnpClient.getPublicIp().catch(() => was); //fallback to previous value
 });
 const getNatInfo = (0, misc_1.debounceAsync)(async () => {
     var _a, _b;
     const gettingIp = getPublicIp(); // don't wait, do it in parallel
-    const res = await client.getGateway().catch(() => null);
+    const res = await upnpClient.getGateway().catch(() => null);
     const status = await (0, listen_1.getServerStatus)();
-    const mappings = res && await (0, misc_1.haveTimeout)(5000, client.getMappings()).catch(() => null);
+    const mappings = res && await (0, misc_1.haveTimeout)(5000, upnpClient.getMappings()).catch(() => null);
     console.debug('mappings found', mappings);
     const gatewayIp = res ? new URL(res.gateway.description).hostname : await findGateway().catch(() => null);
     const localIp = (res === null || res === void 0 ? void 0 : res.address) || (await (0, listen_1.getIps)())[0];
@@ -129,19 +131,19 @@ async function generateSSLCert(domain, email) {
         let check = await checkPort(domain, 80); // some check services may not consider the domain, but we already verified that
         if (check && !check.success && upnp && externalPort !== 80) { // consider a short-lived mapping
             // @ts-ignore
-            await client.createMapping({ private: 80, public: { host: '', port: 80 }, description: 'hfs temporary', ttl: 30 }).catch(() => { });
+            await upnpClient.createMapping({ private: 80, public: { host: '', port: 80 }, description: 'hfs temporary', ttl: 30 }).catch(() => { });
             check = await checkPort(domain, 80); // repeat test
         }
         if (!check)
             throw new apiMiddleware_1.ApiError(const_1.HTTP_FAILED_DEPENDENCY, "couldn't test port 80");
         if (!check.success)
             throw new apiMiddleware_1.ApiError(const_1.HTTP_FAILED_DEPENDENCY, "port 80 is not working on the specified domain");
-        const client = new acme_client_1.default.Client({
+        const acmeClient = new acme_client_1.default.Client({
             accountKey: await acme_client_1.default.crypto.createPrivateKey(),
             directoryUrl: acme_client_1.default.directory.letsencrypt.production
         });
         const [key, csr] = await acme_client_1.default.crypto.createCsr({ commonName: domain });
-        const cert = await client.auto({
+        const cert = await acmeClient.auto({
             csr,
             email,
             challengePriority: ['http-01'],
@@ -203,13 +205,13 @@ const apis = {
             return new apiMiddleware_1.ApiError(const_1.HTTP_FAILED_DEPENDENCY, 'no internal port');
         if (externalPort)
             try {
-                await client.removeMapping({ public: { host: '', port: externalPort } });
+                await upnpClient.removeMapping({ public: { host: '', port: externalPort } });
             }
             catch (e) {
                 return new apiMiddleware_1.ApiError(const_1.HTTP_SERVER_ERROR, 'removeMapping failed: ' + String(e));
             }
         if (external) // must use the object form of 'public' to work around a bug of the library
-            await client.createMapping({ private: internal || internalPort, public: { host: '', port: external }, description: 'hfs', ttl: 0 });
+            await upnpClient.createMapping({ private: internal || internalPort, public: { host: '', port: external }, description: 'hfs', ttl: 0 });
         return {};
     },
     async check_server({ port }) {
@@ -224,19 +226,41 @@ const apis = {
             || new apiMiddleware_1.ApiError(const_1.HTTP_SERVICE_UNAVAILABLE);
     },
     async make_cert({ domain, email }) {
-        if (!domain)
-            return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, 'bad params');
-        const res = await generateSSLCert(domain, email);
-        const CERT_FILE = 'acme.cert';
-        const KEY_FILE = 'acme.key';
-        await promises_1.default.writeFile(CERT_FILE, res.cert);
-        await promises_1.default.writeFile(KEY_FILE, res.key);
-        listen_1.cert.set(CERT_FILE); // update config
-        listen_1.privateKey.set(KEY_FILE);
+        await (0, exports.makeCert)(domain, email);
         return {};
     },
     get_cert() {
         return (0, misc_1.objSameKeys)(lodash_1.default.pick((0, listen_1.getCertObject)(), ['subject', 'issuer', 'validFrom', 'validTo']), v => v);
     }
 };
+exports.acme_domain = (0, config_1.defineConfig)('acme_domain', '');
+exports.acme_email = (0, config_1.defineConfig)('acme_email', '');
+exports.makeCert = (0, misc_1.debounceAsync)(async (domain, email) => {
+    if (!domain)
+        return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, 'bad params');
+    const res = await generateSSLCert(domain, email);
+    const CERT_FILE = 'acme.cert';
+    const KEY_FILE = 'acme.key';
+    await promises_1.default.writeFile(CERT_FILE, res.cert);
+    await promises_1.default.writeFile(KEY_FILE, res.key);
+    listen_1.cert.set(CERT_FILE); // update config
+    listen_1.privateKey.set(KEY_FILE);
+}, 0);
+(0, config_1.defineConfig)('acme_renew', false); // handle config changes
+events_1.default.once('https ready', () => (0, misc_1.repeat)(misc_1.HOUR, renewCert));
+// checks if the cert is near expiration date, and if so renews it
+const renewCert = (0, misc_1.debounceAsync)(async () => {
+    const acmeLog = (...args) => console.log('[acme-renew]:', ...args);
+    const now = new Date();
+    const cert = (0, listen_1.getCertObject)();
+    if (!cert)
+        return;
+    const validTo = new Date(cert.validTo);
+    const isValid = now > new Date(cert.validFrom) && now < validTo &&
+        validTo.getTime() - now.getTime() >= 30 * misc_1.DAY; // it's not expiring in a month
+    if (isValid)
+        return acmeLog("certificate is good");
+    await (0, exports.makeCert)(exports.acme_domain.get(), exports.acme_email.get())
+        .catch(e => acmeLog("error: ", e.toString()));
+}, 0, { retain: misc_1.DAY, retainFailure: misc_1.HOUR });
 exports.default = apis;

package/src/api.plugins.js

@@ -15,7 +15,7 @@ const github_1 = require("./github");
 const const_1 = require("./const");
 const apis = {
     get_plugins({}, ctx) {
-        const list = new apiMiddleware_1.SendListReadable({ addAtStart: [...(0, plugins_1.mapPlugins)(serialize), ...(0, plugins_1.getAvailablePlugins)().map(serialize)] });
+        const list = new apiMiddleware_1.SendListReadable({ addAtStart: [...(0, plugins_1.mapPlugins)(serialize, false), ...(0, plugins_1.getAvailablePlugins)().map(serialize)] });
         return list.events(ctx, {
             pluginInstalled: p => list.add(serialize(p)),
             'pluginStarted pluginStopped pluginUpdated': p => {

package/src/commands.js

@@ -106,7 +106,7 @@ const commands = {
     },
     update: {
         params: '',
-        cb: update_1.update
+        cb: () => (0, update_1.update)()
     },
     'check-update': {
         params: '',

package/src/config.js

@@ -89,11 +89,7 @@ function defineConfig(k, defaultValue, compiler) {
             else
                 setConfig1(k, v);
         },
-        compiled: () => {
-            if (!compiler)
-                throw "missing compiler";
-            return compiled;
-        }
+        compiled: () => compiled !== null && compiled !== void 0 ? compiled : (0, misc_1.throw_)("missing compiler"),
     };
     if (compiler)
         ret.sub((...args) => compiled = compiler(...args));

package/src/const.js

@@ -38,7 +38,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 = "2023-09-20T22:00:36.550Z";
+exports.BUILD_TIMESTAMP = "2023-09-24T12:10:10.944Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.RUNNING_BETA = exports.VERSION.includes('-');

package/src/cross.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.xlate = exports.isEqualLax = exports.isWindowsDrive = exports.isIP = exports.isPrimitive = exports.formatTimestamp = exports.repeat = exports.asyncGeneratorToArray = exports.filterMapGenerator = exports.throw_ = exports.hasProp = exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.randomId = exports.getOrSet = exports.waitFor = exports.newObj = exports.removeStarting = exports.findDefined = exports.isOrderedEqual = exports.swap = exports.tryJson = exports.basename = exports.pendingPromise = exports._log = exports.wantArray = exports.formatPerc = exports.with_ = exports.try_ = exports.setHidden = exports.onlyTruthy = exports.truthy = exports.enforceFinal = exports.objSameKeys = exports.haveTimeout = exports.wait = exports.prefix = exports.formatBytes = exports.MAX_TILES_SIZE = exports.DAY = exports.HOUR = exports.MINUTE = exports.WIKI_URL = exports.REPO_URL = void 0;
+exports.ipForUrl = exports.ipLocalHost = exports.xlate = exports.isEqualLax = exports.isWindowsDrive = exports.isIP = exports.isPrimitive = exports.formatTimestamp = exports.repeat = exports.asyncGeneratorToArray = exports.filterMapGenerator = exports.throw_ = exports.hasProp = exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.randomId = exports.getOrSet = exports.waitFor = exports.newObj = exports.removeStarting = exports.findDefined = exports.isOrderedEqual = exports.swap = exports.tryJson = exports.basename = exports.pendingPromise = exports._dbg = exports._log = exports.wantArray = exports.formatPerc = exports.with_ = exports.try_ = exports.setHidden = exports.onlyTruthy = exports.truthy = exports.enforceFinal = exports.objSameKeys = exports.haveTimeout = exports.wait = exports.prefix = exports.formatBytes = exports.MAX_TILES_SIZE = exports.DAY = exports.HOUR = exports.MINUTE = exports.WIKI_URL = exports.REPO_URL = 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"));
@@ -86,6 +86,11 @@ function _log(...args) {
     return args[args.length - 1];
 }
 exports._log = _log;
+function _dbg(x) {
+    debugger;
+    return x;
+}
+exports._dbg = _dbg;
 function pendingPromise() {
     let takeOut;
     const ret = new Promise((resolve, reject) => takeOut = { resolve, reject });
@@ -225,7 +230,7 @@ async function asyncGeneratorToArray(generator) {
 }
 exports.asyncGeneratorToArray = asyncGeneratorToArray;
 function repeat(every, cb) {
-    Promise.allSettled([cb()]).then(() => setTimeout(() => repeat(every, cb), every));
+    return Promise.allSettled([cb()]).then(() => setTimeout(() => repeat(every, cb), every));
 }
 exports.repeat = repeat;
 function formatTimestamp(x) {
@@ -255,3 +260,11 @@ function xlate(input, table) {
     return (_a = table[input]) !== null && _a !== void 0 ? _a : input;
 }
 exports.xlate = xlate;
+function ipLocalHost(ip) {
+    return ip === '::1' || ip.endsWith('127.0.0.1');
+}
+exports.ipLocalHost = ipLocalHost;
+function ipForUrl(ip) {
+    return ip.includes(':') ? '[' + ip + ']' : ip;
+}
+exports.ipForUrl = ipForUrl;

package/src/customHtml.js

@@ -35,7 +35,7 @@ function watchLoadCustomHtml(folder = '') {
 exports.watchLoadCustomHtml = watchLoadCustomHtml;
 function getSection(name) {
     return (exports.customHtmlState.sections.get(name) || '')
-        + (0, plugins_1.mapPlugins)(pl => pl.getData().customHtml.get(name)).join('\n');
+        + (0, plugins_1.mapPlugins)(pl => { var _a; return (_a = pl.getData().customHtml) === null || _a === void 0 ? void 0 : _a.get(name); }).join('\n');
 }
 exports.getSection = getSection;
 async function saveCustomHtml(sections) {

package/src/debounceAsync.js

@@ -14,6 +14,7 @@ function debounceAsync(callback, wait = 100, options = {}) {
     let lastSince = 0;
     const interceptingWrapper = (...args) => runningDebouncer = debouncer(...args);
     return Object.assign(interceptingWrapper, {
+        clearRetain: () => last = undefined,
         flush: () => runningCallback !== null && runningCallback !== void 0 ? runningCallback : exec(),
         ...cancelable && {
             cancel() {

package/src/listen.js

@@ -43,6 +43,7 @@ const adminApis_1 = require("./adminApis");
 const lodash_1 = __importDefault(require("lodash"));
 const crypto_1 = require("crypto");
 const api_net_1 = require("./api.net");
+const events_1 = __importDefault(require("./events"));
 let httpSrv;
 let httpsSrv;
 const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', !const_1.DEV);
@@ -52,13 +53,11 @@ function getHttpsWorkingPort() {
 }
 exports.getHttpsWorkingPort = getHttpsWorkingPort;
 const commonOptions = { requestTimeout: 0 };
-exports.portCfg = (0, config_1.defineConfig)('port', 80);
-exports.portCfg.sub(async (port) => {
-    while (!index_1.app)
-        await (0, misc_1.wait)(100);
+const considerHttp = (0, misc_1.debounceAsync)(async () => {
+    await (0, misc_1.waitFor)(() => index_1.app);
     stopServer(httpSrv).then();
     httpSrv = Object.assign(http.createServer(commonOptions, index_1.app.callback()), { name: 'http' });
-    port = await startServer(httpSrv, { port });
+    const port = await startServer(httpSrv, { port: exports.portCfg.get(), host: listenInterface.get() });
     if (!port)
         return;
     httpSrv.on('connection', connections_1.newConnection);
@@ -66,6 +65,10 @@ exports.portCfg.sub(async (port) => {
     if (openBrowserAtStart.get() && !const_1.argv.updated)
         openAdmin();
 });
+exports.portCfg = (0, config_1.defineConfig)('port', 80);
+const listenInterface = (0, config_1.defineConfig)('listen_interface', '');
+exports.portCfg.sub(considerHttp);
+listenInterface.sub(considerHttp);
 function openAdmin() {
     for (const srv of [httpSrv, httpsSrv]) {
         const a = srv === null || srv === void 0 ? void 0 : srv.address();
@@ -84,6 +87,8 @@ function openAdmin() {
 }
 exports.openAdmin = openAdmin;
 function getCertObject() {
+    if (!httpsOptions.cert)
+        return;
     const o = new crypto_1.X509Certificate(httpsOptions.cert);
     const some = lodash_1.default.pick(o, ['subject', 'issuer', 'validFrom', 'validTo']);
     return (0, misc_1.objSameKeys)(some, v => (v === null || v === void 0 ? void 0 : v.includes('=')) ? Object.fromEntries(v.split('\n').map(x => x.split('='))) : v);
@@ -99,6 +104,8 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
         httpsSrv = Object.assign(https.createServer(port === PORT_DISABLED ? {} : { ...commonOptions, key: httpsOptions.private_key, cert: httpsOptions.cert }, index_1.app.callback()), { name: 'https' });
         if (port >= 0) {
             const cert = getCertObject();
+            if (!cert)
+                return;
             const cn = (_a = cert.subject) === null || _a === void 0 ? void 0 : _a.CN;
             if (cn)
                 console.log("certificate loaded for", cn);
@@ -120,11 +127,12 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
         console.log("failed to create https server: check your private key and certificate", String(e));
         return;
     }
-    port = await startServer(httpsSrv, { port });
+    port = await startServer(httpsSrv, { port, host: listenInterface.get() });
     if (!port)
         return;
     httpsSrv.on('connection', connections_1.newConnection);
     printUrls(httpsSrv.name);
+    events_1.default.emit('https ready');
 });
 exports.cert = (0, config_1.defineConfig)('cert', '');
 exports.privateKey = (0, config_1.defineConfig)('private_key', '');
@@ -150,6 +158,7 @@ for (const cfg of httpsNeeds) {
 const PORT_DISABLED = -1;
 exports.httpsPortCfg = (0, config_1.defineConfig)('https_port', PORT_DISABLED);
 exports.httpsPortCfg.sub(considerHttps);
+listenInterface.sub(considerHttps);
 function startServer(srv, { port, host }) {
     return new Promise(async (resolve) => {
         if (!srv)
@@ -194,6 +203,8 @@ function startServer(srv, { port, host }) {
                 srv.error = String(e);
                 srv.busy = undefined;
                 const { code } = e;
+                if (code === 'EACCES' && port < 1024)
+                    srv.error = `lacking permission on port ${port}, try with permission (${const_1.IS_WINDOWS ? 'administrator' : 'sudo'}) or port > 1024`;
                 if (code === 'EADDRINUSE') {
                     srv.busy = (0, find_process_1.default)('port', port).then(res => { var _a; return ((_a = res === null || res === void 0 ? void 0 : res[0]) === null || _a === void 0 ? void 0 : _a.name) || ''; }, () => '');
                     srv.error = `port ${port} busy: ${await srv.busy || "unknown process"}`;
@@ -242,11 +253,11 @@ async function getServerStatus() {
 }
 exports.getServerStatus = getServerStatus;
 const ignore = /^(lo|.*loopback.*|virtualbox.*|.*\(wsl\).*|llw\d|awdl\d|utun\d|anpi\d)$/i; // avoid giving too much information
-async function getIps() {
+async function getIps(external = true) {
     const ips = (0, misc_1.onlyTruthy)(Object.entries((0, os_1.networkInterfaces)()).map(([name, nets]) => nets && !ignore.test(name)
         && v4first((0, misc_1.onlyTruthy)(nets.map(net => !net.internal && net.address)))[0] // for each interface we consider only 1 address
     )).flat();
-    const e = await api_net_1.externalIp;
+    const e = external && await api_net_1.externalIp;
     if (e && !ips.includes(e))
         ips.unshift(e);
     return v4first(ips)
@@ -257,21 +268,19 @@ async function getIps() {
 }
 exports.getIps = getIps;
 async function getUrls() {
-    const ips = (await getIps()).map(ip => ip.includes(':') ? '[' + ip + ']' : ip);
+    const on = listenInterface.get();
+    const ips = on ? [on] : await getIps();
     return Object.fromEntries((0, misc_1.onlyTruthy)([httpSrv, httpsSrv].map(srv => {
         var _a;
         if (!(srv === null || srv === void 0 ? void 0 : srv.listening))
             return false;
         const port = (_a = srv === null || srv === void 0 ? void 0 : srv.address()) === null || _a === void 0 ? void 0 : _a.port;
         const appendPort = port === (srv.name === 'https' ? 443 : 80) ? '' : ':' + port;
-        const urls = ips.map(ip => `${srv.name}://${ip}${appendPort}`);
+        const urls = ips.map(ip => `${srv.name}://${(0, misc_1.ipForUrl)(ip)}${appendPort}`);
         return urls.length && [srv.name, urls];
     })));
 }
 exports.getUrls = getUrls;
 function printUrls(srvName) {
-    getUrls().then(urls => {
-        for (const url of urls[srvName])
-            console.log('serving on', url);
-    });
+    getUrls().then(urls => lodash_1.default.each(urls[srvName], url => console.log('serving on', url)));
 }

package/src/misc.js

@@ -32,6 +32,7 @@ const debounceAsync_1 = __importDefault(require("./debounceAsync"));
 exports.debounceAsync = debounceAsync_1.default;
 const apiMiddleware_1 = require("./apiMiddleware");
 const const_1 = require("./const");
+const cross_1 = require("./cross");
 const cbs = new Set();
 function onProcessExit(cb) {
     cbs.add(cb);
@@ -70,7 +71,7 @@ function onOff(em, events) {
 exports.onOff = onOff;
 function isLocalHost(c) {
     const ip = typeof c === 'string' ? c : c.socket.remoteAddress; // don't use Context.ip as it is subject to proxied ips, and that's no use for localhost detection
-    return ip && (ip === '::1' || ip.endsWith('127.0.0.1'));
+    return ip && (0, cross_1.ipLocalHost)(ip);
 }
 exports.isLocalHost = isLocalHost;
 function makeNetMatcher(mask, emptyMaskReturns = false) {