hfs 0.57.26 → 0.57.27-beta2

package/src/vfs.js

@@ -56,7 +56,6 @@ function permsFromParent(parent, child) {
     return lodash_1.default.isEmpty(ret) ? undefined : ret;
 }
 function inheritFromParent(child) {
-    var _a, _b, _c;
     const { parent } = child;
     if (!parent)
         return;
@@ -64,11 +63,11 @@ function inheritFromParent(child) {
     if (typeof parent.mime === 'object' && typeof child.mime === 'object')
         lodash_1.default.defaults(child.mime, parent.mime);
     else if (parent.mime)
-        (_a = child.mime) !== null && _a !== void 0 ? _a : (child.mime = parent.mime);
+        child.mime ??= parent.mime;
     if (parent.accept)
-        (_b = child.accept) !== null && _b !== void 0 ? _b : (child.accept = parent.accept);
+        child.accept ??= parent.accept;
     if (parent.default)
-        (_c = child.default) !== null && _c !== void 0 ? _c : (child.default = parent.default);
+        child.default ??= parent.default;
     return child;
 }
 function isSameFilenameAs(name) {
@@ -79,15 +78,14 @@ function normalizeFilename(x) {
     return (const_1.IS_WINDOWS || const_1.IS_MAC ? x.toLocaleLowerCase() : x).normalize();
 }
 async function applyParentToChild(child, parent, name) {
-    var _a, _b;
     const ret = {
         original: child, // this can be overridden by passing an 'original' in `child`
         ...child,
-        isFolder: (_a = child === null || child === void 0 ? void 0 : child.isFolder) !== null && _a !== void 0 ? _a : (((_b = child === null || child === void 0 ? void 0 : child.children) === null || _b === void 0 ? void 0 : _b.length) > 0 || undefined), // isFolder is hidden in original node, so we must copy it explicitly
+        isFolder: child?.isFolder ?? (child?.children?.length > 0 || undefined), // isFolder is hidden in original node, so we must copy it explicitly
         isTemp: true,
         parent,
     };
-    name || (name = child ? getNodeName(child) : '');
+    name ||= child ? getNodeName(child) : '';
     inheritMasks(ret, parent, name);
     await parentMaskApplier(parent)(ret, name);
     inheritFromParent(ret);
@@ -105,15 +103,12 @@ async function urlToNode(url, ctx, parent = exports.vfs, getRest) {
     const ret = await getNodeByName(name, parent);
     if (!ret)
         return;
-    if (rest || (ret === null || ret === void 0 ? void 0 : ret.original))
+    if (rest || ret?.original)
         return urlToNode(rest, ctx, ret, getRest);
     if (ret.source)
-        try {
-            if (!showHiddenFiles.get() && await isHiddenFile(ret.source))
-                throw 'hiddenFile';
-            ret.isFolder = (await nodeStats(ret)).isDirectory(); // throws if it doesn't exist on disk
-        }
-        catch (_a) {
+        if (!showHiddenFiles.get() && await isHiddenFile(ret.source))
+            throw 'hiddenFile';
+        else if (await setIsFolder(ret) === undefined) { // undefined = not found on disk
             if (!getRest)
                 return;
             const rest = ret.source.slice(parent.source.length); // parent has source, otherwise !ret.source || ret.original
@@ -122,23 +117,24 @@ async function urlToNode(url, ctx, parent = exports.vfs, getRest) {
         }
     return ret;
 }
-async function nodeStats(ret) {
-    if (ret.stats)
-        return ret.stats;
-    const stats = ret.source ? await (0, misc_1.statWithTimeout)(ret.source) : undefined;
-    (0, misc_1.setHidden)(ret, { stats });
+async function nodeStats(node) {
+    if (node.stats || !node.source)
+        return node.stats;
+    const stats = (0, misc_1.statWithTimeout)(node.source).catch(() => {
+        (0, misc_1.setHidden)(node, { stats: null }); // don't cache rejected promises
+    });
+    (0, misc_1.setHidden)(node, { stats });
     return stats;
 }
 async function isHiddenFile(path) {
-    return const_1.IS_WINDOWS ? new Promise(res => fswin_1.default.getAttributes(path, x => res(x === null || x === void 0 ? void 0 : x.IS_HIDDEN)))
+    return const_1.IS_WINDOWS ? new Promise(res => fswin_1.default.getAttributes(path, x => res(x?.IS_HIDDEN)))
         : path[path.lastIndexOf('/') + 1] === '.';
 }
 async function getNodeByName(name, parent) {
-    var _a;
     // does the tree node have a child that goes by this name, otherwise attempt disk
-    const child = ((_a = parent.children) === null || _a === void 0 ? void 0 : _a.find(isSameFilenameAs(name))) || childFromDisk();
+    const child = parent.children?.find(isSameFilenameAs(name)) || await childFromDisk();
     return child && applyParentToChild(child, parent, name);
-    function childFromDisk() {
+    async function childFromDisk() {
         if (!parent.source)
             return;
         const ret = {};
@@ -155,18 +151,26 @@ async function getNodeByName(name, parent) {
             return;
         ret.source = (0, path_1.join)(parent.source, onDisk);
         ret.original = undefined; // this will overwrite the 'original' set in applyParentToChild, so we know this is not part of the vfs
+        await setIsFolder(ret);
         return ret;
     }
 }
+async function setIsFolder(node) {
+    if (!node.source)
+        return;
+    const isFolder = /[\\/]$/.test(node.source) || await nodeStats(node).then(x => x?.isDirectory(), () => undefined);
+    (0, misc_1.setHidden)(node, { isFolder });
+    return isFolder;
+}
 exports.vfs = {};
-(0, config_1.defineConfig)('vfs', exports.vfs).sub(reviewVfs);
+(0, config_1.defineConfig)('vfs', exports.vfs).sub(async (x) => {
+    await reviewVfs(x);
+    console.log('VFS ready');
+});
 async function reviewVfs(data = exports.vfs) {
     await (async function recur(node) {
-        var _a, _b;
-        if (node.source && !((_a = node.children) === null || _a === void 0 ? void 0 : _a.length) && node.isFolder === undefined) {
-            const isFolder = /[\\/]$/.test(node.source) || ((_b = (await nodeStats(node).catch(() => { }))) === null || _b === void 0 ? void 0 : _b.isDirectory());
-            (0, misc_1.setHidden)(node, { isFolder });
-        }
+        if (node.source && !node.children?.length && node.isFolder === undefined)
+            await setIsFolder(node);
         if (node.children)
             await Promise.allSettled(node.children.map(recur));
     })(data);
@@ -198,9 +202,18 @@ function getNodeName(node) {
         return source.slice(source.lastIndexOf('\\') + 1);
     return base;
 }
+// this is sync
 function nodeIsFolder(node) {
-    var _a, _b, _c, _d;
-    return (_c = (_a = node.isFolder) !== null && _a !== void 0 ? _a : (_b = node.original) === null || _b === void 0 ? void 0 : _b.isFolder) !== null && _c !== void 0 ? _c : (!nodeIsLink(node) && (((_d = node.children) === null || _d === void 0 ? void 0 : _d.length) > 0 || !node.source));
+    return node.isFolder ?? node.original?.isFolder
+        ?? (nodeIsLink(node) ? false : (node.children?.length > 0 || !node.source || reconsider()));
+    function reconsider() {
+        // a networked source may be offline at startup, and become online later: recalculate in the background
+        nodeStats(node).then(s => {
+            if (s)
+                (0, misc_1.setHidden)(node.original || node, { isFolder: s.isDirectory() });
+        }, () => { });
+        return undefined;
+    }
 }
 async function hasDefaultFile(node, ctx) {
     return node.default && nodeIsFolder(node) && await urlToNode(node.default, ctx, node) || undefined;
@@ -219,7 +232,6 @@ function statusCodeForMissingPerm(node, perm, ctx, assign = true) {
     }
     return ret;
     function getCode() {
-        var _a;
         if ((isRoot(node) || node.original) && perm === 'can_delete' // we currently don't allow deleting of vfs nodes from frontend
             || !node.source && perm === 'can_upload') // Upload possible only if we know where to store. First check node.source because is supposedly faster.
             return const_1.HTTP_FORBIDDEN;
@@ -231,11 +243,11 @@ function statusCodeForMissingPerm(node, perm, ctx, assign = true) {
             who = node[cur];
             if ((0, misc_1.isWhoObject)(who))
                 who = who.this;
-            who !== null && who !== void 0 ? who : (who = misc_1.defaultPerms[cur]);
+            who ??= misc_1.defaultPerms[cur];
             if (typeof who !== 'string' || who === misc_1.WHO_ANY_ACCOUNT)
                 break;
             if (!max--) {
-                console.error(`endless loop in permission ${perm}=${(_a = node[perm]) !== null && _a !== void 0 ? _a : misc_1.defaultPerms[perm]} for ${node.url || getNodeName(node)}`);
+                console.error(`endless loop in permission ${perm}=${node[perm] ?? misc_1.defaultPerms[perm]} for ${node.url || getNodeName(node)}`);
                 return misc_1.HTTP_SERVER_ERROR;
             }
             cur = who;
@@ -259,37 +271,35 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
     const stream = new node_stream_1.Readable({
         objectMode: true,
         async read() {
-            var _a;
             if (started)
                 return; // for simplicity, we care about starting, and never suspend
             started = true;
-            const { children, source } = parent;
+            const { source } = parent;
             const taken = prefixPath ? undefined : new Set();
             const maskApplier = parentMaskApplier(parent);
             const visitLater = [];
-            if (children)
-                for (const child of children) {
-                    const nodeName = getNodeName(child);
-                    const name = prefixPath + nodeName;
-                    taken === null || taken === void 0 ? void 0 : taken.add(normalizeFilename(name));
-                    const item = { ...child, original: child, name, parent };
-                    if (await cantSee(item))
-                        continue;
-                    if (item.source && !((_a = item.children) === null || _a === void 0 ? void 0 : _a.length)) // real items must be accessible, unless there's more to it
-                        try {
-                            await promises_1.default.access(item.source);
-                        }
-                        catch (_b) {
-                            continue;
-                        }
-                    const isFolder = nodeIsFolder(child);
-                    if (onlyFiles ? !isFolder : (!onlyFolders || isFolder))
-                        stream.push(item);
-                    if (!depth || !isFolder || cantRecur(item))
-                        continue;
-                    inheritMasks(item, parent);
-                    visitLater.push([item, name]); // prioritize siblings
-                }
+            const childrenWorking = parent.children?.length && Promise.all(parent.children.map(async (child) => {
+                const nodeName = getNodeName(child);
+                const name = prefixPath + nodeName;
+                taken?.add(normalizeFilename(name));
+                const item = { ...child, original: child, name, parent };
+                if (await cantSee(item))
+                    return;
+                if (item.source && !item.children?.length) // real items must be accessible, unless there's more to it
+                    try {
+                        await promises_1.default.access(item.source);
+                    }
+                    catch {
+                        return;
+                    }
+                const isFolder = nodeIsFolder(child);
+                if (onlyFiles ? !isFolder : (!onlyFolders || isFolder))
+                    stream.push(item);
+                if (!depth || !isFolder || cantRecur(item))
+                    return;
+                inheritMasks(item, parent);
+                visitLater.push([item, name]); // prioritize siblings
+            }));
             try {
                 if (!source)
                     return;
@@ -299,23 +309,22 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
                     return;
                 try {
                     await (0, walkDir_1.walkDir)(source, { depth, ctx, hidden: showHiddenFiles.get(), parallelizeRecursion }, async (entry) => {
-                        var _a;
-                        if (ctx === null || ctx === void 0 ? void 0 : ctx.isAborted()) {
+                        if (ctx?.isAborted()) {
                             stream.push(null);
                             return null;
                         }
                         if ((0, comments_1.usingDescriptIon)() && entry.name === comments_1.DESCRIPT_ION)
                             return;
-                        const { path } = entry;
+                        const { path } = entry; // this path is not the original deprecated property: we are overwriting/reusing it
                         const isFolder = entry.isDirectory();
-                        let renamed = (_a = parent.rename) === null || _a === void 0 ? void 0 : _a[path];
+                        let renamed = parent.rename?.[path];
                         if (renamed) {
                             const dir = (0, path_1.dirname)(path); // if `path` isn't just the name, copy its dir in renamed
                             if (dir !== '.')
                                 renamed = dir + '/' + renamed;
                         }
                         const name = prefixPath + (renamed || path);
-                        if (taken === null || taken === void 0 ? void 0 : taken.has(normalizeFilename(name))) // taken by vfs node above
+                        if (taken?.has(normalizeFilename(name))) // taken by vfs node above
                             return false; // false just in case it's a folder
                         const item = { name, isFolder, source: (0, path_1.join)(source, path), parent };
                         if (await cantSee(item)) // can't see: don't produce and don't recur
@@ -331,6 +340,7 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
                 }
             }
             finally {
+                await childrenWorking;
                 for (const [item, name] of visitLater)
                     for await (const x of walkNode(item, { depth: depth - 1, prefixPath: name + '/', ctx, requiredPerm, onlyFolders, parallelizeRecursion }))
                         stream.push(x);
@@ -379,13 +389,13 @@ function parentMaskApplier(parent) {
         let isFolder = undefined;
         for (const { matcher, mods, mustBeFolder } of matchers) {
             if (mustBeFolder !== undefined) {
-                isFolder !== null && isFolder !== void 0 ? isFolder : (isFolder = nodeIsFolder(item));
+                isFolder ??= nodeIsFolder(item);
                 if (mustBeFolder !== isFolder)
                     continue;
             }
             if (!matcher(virtualBasename))
                 continue;
-            item.masks && (item.masks = lodash_1.default.merge(lodash_1.default.cloneDeep(mods.masks), item.masks)); // item.masks must take precedence
+            item.masks &&= lodash_1.default.merge(lodash_1.default.cloneDeep(mods.masks), item.masks); // item.masks must take precedence
             lodash_1.default.defaults(item, mods);
         }
     };
@@ -421,12 +431,11 @@ function renameUnderPath(rename, path) {
 events_1.default.on('accountRenamed', ({ from, to }) => {
     ;
     (function renameInNode(n) {
-        var _a;
         for (const k of misc_1.PERM_KEYS)
             renameInPerm(n[k]);
         if (n.masks)
             Object.values(n.masks).forEach(renameInNode);
-        (_a = n.children) === null || _a === void 0 ? void 0 : _a.forEach(renameInNode);
+        n.children?.forEach(renameInNode);
     })(exports.vfs);
     (0, exports.saveVfs)();
     function renameInPerm(a) {

package/src/walkDir.js

@@ -25,20 +25,19 @@ function walkDir(path, { depth = 0, hidden = true, parallelizeRecursion = false,
             return reject(Error('ENOTDIR'));
         dirQ.add(() => readDir('', depth)
             .then(res => {
-            Promise.resolve(res === null || res === void 0 ? void 0 : res.branchDone).then(resolve);
+            Promise.resolve(res?.branchDone).then(resolve);
         }, reject));
     });
     async function readDir(relativePath, depth) {
-        var _a, _b;
         if (stopped)
             return;
         const base = (0, path_1.join)(path, relativePath);
         const subDirsDone = [];
         let n = 0;
         let last;
-        const res = (_a = (await events_1.default.emitAsync('listDiskFolder', { path: base, ctx }))) === null || _a === void 0 ? void 0 : _a[0]; // consider only first result
+        const res = (await events_1.default.emitAsync('listDiskFolder', { path: base, ctx }))?.[0]; // consider only first result
         const pluginReceiver = lodash_1.default.isFunction(res) && res || null;
-        const pluginIterator = lodash_1.default.isFunction((res === null || res === void 0 ? void 0 : res[Symbol.asyncIterator]) || (res === null || res === void 0 ? void 0 : res[Symbol.iterator])) && res;
+        const pluginIterator = lodash_1.default.isFunction(res?.[Symbol.asyncIterator] || res?.[Symbol.iterator]) && res;
         if (const_1.IS_WINDOWS && !pluginIterator) { // use native apis to read the 'hidden' attribute
             const direntMethods = {
                 isDir: false,
@@ -67,7 +66,7 @@ function walkDir(path, { depth = 0, hidden = true, parallelizeRecursion = false,
                     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, util_files_1.statWithTimeout)((0, path_1.join)(base, entry.name)).catch(() => null);
+                const stats = entry.isSymbolicLink?.() && await (0, util_files_1.statWithTimeout)((0, path_1.join)(base, entry.name)).catch(() => null);
                 if (stats === null)
                     continue;
                 if (stats)
@@ -77,7 +76,7 @@ function walkDir(path, { depth = 0, hidden = true, parallelizeRecursion = false,
                     expanded.stats = stats;
                 await work(expanded);
             }
-        pluginReceiver === null || pluginReceiver === void 0 ? void 0 : pluginReceiver(!stopped);
+        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);
@@ -87,7 +86,7 @@ function walkDir(path, { depth = 0, hidden = true, parallelizeRecursion = false,
         return { branchDone, n };
         async function work(entry) {
             entry.path = (relativePath && relativePath + '/') + entry.name;
-            pluginReceiver === null || pluginReceiver === void 0 ? void 0 : pluginReceiver(entry);
+            pluginReceiver?.(entry);
             if (last && closingQ.length) // pending entries
                 last.closingBranch = Promise.resolve(closingQ.shift());
             last = entry;
@@ -104,9 +103,9 @@ function walkDir(path, { depth = 0, hidden = true, parallelizeRecursion = false,
             const job = () => readDir(entry.path, depth - 1) // recur
                 .then(x => x, () => { }) // mute errors
                 .then(res => {
-                if (!(res === null || res === void 0 ? void 0 : res.n))
+                if (!res?.n)
                     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());
+                Promise.resolve(res?.branchDone).then(() => branchDone.resolve());
             });
             if (parallelizeRecursion)
                 dirQ.add(job);
@@ -119,6 +118,7 @@ const kStats = Symbol('stats');
 // Adapting an internal class in Node.js to mimic the behavior of `Dirent` when creating it manually from `Stats`.
 // https://github.com/nodejs/node/blob/a4cf6b204f0b160480153dc293ae748bf15225f9/lib/internal/fs/utils.js#L199C1-L213
 class DirentFromStats extends node_fs_1.Dirent {
+    [kStats];
     constructor(name, stats) {
         // @ts-expect-error The constructor has parameters, but they are not represented in types.
         // https://github.com/nodejs/node/blob/a4cf6b204f0b160480153dc293ae748bf15225f9/lib/internal/fs/utils.js#L164

package/src/watchLoad.js

@@ -37,13 +37,13 @@ function watchLoad(path, parser, { failedOnFirstAttempt, immediateFirst } = {})
                 void debounced.flush();
         }
         catch (e) {
-            retry = setTimeout(install, 3000); // manual watching until watch is successful
+            retry = setTimeout(install, 3_000); // manual watching until watch is successful
             if (first)
-                failedOnFirstAttempt === null || failedOnFirstAttempt === void 0 ? void 0 : failedOnFirstAttempt();
+                failedOnFirstAttempt?.();
         }
     }
     function unwatch() {
-        watcher === null || watcher === void 0 ? void 0 : watcher.close();
+        watcher?.close();
         clearTimeout(retry);
         watcher = undefined;
     }
@@ -52,7 +52,7 @@ function watchLoad(path, parser, { failedOnFirstAttempt, immediateFirst } = {})
             return;
         doing = true;
         try {
-            const text = await (0, util_files_1.readFileBusy)(path).catch(e => {
+            const text = await (0, util_files_1.readFileWithBusyRetry)(path).catch(e => {
                 if (e.code === 'EPERM')
                     console.error("missing permissions on file", path); // warn user, who could be clueless about this problem
                 return '';

package/src/zip.js

@@ -14,14 +14,13 @@ const api_get_file_list_1 = require("./api.get_file_list");
 const comments_1 = require("./comments");
 // expects 'node' to have had permissions checked by caller
 async function zipStreamFromFolder(node, ctx) {
-    var _a;
-    const list = (_a = (0, misc_1.wantArray)(ctx.query.list)[0]) === null || _a === void 0 ? void 0 : _a.split('//'); // slash is the only char not allowed in file names both for windows and unix, but still we need to encode whole paths, so the only safe choice to separate the entries is the double slash
+    const list = (0, misc_1.wantArray)(ctx.query.list)[0]?.split('//'); // slash is the only char not allowed in file names both for windows and unix, but still we need to encode whole paths, so the only safe choice to separate the entries is the double slash
     if (!list && (0, vfs_1.statusCodeForMissingPerm)(node, 'can_archive', ctx))
         return;
     ctx.status = const_1.HTTP_OK;
     ctx.mime = 'zip';
     // ctx.query.list is undefined | string | string[]
-    const name = (list === null || list === void 0 ? void 0 : list.length) === 1 ? (0, misc_1.safeDecodeURIComponent)((0, path_1.basename)(list[0])) : (0, vfs_1.getNodeName)(node);
+    const name = list?.length === 1 ? (0, misc_1.safeDecodeURIComponent)((0, path_1.basename)(list[0])) : (0, vfs_1.getNodeName)(node);
     (0, serveFile_1.forceDownload)(ctx, ((0, misc_1.isWindowsDrive)(name) ? name[0] : (name || 'archive')) + '.zip');
     const { filterName, filterComment } = (0, api_get_file_list_1.paramsToFilter)(ctx.query);
     const walker = !list ? (0, vfs_1.walkNode)(node, { ctx, requiredPerm: 'can_archive' })
@@ -61,7 +60,7 @@ async function zipStreamFromFolder(node, ctx) {
                 return { path: name + '/' };
             if (!source)
                 return;
-            const st = el.stats || await (0, misc_1.statWithTimeout)(source);
+            const st = await (el.stats || (0, misc_1.statWithTimeout)(source));
             if (!st || !st.isFile())
                 return;
             return {
@@ -73,7 +72,7 @@ async function zipStreamFromFolder(node, ctx) {
                 getData: () => (0, fs_1.createReadStream)(source, { start: 0, end: Math.max(0, st.size - 1) })
             };
         }
-        catch (_a) { }
+        catch { }
     });
     const zip = new QuickZipStream_1.QuickZipStream(mappedWalker);
     const time = 1000 * zipSeconds.get();
@@ -86,6 +85,6 @@ async function zipStreamFromFolder(node, ctx) {
     ctx.body = zip;
     ctx.req.on('close', () => zip.destroy());
     ctx.state.archive = 'zip';
-    (0, serveFile_1.monitorAsDownload)(ctx, size, range === null || range === void 0 ? void 0 : range.start);
+    (0, serveFile_1.monitorAsDownload)(ctx, size, range?.start);
 }
 const zipSeconds = (0, config_1.defineConfig)('zip_calculate_size_for_seconds', 5);