hfs 0.26.2 → 0.26.5

package/frontend/assets/index.93366732.css

@@ -0,0 +1 @@
+:root{--bg: #fff;--text: #555;--faint-contrast: #0002;--mild-contrast: #0005;--good-contrast: #000a;--button-bg: #68a;--button-text: #fff;--focus-color: #468}:root .theme-dark{--bg: #000;--text: #999;--faint-contrast: #fff2;--mild-contrast: #fff5;--good-contrast: #fffa;--button-bg: #345;--button-text: #999}:root .theme-dark body{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-backdrop{background:rgba(51,51,51,.7333333333)}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,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}input[type=checkbox]{margin:0 1.3em 0 .8em;transform:scale(1.7);accent-color:var(--button-bg)}.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{opacity:.6}button:focus-visible,.breadcrumb:focus-visible{outline:3px solid var(--focus-color)}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}header{position:sticky;top:0;background:var(--bg);padding:.2em;z-index:1}.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{font-size:90%;margin:.4em 0 0 .5em;float:right}#folder-stats .icon{margin-right:.3em}header input{width:100%;margin:.2em auto;box-sizing:border-box}#filter-bar{display:flex;gap:.3em;margin:.5em 0}#filter-bar input{flex:1}#filter-bar button{padding:0 .5em}ul.dir{flex:1;padding:0;margin:0;clear:both}ul.dir li{display:block;list-style-type:none;margin-bottom:.3em;padding:.3em;border-top:1px solid var(--button-bg)}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:12px;margin-top:.2em}ul.dir li .entry-props .icon{margin:0 .3em}ul.dir li .entry-props .entry-size{display:inline-block}#menu-panel{margin-bottom:.2em}#menu-bar{display:flex;justify-content:space-evenly;flex-wrap:wrap}#menu-bar>*{flex:auto;margin:.1em}#menu-bar button{padding-left:0;padding-right:0}#menu-bar>a>button{width:100%}#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-confirm,.dialog-prompt{--color: var(--button-bg)}#paging{display:flex;position:sticky;bottom:0;background:var(--bg);gap:.5em;overflow-x:auto}#paging>button{flex:1;background:var(--button-bg);text-align:center}*{scrollbar-width:thin;scrollbar-color:var(--button-bg) var(--faint-contrast)}*::-webkit-scrollbar{width:12px}*::-webkit-scrollbar-track{background:var(--faint-contrast)}*::-webkit-scrollbar-thumb{background-color:var(--button-bg);border-radius:20px;border:1px solid var(--faint-contrast)}@media (max-width: 42em){body,button,select{font-size:14pt}#menu-bar button label{display:none}#filter-bar{margin:.2em 0}#filter-bar label{display:none}#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)}.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-closer{border-radius:0 .8em;right:0;padding:0;background-color:#c99}.dialog-icon~.dialog-content{margin-top:1.3em}.dialog-type{left:0;top:0;overflow:hidden;line-height:1.7em}.dialog-content{overflow:auto;max-height:calc(100vh - 4em)}.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: 50em){.dialog-closer{font-size:120%}.dialog-icon~.dialog-content{margin-top:2em}}

package/{admin/assets/sha512.3c0e384c.js → frontend/assets/sha512.bb881250.js}

@@ -1,4 +1,4 @@
-import{c as SF}from"./index.f056db34.js";function OF(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 yF={exports:{}};/*
+import{c as SF}from"./index.1151988f.js";function OF(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 yF={exports:{}};/*
  * [js-sha512]{@link https://github.com/emn178/js-sha512}
  *
  * @version 0.8.0

package/frontend/index.html

@@ -6,8 +6,8 @@
     <link href="fontello.css" rel="stylesheet" />
     <script>SESSION = _HFS_SESSION_</script>
     <title>File Server</title>
-    <script type="module" crossorigin src="/assets/index.55c710c2.js"></script>
-    <link rel="stylesheet" href="/assets/index.ee805a6c.css">
+    <script type="module" crossorigin src="/assets/index.1151988f.js"></script>
+    <link rel="stylesheet" href="/assets/index.93366732.css">
   </head>
   <body>
     <div hidden>_HFS_PLUGINS_</div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.26.2",
+  "version": "0.26.5",
   "description": "HTTP File Server",
   "keywords": [
     "file server",
@@ -30,7 +30,6 @@
     "dist-bin": "npm run dist-modules && cd dist && pkg . -C gzip && mv -f hfs-win-x64.exe hfs.exe && zip hfs-windows.zip hfs.exe -r plugins && cp -f hfs-linux-x64 hfs && zip hfs-linux.zip hfs -r plugins && cp -f hfs-macos-x64 hfs && zip hfs-mac.zip hfs -r plugins && cp -f hfs-macos-arm64 hfs && zip hfs-mac-arm.zip hfs -r plugins && rm hfs",
     "dist-modules": "cp package*.json dist && cd dist && npm ci --omit=dev && npm i -f --no-save --omit=dev @node-rs/crc32-win32-x64-msvc && rm package-lock.json && cd .. && node prune_modules",
     "dist-win": "npm run dist-modules && cd dist && pkg . -C gzip -t node16-win-x64 && zip hfs-windows.zip hfs.exe -r plugins",
-    "dist-mac": "cd dist && pkg . -C gzip -t node16-mac-arm64",
     "dist-node": "npm run dist-modules && cd dist && zip hfs-node.zip -r * -x *.zip *.exe hfs-* *.log logs"
   },
   "engines": {

package/plugins/vhosting/plugin.js

@@ -9,9 +9,7 @@ exports.config = {
         fields: {
             host: { label: "Domain" },
             root: { helperText: "Root path in VFS" },
-        },
-        defaultValue: [],
-        height: 300,
+        }
     },
 	mandatory: {
 		label: "Block requests that are not using any of the domains above",

package/src/api.plugins.js

@@ -23,7 +23,9 @@ const apis = {
             pluginUninstalled: id => list.remove({ id }),
         });
         function serialize(p) {
-            return lodash_1.default.defaults('getData' in p ? Object.assign(lodash_1.default.pick(p, ['id', 'started']), p.getData()) : p, { started: null, badApi: null }); // nulls should be used to be sure to overwrite previous values,
+            const o = 'getData' in p ? Object.assign(lodash_1.default.pick(p, ['id', 'started']), p.getData())
+                : { ...p }; // _.defaults mutates object, and we don't want that
+            return lodash_1.default.defaults(o, { started: null, badApi: null }); // nulls should be used to be sure to overwrite previous values,
         }
     },
     async get_plugin_updates() {

package/src/commands.js

@@ -7,10 +7,23 @@ const perm_1 = require("./perm");
 const config_1 = require("./config");
 const lodash_1 = __importDefault(require("lodash"));
 const update_1 = require("./update");
+const listen_1 = require("./listen");
 const yaml_1 = __importDefault(require("yaml"));
 const const_1 = require("./const");
-console.log(`HINT: type "help" for help`);
-require('readline').createInterface({ input: process.stdin }).on('line', (line) => {
+const readline_1 = require("readline");
+try {
+    /*
+    is this try-block useful in case the stdin is unavailable?
+    Not sure, but someone reported a problem using nohup https://github.com/rejetto/hfs/issues/74
+    and I've found this example try-catching https://github.com/DefinitelyTyped/DefinitelyTyped/blob/dda83a906914489e09ca28afea12948529015d4a/types/node/readline.d.ts#L489
+    */
+    (0, readline_1.createInterface)({ input: process.stdin }).on('line', parseCommandLine);
+    console.log(`HINT: type "help" for help`);
+}
+catch (_a) {
+    console.log("console commands not available");
+}
+function parseCommandLine(line) {
     if (!line)
         return;
     const [name, ...params] = line.trim().split(/ +/);
@@ -25,7 +38,7 @@ require('readline').createInterface({ input: process.stdin }).on('line', (line)
         else
             throw err;
     });
-});
+}
 const commands = {
     help: {
         params: '',
@@ -33,6 +46,12 @@ const commands = {
             console.log("supported commands:", ...lodash_1.default.map(commands, ({ params }, name) => '\n - ' + name + ' ' + params));
         }
     },
+    'show-admin': {
+        params: '',
+        cb() {
+            (0, listen_1.openAdmin)();
+        }
+    },
     'create-admin': {
         params: '<password> [<username>=admin]',
         async cb(password, username = 'admin') {

package/src/config.js

@@ -12,7 +12,6 @@ const yaml_1 = __importDefault(require("yaml"));
 const lodash_1 = __importDefault(require("lodash"));
 const misc_1 = require("./misc");
 const fs_1 = require("fs");
-const util_1 = require("util");
 const path_1 = require("path");
 const events_2 = __importDefault(require("./events"));
 const FILE = 'config.yaml';
@@ -163,10 +162,7 @@ exports.saveConfigAsap = (0, misc_1.debounceAsync)(async () => {
         await (0, misc_1.wait)(100);
     let txt = yaml_1.default.stringify(state, { lineWidth: 1000 });
     if (txt.trim() === '{}') // most users wouldn't understand
-        if (await (0, util_1.promisify)(fs_1.exists)(path)) // if a file exists then empty it, else don't bother creating it
-            txt = '';
-        else
-            return;
+        txt = '';
     save(path, txt)
         .catch(err => console.error('Failed at saving config file, please ensure it is writable.', String(err)));
 });

package/src/const.js

@@ -43,7 +43,7 @@ const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.DAY = 86400000;
 exports.SESSION_DURATION = exports.DAY;
-exports.API_VERSION = 4; // introduced type:real_path and api.subscribeConfig/setConfig/getHfsConfig
+exports.API_VERSION = 4.1; // array.$width
 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/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.portCfg = void 0;
+exports.getUrls = exports.getStatus = exports.httpsPortCfg = exports.openAdmin = exports.portCfg = void 0;
 const http = __importStar(require("http"));
 const config_1 = require("./config");
 const index_1 = require("./index");
@@ -40,6 +40,7 @@ const misc_1 = require("./misc");
 const const_1 = require("./const");
 const find_process_1 = __importDefault(require("find-process"));
 const perm_1 = require("./perm");
+const lodash_1 = __importDefault(require("lodash"));
 let httpSrv;
 let httpsSrv;
 const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', !const_1.DEV);
@@ -55,13 +56,25 @@ exports.portCfg.sub(async (port) => {
     httpSrv.on('connection', connections_1.newConnection);
     printUrls(port, 'http');
     if (openBrowserAtStart.get())
-        (0, open_1.default)('http://localhost' + (port === 80 ? '' : ':' + port) + const_1.ADMIN_URI, { wait: true }).catch(e => {
+        openAdmin();
+});
+function openAdmin() {
+    for (const srv of [httpSrv, httpsSrv]) {
+        const a = srv.address();
+        if (!a || typeof a === 'string')
+            continue;
+        const baseUrl = srv.name + '://localhost:' + a.port;
+        (0, open_1.default)(baseUrl + const_1.ADMIN_URI, { wait: true }).catch(e => {
             console.debug(String(e));
             console.warn("cannot launch browser on this machine >PLEASE< open your browser and reach one of these (you may need a different address)", ...Object.values(getUrls()).flat().map(x => '\n - ' + x + const_1.ADMIN_URI));
             if (!(0, perm_1.anyAccountCanLoginAdmin)())
                 console.log(`HINT: you can enter command: create-admin YOUR_PASSWORD`);
         });
-});
+        return true;
+    }
+    console.log("openAdmin failed");
+}
+exports.openAdmin = openAdmin;
 const considerHttps = (0, misc_1.debounceAsync)(async () => {
     var _a, _b;
     stopServer(httpsSrv).then();
@@ -207,20 +220,16 @@ function printUrls(port, proto) {
     if (!port)
         return;
     for (const [name, nets] of Object.entries((0, os_1.networkInterfaces)())) {
-        if (!nets)
+        if (!nets || ignore.test(name))
             continue;
-        const filteredNets = nets.filter(n => !n.internal);
-        if (!filteredNets.length || ignore.test(name))
+        lodash_1.default.remove(nets, 'internal');
+        if (!nets.length)
             continue;
-        console.log('network', name);
-        for (const net of nets) {
-            if (net.internal)
-                continue;
-            const appendPort = port === (proto === 'https' ? 443 : 80) ? '' : ':' + port;
-            let { address } = net;
-            if (address.includes(':'))
-                address = '[' + address + ']';
-            console.log('-', proto + '://' + address + appendPort);
-        }
+        const best = lodash_1.default.find(nets, { family: 'IPv4' }) || nets[0];
+        const appendPort = port === (proto === 'https' ? 443 : 80) ? '' : ':' + port;
+        let { address } = best;
+        if (address.includes(':'))
+            address = '[' + address + ']';
+        console.log('network', name, proto + '://' + address + appendPort);
     }
 }

package/src/plugins.js

@@ -31,7 +31,7 @@ exports.parsePluginSource = exports.rescan = exports.pluginsConfig = exports.ena
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const watchLoad_1 = require("./watchLoad");
 const lodash_1 = __importDefault(require("lodash"));
-const path_1 = __importStar(require("path"));
+const path_1 = __importDefault(require("path"));
 const const_1 = require("./const");
 const Const = __importStar(require("./const"));
 const misc_1 = require("./misc");
@@ -66,8 +66,9 @@ function setPluginConfig(id, changes) {
 }
 exports.setPluginConfig = setPluginConfig;
 function getPluginInfo(id) {
-    var _a, _b;
-    return (_b = (_a = plugins[id]) === null || _a === void 0 ? void 0 : _a.getData()) !== null && _b !== void 0 ? _b : availablePlugins[id];
+    var _a;
+    const running = (_a = plugins[id]) === null || _a === void 0 ? void 0 : _a.getData();
+    return running && Object.assign(running, { id }) || availablePlugins[id];
 }
 exports.getPluginInfo = getPluginInfo;
 function mapPlugins(cb) {
@@ -123,25 +124,14 @@ function pluginsMiddleware() {
 exports.pluginsMiddleware = pluginsMiddleware;
 class Plugin {
     constructor(id, data, unwatch) {
-        var _a, _b;
         this.id = id;
         this.data = data;
         this.unwatch = unwatch;
         this.started = new Date();
         if (!data)
             throw 'invalid data';
-        // if a previous instance is present, we are going to overwrite it, but first call its unload callback
-        const old = plugins[id];
-        try {
-            (_b = (_a = old === null || old === void 0 ? void 0 : old.data) === null || _a === void 0 ? void 0 : _a.unload) === null || _b === void 0 ? void 0 : _b.call(_a);
-        } // we don't want all the effects of the Plugin.unload
-        catch (e) {
-            console.debug('error unloading plugin', id, String(e));
-        }
-        // track this
-        const wasStopped = availablePlugins[id];
-        if (wasStopped)
-            delete availablePlugins[id];
+        if (plugins[id])
+            throw "unload first: " + id;
         plugins[id] = this;
         this.data = data = { ...data }; // clone to make object modifiable. Objects coming from import are not.
         // some validation
@@ -154,7 +144,6 @@ class Plugin {
                 console.warn('invalid', k);
             }
         }
-        events_1.default.emit(old || wasStopped ? 'pluginStarted' : 'pluginInstalled', this);
     }
     get middleware() {
         var _a;
@@ -175,17 +164,19 @@ class Plugin {
     getData() {
         return { ...this.data };
     }
-    async unload() {
+    async unload(reloading = false) {
         var _a, _b;
         const { id } = this;
-        console.log('unloading plugin', id);
         try {
             await ((_b = (_a = this.data) === null || _a === void 0 ? void 0 : _a.unload) === null || _b === void 0 ? void 0 : _b.call(_a));
+            console.log('unloaded plugin', id);
         }
         catch (e) {
-            console.debug('error unloading plugin', id, String(e));
+            console.log('error unloading plugin', id, String(e));
         }
         delete plugins[id];
+        if (reloading)
+            return;
         this.unwatch();
         if (availablePlugins[id])
             events_1.default.emit('pluginStopped', availablePlugins[id]);
@@ -213,8 +204,8 @@ async function rescan() {
     console.debug('scanning plugins');
     const found = [];
     const foundDisabled = {};
-    const MASK = (0, path_1.join)(exports.PATH, '*', 'plugin.js');
-    for (const f of await (0, fast_glob_1.default)([(0, path_1.join)(const_1.APP_PATH, MASK), MASK])) {
+    const MASK = exports.PATH + '/*/plugin.js'; // be sure to not use path.join as fast-glob doesn't work with \
+    for (const f of await (0, fast_glob_1.default)([(0, misc_1.adjustStaticPathForGlob)(const_1.APP_PATH) + '/' + MASK, MASK])) {
         const id = f.split('/').slice(-2)[0];
         if (id.endsWith(exports.DISABLING_POSTFIX))
             continue;
@@ -232,14 +223,16 @@ async function rescan() {
         const module = path_1.default.resolve(f);
         const { unwatch } = (0, watchLoad_1.watchLoad)(f, async () => {
             try {
-                const reloading = plugins[id];
-                console.log(reloading ? "reloading plugin" : "loading plugin", id);
+                const alreadyRunning = plugins[id];
+                console.log(alreadyRunning ? "reloading plugin" : "loading plugin", id);
                 const { init, ...data } = await Promise.resolve().then(() => __importStar(require(module)));
                 delete data.default;
                 deleteModule(require.resolve(module)); // avoid caching at next import
                 calculateBadApi(data);
                 if (data.badApi)
                     console.log("plugin", id, data.badApi);
+                await (alreadyRunning === null || alreadyRunning === void 0 ? void 0 : alreadyRunning.unload(true));
+                console.debug("starting plugin", id);
                 const res = await (init === null || init === void 0 ? void 0 : init.call(null, {
                     srcDir: __dirname,
                     const: Const,
@@ -256,16 +249,28 @@ async function rescan() {
                         cb(last);
                         return exports.pluginsConfig.sub(() => {
                             const now = this.getConfig(cfgKey);
-                            if (!(0, misc_1.same)(now, last))
+                            if ((0, misc_1.same)(now, last))
+                                return;
+                            try {
                                 cb(last = now);
+                            }
+                            catch (e) {
+                                console.log('plugin', id, String(e));
+                            }
                         });
                     },
                     getHfsConfig: config_1.getConfig,
                 }));
                 Object.assign(data, res);
-                new Plugin(id, data, unwatch);
-                if (reloading)
-                    events_1.default.emit('pluginUpdated', getPluginInfo(id));
+                const plugin = new Plugin(id, data, unwatch);
+                if (alreadyRunning)
+                    events_1.default.emit('pluginUpdated', Object.assign(lodash_1.default.pick(plugin, 'started'), getPluginInfo(id)));
+                else {
+                    const wasInstalled = availablePlugins[id];
+                    if (wasInstalled)
+                        delete availablePlugins[id];
+                    events_1.default.emit(wasInstalled ? 'pluginStarted' : 'pluginInstalled', plugin);
+                }
             }
             catch (e) {
                 console.log("plugin error:", e);

package/src/util-files.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.unzip = exports.run = exports.dirStream = exports.isWindowsDrive = exports.dirTraversal = exports.watchDir = exports.readFileBusy = exports.isFile = exports.isDirectory = void 0;
+exports.unzip = exports.run = exports.dirStream = exports.adjustStaticPathForGlob = exports.isWindowsDrive = exports.dirTraversal = exports.watchDir = exports.readFileBusy = exports.isFile = exports.isDirectory = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const misc_1 = require("./misc");
 const fs_1 = require("fs");
@@ -86,23 +86,30 @@ function isWindowsDrive(s) {
     return s && /^[a-zA-Z]:$/.test(s);
 }
 exports.isWindowsDrive = isWindowsDrive;
-async function* dirStream(path) {
-    const stats = await promises_1.default.stat(path);
-    if (!stats.isDirectory())
+// apply this to paths that may contain \ as separator (not supported by fast-glob) and other special chars to be escaped (parenthesis)
+function adjustStaticPathForGlob(path) {
+    return fast_glob_1.default.escapePath(path.replace(/\\/g, '/'));
+}
+exports.adjustStaticPathForGlob = adjustStaticPathForGlob;
+async function* dirStream(path, deep) {
+    if (!await isDirectory(path))
         throw Error('ENOTDIR');
-    const dirStream = fast_glob_1.default.stream('*', {
+    const dirStream = fast_glob_1.default.stream(deep ? '**/*' : '*', {
         cwd: path,
         dot: true,
+        deep,
         onlyFiles: false,
         suppressErrors: true,
+        objectMode: true,
     });
     const skip = await getItemsToSkip(path);
-    for await (let path of dirStream) {
-        if (path instanceof Buffer)
-            path = path.toString('utf8');
-        if (skip === null || skip === void 0 ? void 0 : skip.includes(path))
+    for await (const entry of dirStream) {
+        let { path, dirent } = entry;
+        if (!dirent.isDirectory() && !dirent.isFile())
             continue;
-        yield path;
+        path = String(path);
+        if (!(skip === null || skip === void 0 ? void 0 : skip.includes(path)))
+            yield path;
     }
     async function getItemsToSkip(path) {
         if (!const_1.IS_WINDOWS)

package/src/vfs.js

@@ -114,7 +114,19 @@ function hasPermission(node, perm, ctx) {
         && (perm !== 'can_see' || hasPermission(node, 'can_read', ctx)); // for can_see you must also can_read
 }
 exports.hasPermission = hasPermission;
+/* redev: 1322k716 8.6s
+-temp 6.43s
+*/
+setTimeout(async () => {
+    let n = 0;
+    console.time('asd');
+    for await (const x of walkNode({ source: '/Users/rejetto/redev' }, undefined, Infinity))
+        ++n;
+    console.timeEnd('asd');
+    console.log({ n });
+}, 3000);
 async function* walkNode(parent, ctx, depth = 0, prefixPath = '') {
+    var _a;
     const { children, source } = parent;
     if (children)
         for (let idx = 0; idx < children.length; idx++) {
@@ -122,60 +134,58 @@ async function* walkNode(parent, ctx, depth = 0, prefixPath = '') {
             yield* workItem({
                 ...child,
                 name: prefixPath ? (prefixPath + getNodeName(child)) : child.name
-            });
+            }, depth > 0 && await nodeIsDirectory(child).catch(() => false));
         }
     if (!source)
         return;
     try {
-        for await (const path of (0, misc_1.dirStream)(source)) {
-            if (ctx.req.aborted)
+        for await (const path of (0, misc_1.dirStream)(source, depth)) {
+            if (ctx === null || ctx === void 0 ? void 0 : ctx.req.aborted)
                 return;
-            let { rename } = parent;
-            const renamed = rename === null || rename === void 0 ? void 0 : rename[path];
+            const renamed = (_a = parent.rename) === null || _a === void 0 ? void 0 : _a[path];
             yield* workItem({
-                name: (prefixPath || renamed) && prefixPath + (renamed || path),
+                name: prefixPath + (renamed || path),
                 source: (0, path_1.join)(source, path),
-                rename: renameUnderPath(rename, path),
+                rename: renameUnderPath(parent.rename, path),
             });
         }
     }
     catch (e) {
         console.debug('glob', source, e); // ENOTDIR, or lacking permissions
     }
-    async function* workItem(item) {
+    // item will be changed, so be sure to pass a temp node
+    async function* workItem(item, recur = false) {
+        const name = getNodeName(item);
         // we basename for depth>0 where we already have the rest of the path in the parent's url, and would be duplicated
-        const name = (0, path_1.basename)(getNodeName(item));
-        const url = (0, misc_1.enforceFinal)('/', parent.url || '') + name;
-        const temp = inheritFromParent(parent, {
-            ...item,
+        const virtualBasename = (0, path_1.basename)(name);
+        const url = (0, misc_1.enforceFinal)('/', parent.url || '') + virtualBasename;
+        Object.assign(item, {
             isTemp: true,
             url,
             parents: [...parent.parents || [], parent],
         });
-        applyMasks(temp, parent, name);
-        if (!hasPermission(temp, 'can_see', ctx))
+        inheritFromParent(parent, item);
+        applyMasks(item, parent, virtualBasename);
+        if (ctx && !hasPermission(item, 'can_see', ctx))
             return;
-        yield temp;
-        try {
-            if (!depth || !await nodeIsDirectory(temp))
-                return;
-            inheritMasks(temp, parent, name);
-            yield* walkNode(temp, ctx, depth - 1, getNodeName(temp) + '/');
-        }
-        catch (_a) { } // stat failed in nodeIsDirectory, ignore
+        yield item;
+        if (!recur)
+            return;
+        inheritMasks(item, parent, virtualBasename);
+        yield* walkNode(item, ctx, depth - 1, name + '/');
     }
 }
 exports.walkNode = walkNode;
-function applyMasks(item, parent, name) {
+function applyMasks(item, parent, virtualBasename) {
     const { masks } = parent;
     if (!masks)
         return;
     for (const k in masks)
-        if (k.startsWith('**/') && (0, micromatch_1.isMatch)(name, k.slice(3))
-            || !k.includes('/') && (0, micromatch_1.isMatch)(name, k))
+        if (k.startsWith('**/') && (0, micromatch_1.isMatch)(virtualBasename, k.slice(3))
+            || !k.includes('/') && (0, micromatch_1.isMatch)(virtualBasename, k))
             Object.assign(item, masks[k]);
 }
-function inheritMasks(item, parent, name) {
+function inheritMasks(item, parent, virtualBasename) {
     const { masks } = parent;
     if (!masks)
         return;
@@ -183,8 +193,8 @@ function inheritMasks(item, parent, name) {
     for (const k in masks)
         if (k.startsWith('**/'))
             o[k.slice(3)] = masks[k];
-        else if (k.startsWith(name + '/'))
-            o[k.slice(name.length + 1)] = masks[k];
+        else if (k.startsWith(virtualBasename + '/'))
+            o[k.slice(virtualBasename.length + 1)] = masks[k];
     if (Object.keys(o).length)
         item.masks = o;
 }

package/frontend/assets/index.ee805a6c.css

@@ -1 +0,0 @@
-:root{--bg: #fff;--text: #555;--faint-contrast: #0002;--mild-contrast: #0005;--good-contrast: #000a;--button-bg: #68a;--button-text: #fff;--focus-color: #468}:root .theme-dark{--bg: #000;--text: #999;--faint-contrast: #fff2;--mild-contrast: #fff5;--good-contrast: #fffa;--button-bg: #345;--button-text: #999}:root .theme-dark a{color:#8ac}:root .theme-dark .dialog-closer{background:#633}:root .theme-dark .dialog-icon{color:#ccc}:root .theme-dark .dialog-backdrop{background:rgba(51,51,51,.7333333333)}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,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}input[type=checkbox]{margin:0 1.3em 0 .8em;transform:scale(1.7);accent-color:var(--button-bg)}.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{opacity:.6}button:focus-visible,.breadcrumb:focus-visible{outline:3px solid var(--focus-color)}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}header{position:sticky;top:0;background:var(--bg);padding:.2em;z-index:1}.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{font-size:90%;margin:.4em 0 0 .5em;float:right}#folder-stats .icon{margin-right:.3em}header input{width:100%;margin:.2em auto;box-sizing:border-box}#filter-bar{display:flex;gap:.3em;margin:.5em 0}#filter-bar input{flex:1}#filter-bar button{padding:0 .5em}ul.dir{flex:1;padding:0;margin:0;clear:both}ul.dir li{display:block;list-style-type:none;margin-bottom:.3em;padding:.3em;border-top:1px solid var(--button-bg)}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:12px;margin-top:.2em}ul.dir li .entry-props .icon{margin:0 .3em}ul.dir li .entry-props .entry-size{display:inline-block}#menu-panel{margin-bottom:.2em}#menu-bar{display:flex;justify-content:space-evenly;flex-wrap:wrap}#menu-bar>*{flex:auto;margin:.1em}#menu-bar button{padding-left:0;padding-right:0}#menu-bar>a>button{width:100%}#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-confirm,.dialog-prompt{--color: var(--button-bg)}#paging{display:flex;position:sticky;bottom:0;background:var(--bg);gap:.5em;overflow-x:auto}#paging>button{flex:1;background:var(--button-bg);text-align:center}*{scrollbar-width:thin;scrollbar-color:var(--button-bg) var(--faint-contrast)}*::-webkit-scrollbar{width:12px}*::-webkit-scrollbar-track{background:var(--faint-contrast)}*::-webkit-scrollbar-thumb{background-color:var(--button-bg);border-radius:20px;border:1px solid var(--faint-contrast)}@media (max-width: 42em){body,button,select{font-size:14pt}#menu-bar button label{display:none}#filter-bar{margin:.2em 0}#filter-bar label{display:none}#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)}.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-closer{border-radius:0 .8em;right:0;padding:0;background-color:#c99}.dialog-icon~.dialog-content{margin-top:1.3em}.dialog-type{left:0;top:0;overflow:hidden;line-height:1.7em}.dialog-content{overflow:auto;max-height:calc(100vh - 4em)}.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: 50em){.dialog-closer{font-size:120%}.dialog-icon~.dialog-content{margin-top:2em}}