hfs 0.57.0 → 0.57.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.57.0",
+  "version": "0.57.1",
   "description": "HTTP File Server",
   "keywords": ["file server", "http server"],
   "homepage": "https://rejetto.com/hfs",
@@ -76,7 +76,7 @@
     "buffer-crc32": "^1.0.0",
     "fast-glob": "^3.3.3",
     "find-process": "^1.4.7",
-    "formidable": "^3.5.1",
+    "formidable": "^3.5.4",
     "fs-x-attributes": "^1.0.2",
     "fswin": "^3.24.829",
     "iconv-lite": "^0.6.3",

package/src/const.js

@@ -64,7 +64,7 @@ exports.DEV = process.env.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 = "2025-04-26T18:03:57.675Z";
+exports.BUILD_TIMESTAMP = "2025-04-30T12:19:36.833Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.RUNNING_BETA = exports.VERSION.includes('-');

package/src/middlewares.js

@@ -137,7 +137,10 @@ function failAllowNet(ctx, a) {
     const mask = cached !== null && cached !== void 0 ? cached : (0, perm_1.getFromAccount)(a || '', a => a.allow_net);
     if (!cached && mask && ((_b = ctx.session) === null || _b === void 0 ? void 0 : _b.username))
         ctx.session.allowNet = mask; // must be deleted on logout by setLoggedIn
-    return mask && !(0, misc_1.netMatches)(ctx.ip, mask, true);
+    const ret = mask && !(0, misc_1.netMatches)(ctx.ip, mask, true);
+    if (ret)
+        console.debug("login failed: allow_net");
+    return ret;
 }
 const paramsDecoder = async (ctx, next) => {
     ctx.state.params = ctx.method === 'POST' && ctx.originalUrl.startsWith(const_1.API_URI)

package/src/serveGuiAndSharedFiles.js

@@ -177,7 +177,7 @@ async function sendFolderList(node, ctx) {
             || URL.protocol + '//' + URL.host + ctx.state.revProxyPath;
         prepend = base + (0, misc_1.pathEncode)(decodeURI(ctx.path)); // redo the encoding our way, keeping unicode chars unchanged
     }
-    const walker = (0, vfs_1.walkNode)(node, { ctx, depth: depth === '*' ? Infinity : Number(depth) });
+    const walker = (0, vfs_1.walkNode)(node, { ctx, depth: depth === '*' ? Infinity : Number(depth), parallelizeRecursion: false });
     ctx.body = (0, misc_1.asyncGeneratorToReadable)((0, misc_1.filterMapGenerator)(walker, async (el) => {
         const isFolder = await (0, vfs_1.nodeIsDirectory)(el);
         return !folders && isFolder ? undefined

package/src/upload.js

@@ -223,6 +223,7 @@ function uploadWriter(base, baseUri, path, ctx) {
                         void (0, comments_1.setCommentFor)(dest, String(ctx.query.comment));
                     obj.uri = (0, misc_1.enforceFinal)('/', baseUri) + (0, misc_1.pathEncode)((0, path_1.basename)(dest));
                     events_1.default.emit('uploadFinished', obj);
+                    console.debug("upload finished", dest);
                     if (resEvent)
                         for (const cb of resEvent)
                             if (lodash_1.default.isFunction(cb))
@@ -304,13 +305,12 @@ function uploadWriter(base, baseUri, path, ctx) {
     function releaseFile() {
         uploadingFiles.delete(fullPath);
     }
-    function fail(status, msg) {
-        console.debug('upload failed', status || '', msg || '');
+    function fail(status = ctx.status, msg) {
+        console.debug('upload failed', status, msg || '');
         releaseFile();
-        if (status)
-            ctx.status = status;
+        ctx.status = status;
         if (msg)
             ctx.body = msg;
-        (0, frontEndApis_1.notifyClient)(ctx, const_1.UPLOAD_REQUEST_STATUS, { [path]: ctx.status }); // allow browsers to detect failure while still sending body
+        (0, frontEndApis_1.notifyClient)(ctx, const_1.UPLOAD_REQUEST_STATUS, { [path]: status }); // allow browsers to detect failure while still sending body
     }
 }

package/src/vfs.js

@@ -250,7 +250,7 @@ function statusCodeForMissingPerm(node, perm, ctx, assign = true) {
     }
 }
 // it's the responsibility of the caller to verify you have list permission on parent, as callers have different needs.
-async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requiredPerm, onlyFolders = false, onlyFiles = false, } = {}) {
+async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requiredPerm, onlyFolders = false, onlyFiles = false, parallelizeRecursion = true, } = {}) {
     let started = false;
     const stream = new node_stream_1.Readable({
         objectMode: true,
@@ -297,7 +297,7 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
                 try {
                     let lastDir = prefixPath.slice(0, -1) || '.';
                     parentsCache.set(lastDir, parent);
-                    await (0, walkDir_1.walkDir)(source, { depth, ctx, hidden: showHiddenFiles.get() }, async (entry) => {
+                    await (0, walkDir_1.walkDir)(source, { depth, ctx, hidden: showHiddenFiles.get(), parallelizeRecursion }, async (entry) => {
                         var _a, _b;
                         if (ctx === null || ctx === void 0 ? void 0 : ctx.isAborted()) {
                             stream.push(null);
@@ -339,7 +339,7 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
             }
             finally {
                 for (const [item, name] of visitLater)
-                    for await (const x of walkNode(item, { ctx, depth: depth - 1, prefixPath: name + '/', requiredPerm, onlyFolders }))
+                    for await (const x of walkNode(item, { depth: depth - 1, prefixPath: name + '/', ctx, requiredPerm, onlyFolders, parallelizeRecursion }))
                         stream.push(x);
                 stream.push(null);
             }

package/src/walkDir.js

@@ -17,7 +17,7 @@ const fswin_1 = __importDefault(require("fswin"));
 const util_files_1 = require("./util-files");
 const dirQ = (0, makeQ_1.makeQ)(3);
 // cb returns void = just go on, null = stop, false = go on but don't recur (in case of depth)
-function walkDir(path, { depth = 0, hidden = true, ctx }, cb) {
+function walkDir(path, { depth = 0, hidden = true, parallelizeRecursion = false, ctx }, cb) {
     let stopped = false;
     const closingQ = [];
     return new Promise(async (resolve, reject) => {
@@ -60,25 +60,31 @@ function walkDir(path, { depth = 0, hidden = true, ctx }, cb) {
                     stats: { size: f.SIZE, birthtime: f.CREATION_TIME, mtime: f.LAST_WRITE_TIME }
                 }));
             }, true));
-            pluginReceiver === null || pluginReceiver === void 0 ? void 0 : pluginReceiver(!stopped);
-            return;
-        }
-        for await (let entry of (pluginIterator || await (0, promises_1.opendir)(base))) {
-            if (stopped)
-                break;
-            if (!hidden && entry.name[0] === '.' && !const_1.IS_WINDOWS)
-                continue;
-            const stats = ((_b = entry.isSymbolicLink) === null || _b === void 0 ? void 0 : _b.call(entry)) && await (0, promises_1.stat)((0, path_1.join)(base, entry.name)).catch(() => null);
-            if (stats === null)
-                continue;
-            if (stats)
-                entry = new DirentFromStats(entry.name, stats);
-            const expanded = entry;
-            if (stats)
-                expanded.stats = stats;
-            await work(expanded);
         }
+        else
+            for await (let entry of (pluginIterator || await (0, promises_1.opendir)(base))) {
+                if (stopped)
+                    break;
+                if (!hidden && entry.name[0] === '.' && !const_1.IS_WINDOWS)
+                    continue;
+                const stats = ((_b = entry.isSymbolicLink) === null || _b === void 0 ? void 0 : _b.call(entry)) && await (0, promises_1.stat)((0, path_1.join)(base, entry.name)).catch(() => null);
+                if (stats === null)
+                    continue;
+                if (stats)
+                    entry = new DirentFromStats(entry.name, stats);
+                const expanded = entry;
+                if (stats)
+                    expanded.stats = stats;
+                await work(expanded);
+            }
         pluginReceiver === null || pluginReceiver === void 0 ? void 0 : pluginReceiver(!stopped);
+        const branchDone = Promise.allSettled(subDirsDone);
+        if (last) // using streams, we don't know when the entries are received, so we need to notify on last item
+            last.closingBranch = branchDone.then(() => relativePath);
+        else
+            closingQ.push(relativePath); // ok, we'll ask next one to carry this info
+        // don't return the promise directly, as this job ends here, but communicate to caller the promise for the whole branch
+        return { branchDone, n };
         async function work(entry) {
             entry.path = (relativePath && relativePath + '/') + entry.name;
             pluginReceiver === null || pluginReceiver === void 0 ? void 0 : pluginReceiver(entry);
@@ -94,6 +100,7 @@ function walkDir(path, { depth = 0, hidden = true, ctx }, cb) {
             if (!depth || !entry.isDirectory())
                 return;
             const branchDone = (0, cross_1.pendingPromise)(); // per-job
+            subDirsDone.push(branchDone);
             const job = () => readDir(entry.path, depth - 1) // recur
                 .then(x => x, () => { }) // mute errors
                 .then(res => {
@@ -101,16 +108,11 @@ function walkDir(path, { depth = 0, hidden = true, ctx }, cb) {
                     closingQ.push(entry.path); // no children to tell i'm done
                 Promise.resolve(res === null || res === void 0 ? void 0 : res.branchDone).then(() => branchDone.resolve());
             });
-            dirQ.add(job); // this won't start until next tick
-            subDirsDone.push(branchDone);
+            if (parallelizeRecursion)
+                dirQ.add(job);
+            else
+                await job();
         }
-        const branchDone = Promise.allSettled(subDirsDone).then(() => { });
-        if (last) // using streams, we don't know when the entries are received, so we need to notify on last item
-            last.closingBranch = branchDone.then(() => relativePath);
-        else
-            closingQ.push(relativePath); // ok, we'll ask next one to carry this info
-        // don't return the promise directly, as this job ends here, but communicate to caller the promise for the whole branch
-        return { branchDone, n };
     }
 }
 const kStats = Symbol('stats');