hfs 0.52.6 → 0.52.7-rc2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.52.6",
+  "version": "0.52.7-rc2",
   "description": "HTTP File Server",
   "keywords": [
     "file server",

package/src/const.js

@@ -45,7 +45,7 @@ exports.DEV = process.env.DEV || exports.argv.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 = "2024-05-11T20:19:38.447Z";
+exports.BUILD_TIMESTAMP = "2024-05-12T16:27:50.053Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.RUNNING_BETA = exports.VERSION.includes('-');

package/src/roots.js

@@ -24,11 +24,12 @@ const rootsMiddleware = (ctx, next) => (() => {
     if (ctx.path.startsWith(misc_1.SPECIAL_URI)) { // special uris should be excluded...
         if (!ctx.path.startsWith(misc_1.API_URI))
             return; // ...unless it's an api
+        params = ctx.state.params || ctx.query; // for api we'll translate params
+        changeUriParams(v => (0, misc_1.removeStarting)(ctx.state.revProxyPath, v)); // removal must be done before adding the root
         let { referer } = ctx.headers;
         referer && (referer = new URL(referer).pathname);
         if (referer === null || referer === void 0 ? void 0 : referer.startsWith(ctx.state.revProxyPath + misc_1.ADMIN_URI))
             return; // exclude apis for admin-panel
-        params = ctx.state.params || ctx.query; // for api we'll translate params
     }
     if (lodash_1.default.isEmpty(exports.roots.get()))
         return;
@@ -44,19 +45,24 @@ const rootsMiddleware = (ctx, next) => (() => {
         (0, connections_1.disconnect)(ctx, 'bad-domain');
         return true; // true will avoid calling next
     }
-    if (!params) {
-        ctx.path = join(root, ctx.path, '');
-        return;
-    }
-    for (const [k, v] of Object.entries(params))
-        if (k.startsWith('uri'))
-            params[k] = Array.isArray(v) ? v.map(x => join(root, x)) : join(root, v);
-    function join(a, b, removePrefix = ctx.state.revProxyPath) {
-        return a + (b && b[0] !== '/' ? '/' : '')
-            + (0, misc_1.removeStarting)(removePrefix, b); // removal must be done before adding the root
+    changeUriParams(v => join(root, v));
+    if (!params)
+        ctx.path = join(root, ctx.path);
+    function changeUriParams(cb) {
+        if (!params)
+            return;
+        for (const [k, v] of Object.entries(params))
+            if (k.startsWith('uri'))
+                params[k] = Array.isArray(v) ? v.map(cb) : cb(v);
     }
 })() || next();
 exports.rootsMiddleware = rootsMiddleware;
-function join(a, b) {
-    return a + (b && b[0] !== '/' ? '/' : '') + b;
+function join(a, b, joiner = '/') {
+    if (!b)
+        return a;
+    if (!a)
+        return b;
+    const ends = a.at(-1) === joiner;
+    const starts = b[0] === joiner;
+    return a + (!ends && !starts ? joiner + b : ends && starts ? b.slice(1) : b);
 }