hfs 0.42.2 → 0.43.0

package/src/serveFile.js

@@ -33,6 +33,8 @@ function serveFileNode(ctx, node) {
         }
     }
     ctx.vfsNode = node; // useful to tell service files from files shared by the user
+    if ('dl' in ctx.params) // please, download
+        ctx.attachment(name);
     return serveFile(ctx, source || '', mimeString);
 }
 exports.serveFileNode = serveFileNode;
@@ -41,8 +43,6 @@ async function serveFile(ctx, source, mime, content) {
     if (!source)
         return;
     const fn = path_1.default.basename(source);
-    if ('dl' in ctx.params) // please, download
-        ctx.attachment(fn);
     mime = mime !== null && mime !== void 0 ? mime : lodash_1.default.find(mimeCfg.get(), (v, k) => (0, misc_1.matches)(fn, k));
     if (mime === vfs_1.MIME_AUTO)
         mime = mime_types_1.default.lookup(source) || '';

package/src/serveGuiFiles.js

@@ -41,6 +41,7 @@ const valtio_1 = require("valtio");
 const customHtml_1 = require("./customHtml");
 const lodash_1 = __importDefault(require("lodash"));
 const config_1 = require("./config");
+const lang_1 = require("./lang");
 // in case of dev env we have our static files within the 'dist' folder'
 const DEV_STATIC = process.env.DEV ? 'dist/' : '';
 function serveStatic(uri) {
@@ -68,8 +69,6 @@ function serveStatic(uri) {
             return (0, serveFile_1.serveFile)(ctx, fullPath, 'auto', content);
         // we don't cache the index as it's small and may prevent plugins change to apply
         ctx.body = await treatIndex(ctx, uri, String(content));
-        ctx.type = 'html';
-        ctx.set('Cache-Control', 'no-store, no-cache, must-revalidate');
     };
 }
 function shouldServeApp(ctx) {
@@ -84,10 +83,10 @@ function adjustBundlerLinks(ctx, uri, data) {
 async function treatIndex(ctx, filesUri, body) {
     const session = await (0, api_auth_1.refresh_session)({}, ctx);
     ctx.set('etag', '');
+    ctx.set('Cache-Control', 'no-store, no-cache, must-revalidate');
+    ctx.type = 'html';
     const isFrontend = filesUri === const_1.FRONTEND_URI;
     const pub = ctx.state.revProxyPath + const_1.PLUGINS_PUB_URI;
-    const css = (0, plugins_1.mapPlugins)((plug, k) => { var _a; return (_a = (isFrontend ? plug.frontend_css : null)) === null || _a === void 0 ? void 0 : _a.map(f => pub + k + '/' + f); }).flat().filter(Boolean);
-    const js = (0, plugins_1.mapPlugins)((plug, k) => { var _a; return (_a = (isFrontend ? plug.frontend_js : null)) === null || _a === void 0 ? void 0 : _a.map(f => pub + k + '/' + f); }).flat().filter(Boolean);
     // expose plugins' configs that are declared with 'frontend' attribute
     const plugins = Object.fromEntries((0, misc_1.onlyTruthy)((0, plugins_1.mapPlugins)((pl, name) => {
         var _a, _b;
@@ -99,6 +98,7 @@ async function treatIndex(ctx, filesUri, body) {
         configs = ((_b = (_a = (0, plugins_1.getPluginInfo)(name)).onFrontendConfig) === null || _b === void 0 ? void 0 : _b.call(_a, configs)) || configs;
         return !lodash_1.default.isEmpty(configs) && [name, configs];
     })));
+    const lang = await (0, lang_1.getLangData)(ctx);
     let ret = body
         .replace(/((?:src|href) *= *['"])\/?(?![a-z]+:\/\/)/g, '$1' + ctx.state.revProxyPath + filesUri)
         .replace('</head>', () => `
@@ -115,17 +115,30 @@ async function treatIndex(ctx, filesUri, body) {
         plugins,
         prefixUrl: ctx.state.revProxyPath,
         customHtml: lodash_1.default.omit(Object.fromEntries(customHtml_1.customHtmlState.sections), ['top', 'bottom']),
-        fileMenuOnLink: fileMenuOnLink.get()
-    }, null, 4)}
+        fileMenuOnLink: fileMenuOnLink.get(),
+        lang
+    }, null, 4)
+        .replace(/<(\/script)/g, '<"+"$1') /*avoid breaking our script container*/}
             document.documentElement.setAttribute('ver', '${const_1.VERSION.split('-')[0] /*for style selectors*/}')
+            HFS.getPluginKey = () => document.currentScript?.getAttribute('plugin')
+                || console.error("this function must be called at the very top of your file")
+            HFS.getPluginConfig = () => HFS.plugins[HFS.getPluginKey()]
             </script>
             <style>
             :root {
                 ${lodash_1.default.map(plugins, (configs, pluginName) => lodash_1.default.map(configs, (v, k) => `--${pluginName}-${k}: ${serializeCss(v)};`).join('\n')).join('')}
             }
             </style>
-            ${css.map(uri => `<link rel='stylesheet' type='text/css' href='${uri}'/>`).join('\n')}
-            ${js.map(uri => `<script defer src='${uri}'></script>`).join('\n')}
+            ${!isFrontend ? '' : (0, plugins_1.mapPlugins)((plug, k) => {
+        var _a;
+        return (_a = plug.frontend_css) === null || _a === void 0 ? void 0 : _a.map(f => `<link rel='stylesheet' type='text/css' href='${pub + k + '/' + f}' plugin=${JSON.stringify(k)}/>`);
+    })
+        .flat().filter(Boolean).join('\n')}
+            ${!isFrontend ? '' : (0, plugins_1.mapPlugins)((plug, k) => {
+        var _a;
+        return (_a = plug.frontend_js) === null || _a === void 0 ? void 0 : _a.map(f => `<script defer plugin=${JSON.stringify(k)} src='${pub + k + '/' + f}'></script>`);
+    })
+        .flat().filter(Boolean).join('\n')}
         </head>`);
     if (isFrontend)
         ret = ret

package/src/upload.js

@@ -15,7 +15,7 @@ const util_os_1 = require("./util-os");
 const connections_1 = require("./connections");
 const throttler_1 = require("./throttler");
 const lodash_1 = __importDefault(require("lodash"));
-exports.deleteUnfinishedUploadsAfter = (0, config_1.defineConfig)('delete_unfinished_uploads_after');
+exports.deleteUnfinishedUploadsAfter = (0, config_1.defineConfig)('delete_unfinished_uploads_after', undefined);
 exports.minAvailableMb = (0, config_1.defineConfig)('min_available_mb', 100);
 const dontOverwriteUploading = (0, config_1.defineConfig)('dont_overwrite_uploading', false);
 const waitingToBeDeleted = {};

package/src/vfs.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.walkNode = exports.statusCodeForMissingPerm = exports.hasPermission = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.urlToNode = exports.isSameFilenameAs = exports.MIME_AUTO = exports.defaultPerms = void 0;
+exports.masksCouldGivePermission = exports.walkNode = exports.statusCodeForMissingPerm = exports.hasPermission = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.urlToNode = exports.isSameFilenameAs = exports.MIME_AUTO = exports.defaultPerms = exports.WHO_ANY_ACCOUNT = exports.WHO_NO_ONE = exports.WHO_ANYONE = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = require("path");
 const misc_1 = require("./misc");
@@ -13,15 +13,15 @@ const config_1 = require("./config");
 const const_1 = require("./const");
 const events_1 = __importDefault(require("./events"));
 const perm_1 = require("./perm");
-const WHO_ANYONE = true;
-const WHO_NO_ONE = false;
-const WHO_ANY_ACCOUNT = '*';
+exports.WHO_ANYONE = true;
+exports.WHO_NO_ONE = false;
+exports.WHO_ANY_ACCOUNT = '*';
 exports.defaultPerms = {
-    can_see: WHO_ANYONE,
-    can_read: WHO_ANYONE,
-    can_list: WHO_ANYONE,
-    can_upload: WHO_NO_ONE,
-    can_delete: WHO_NO_ONE,
+    can_see: exports.WHO_ANYONE,
+    can_read: exports.WHO_ANYONE,
+    can_list: exports.WHO_ANYONE,
+    can_upload: exports.WHO_NO_ONE,
+    can_delete: exports.WHO_NO_ONE,
 };
 exports.MIME_AUTO = 'auto';
 function inheritFromParent(parent, child) {
@@ -104,16 +104,18 @@ function saveVfs() {
 }
 exports.saveVfs = saveVfs;
 function getNodeName(node) {
-    const { name, source: s } = node;
+    const { name, source } = node;
     if (name)
         return name;
-    if (!s)
+    if (!source)
         return ''; // should happen only for root
-    if (/^[a-zA-Z]:\\?$/.test(s))
-        return s.slice(0, 2); // exclude trailing slash
-    const base = (0, path_1.basename)(s);
+    if (source === '/')
+        return 'root';
+    if (/^[a-zA-Z]:\\?$/.test(source))
+        return source.slice(0, 2); // exclude trailing slash
+    const base = (0, path_1.basename)(source);
     if (/^[./\\]*$/.test(base)) // if empty or special-chars-only
-        return (0, path_1.basename)((0, path_1.resolve)(s)); // resolve to try to get more
+        return (0, path_1.basename)((0, path_1.resolve)(source)); // resolve to try to get more
     return base;
 }
 exports.getNodeName = getNodeName;
@@ -137,10 +139,6 @@ exports.statusCodeForMissingPerm = statusCodeForMissingPerm;
 // Too many parameters: consider object, but benchmark against degraded recursion on huge folders.
 async function* walkNode(parent, ctx, depth = 0, prefixPath = '', requiredPerm) {
     var _a;
-    if (requiredPerm && ctx
-        && !hasPermission(parent, requiredPerm, ctx)
-        && !masksCouldGivePermission(parent.masks))
-        return; // no permission, no reason to continue
     const { children, source } = parent;
     const took = prefixPath ? undefined : new Set();
     if (children)
@@ -160,6 +158,10 @@ async function* walkNode(parent, ctx, depth = 0, prefixPath = '', requiredPerm)
         }
     if (!source)
         return;
+    if (requiredPerm && ctx // no permission, no reason to continue (at least for dynamic elements)
+        && !hasPermission(parent, requiredPerm, ctx)
+        && !masksCouldGivePermission(parent.masks, requiredPerm))
+        return;
     try {
         let lastDir = prefixPath.slice(0, -1) || '.';
         const map = new Map();
@@ -201,20 +203,12 @@ async function* walkNode(parent, ctx, depth = 0, prefixPath = '', requiredPerm)
         item.isTemp = true;
         return item;
     }
-    function masksCouldGivePermission(masks) {
-        if (!masks)
-            return false;
-        for (const [, props] of Object.entries(masks)) {
-            const v = props[requiredPerm];
-            if (v && (!ctx || matchWho(v, ctx))) // without ctx we can't say, so it could
-                return true;
-            if (masksCouldGivePermission(props.masks))
-                return true;
-        }
-        return false;
-    }
 }
 exports.walkNode = walkNode;
+function masksCouldGivePermission(masks, perm) {
+    return masks !== undefined && Object.values(masks).some(props => props[perm] || masksCouldGivePermission(props.masks, perm));
+}
+exports.masksCouldGivePermission = masksCouldGivePermission;
 function applyMasks(item, parent, virtualBasename) {
     const { masks } = parent;
     if (!masks)
@@ -246,8 +240,8 @@ function renameUnderPath(rename, path) {
     return lodash_1.default.isEmpty(rename) ? undefined : rename;
 }
 function matchWho(who, ctx) {
-    return who === WHO_ANYONE
-        || who === WHO_ANY_ACCOUNT && Boolean(ctx.state.account)
+    return who === exports.WHO_ANYONE
+        || who === exports.WHO_ANY_ACCOUNT && Boolean(ctx.state.account)
         || Array.isArray(who) // check if I or any ancestor match `who`, but cache ancestors' usernames inside context state
             && (0, misc_1.getOrSet)(ctx.state, 'usernames', () => (0, perm_1.getCurrentUsernameExpanded)(ctx)).some((u) => who.includes(u));
 }