hfs 0.38.2 → 0.40.0

package/src/serveGuiFiles.js

@@ -59,14 +59,14 @@ function serveStatic(uri) {
         const content = await (0, misc_1.getOrSet)(cache, ctx.path, async () => {
             const data = await promises_1.default.readFile(fullPath).catch(() => null);
             return serveApp || !data ? data
-                : adjustBundlerLinks(ctx.path, uri, data);
+                : adjustBundlerLinks(ctx, uri, data);
         });
         if (content === null)
             return ctx.status = const_1.HTTP_NOT_FOUND;
         if (!serveApp)
-            return (0, serveFile_1.serveFile)(fullPath, 'auto', content)(ctx, next);
+            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, String(content), uri);
+        ctx.body = await treatIndex(ctx, uri, String(content));
         ctx.type = 'html';
         ctx.set('Cache-Control', 'no-store, no-cache, must-revalidate');
     };
@@ -75,17 +75,18 @@ function shouldServeApp(ctx) {
     var _a;
     return (_a = ctx.state).serveApp || (_a.serveApp = ctx.path.endsWith('/'));
 }
-function adjustBundlerLinks(path, uri, data) {
-    const ext = (0, path_1.extname)(path);
+function adjustBundlerLinks(ctx, uri, data) {
+    const ext = (0, path_1.extname)(ctx.path);
     return ext && !ext.match(/\.(css|html|js|ts|scss)/) ? data
-        : String(data).replace(/((?:import | from )['"])\//g, `$1${uri}`);
+        : String(data).replace(/((?:import | from )['"])\//g, `$1${ctx.state.revProxyPath}${uri}`);
 }
-async function treatIndex(ctx, body, filesUri) {
+async function treatIndex(ctx, filesUri, body) {
     const session = await (0, api_auth_1.refresh_session)({}, ctx);
     ctx.set('etag', '');
     const isFrontend = filesUri === const_1.FRONTEND_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 => const_1.PLUGINS_PUB_URI + 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 => const_1.PLUGINS_PUB_URI + k + '/' + f); }).flat().filter(Boolean);
+    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;
@@ -98,7 +99,7 @@ async function treatIndex(ctx, body, filesUri) {
         return !lodash_1.default.isEmpty(configs) && [name, configs];
     })));
     let ret = body
-        .replace(/((?:src|href) *= *['"])\/?(?![a-z]+:\/\/)/g, '$1' + filesUri)
+        .replace(/((?:src|href) *= *['"])\/?(?![a-z]+:\/\/)/g, '$1' + ctx.state.revProxyPath + filesUri)
         .replace('</head>', () => `
             ${!isFrontend ? '' : `
                 <title>${adminApis_1.title.get()}</title>
@@ -110,6 +111,7 @@ async function treatIndex(ctx, body, filesUri) {
         API_VERSION: const_1.API_VERSION,
         session: session instanceof apiMiddleware_1.ApiError ? null : session,
         plugins,
+        prefixUrl: ctx.state.revProxyPath,
         customHtml: lodash_1.default.omit(Object.fromEntries(customHtml_1.customHtmlState.sections), ['top', 'bottom']), // excluding sections we apply in this phase  
     }, null, 4)}
             document.documentElement.setAttribute('ver', '${const_1.VERSION.split('-')[0] /*for style selectors*/}')
@@ -141,8 +143,8 @@ function serveProxied(port, uri) {
      proxy = lib.default('127.0.0.1:' + port, {
         proxyReqPathResolver: (ctx) => shouldServeApp(ctx) ? '/' : ctx.path,
         userResDecorator(res, data, ctx) {
-            return shouldServeApp(ctx) ? treatIndex(ctx, String(data), uri)
-                : adjustBundlerLinks(ctx.path, uri, data);
+            return shouldServeApp(ctx) ? treatIndex(ctx, uri, String(data))
+                : adjustBundlerLinks(ctx, uri, data);
         }
     }));
     return function () {

package/src/throttler.js

@@ -65,6 +65,8 @@ const throttler = async (ctx, next) => {
     ctx.body = ctx.body.pipe(ts);
     if (bak)
         ctx.response.length = bak;
+    ts.once('end', () => // in case of compressed response, we offer calculation of real size
+     ctx.state.length = ts.getBytesSent());
 };
 exports.throttler = throttler;
 function roundSpeed(n) {

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.cantReadStatusCode = exports.walkNode = exports.hasPermission = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.urlToNode = exports.MIME_AUTO = exports.defaultPerms = void 0;
+exports.cantReadStatusCode = exports.walkNode = exports.hasPermission = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.urlToNode = exports.isSameFilenameAs = exports.MIME_AUTO = exports.defaultPerms = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = require("path");
 const micromatch_1 = require("micromatch");
@@ -14,7 +14,6 @@ const config_1 = require("./config");
 const const_1 = require("./const");
 const events_1 = __importDefault(require("./events"));
 const perm_1 = require("./perm");
-const misc_2 = require("./misc");
 const WHO_ANYONE = true;
 const WHO_NO_ONE = false;
 const WHO_ANY_ACCOUNT = '*';
@@ -38,6 +37,11 @@ function inheritFromParent(parent, child) {
         child.mime || (child.mime = parent.mime);
     return child;
 }
+function isSameFilenameAs(name) {
+    const lc = name.toLowerCase();
+    return (other) => lc === (typeof other === 'string' ? other : getNodeName(other)).toLowerCase();
+}
+exports.isSameFilenameAs = isSameFilenameAs;
 async function urlToNode(url, ctx, parent = exports.vfs, getRest) {
     var _a;
     let initialSlashes = 0;
@@ -54,9 +58,7 @@ async function urlToNode(url, ctx, parent = exports.vfs, getRest) {
         return;
     }
     // does the tree node have a child that goes by this name?
-    const sameName = !const_1.IS_WINDOWS ? (x) => x === name // easy
-        : (0, misc_2.with_)(name.toLowerCase(), lc => (x) => x.toLowerCase() === lc);
-    const child = (_a = parent.children) === null || _a === void 0 ? void 0 : _a.find(x => sameName(getNodeName(x)));
+    const child = (_a = parent.children) === null || _a === void 0 ? void 0 : _a.find(isSameFilenameAs(name));
     const ret = {
         ...child,
         original: child,
@@ -124,8 +126,7 @@ exports.nodeIsDirectory = nodeIsDirectory;
 function hasPermission(node, perm, ctx) {
     var _a;
     return (node.source || perm !== 'can_upload') // Upload possible only if we know where to store. First check node.source because is supposedly faster.
-        && matchWho((_a = node[perm]) !== null && _a !== void 0 ? _a : exports.defaultPerms[perm], ctx)
-        && (perm !== 'can_see' || hasPermission(node, 'can_read', ctx)); // can_see is used to hide something you nonetheless can_read, so you MUST also can_read
+        && matchWho((_a = node[perm]) !== null && _a !== void 0 ? _a : exports.defaultPerms[perm], ctx);
 }
 exports.hasPermission = hasPermission;
 async function* walkNode(parent, ctx, depth = 0, prefixPath = '') {