fix: improve redirect logic for URLs ending with '/' in getFilenameFromUrl

Author: bjohansebas

src/utils/getFilenameFromUrl.js

@@ -17,18 +17,7 @@ function decode(input) {
   return querystring.unescape(input);
 }
 
-const memoizedParseWithIndex = memorize(parse, undefined, (value) => {
-  if (value.pathname) {
-    value.pathname = decode(value.pathname);
-    if (value.pathname[value.pathname.length - 1] === "/") {
-      value.pathname = path.join(value.pathname, "index.html");
-    }
-  }
-
-  return value;
-});
-
-const memoizedParseWithoutIndex = memorize(parse, undefined, (value) => {
+const memoizedParse = memorize(parse, undefined, (value) => {
   if (value.pathname) {
     value.pathname = decode(value.pathname);
   }
@@ -54,7 +43,6 @@ const UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
  */
 
 // TODO refactor me in the next major release, this function should return `{ filename, stats, error }`
-// TODO fix redirect logic when `/` at the end, like https://github.com/pillarjs/send/blob/121dda811bae6420ce08171b10685d19c4e53059/index.js#L426
 /**
  * @template {IncomingMessage} Request
  * @template {ServerResponse} Response
@@ -74,19 +62,20 @@ function getFilenameFromUrl(context, url, extra = {}) {
 
   try {
     // The `url` property of the `request` is contains only  `pathname`, `search` and `hash`
-    urlObject = memoizedParseWithIndex(url, false, true);
+    urlObject = memoizedParse(url, false, true);
   } catch {
     return;
   }
 
   for (const { publicPath, outputPath, assetsInfo } of paths) {
     /** @type {string | undefined} */
     let filename;
+
     /** @type {import("node:url").Url} */
     let publicPathObject;
 
     try {
-      publicPathObject = memoizedParseWithoutIndex(
+      publicPathObject = memoizedParse(
         publicPath !== "auto" && publicPath ? publicPath : "/",
         false,
         true,
@@ -127,11 +116,20 @@ function getFilenameFromUrl(context, url, extra = {}) {
       );
 
       try {
+        if (filename[filename.length - 1] === "/") {
+          if (options.index === false) {
+            return;
+          } else if (options.index === "string") {
+            filename = path.join(filename, options.index);
+          } else {
+            filename = path.join(filename, "index.html");
+          }
+        }
         extra.stats = context.outputFileSystem.statSync(filename);
       } catch {
         continue;
       }
-      // console.log({stats: extra.stats});
+
       if (extra.stats.isFile()) {
         foundFilename = filename;